From edcc2f1bd2de5602390fc7a5d313428255afd0b6 Mon Sep 17 00:00:00 2001 From: jhunkeler Date: Sun, 3 Jan 2010 22:22:00 +0000 Subject: - view.roster.php replaced view.current.php - Roster generation code completed by OC (yay!). - Class RUDI_Information added to grab unit information. - Views have been added from Unit/Platoon information, however, OC decided not to use the right table so everything needs to be moved around (not so yay!) git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@442 c5b2fb0a-d05d-0410-98c8-828840a80ff6 --- modules/rudi/views/view.awards.php | 22 +++--- modules/rudi/views/view.current.php | 134 -------------------------------- modules/rudi/views/view.drills.php | 28 +------ modules/rudi/views/view.information.php | 20 +++++ modules/rudi/views/view.platoon.php | 22 ++++++ modules/rudi/views/view.profile.php | 82 ++++++++----------- modules/rudi/views/view.ranks.php | 18 ++--- modules/rudi/views/view.roster.php | 23 ++++++ modules/rudi/views/view.unit.php | 22 ++++++ 9 files changed, 139 insertions(+), 232 deletions(-) delete mode 100644 modules/rudi/views/view.current.php create mode 100644 modules/rudi/views/view.information.php create mode 100644 modules/rudi/views/view.platoon.php create mode 100644 modules/rudi/views/view.roster.php create mode 100644 modules/rudi/views/view.unit.php (limited to 'modules/rudi/views') diff --git a/modules/rudi/views/view.awards.php b/modules/rudi/views/view.awards.php index 6a60536..5039e56 100644 --- a/modules/rudi/views/view.awards.php +++ b/modules/rudi/views/view.awards.php @@ -1,4 +1,4 @@ - + images_path . "/medals/"; ?> @@ -6,9 +6,7 @@ Awards and Medals getAwardClasses(); ?> - +
"; echo ""; echo ""; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; foreach($this->awards as $award) { @@ -43,9 +41,9 @@ td.rudi { { echo " - - - + + + "; } diff --git a/modules/rudi/views/view.current.php b/modules/rudi/views/view.current.php deleted file mode 100644 index b0e1316..0000000 --- a/modules/rudi/views/view.current.php +++ /dev/null @@ -1,134 +0,0 @@ - - - - - Roster Current - - - - - - - "; - - echo " - - - - - "; - - $p = 1; - $s = 1; - $u = 1; - $members = $this->data; - while($u != count($members)) - { - while($p != $stats['platoon']) - { - echo " - - "; - - while($s != $stats['squad']) - { - if($members[$u]->squad_id) - echo " - - - - - "; - - echo " - - "; - - ++$s; - } - - ++$p; - } - - ++$u; - } - echo "
{$classes[$cl]->name}s
ImageAwardDescriptionImageAwardDescription
image}\" alt=\"{$award->image}\"/>{$award->name} {$award->description} image}\" alt=\"{$award->image}\"/>{$award->name} {$award->description} 
RankNameWeaponStatus
a platoon
{$members[$u]->rank_short}{$members[$u]->name}{$members[$u]->weapon_name}{$members[$u]->status}
a squad
"; - */ - ?> - - - - - - getMembersOfPlatoon($platoon_count) > 0): ?> - - - - - - - - - - - - - - - data as $member): ?> - platoon_id == $platoon_count && $member->status_id < 2): ?> - - - - - - - - - - - - - - - - - - -
RankNameRoleWeaponStatus
images_path}/ranks/small/{$member->rank_short}.png"; ?>" alt="rank_short; ?>" />last_name . ', ' . $member->first_name; ?> - 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; - echo ' '; - } - else - { - echo "Soldier"; - } - } - ?> - weapon_manufacturer . ' ' . $member->weapon_model; ?>status; ?>
- - diff --git a/modules/rudi/views/view.drills.php b/modules/rudi/views/view.drills.php index 084be97..06fbe62 100644 --- a/modules/rudi/views/view.drills.php +++ b/modules/rudi/views/view.drills.php @@ -1,24 +1,3 @@ - - - Drills - - - - - - drills); foreach($this->drills as $drill) { $name = $drill->last_name . ', ' . $drill->first_name; @@ -93,7 +72,4 @@ foreach($this->drills as $drill) } CloseTable(); -?> - - - \ No newline at end of file +?> \ No newline at end of file diff --git a/modules/rudi/views/view.information.php b/modules/rudi/views/view.information.php new file mode 100644 index 0000000..a62ba8a --- /dev/null +++ b/modules/rudi/views/view.information.php @@ -0,0 +1,20 @@ + \ No newline at end of file diff --git a/modules/rudi/views/view.platoon.php b/modules/rudi/views/view.platoon.php new file mode 100644 index 0000000..dbbb455 --- /dev/null +++ b/modules/rudi/views/view.platoon.php @@ -0,0 +1,22 @@ +Platoon($unit_id, $platoon_id); ?> + + + + + + + + + + + + + + + + + + +
 <?php echo $data->logo; ?>
