diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2011-04-17 20:13:07 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2011-04-17 20:13:07 -0400 |
| commit | 0077cb99704fe863cf731fc5cab792af2ede96c2 (patch) | |
| tree | dd68f44971aa2aee821f588d33b250dcd2fe57e3 /modules/rudi | |
| parent | e8b28c5e910d92cbec3d4baa6e98f025e8418d28 (diff) | |
| download | bayonetcms-0077cb99704fe863cf731fc5cab792af2ede96c2.tar.gz | |
Backporting retarded amount of changes outside of version control
Diffstat (limited to 'modules/rudi')
97 files changed, 665 insertions, 185 deletions
diff --git a/modules/rudi/header.php b/modules/rudi/header.php index 47c5ffa..7ea6723 100644 --- a/modules/rudi/header.php +++ b/modules/rudi/header.php @@ -1,6 +1,10 @@ -<html> -<head> -<title>RUDI</title> -<!-- <link rel="stylesheet" type="text/css" href="includes/rudi.css" /> --> -</head> -<body> +<?php OpenContent(); ?> +<div class="content" style="text-align:center"> + <div class="inline" style="margin:0px 20px 0px 20px;"><?php echo LinkModule('rudi',NULL,'Roster'); ?></div> + <div class="inline" style="margin:0px 20px 0px 20px;"><?php echo LinkModule('rudi','&show=awards','Awards & Medals'); ?></div> + <div class="inline" style="margin:0px 20px 0px 20px;"><?php echo LinkModule('rudi','&show=weapons','Weapons'); ?></div> + <div class="inline" style="margin:0px 20px 0px 20px;"><?php echo LinkModule('rudi','&show=ranks','Ranks'); ?></div> + <div class="clear"></div> +</div> +<?php CloseContent(); ?> +<br />
\ No newline at end of file diff --git a/modules/rudi/images/medals/CIB_1st.gif b/modules/rudi/images/medals/CIB_1st.gif Binary files differnew file mode 100644 index 0000000..eb218ec --- /dev/null +++ b/modules/rudi/images/medals/CIB_1st.gif diff --git a/modules/rudi/images/medals/CIB_2nd.gif b/modules/rudi/images/medals/CIB_2nd.gif Binary files differnew file mode 100644 index 0000000..d4fd78e --- /dev/null +++ b/modules/rudi/images/medals/CIB_2nd.gif diff --git a/modules/rudi/images/medals/CIB_3rd.gif b/modules/rudi/images/medals/CIB_3rd.gif Binary files differnew file mode 100644 index 0000000..2ddf96a --- /dev/null +++ b/modules/rudi/images/medals/CIB_3rd.gif diff --git a/modules/rudi/images/medals/CoD2.gif b/modules/rudi/images/medals/CoD2.gif Binary files differnew file mode 100644 index 0000000..8e936a0 --- /dev/null +++ b/modules/rudi/images/medals/CoD2.gif diff --git a/modules/rudi/images/medals/CoD2.jpg b/modules/rudi/images/medals/CoD2.jpg Binary files differnew file mode 100644 index 0000000..099ca27 --- /dev/null +++ b/modules/rudi/images/medals/CoD2.jpg diff --git a/modules/rudi/images/medals/DUC.jpg b/modules/rudi/images/medals/DUC.jpg Binary files differnew file mode 100644 index 0000000..566f81b --- /dev/null +++ b/modules/rudi/images/medals/DUC.jpg diff --git a/modules/rudi/images/medals/SM.gif b/modules/rudi/images/medals/SM.gif Binary files differnew file mode 100644 index 0000000..ac59604 --- /dev/null +++ b/modules/rudi/images/medals/SM.gif diff --git a/modules/rudi/images/medals/SS.gif b/modules/rudi/images/medals/SS.gif Binary files differnew file mode 100644 index 0000000..a488adc --- /dev/null +++ b/modules/rudi/images/medals/SS.gif diff --git a/modules/rudi/images/medals/afem.jpg b/modules/rudi/images/medals/afem.jpg Binary files differnew file mode 100644 index 0000000..6b0324c --- /dev/null +++ b/modules/rudi/images/medals/afem.jpg diff --git a/modules/rudi/images/medals/arma2duc.jpg b/modules/rudi/images/medals/arma2duc.jpg Binary files differnew file mode 100644 index 0000000..bf4bfcc --- /dev/null +++ b/modules/rudi/images/medals/arma2duc.jpg diff --git a/modules/rudi/images/medals/cib1.png b/modules/rudi/images/medals/cib1.png Binary files differnew file mode 100644 index 0000000..d96bf80 --- /dev/null +++ b/modules/rudi/images/medals/cib1.png diff --git a/modules/rudi/images/medals/cib2.png b/modules/rudi/images/medals/cib2.png Binary files differnew file mode 100644 index 0000000..ba6f8dd --- /dev/null +++ b/modules/rudi/images/medals/cib2.png diff --git a/modules/rudi/images/medals/cib3.png b/modules/rudi/images/medals/cib3.png Binary files differnew file mode 100644 index 0000000..abc2215 --- /dev/null +++ b/modules/rudi/images/medals/cib3.png diff --git a/modules/rudi/images/medals/cib4.png b/modules/rudi/images/medals/cib4.png Binary files differnew file mode 100644 index 0000000..d511343 --- /dev/null +++ b/modules/rudi/images/medals/cib4.png diff --git a/modules/rudi/images/medals/cod4unitcit.jpg b/modules/rudi/images/medals/cod4unitcit.jpg Binary files differnew file mode 100644 index 0000000..aad4498 --- /dev/null +++ b/modules/rudi/images/medals/cod4unitcit.jpg diff --git a/modules/rudi/images/medals/dsm.jpg b/modules/rudi/images/medals/dsm.jpg Binary files differindex b90e927..7cf0978 100644 --- a/modules/rudi/images/medals/dsm.jpg +++ b/modules/rudi/images/medals/dsm.jpg diff --git a/modules/rudi/images/medals/eib.jpg b/modules/rudi/images/medals/eib.jpg Binary files differnew file mode 100644 index 0000000..e8b5f59 --- /dev/null +++ b/modules/rudi/images/medals/eib.jpg diff --git a/modules/rudi/images/medals/eib.png b/modules/rudi/images/medals/eib.png Binary files differnew file mode 100644 index 0000000..909f057 --- /dev/null +++ b/modules/rudi/images/medals/eib.png diff --git a/modules/rudi/images/medals/expert.gif b/modules/rudi/images/medals/expert.gif Binary files differnew file mode 100644 index 0000000..b00bc76 --- /dev/null +++ b/modules/rudi/images/medals/expert.gif diff --git a/modules/rudi/images/medals/oak_leaf_clusters.gif b/modules/rudi/images/medals/oak_leaf_clusters.gif Binary files differnew file mode 100644 index 0000000..376ef8c --- /dev/null +++ b/modules/rudi/images/medals/oak_leaf_clusters.gif diff --git a/modules/rudi/images/medals/pass.gif b/modules/rudi/images/medals/pass.gif Binary files differnew file mode 100644 index 0000000..58d305f --- /dev/null +++ b/modules/rudi/images/medals/pass.gif diff --git a/modules/rudi/images/medals/sniper_qual.gif b/modules/rudi/images/medals/sniper_qual.gif Binary files differnew file mode 100644 index 0000000..9d51310 --- /dev/null +++ b/modules/rudi/images/medals/sniper_qual.gif diff --git a/modules/rudi/images/medals/sniper_qual.jpg b/modules/rudi/images/medals/sniper_qual.jpg Binary files differnew file mode 100644 index 0000000..1e19720 --- /dev/null +++ b/modules/rudi/images/medals/sniper_qual.jpg diff --git a/modules/rudi/images/medals/success.gif b/modules/rudi/images/medals/success.gif Binary files differnew file mode 100644 index 0000000..d3fca80 --- /dev/null +++ b/modules/rudi/images/medals/success.gif diff --git a/modules/rudi/images/medals/valor_device.gif b/modules/rudi/images/medals/valor_device.gif Binary files differnew file mode 100644 index 0000000..3a68d96 --- /dev/null +++ b/modules/rudi/images/medals/valor_device.gif diff --git a/modules/rudi/images/medals/valor_device.jpg b/modules/rudi/images/medals/valor_device.jpg Binary files differnew file mode 100644 index 0000000..facff6f --- /dev/null +++ b/modules/rudi/images/medals/valor_device.jpg diff --git a/modules/rudi/images/ranks/tiny/1LT.png b/modules/rudi/images/ranks/tiny/1LT.png Binary files differnew file mode 100644 index 0000000..83b6ab1 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/1LT.png diff --git a/modules/rudi/images/ranks/tiny/1SG.png b/modules/rudi/images/ranks/tiny/1SG.png Binary files differnew file mode 100644 index 0000000..4d9e872 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/1SG.png diff --git a/modules/rudi/images/ranks/tiny/2LT.png b/modules/rudi/images/ranks/tiny/2LT.png Binary files differnew file mode 100644 index 0000000..00df3a7 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/2LT.png diff --git a/modules/rudi/images/ranks/tiny/CPL.png b/modules/rudi/images/ranks/tiny/CPL.png Binary files differnew file mode 100644 index 0000000..b9dd559 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/CPL.png diff --git a/modules/rudi/images/ranks/tiny/CPT.png b/modules/rudi/images/ranks/tiny/CPT.png Binary files differnew file mode 100644 index 0000000..2c83daf --- /dev/null +++ b/modules/rudi/images/ranks/tiny/CPT.png diff --git a/modules/rudi/images/ranks/tiny/CW2.png b/modules/rudi/images/ranks/tiny/CW2.png Binary files differnew file mode 100644 index 0000000..43367ae --- /dev/null +++ b/modules/rudi/images/ranks/tiny/CW2.png diff --git a/modules/rudi/images/ranks/tiny/CW3.png b/modules/rudi/images/ranks/tiny/CW3.png Binary files differnew file mode 100644 index 0000000..7ec90e4 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/CW3.png diff --git a/modules/rudi/images/ranks/tiny/CW4.png b/modules/rudi/images/ranks/tiny/CW4.png Binary files differnew file mode 100644 index 0000000..91db1a3 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/CW4.png diff --git a/modules/rudi/images/ranks/tiny/LTC.png b/modules/rudi/images/ranks/tiny/LTC.png Binary files differnew file mode 100644 index 0000000..5a82ff1 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/LTC.png diff --git a/modules/rudi/images/ranks/tiny/MSG.png b/modules/rudi/images/ranks/tiny/MSG.png Binary files differnew file mode 100644 index 0000000..d045260 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/MSG.png diff --git a/modules/rudi/images/ranks/tiny/PFC.png b/modules/rudi/images/ranks/tiny/PFC.png Binary files differnew file mode 100644 index 0000000..cf7e41b --- /dev/null +++ b/modules/rudi/images/ranks/tiny/PFC.png diff --git a/modules/rudi/images/ranks/tiny/PV2.png b/modules/rudi/images/ranks/tiny/PV2.png Binary files differnew file mode 100644 index 0000000..6e2fa3c --- /dev/null +++ b/modules/rudi/images/ranks/tiny/PV2.png diff --git a/modules/rudi/images/ranks/tiny/SFC.png b/modules/rudi/images/ranks/tiny/SFC.png Binary files differnew file mode 100644 index 0000000..ec74e80 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/SFC.png diff --git a/modules/rudi/images/ranks/tiny/SGT.png b/modules/rudi/images/ranks/tiny/SGT.png Binary files differnew file mode 100644 index 0000000..fe5e441 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/SGT.png diff --git a/modules/rudi/images/ranks/tiny/SPC.png b/modules/rudi/images/ranks/tiny/SPC.png Binary files differnew file mode 100644 index 0000000..1d991f3 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/SPC.png diff --git a/modules/rudi/images/ranks/tiny/SSG.png b/modules/rudi/images/ranks/tiny/SSG.png Binary files differnew file mode 100644 index 0000000..956951e --- /dev/null +++ b/modules/rudi/images/ranks/tiny/SSG.png diff --git a/modules/rudi/images/ranks/tiny/WO1.png b/modules/rudi/images/ranks/tiny/WO1.png Binary files differnew file mode 100644 index 0000000..eb6f347 --- /dev/null +++ b/modules/rudi/images/ranks/tiny/WO1.png diff --git a/modules/rudi/images/uniform/ACoia.png b/modules/rudi/images/uniform/ACoia.png Binary files differindex 0e70357..e22cdd2 100644 --- a/modules/rudi/images/uniform/ACoia.png +++ b/modules/rudi/images/uniform/ACoia.png diff --git a/modules/rudi/images/uniform/ACourter.png b/modules/rudi/images/uniform/ACourter.png Binary files differnew file mode 100644 index 0000000..c422930 --- /dev/null +++ b/modules/rudi/images/uniform/ACourter.png diff --git a/modules/rudi/images/uniform/ADodge.png b/modules/rudi/images/uniform/ADodge.png Binary files differnew file mode 100644 index 0000000..77c9526 --- /dev/null +++ b/modules/rudi/images/uniform/ADodge.png diff --git a/modules/rudi/images/uniform/AHernandez.png b/modules/rudi/images/uniform/AHernandez.png Binary files differnew file mode 100644 index 0000000..c118b76 --- /dev/null +++ b/modules/rudi/images/uniform/AHernandez.png diff --git a/modules/rudi/images/uniform/AKlassen.png b/modules/rudi/images/uniform/AKlassen.png Binary files differnew file mode 100644 index 0000000..7051ae2 --- /dev/null +++ b/modules/rudi/images/uniform/AKlassen.png diff --git a/modules/rudi/images/uniform/ASherman.png b/modules/rudi/images/uniform/ASherman.png Binary files differnew file mode 100644 index 0000000..57facd0 --- /dev/null +++ b/modules/rudi/images/uniform/ASherman.png diff --git a/modules/rudi/images/uniform/AZanesco.png b/modules/rudi/images/uniform/AZanesco.png Binary files differnew file mode 100644 index 0000000..e38c659 --- /dev/null +++ b/modules/rudi/images/uniform/AZanesco.png diff --git a/modules/rudi/images/uniform/BMorgan.png b/modules/rudi/images/uniform/BMorgan.png Binary files differnew file mode 100644 index 0000000..010bac0 --- /dev/null +++ b/modules/rudi/images/uniform/BMorgan.png diff --git a/modules/rudi/images/uniform/BSegal.png b/modules/rudi/images/uniform/BSegal.png Binary files differindex 1c9c0f2..0428ed2 100644 --- a/modules/rudi/images/uniform/BSegal.png +++ b/modules/rudi/images/uniform/BSegal.png diff --git a/modules/rudi/images/uniform/BWhiting.png b/modules/rudi/images/uniform/BWhiting.png Binary files differnew file mode 100644 index 0000000..f9e754e --- /dev/null +++ b/modules/rudi/images/uniform/BWhiting.png diff --git a/modules/rudi/images/uniform/DHolson.png b/modules/rudi/images/uniform/DHolson.png Binary files differindex b372cf5..91b5e9e 100644 --- a/modules/rudi/images/uniform/DHolson.png +++ b/modules/rudi/images/uniform/DHolson.png diff --git a/modules/rudi/images/uniform/DKillian.png b/modules/rudi/images/uniform/DKillian.png Binary files differnew file mode 100644 index 0000000..eb6cb67 --- /dev/null +++ b/modules/rudi/images/uniform/DKillian.png diff --git a/modules/rudi/images/uniform/EOConnell.png b/modules/rudi/images/uniform/EOConnell.png Binary files differindex 9e46bfd..f9fd55d 100644 --- a/modules/rudi/images/uniform/EOConnell.png +++ b/modules/rudi/images/uniform/EOConnell.png diff --git a/modules/rudi/images/uniform/GTownsend.png b/modules/rudi/images/uniform/GTownsend.png Binary files differindex 6d6f314..b3e6c0b 100644 --- a/modules/rudi/images/uniform/GTownsend.png +++ b/modules/rudi/images/uniform/GTownsend.png diff --git a/modules/rudi/images/uniform/INewton.png b/modules/rudi/images/uniform/INewton.png Binary files differnew file mode 100644 index 0000000..02aa620 --- /dev/null +++ b/modules/rudi/images/uniform/INewton.png diff --git a/modules/rudi/images/uniform/JCiciotti.png b/modules/rudi/images/uniform/JCiciotti.png Binary files differnew file mode 100644 index 0000000..29b5722 --- /dev/null +++ b/modules/rudi/images/uniform/JCiciotti.png diff --git a/modules/rudi/images/uniform/JHiggins.jpg b/modules/rudi/images/uniform/JHiggins.jpg Binary files differnew file mode 100644 index 0000000..122bd3c --- /dev/null +++ b/modules/rudi/images/uniform/JHiggins.jpg diff --git a/modules/rudi/images/uniform/JHiggins.png b/modules/rudi/images/uniform/JHiggins.png Binary files differnew file mode 100644 index 0000000..c468434 --- /dev/null +++ b/modules/rudi/images/uniform/JHiggins.png diff --git a/modules/rudi/images/uniform/JMagers.png b/modules/rudi/images/uniform/JMagers.png Binary files differnew file mode 100644 index 0000000..aaeeb0e --- /dev/null +++ b/modules/rudi/images/uniform/JMagers.png diff --git a/modules/rudi/images/uniform/JMelnyk.png b/modules/rudi/images/uniform/JMelnyk.png Binary files differindex 111291c..8f7178f 100644 --- a/modules/rudi/images/uniform/JMelnyk.png +++ b/modules/rudi/images/uniform/JMelnyk.png diff --git a/modules/rudi/images/uniform/JMervau.png b/modules/rudi/images/uniform/JMervau.png Binary files differnew file mode 100644 index 0000000..d7d80bc --- /dev/null +++ b/modules/rudi/images/uniform/JMervau.png diff --git a/modules/rudi/images/uniform/JSchroeder.png b/modules/rudi/images/uniform/JSchroeder.png Binary files differnew file mode 100644 index 0000000..7556027 --- /dev/null +++ b/modules/rudi/images/uniform/JSchroeder.png diff --git a/modules/rudi/images/uniform/KGrimes.png b/modules/rudi/images/uniform/KGrimes.png Binary files differindex db03b87..35aa4cb 100644 --- a/modules/rudi/images/uniform/KGrimes.png +++ b/modules/rudi/images/uniform/KGrimes.png diff --git a/modules/rudi/images/uniform/KOlson.png b/modules/rudi/images/uniform/KOlson.png Binary files differnew file mode 100644 index 0000000..89e7f00 --- /dev/null +++ b/modules/rudi/images/uniform/KOlson.png diff --git a/modules/rudi/images/uniform/LTrimble.png b/modules/rudi/images/uniform/LTrimble.png Binary files differindex 3d8f2b6..3ec56da 100644 --- a/modules/rudi/images/uniform/LTrimble.png +++ b/modules/rudi/images/uniform/LTrimble.png diff --git a/modules/rudi/images/uniform/MAbballe.png b/modules/rudi/images/uniform/MAbballe.png Binary files differnew file mode 100644 index 0000000..596d551 --- /dev/null +++ b/modules/rudi/images/uniform/MAbballe.png diff --git a/modules/rudi/images/uniform/MCampeau.png b/modules/rudi/images/uniform/MCampeau.png Binary files differnew file mode 100644 index 0000000..c5711b7 --- /dev/null +++ b/modules/rudi/images/uniform/MCampeau.png diff --git a/modules/rudi/images/uniform/MLula.png b/modules/rudi/images/uniform/MLula.png Binary files differindex a674bc2..2b7feb0 100644 --- a/modules/rudi/images/uniform/MLula.png +++ b/modules/rudi/images/uniform/MLula.png diff --git a/modules/rudi/images/uniform/MMark.png b/modules/rudi/images/uniform/MMark.png Binary files differindex ed5ae93..063d1f8 100644 --- a/modules/rudi/images/uniform/MMark.png +++ b/modules/rudi/images/uniform/MMark.png diff --git a/modules/rudi/images/uniform/PBurris.png b/modules/rudi/images/uniform/PBurris.png Binary files differindex f64736d..c3546fd 100644 --- a/modules/rudi/images/uniform/PBurris.png +++ b/modules/rudi/images/uniform/PBurris.png diff --git a/modules/rudi/images/uniform/PPederson.png b/modules/rudi/images/uniform/PPederson.png Binary files differindex c5743f9..33b98be 100644 --- a/modules/rudi/images/uniform/PPederson.png +++ b/modules/rudi/images/uniform/PPederson.png diff --git a/modules/rudi/images/uniform/PRadziwonowicz.png b/modules/rudi/images/uniform/PRadziwonowicz.png Binary files differnew file mode 100644 index 0000000..46e60f4 --- /dev/null +++ b/modules/rudi/images/uniform/PRadziwonowicz.png diff --git a/modules/rudi/images/uniform/RECRUIT.png b/modules/rudi/images/uniform/RECRUIT.png Binary files differnew file mode 100644 index 0000000..3f9a97b --- /dev/null +++ b/modules/rudi/images/uniform/RECRUIT.png diff --git a/modules/rudi/images/uniform/RLeahy.png b/modules/rudi/images/uniform/RLeahy.png Binary files differindex 1c36abf..99d0c0d 100644 --- a/modules/rudi/images/uniform/RLeahy.png +++ b/modules/rudi/images/uniform/RLeahy.png diff --git a/modules/rudi/images/uniform/RStewart.png b/modules/rudi/images/uniform/RStewart.png Binary files differnew file mode 100644 index 0000000..a1c4e8a --- /dev/null +++ b/modules/rudi/images/uniform/RStewart.png diff --git a/modules/rudi/images/uniform/SCorsaro.png b/modules/rudi/images/uniform/SCorsaro.png Binary files differindex 1895adf..33373cf 100644 --- a/modules/rudi/images/uniform/SCorsaro.png +++ b/modules/rudi/images/uniform/SCorsaro.png diff --git a/modules/rudi/images/uniform/SDayton.png b/modules/rudi/images/uniform/SDayton.png Binary files differnew file mode 100644 index 0000000..8638b96 --- /dev/null +++ b/modules/rudi/images/uniform/SDayton.png diff --git a/modules/rudi/images/uniform/TKleiber.png b/modules/rudi/images/uniform/TKleiber.png Binary files differnew file mode 100644 index 0000000..27ed4b5 --- /dev/null +++ b/modules/rudi/images/uniform/TKleiber.png diff --git a/modules/rudi/images/uniform/TMichaels.png b/modules/rudi/images/uniform/TMichaels.png Binary files differnew file mode 100644 index 0000000..4935871 --- /dev/null +++ b/modules/rudi/images/uniform/TMichaels.png diff --git a/modules/rudi/images/uniform/TMoore.png b/modules/rudi/images/uniform/TMoore.png Binary files differnew file mode 100644 index 0000000..eceda1e --- /dev/null +++ b/modules/rudi/images/uniform/TMoore.png diff --git a/modules/rudi/images/uniform/ZBarrett.png b/modules/rudi/images/uniform/ZBarrett.png Binary files differindex c9d106b..1954d8f 100644 --- a/modules/rudi/images/uniform/ZBarrett.png +++ b/modules/rudi/images/uniform/ZBarrett.png diff --git a/modules/rudi/includes/common.class.php b/modules/rudi/includes/common.class.php index 2112853..0d5e63e 100644 --- a/modules/rudi/includes/common.class.php +++ b/modules/rudi/includes/common.class.php @@ -2,6 +2,7 @@ define('RUDI_PROFILE_SMALL', true); define('RUDI_PROFILE_BIG', false); +define('RUDI_ROSTER_RESERVES', 12); class Soldier { @@ -444,21 +445,61 @@ class RUDI_Common */ protected function getCombatRecord($member_id) { + $data = NULL; $query = sprintf( - "SELECT c.date, c.status, u1.name, u1.website, u.war_id " + "SELECT s.title, s.date, s.status, u1.name, u1.website, s.war_id, s.home_score, s.visit_score " ."FROM rudi_combat_record AS c " - ."RIGHT OUTER JOIN rudi_war_stats AS u ON u.visit_unit_id = c.visitor_id " - ."RIGHT OUTER JOIN rudi_war_units AS u1 ON u1.name " - ."LEFT OUTER JOIN rudi_unit_members AS m ON m.member_id = c.member_id " - ."WHERE c.member_id = %d ORDER BY c.date DESC ", + ."RIGHT OUTER JOIN rudi_war_stats AS s ON s.war_id = c.war_id " + ."RIGHT OUTER JOIN rudi_war_units AS u1 ON u1.visitor_id = s.visit_unit_id " + ."WHERE c.member_id = %d ORDER BY s.date DESC ", (int)$member_id); $result = $this->db->Query($query); + $data = $this->db->FetchObject($result,'CombatRecord'); return $data; } + + /** + * RUDI_Common::getUnitArr() + * + * @param member_id $mID + * @return an array of the member's units orders from Team - Unit with name, id, & leader + */ + function getUnitArr($mID){ + $unitArr = array(); + + $result = $this->db->Query("SELECT * FROM `rudi_unit_members` WHERE `member_id` = $mID LIMIT 1"); + $member = $this->db->FetchRow($result); + $curUnit = $member['cunit_id']; + + $i = 0; + + $subOf = $curUnit; + while($subOf != 0){ + $unitID = $subOf; + $result = $this->db->Query("SELECT * FROM `rudi_combat_units` WHERE `unit_id` = $subOf LIMIT 1"); + $data = $this->db->fetch($result); + foreach($data as $units){ + $subOf = $units['detachment']; + $leader = $units['leader_id']; + $name = $units['name']; + } + + $unitArr[$i]['unit_id'] = $unitID; + $unitArr[$i]['leader_id'] = $leader; + $unitArr[$i]['name'] = $name; + + + // echo "Unit ID: ".$unitArr[$i]['unit_id']."<br />Name: ".$unitArr[$i]['name']."<br />Leader ID: ".$unitArr[$i]['leader_id']."<br /><br />"; + + $i++; + } + + return array_reverse($unitArr); + } /** * RUDI_Core::getSuperiorUnit() @@ -557,6 +598,7 @@ class RUDI_Common protected function getSuperiorTrue($id) { $superior =& $this->data[$id]->superior; //Reference only the data we need to use + $name =& $this->data[$id]->name; $leader = NULL; //Set the return value to null @@ -577,6 +619,48 @@ class RUDI_Common return $leader; } + /** + * RUDI_Core::getSuperior($unit_id) + * + * @param mixed $unit_id + * @return + */ + protected function getSuperior($id) + { + $leader = NULL; + $unit_id = $this->data[$id]->unit_id; + + $result = $this->db->Query("SELECT `leader_id`, `detachment` FROM `rudi_combat_units` WHERE `unit_id` = '$unit_id' LIMIT 1"); + $row = $this->db->FetchRow($result); + + $detachment = $row['detachment']; + $leader_id = $row['leader_id']; + if($leader_id == $id){ + $leader_id = 0; + } + while($leader_id == 0){ + if($detachment == 0){ + break; + } + $result = $this->db->Query("SELECT `leader_id`, `detachment` FROM `rudi_combat_units` WHERE `unit_id` = '$detachment' LIMIT 1"); + $row = $this->db->FetchRow($result); + $detachment = $row['detachment']; + $leader_id = $row['leader_id']; + } + + if($leader_id != 0){ + $result = $this->db->Query("SELECT CONCAT(r.shortname, ' ', m.last_name) AS name FROM rudi_unit_members AS m LEFT OUTER JOIN rudi_ranks AS r ON r.rank_id = m.rank_id WHERE m.member_id = '$leader_id' LIMIT 1"); + $row = $this->db->FetchRow($result); + + $leader->name = $row['name']; + $leader->leader_id = $leader_id; + } + + return $leader; + } + + + /** * RUDI_Core::getUnit() * @@ -667,17 +751,34 @@ class RUDI_Common * @param int $leader_id */ public function printRoster($unit_id, $leader_id){ + $num = 0; foreach($this->data as $member){ - if($member->unit_id == $unit_id && $member->status_id < 4){ -?> - <tr> + if($member->unit_id == $unit_id && $member->status_id < 3){ + decho($member); + if($num%2==0){ + echo "<tr>"; + } + else { + echo '<tr class="high">'; + } + ?> <!-- Rank --> - <td class="roster"><img src="<?php echo "modules/rudi/images/ranks/small/{$member->rank_short}.png"; ?>" alt="<?php echo $member->rank_short; ?>" /></td> + <td class="roster"> + <?php + if(file_exists("modules/rudi/images/ranks/tiny/{$member->rank_short}.png")){ + echo "<img src=\"modules/rudi/images/ranks/tiny/{$member->rank_short}.png\" alt=\"{$member->rank_short}\" />"; + }else{ + //echo $member->rank_short; + } + ?> + </td> <!-- Name --> - <td class="roster"><a class="rudi_roster" href="?load=rudi&profile=<?php echo $member->member_id ?>"><?php echo $member->last_name . ', ' . $member->first_name; ?></a></td> + <td class="roster"><a class="rosterlink" href="?load=rudi&profile=<?php echo $member->member_id ?>"><?php echo $member->rank_long . ' ' . $member->first_name . ' ' . $member->last_name; ?></a></td> <!-- Roles --> <td class="roster"> + <?php echo $member->role_name; ?> <?php + /* decho(count($member->Roles) . ' roles attached to: ' . $member->last_name); for($role = 0; $role < count($member->Roles); ++$role) { @@ -688,9 +789,9 @@ class RUDI_Common echo $member->Roles[$role]->role_name; if($role < count($member->Roles) - 1) echo ', '; - echo ' '; + //echo ' '; } - } + } */ ?> </td> <!-- Weapon --> @@ -698,10 +799,135 @@ class RUDI_Common <!-- Status --> <td class="roster"><?php echo $member->status; ?></td> </tr> -<?php - } +<?php $num++; + } + } - } + } + + /** + * RUDI_Core::printReserves() + * + */ + public function printReserves(){ + $num = 0; + foreach($this->data as $member){ + if($member->status_id == 3 || $member->unit_id == RUDI_ROSTER_RESERVES){ + decho($member); + + if($num == 0) + echo "<tr><th colspan=\"5\">Reserves</th></tr>"; + + if($num%2==0){ + echo "<tr>"; + } + else { + echo '<tr class="high">'; + } + ?> + <!-- Rank --> + <td class="roster"> + <?php + if(file_exists("modules/rudi/images/ranks/tiny/{$member->rank_short}.png")){ + echo "<img src=\"modules/rudi/images/ranks/tiny/{$member->rank_short}.png\" alt=\"{$member->rank_short}\" />"; + }else{ + //echo $member->rank_short; + } + ?> + </td> + <!-- Name --> + <td class="roster"><a class="rosterlink" href="?load=rudi&profile=<?php echo $member->member_id ?>"><?php echo $member->rank_long . ' ' . $member->first_name . ' ' . $member->last_name; ?></a></td> + <!-- Roles --> + <td class="roster"> + <?php echo $member->role_name; ?> + <?php + /* + decho(count($member->Roles) . ' roles attached to: ' . $member->last_name); + for($role = 0; $role < count($member->Roles); ++$role) + { + if($member->Roles[$role]->role_name) + { + //decho($role . " = (" . $member->Roles[$role]->role_name . ")"); + + echo $member->Roles[$role]->role_name; + if($role < count($member->Roles) - 1) echo ', '; + + //echo ' '; + } + } */ + ?> + </td> + <!-- Weapon --> + <td class="roster"><?php echo $member->weapon_model; ?></td> + <!-- Status --> + <td class="roster"><?php echo $member->status; ?></td> + </tr> +<?php $num++; + } + + } + } + + /** + * RUDI_Core::printPastRoster() + * + */ + public function printPastRoster(){ + decho($this->data); + $num=0; + foreach($this->data as $member){ + if($member->status_id >= 4){ + decho($member); +?> +<?php if($num%2==0){ + echo "<tr>"; + } + else { + echo '<tr class="high">'; + } + ?> + <!-- Rank --> + <td class="roster"> +<?php + if(file_exists("modules/rudi/images/ranks/tiny/{$member->rank_short}.png")){ + echo "<img src=\"modules/rudi/images/ranks/tiny/{$member->rank_short}.png\" alt=\"{$member->rank_short}\" />"; + }else{ + //echo $member->rank_short; + } +?> + </td> + <!-- Name --> + <td><a class="rosterlink" href="?load=rudi&profile=<?php echo $member->member_id ?>"><?php echo $member->rank_long . ' ' . $member->first_name . ' ' . $member->last_name; ?></a></td> + <!-- Roles --> + <td class="roster"> + <?php echo $member->role_name; ?> +<?php + /* decho(count($member->Roles) . ' roles attached to: ' . $member->last_name); + for($role = 0; $role < count($member->Roles); ++$role) + { + if($member->Roles[$role]->role_name) + { + //decho($role . " = (" . $member->Roles[$role]->role_name . ")"); + + echo $member->Roles[$role]->role_name; + if($role < count($member->Roles) - 1) echo ', '; + + //echo ' '; + } + } */ +?> + </td> + <!-- Weapon --> + <td class="roster"><?php echo $this->getDiffTime($member->date_enlisted, $member->date_discharged); ?></td> + <!-- Status --> + <td class="roster"><?php echo $member->status; ?></td> + </tr> +<?php + $num++; + } + + } + } /** * RUDI_Core::displayUnitsRec() * @@ -711,8 +937,13 @@ class RUDI_Common $result = $this->db->Query("SELECT * FROM `rudi_combat_units` WHERE `detachment` = '$unit_id' ORDER BY `weight`"); $row = $this->db->FetchObject($result,'UnitInfo'); foreach($row as $unit){ - echo "<tr><th colspan=\"5\">{$unit->name} : {$unit->callsign}</th></tr>"; - $this->printRoster($unit->unit_id, $unit->leader_id); + $num = 0; + $check = $this->db->Query("SELECT `member_id` FROM `rudi_unit_members` WHERE `cunit_id` = '$unit->unit_id' AND `date_discharged` IS NULL LIMIT 1"); + $num = $this->db->Rows($check); + if($num >= 1 && $unit->unit_id != RUDI_ROSTER_RESERVES){ + echo "<tr><th colspan=\"5\">{$unit->name} : {$unit->callsign}</th></tr>"; + $this->printRoster($unit->unit_id, $unit->leader_id); + } $this->displayUnitsRec($unit->unit_id); } } @@ -742,6 +973,9 @@ class RUDI_Common ."m.location_city, " ."m.location_province, " ."m.primary_mos, " + ."m.points, " + ."m.drillcount, " + ."m.attendcount, " ."r.rank_id, " ."r.image AS rank_image, " ."r.longname AS rank_long, " @@ -759,9 +993,14 @@ class RUDI_Common ."t.team_id, " ."t.name AS team_name, " ."t.leader_id AS team_leader_id, " + ."ro.role_id, " + ."ro.name AS role_name, " ."w.weapon_id, " ."w.manufacturer AS weapon_manufacturer, " ."w.model AS weapon_model, " + ."w2.weapon_id, " + ."w2.manufacturer AS weapon2_manufacturer, " + ."w2.model AS weapon2_model, " ."co.country_id, " ."co.name AS country_name, " ."co.image AS country_image, " @@ -780,7 +1019,9 @@ class RUDI_Common ."FROM rudi_unit_members AS m " ."LEFT OUTER JOIN rudi_weapons AS w ON w.weapon_id = m.weapon_id " - ."LEFT OUTER JOIN rudi_units AS u ON u.unit_id = m.unit_id " + ."LEFT OUTER JOIN rudi_weapons AS w2 ON w2.weapon_id = m.weapon2_id " + ."LEFT OUTER JOIN rudi_roles AS ro ON ro.role_id = m.role_id " + ."LEFT OUTER JOIN rudi_combat_units AS u ON u.unit_id = m.cunit_id " ."LEFT OUTER JOIN rudi_squads AS s ON s.squad_id = m.squad_id " ."LEFT OUTER JOIN rudi_teams AS t ON t.team_id = m.team_id " ."LEFT OUTER JOIN rudi_platoons AS p ON p.platoon_id = m.platoon_id " @@ -799,6 +1040,7 @@ class RUDI_Common ."m.status_id, " ."m.date_promotion, " ."m.date_enlisted, " + ."m.date_discharged, " ."m.primary_mos, " ."r.rank_id, " ."r.image AS rank_image, " @@ -816,6 +1058,8 @@ class RUDI_Common ."st.status_id, " ."t.team_id, " ."t.name AS team_name, " + ."ro.role_id, " + ."ro.name AS role_name, " ."w.weapon_id, " ."w.manufacturer AS weapon_manufacturer, " ."w.model AS weapon_model, " @@ -825,6 +1069,7 @@ class RUDI_Common ."FROM rudi_unit_members AS m " ."LEFT OUTER JOIN rudi_weapons AS w ON w.weapon_id = m.weapon_id " + ."LEFT OUTER JOIN rudi_roles AS ro ON ro.role_id = m.role_id " ."LEFT OUTER JOIN rudi_combat_units AS u ON u.unit_id = m.cunit_id " ."LEFT OUTER JOIN rudi_squads AS s ON s.squad_id = m.squad_id " ."LEFT OUTER JOIN rudi_teams AS t ON t.team_id = m.team_id " @@ -848,22 +1093,24 @@ class RUDI_Common { $count = $member->member_id; $this->data[$member->member_id] = $member; - $this->data[$count]->Roles = $this->getRoles($member->member_id,$member->rank_id); + /* $this->data[$count]->Roles = $this->getRoles($member->member_id,$member->rank_id); if(is_object($this->data[$count]->Roles)) { $this->data[$count]->Roles = array((object)$nothing); - } + } */ if($query_t != RUDI_PROFILE_SMALL) { $this->data[$count]->service_record = $this->getServiceRecord($member->member_id); $this->data[$count]->award_record = $this->getAwardRecord($member->member_id); $this->data[$count]->combat_record = $this->getCombatRecord($member->member_id); - $this->data[$count]->superior->unit = $this->getSuperiorUnit($member->unit_id); + //$this->data[$count]->superior_next = $this->getSuperiorTrue($member->member_id); + $this->data[$count]->superior = $this->getSuperior($member->member_id); + $this->data[$count]->superior->unit = $this->getSuperiorUnit($member->unit_id); $this->data[$count]->superior->platoon = $this->getSuperiorPlatoon($member->platoon_id); $this->data[$count]->superior->squad = $this->getSuperiorSquad($member->squad_id); $this->data[$count]->superior->team = $this->getSuperiorTeam($member->team_id); - $this->data[$count]->superior_next = $this->getSuperiorTrue($member->member_id); + $this->data[$count]->superior_next = $this->getSuperiorTrue($member->member_id); } $count++; } @@ -876,7 +1123,7 @@ class RUDI_Common $query = "SELECT a.award_id, a.image, a.name, a.description, a.class_id, c.name AS class_name " ."FROM rudi_awards AS a " ."LEFT OUTER JOIN rudi_award_classes AS c ON c.class_id = a.class_id " - ."ORDER BY c.class_id, a.award_id ASC"; + ."ORDER BY a.weight, c.class_id, a.award_id ASC"; $result = $this->db->Query($query); $row = $this->db->FetchObject($result,'Award'); return $row; @@ -890,6 +1137,16 @@ class RUDI_Common return $row; } + protected function getWeapons($order = "") + { + $query = "SELECT weapon_id, manufacturer, model, role, caliber FROM rudi_weapons"; + $query = $query ." ". $order; + $result = $this->db->Query($query); + $row = $this->db->Fetch($result); + return $row; + } + + protected function getRanks() { $query = "SELECT rank_id, shortname, longname, image FROM rudi_ranks WHERE active = 1 ORDER BY weight DESC"; diff --git a/modules/rudi/includes/information.class.php b/modules/rudi/includes/information.class.php index 2632675..d34c4aa 100644 --- a/modules/rudi/includes/information.class.php +++ b/modules/rudi/includes/information.class.php @@ -1,34 +1,34 @@ -<?php
-
-class RUDI_Information extends RUDI_Common
-{
- public function __construct()
- {
- global $db;
- $this->db = $db;
- }
-
- public function Unit($unit_id)
- {
- $query = sprintf("SELECT leader_id, name, logo, url, creed, bio
- FROM rudi_units
- WHERE unit_id = %d", (int)$unit_id);
- $result = $this->db->Query($query);
- $unit = $this->db->FetchObject($result, 'UnitInfo', true);
- return $unit;
- }
-
- public function Platoon($unit_id, $platoon_id)
- {
- $query = sprintf("SELECT leader_id, name, logo, creed, bio
- FROM rudi_platoons
- WHERE unit_id = %d AND platoon_id = %d", (int)$unit_id, (int)$platoon_id);
- $result = $this->db->Query($query);
- $platoon = $this->db->FetchObject($result, 'UnitInfo', true);
- decho($platoon);
-
- return $platoon;
- }
-}
-
+<?php + +class RUDI_Information extends RUDI_Common +{ + public function __construct() + { + global $db; + $this->db = $db; + } + + public function Unit($unit_id) + { + $query = sprintf("SELECT leader_id, name, logo, url, creed, bio + FROM rudi_units + WHERE unit_id = %d", (int)$unit_id); + $result = $this->db->Query($query); + $unit = $this->db->FetchObject($result, 'UnitInfo', true); + return $unit; + } + + public function Platoon($unit_id, $platoon_id) + { + $query = sprintf("SELECT leader_id, name, logo, creed, bio + FROM rudi_platoons + WHERE unit_id = %d AND platoon_id = %d", (int)$unit_id, (int)$platoon_id); + $result = $this->db->Query($query); + $platoon = $this->db->FetchObject($result, 'UnitInfo', true); + decho($platoon); + + return $platoon; + } +} + ?>
\ No newline at end of file diff --git a/modules/rudi/includes/rudi.css b/modules/rudi/includes/rudi.css index 8c4ebf2..1eececd 100644 --- a/modules/rudi/includes/rudi.css +++ b/modules/rudi/includes/rudi.css @@ -1,25 +1,22 @@ -table.rudi { - /* background: green; */ -} /* -table{ +table.rudi{ border:1px solid #000; } -tr{ +table.rudi tr{ border:1px solid #000; } -th{ +table.rudi th{ padding:5px; border:1px solid #000; -} +} -td{ +table.rudi td{ text-align:center; padding:2px; border:1px solid #000; -} */ +}*/ table.rudi td.data{ text-align:left; @@ -36,17 +33,19 @@ table.rudi th { table.rudi td { text-align:center; vertical-align: middle; - /* border: 1px solid #a1a1a1; */ + /*border: 1px solid #a1a1a1;*/ } -table.rudi td.roster { + +/*table.rudi td.roster { text-align:center; vertical-align: middle; border: 1px solid #a1a1a1; -} + height: 40px; +}*/ table.rudi th.header { - /* table has a 5px padding so everything is 10px bigger than these values */ + /*table has a 5px padding so everything is 10px bigger than these values*/ width:100px; height:19px; color: #FFF; @@ -54,7 +53,8 @@ table.rudi th.header { border: 1px solid #666; font-family: arial, helvetica, sans-serif; font-size:12px; -} +} + table.rudi td.info { color: #333; @@ -64,8 +64,54 @@ table.rudi td.info { border: 1px solid #666; font-family: arial, helvetica, sans-serif; font-size:12px; -} +} #thin { border:1px outset #333; } + + table.rudiroster { + font-family: verdana; + font-size: 10px; + width: 850px; + text-align: center; + color: #2c2921; + /*background-color: #b0aea2;*/ + background-color: #6b675c; + } + + .rudiroster th { + background-color: #575551; + color: white; + } + .rudiroster td { + font-size: 10px; + height: 25px; + } + .rudiroster tr { + height: 25px; + /*background-color: #78756c;*/ + background-color: #d6d6d6; + } + .rudiroster tr.unfilled { + background-color: #7e7e7e; + color: #9d9d9d; + } + table.rudiroster td img { + padding:0px; + } + + tr.null { + height: 10px; + } + + .rudiroster tr.high { + /* background-color: #898577; */ + background-color: #e4e6e8; + } + + a.rosterlink, a.rosterlink:hover, a.rosterlink:visited { + font-size: 10px; + color: #2c2921; + text-decoration: none; + }
\ No newline at end of file diff --git a/modules/rudi/index.php b/modules/rudi/index.php index 995c90d..4550ad7 100644 --- a/modules/rudi/index.php +++ b/modules/rudi/index.php @@ -1,11 +1,14 @@ <link rel="stylesheet" type="text/css" href="modules/rudi/includes/rudi.css" media="screen"/> <?php -//include 'header.php'; + + include 'header.php'; + //include 'includes/debug.php'; //require 'includes/sql.class.php'; include_once 'includes/common.class.php'; include_once 'includes/drills.class.php'; include_once 'includes/information.class.php'; +define('BLOCK_RIGHT_DISABLE', true); OpenContent(); echo "<div class=\"contentHeading\">RUDI: Realism Unit Data Interface</div>"; @@ -66,7 +69,14 @@ class RUDI_Gateway extends RUDI_Common //$this->drills = $this->getDrills($_GET['id']); $drills = new RUDI_Drills($_GET['id']); include 'views/view.drills.php'; - break; + break; + case 'points': + $this->Update(); + include 'views/view.points.php'; + break; + case 'weapons': + include 'views/view.weapons.php'; + break; } echo "</td></tr>"; CloseTable(); diff --git a/modules/rudi/views/view.awards.php b/modules/rudi/views/view.awards.php index 5039e56..0a17005 100644 --- a/modules/rudi/views/view.awards.php +++ b/modules/rudi/views/view.awards.php @@ -1,4 +1,4 @@ -<?php //define('BLOCK_RIGHT_DISABLE','block_right_disable'); ?> +<?php define('BLOCK_RIGHT_DISABLE','block_right_disable'); ?> <?php $medals_path = $this->images_path . "/medals/"; ?> <html> diff --git a/modules/rudi/views/view.information.php b/modules/rudi/views/view.information.php index a62ba8a..d017564 100644 --- a/modules/rudi/views/view.information.php +++ b/modules/rudi/views/view.information.php @@ -1,20 +1,20 @@ -<?php
-$unit_id = $_GET['unit_id'];
-$platoon_id = $_GET['platoon_id'];
-switch($_GET['info'])
-{
- case 'unit':
- if(isset($unit_id))
- include_once 'view.unit.php';
- break;
-
- case 'platoon':
- if(isset($unit_id, $platoon_id))
- include_once 'view.platoon.php';
- break;
-
- default:
- ReportError('Invalid info entry');
- return;
-}
+<?php +$unit_id = $_GET['unit_id']; +$platoon_id = $_GET['platoon_id']; +switch($_GET['info']) +{ + case 'unit': + if(isset($unit_id)) + include_once 'view.unit.php'; + break; + + case 'platoon': + if(isset($unit_id, $platoon_id)) + include_once 'view.platoon.php'; + break; + + default: + ReportError('Invalid info entry'); + return; +} ?>
\ No newline at end of file diff --git a/modules/rudi/views/view.platoon.php b/modules/rudi/views/view.platoon.php index dbbb455..4ee60dc 100644 --- a/modules/rudi/views/view.platoon.php +++ b/modules/rudi/views/view.platoon.php @@ -1,22 +1,22 @@ -<?php $data = $info->Platoon($unit_id, $platoon_id); ?>
-
-<table align="center">
- <tr>
- <th> </th>
- <td><img src="<?php echo '/cms/modules/rudi/images/units/' . $data->logo; ?>" alt="<?php echo $data->logo; ?>"/></td>
- </tr>
- <tr>
- <th width="25%">Platoon</th>
- <td><?php echo $data->name; ?></td>
- </tr>
- <tr>
- <th>Creed</th>
- <td><?php echo $data->creed; ?></td>
- </tr>
- <tr>
- <th valign="top">Biography</th>
- <td><?php echo $data->bio; ?></td>
- </tr>
-</table>
-
+<?php $data = $info->Platoon($unit_id, $platoon_id); ?> + +<table align="center"> + <tr> + <th> </th> + <td><img src="<?php echo '/cms/modules/rudi/images/units/' . $data->logo; ?>" alt="<?php echo $data->logo; ?>"/></td> + </tr> + <tr> + <th width="25%">Platoon</th> + <td><?php echo $data->name; ?></td> + </tr> + <tr> + <th>Creed</th> + <td><?php echo $data->creed; ?></td> + </tr> + <tr> + <th valign="top">Biography</th> + <td><?php echo $data->bio; ?></td> + </tr> +</table> + <?php decho($data); ?>
\ No newline at end of file diff --git a/modules/rudi/views/view.points.php b/modules/rudi/views/view.points.php new file mode 100644 index 0000000..bf6c2b6 --- /dev/null +++ b/modules/rudi/views/view.points.php @@ -0,0 +1,35 @@ +<h3>Points Ticker:</h3>
+<table width="100%" class="rudi" cellspacing="0">
+
+ <tr>
+ <!-- Table header -->
+ <th class="header">Rank</th>
+ <th class="header">Name</th>
+ <th class="header">Points</th>
+ <th class="header">Missed Count</th>
+ <th class="header">Attended Count</th>
+ </tr>
+<?php
+ $num = 0;
+ foreach($this->data as $member){
+ if($member->status_id < 4){
+ if($num %2 == 0){
+ echo '<tr style="background-color:#D4D4D4; height:30px;">';
+ }else{
+ echo '<tr style="height:30px;">';
+ }
+?>
+ <td><?php echo $member->rank_short; ?></td>
+ <td><?php echo $member->first_name." ".$member->last_name; ?></td>
+ <td><?php echo $member->points; ?></td>
+ <td><?php echo $member->drillcount; ?></td>
+ <td><?php echo $member->attendcount; ?></td>
+ </tr>
+
+<?php
+ $num++;
+ }
+ }
+
+?>
+</table>
\ No newline at end of file diff --git a/modules/rudi/views/view.profile.php b/modules/rudi/views/view.profile.php index 6135ea4..97adead 100644 --- a/modules/rudi/views/view.profile.php +++ b/modules/rudi/views/view.profile.php @@ -1,10 +1,14 @@ <?php //define('BLOCK_RIGHT_DISABLE','block_right_disable'); $member =& $this->data[$_GET['profile']]; -$uniform_image = $member->first_name[0].str_replace(array("'", "\""), "", $member->last_name).".png"; +$uniform_image = "modules/rudi/images/uniform/".$member->first_name[0].str_replace(array("'", "\""), "", $member->last_name).".png"; decho($member); define('BLOCK_RIGHT_DISABLE', true); + +$arrUnits = $this->getUnitArr($_GET['profile']); +decho($arrUnits); ?> + <style type="text/css"> @@ -15,7 +19,13 @@ define('BLOCK_RIGHT_DISABLE', true); <th class="header">Viewing Profile of: <?php echo $member->rank_long . " " . $member->first_name . " " . $member->last_name; ?></th> </tr> <tr> - <td><center><img src="modules/rudi/images/uniform/<?php echo $uniform_image; ?>" /> </center></td> + <td><center> +<?php + if(file_exists($uniform_image)){ + echo '<img src="'.$uniform_image.'" />'; + } +?> + </center></td> </tr> <tr> <td><table width="100%" border="0" cellpadding="1"> @@ -23,11 +33,18 @@ define('BLOCK_RIGHT_DISABLE', true); <td width="20%"> <table width="100%" border="0" cellpadding="5" align="center" style="border: 0px;"> <tr> - <td><center><?php echo $member->primary_mos; ?></center></td> + <td><center><span style="font-weight: bold; font-size: 16px; font-family: arial;"><?php echo $member->primary_mos; ?></span></center></td> </tr> <tr> - <td><center><img src="modules/rudi/images/ranks/large/<?php echo $member->rank_image; ?>" /> </center></td> - </tr> + <td><center> + <?php + if(file_exists("modules/rudi/images/ranks/large/{$member->rank_image}")){ + echo "<img src=\"modules/rudi/images/ranks/large/{$member->rank_image}\" alt=\"{$member->rank_short}\" />"; + }else{ + echo $member->rank_short; + } + ?> + </center></td></tr> <tr> <td><center><img src="modules/rudi/images/flags/<?php echo $member->country_image; ?>" /> </center></td> </tr> @@ -38,12 +55,12 @@ define('BLOCK_RIGHT_DISABLE', true); <tr> <th class="header" scope="row">Location</th> <td class="info"><?php echo $this->evalData($member->location); ?> </td> - <th class="header">Superior</th> + <th class="header">Reports To</th> <td class="info"><?php - if(!is_null($member->superior_next->leader_id)) - echo "<a href=\"?load=rudi&profile={$member->superior_next->leader_id}\">"; + if(!is_null($member->superior->leader_id)) + echo "<a href=\"?load=rudi&profile={$member->superior->leader_id}\">"; - echo $this->evalData($member->superior_next->name); + echo $this->evalData($member->superior->name); echo "</a> "; ?> </td> @@ -52,23 +69,27 @@ define('BLOCK_RIGHT_DISABLE', true); <th class="header" scope="row">Status</th> <td class="info"><?php echo $this->evalData($member->status); ?> </td> <th class="header">Position</th> - <td class="info"><?php echo $this->evalData($member->position); ?> </td> + <td class="info"><?php echo $this->evalData($member->role_name); ?> </td> </tr> <tr> <th class="header" scope="row">Unit</th> - <td class="info"><?php echo $this->evalData($member->unit_name); ?> </td> + <td class="info"><?php echo $this->evalData($arrUnits[0]['name']); ?> </td> <th class="header">Weapon</th> - <td class="info"><?php echo $this->evalData($member->weapon_name); ?> </td> + <td class="info"><?php echo $this->evalData($member->weapon_model); ?> + <?php if($member->weapon2_model != NULL) + echo "/ ".$member->weapon2_model; + ?> + </td> </tr> <tr> <th class="header" scope="row">Platoon</th> - <td class="info"><?php echo $this->evalData($member->platoon_name); ?> </td> + <td class="info"><?php echo $this->evalData($arrUnits[1]['name']); ?> </td> <th class="header" scope="row">Enlisted</th> <td class="info"><?php echo $this->evalData($member->enlist_date); ?> </td> </tr> <tr> <th class="header" scope="row">Squad</th> - <td class="info"><?php echo $this->evalData($member->squad_name); ?> </td> + <td class="info"><?php echo $this->evalData($arrUnits[2]['name']); ?> </td> <th class="header">Time In Service</th> <?php if($member->discharge_date): ?> <td class="info"><?php echo $this->getDiffTime($member->enlist_date_st, $member->discharge_date); ?> </td> @@ -79,7 +100,7 @@ define('BLOCK_RIGHT_DISABLE', true); </tr> <tr> <th class="header">Team</th> - <td class="info"><?php echo $this->evalData($member->team_name); ?> </td> + <td class="info"><?php echo $this->evalData($arrUnits[3]['name']); ?> </td> <th class="header">Time In Grade</th> <?php if($member->discharge_date): ?> <td class="info"><?php echo $this->getDiffTime($member->promo_date_st, $member->discharge_date); ?> </td> @@ -122,7 +143,7 @@ define('BLOCK_RIGHT_DISABLE', true); <?php foreach($member->service_record as $record): ?> <tr> <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date_added)); ?> </th> - <td><?php echo $record->record_note; ?> </td> + <td style="text-align:left; padding-left: 10px;"><?php echo $record->record_note; ?> </td> </tr> <?php endforeach; ?> <?php endif; ?> @@ -142,9 +163,9 @@ define('BLOCK_RIGHT_DISABLE', true); <?php foreach($member->award_record as $record): ?> <tr> <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date_added)); ?> </th> - <td ><?php echo $this->evalData($record->award_name); ?> </td> + <td style="text-align:left; padding-left: 10px;" ><?php echo $this->evalData($record->award_name); ?> </td> <td style="vertical-align:middle;"><center><img src="modules/rudi/images/medals/<?php echo $record->image; ?>"/></center></td> - <td width="40%"><?php echo $record->record_note; ?> </td> + <td width="40%" style="text-align:left; padding-left: 10px;"><?php echo $record->record_note; ?> </td> </tr> <?php endforeach; ?> <?php endif; ?> @@ -155,7 +176,7 @@ define('BLOCK_RIGHT_DISABLE', true); <table width="100%" border="0" cellpadding="1" id="thin"> <tr> - <th class="header" scope="col" colspan="3">Combat Record</th> + <th class="header" scope="col" colspan="4">Combat Record</th> </tr> <tr> <?php if($this->evalData($member->combat_record)):?> @@ -163,9 +184,10 @@ define('BLOCK_RIGHT_DISABLE', true); <?php else:?> <?php foreach($member->combat_record as $record): ?> <tr> - <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date_added)); ?> </th> + <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date)); ?> </th> <td><a href="<?php echo $record->website; ?>"><?php echo $record->name; ?></a> </td> - <td><?php echo $record->status; ?> </td> + <td><?php echo $record->title; ?> </td> + <td><?php echo $record->status . ' '. $record->home_score . '-' . $record->visit_score; ?> </td> </tr> <?php endforeach; ?> <?php endif; ?> diff --git a/modules/rudi/views/view.roster.php b/modules/rudi/views/view.roster.php index c0ee92d..6d7d14f 100644 --- a/modules/rudi/views/view.roster.php +++ b/modules/rudi/views/view.roster.php @@ -1,23 +1,59 @@ -<table width="100%" class="rudi">
-<?php
- $result = $this->db->query("SELECT * FROM `rudi_combat_units` WHERE `detachment` = 0");
- $row = $this->db->fetch($result);
- foreach($row as $unit){
- echo "<tr><th colspan=\"5\">{$unit['name']} : {$unit['callsign']}</th></tr>";
-?>
- <tr>
- <!-- Table header -->
- <th class="header">Rank</th>
- <th class="header">Name</th>
- <th class="header">Role</th>
- <th class="header">Weapon</th>
- <th class="header">Status</th>
- </tr>
-<?php
- $this->printRoster($unit['unit_id'], $unit['leader_id']);
- $this->displayUnitsRec($unit['unit_id']);
- }
-
-?>
-</table>
-
+<div style="text-align: center"> +<?php + + echo LinkInternal('Active Roster','?load=rudi'); + echo ' '.LinkInternal('Past Member Roster','?load=rudi&select=past').'<br /><br />'; + +?> +</div> +<center> +<table width="100%" cellspacing="1" cellpadding="0" class="rudiroster"> +<?php + + if(isset($_GET['select']) && $_GET['select'] == "past"){ + +?> + <tr><th colspan="5">Past Members Roster</th></tr> + <tr> + <!-- Table header --> + <th class="header" width="90px">Rank</th> + <th class="header" width="280px">Name</th> + <th class="header" width="174px">Role</th> + <th class="header" width="160px">Time in Service</th> + <th class="header" width="140px">Status</th> + </tr> +<?php + $this->printPastRoster(); + + }else { + + $result = $this->db->query("SELECT * FROM `rudi_combat_units` WHERE `detachment` = 0"); + $row = $this->db->fetch($result); + foreach($row as $unit){ + $unit_id = $unit['unit_id']; + decho("SELECT `member_id` FROM `rudi_unit_members` WHERE `cunit_id` = '$unit_id' AND `date_discharged` IS NULL LIMIT 1"); + $num = 0; + $check = $this->db->Query("SELECT `member_id` FROM `rudi_unit_members` WHERE `cunit_id` = '$unit_id' AND `date_discharged` IS NULL LIMIT 1"); + $num = $this->db->Rows($check); + if($num >= 1){ + echo "<tr><th colspan=\"5\">{$unit['name']} : {$unit['callsign']}</th></tr>"; +?> + <tr> + <!-- Table header --> + <th class="header" width="90px">Rank</th> + <th class="header" width="300px">Name</th> + <th class="header" width="214px">Role</th> + <th class="header" width="120px">Weapon</th> + <th class="header" width="120px">Status</th> + </tr> +<?php + $this->printRoster($unit['unit_id'], $unit['leader_id']); + $this->displayUnitsRec($unit['unit_id']); + } + } + $this->printReserves(); + } + +?> +</table> +</center> diff --git a/modules/rudi/views/view.unit.php b/modules/rudi/views/view.unit.php index fcc66ac..4e85e29 100644 --- a/modules/rudi/views/view.unit.php +++ b/modules/rudi/views/view.unit.php @@ -1,22 +1,22 @@ -<?php $data = $info->Unit($unit_id); ?>
-
-<table align="center">
- <tr>
- <th> </th>
- <td><img src="<?php echo '/cms/modules/rudi/images/units/' . $data->logo; ?>" alt="<?php echo $data->logo; ?>"/></td>
- </tr>
- <tr>
- <th width="25%">Unit</th>
- <td><?php echo $data->name; ?></td>
- </tr>
- <tr>
- <th>Creed</th>
- <td><?php echo $data->creed; ?></td>
- </tr>
- <tr>
- <th valign="top">Biography</th>
- <td><?php echo $data->bio; ?></td>
- </tr>
-</table>
-
+<?php $data = $info->Unit($unit_id); ?> + +<table align="center"> + <tr> + <th> </th> + <td><img src="<?php echo '/cms/modules/rudi/images/units/' . $data->logo; ?>" alt="<?php echo $data->logo; ?>"/></td> + </tr> + <tr> + <th width="25%">Unit</th> + <td><?php echo $data->name; ?></td> + </tr> + <tr> + <th>Creed</th> + <td><?php echo $data->creed; ?></td> + </tr> + <tr> + <th valign="top">Biography</th> + <td><?php echo $data->bio; ?></td> + </tr> +</table> + <?php decho($data); ?>
\ No newline at end of file diff --git a/modules/rudi/views/view.weapons.php b/modules/rudi/views/view.weapons.php new file mode 100644 index 0000000..2cb033c --- /dev/null +++ b/modules/rudi/views/view.weapons.php @@ -0,0 +1,70 @@ +<?php define('BLOCK_RIGHT_DISABLE','block_right_disable'); ?>
+<?php $medals_path = $this->images_path . "/medals/"; ?>
+
+<html>
+<head>
+ <title>Awards and Medals</title>
+
+<style type="text/css">
+/*th.header {
+ width:175px;
+ background:#333;
+}
+
+td.rudi {
+ text-align: center;
+ vertical-align: middle;
+} */
+</style>
+
+</head>
+<body>
+
+<?php $weapons = $this->getWeapons("ORDER BY role ASC, caliber ASC, model ASC"); ?>
+<center>
+<table class="rudiroster" cellspacing="1" cellpadding="0" align="center">
+<tr><th width="250px">Model</th><th width="250px">Caliber</th><th width="250px">Role</th></tr>
+ <?php
+ $num=0;
+ $role = "Assault";
+ foreach($weapons as $weapon){
+ if($role != $weapon['role']){
+ echo '<tr class="null" style="height:3px;"></tr>';
+ }
+ if($num%2==0)
+ echo '<tr class="high">';
+ else
+ echo "<tr>";
+ echo "<td>".$weapon['model']."</td><td>".$weapon['caliber']."</td><td>".$weapon['role']."</td></tr>";
+ $role = $weapon['role'];
+ $num++;
+ }
+
+ ?>
+
+</table>
+</center>
+<!-- grr wtf
+ <table align="center" style="width: 100%;">
+ <tr>
+ <th scope="col" class="header" style="width:1px;">Image</th>
+ <th scope="col" class="header" style="width:1px;">Award</th>
+ <th scope="col" class="header">Description</th>
+ </tr>
+
+
+ <?php //foreach($this->awards as $award): ?>
+
+ <tr>
+ <td align='center' class="rudi"><img src="/rudi/images/medals/<?php //echo $award->image; ?>"></img> </td>
+ <td align='center' class="rudi"><?php //echo $award->name; ?> </td>
+ <td align='left'><?php //echo wordwrap($award->description,80,"<br/>"); ?> </td>
+ </tr>
+
+ <?php //endforeach; ?>
+
+
+ </table>
+-->
+</body>
+</html>
\ No newline at end of file |