Platoonname; ?>
Creedcreed; ?>
Biographybio; ?>
+ + \ No newline at end of file diff --git a/modules/rudi/views/view.profile.php b/modules/rudi/views/view.profile.php index 877fab0..7244b8d 100644 --- a/modules/rudi/views/view.profile.php +++ b/modules/rudi/views/view.profile.php @@ -1,50 +1,34 @@ data[$_GET['profile']]; -$uniform_image = strtolower($member->first_name[0] . $member->last_name . ".png"); -$uniform_image[0] = strtoupper($uniform_image[0]); -$uniform_image[1] = strtoupper($uniform_image[1]); +$uniform_image = $member->first_name[0].str_replace(array("'", "\""), "", $member->last_name).".png"; +decho($member); ?> - - - -Profile page of, <?php echo $member->last_name ?> - - - + +
- + - + -
Viewing Profile of: rank_long . " " . $member->first_name . " " . $member->last_name; ?>Viewing Profile of: rank_long . " " . $member->first_name . " " . $member->last_name; ?>
 
 
@@ -52,9 +36,9 @@ td {
+ + + - + - +
primary_mos; ?>
 
 
 
 
- + - - + - + - + - + - + - + - + discharge_date): ?> - + - + - + - + discharge_date): ?> - + - + @@ -127,7 +111,7 @@ td { - service_record)):?> + service_record); if($this->evalData($member->service_record)):?> service_record as $record): ?> @@ -147,14 +131,14 @@ td { - award_record)):?> + evalData($member->award_record)):?> award_record as $record): ?> - + @@ -169,7 +153,7 @@ td { - combat_record)):?> + evalData($member->combat_record)):?> combat_record as $record): ?> @@ -183,6 +167,4 @@ td {
LocationevalData($member->location) ?> evalData($member->location) ?>  Superiorsuperior_next->leader_id)) echo "superior_next->leader_id}\">"; @@ -65,44 +49,44 @@ td {
StatusevalData($member->status) ?> evalData($member->status) ?>  PositionevalData($member->position) ?> evalData($member->position) ?> 
UnitevalData($member->unit_name) ?> evalData($member->unit_name) ?>  WeaponevalData($member->weapon_name) ?> evalData($member->weapon_name) ?> 
PlatoonevalData($member->platoon_name) ?> evalData($member->platoon_name) ?>  EnlistedevalData($member->enlist_date) ?> evalData($member->enlist_date) ?> 
SquadevalData($member->squad_name) ?> evalData($member->squad_name) ?>  Time In Service getDiffTime($member->enlist_date_st, $member->discharge_date)?> getDiffTime($member->enlist_date_st, $member->discharge_date)?>  getDiffTime($member->enlist_date_st)?>getDiffTime($member->enlist_date_st)?>
TeamevalData($member->team_name) ?> evalData($member->team_name) ?>  Time In GradegetDiffTime($member->promo_date_st) ?> getDiffTime($member->promo_date_st) ?> 
SeparatedevalData($member->discharge_date) ?> evalData($member->discharge_date) ?> 
Service Record
No service record available  Award Record
No award record available 
date_added?>  evalData($record->award_name); ?> 
 record_note ?> 
Combat Record
No combat record available 
- - \ No newline at end of file + \ No newline at end of file diff --git a/modules/rudi/views/view.ranks.php b/modules/rudi/views/view.ranks.php index 2bb1823..4792049 100644 --- a/modules/rudi/views/view.ranks.php +++ b/modules/rudi/views/view.ranks.php @@ -1,13 +1,11 @@ - + Awards and Medals - +
- - + + ranks as $rank): ?> - - + + diff --git a/modules/rudi/views/view.roster.php b/modules/rudi/views/view.roster.php new file mode 100644 index 0000000..01da5ea --- /dev/null +++ b/modules/rudi/views/view.roster.php @@ -0,0 +1,23 @@ +
ImageRankImageRank
images_path}/ranks/small/{$rank->image}"; ?>"> longname; ?> image}"; ?>" /> longname; ?> 
+db->query("SELECT * FROM `rudi_combat_units` WHERE `detachment` = 0"); + $row = $this->db->fetch($result); + foreach($row as $unit){ + echo ""; +?> + + + + + + + + +printRoster($unit['unit_id'], $unit['leader_id']); + $this->displayUnitsRec($unit['unit_id']); + } + +?> +
{$unit['name']}
RankNameRoleWeaponStatus
+ diff --git a/modules/rudi/views/view.unit.php b/modules/rudi/views/view.unit.php new file mode 100644 index 0000000..fcc66ac --- /dev/null +++ b/modules/rudi/views/view.unit.php @@ -0,0 +1,22 @@ +Unit($unit_id); ?> + + + + + + + + + + + + + + + + + + +
 <?php echo $data->logo; ?>
Unitname; ?>
Creedcreed; ?>
Biographybio; ?>
+ + \ No newline at end of file -- cgit