diff options
Diffstat (limited to 'modules/rudi/views')
| -rw-r--r-- | modules/rudi/views/view.drills.php | 86 | ||||
| -rw-r--r-- | modules/rudi/views/view.profile.php | 53 |
2 files changed, 87 insertions, 52 deletions
diff --git a/modules/rudi/views/view.drills.php b/modules/rudi/views/view.drills.php index 06fbe62..bc80f83 100644 --- a/modules/rudi/views/view.drills.php +++ b/modules/rudi/views/view.drills.php @@ -2,11 +2,11 @@ function Rating($val) { - define(EXCELLENT,100); - define(GOOD, 75); - define(FAIR, 50); - define(POOR, 25); - define(TERRIBLE, 0); + define('EXCELLENT',100); + define('GOOD', 75); + define('FAIR', 50); + define('POOR', 25); + define('TERRIBLE', 0); if($val == EXCELLENT) return "Excellent"; @@ -22,35 +22,42 @@ function Rating($val) OpenTable("Drills"); +if(isset($_GET['stats'])) +{ + + return; +} + if(isset($_GET['id'])) { - decho($this->drills); - foreach($this->drills as $drill) - { - $name = $drill->last_name . ', ' . $drill->first_name; - $pRating = Rating($drill->performance); - $iRating = Rating($drill->initiative); - - echo "<tr> - <th class=\"header\">Soldier</th> - <th class=\"header\">Performance Rating</th> - <th class=\"header\">Initiative Rating</th> - <th class=\"header\">Early Excusal</th> - <th class=\"header\">Excusal Reason</th> - - </tr>"; + echo " + <tr> + <th class=\"header\">Soldier</th> + <th class=\"header\">Performance Rating</th> + <th class=\"header\">Initiative Rating</th> + <th class=\"header\">Early Excusal</th> + <th class=\"header\">Excusal Reason</th> + </tr>"; + foreach($drills->manifest['members'] as $drill) + { + $name = $drill->last_name . ', ' . $drill->first_name; + $pRating = Rating($drill->performance); + $iRating = Rating($drill->initiative); - echo "<tr> - <td class=\"rudi\">{$name}</td> - <td class=\"rudi\">{$pRating}</td> - <td class=\"rudi\">{$iRating}</td> - <td class=\"rudi\">{$drill->excusal}</td> - <td class=\"rudi\">{$drill->excusal_reason}</td> + echo " + <tr> + <td class=\"rudi\">{$name}</td> + <td class=\"rudi\">{$pRating}</td> + <td class=\"rudi\">{$iRating}</td> + <td class=\"rudi\"> " . ($drill->excusal ? "Yes" : "No") . "</td> + <td class=\"rudi\">{$drill->excusal_reason}</td> - </tr>"; + </tr>"; } CloseTable(); echo "<a href=\"?load=rudi&show=drills\">Back</a>"; + decho('DATA FOR QUERY'); + decho($drills->manifest); return; } @@ -61,7 +68,7 @@ echo "<tr> <th class=\"header\">Notes</th> </tr>"; -foreach($this->drills as $drill) +foreach($drills->manifest as $drill) { echo "<tr> <td class=\"rudi\"><a href=\"?load=rudi&show=drills&id={$drill->drill_id}\">View</a></td> @@ -71,5 +78,28 @@ foreach($this->drills as $drill) </tr>"; } +/* +decho('manifest'); +decho($drills->manifest); +decho('attendence of drill 2'); +decho($drills->getAttendenceOf(2)); +decho('member 1 attendence of drill 2'); +decho($drills->getMemberAttendenceOf(2,1)); +decho('member 1 attendence in general'); +decho($drills->getMemberAttendence(1)); +decho('statistics of member 1 in general'); + +$drill = $drills->getAttendenceOf(2); +$drill['stats'] = $drills->getMemberStatistics($drills->getAttendenceOf(2)); + +$member = $drills->getMemberAttendenceOf(2,1); +$member[] = $drills->getMemberStatistics($member); +*/ + + +decho('DATA FOR QUERY'); +decho($drills->manifest); +decho($drill); +decho($member); CloseTable(); ?>
\ No newline at end of file diff --git a/modules/rudi/views/view.profile.php b/modules/rudi/views/view.profile.php index 7244b8d..1010985 100644 --- a/modules/rudi/views/view.profile.php +++ b/modules/rudi/views/view.profile.php @@ -3,6 +3,7 @@ $member =& $this->data[$_GET['profile']]; $uniform_image = $member->first_name[0].str_replace(array("'", "\""), "", $member->last_name).".png"; decho($member); +define('BLOCK_RIGHT_DISABLE', true); ?> <style type="text/css"> @@ -25,10 +26,10 @@ decho($member); <td><center><?php echo $member->primary_mos; ?></center></td> </tr> <tr> - <td><center><img src="modules/rudi/images/ranks/large/<?php echo $member->rank_image ?>" /> </center></td> + <td><center><img src="modules/rudi/images/ranks/large/<?php echo $member->rank_image; ?>" /> </center></td> </tr> <tr> - <td><center><img src="modules/rudi/images/flags/<?php echo $member->country_image?>" /> </center></td> + <td><center><img src="modules/rudi/images/flags/<?php echo $member->country_image; ?>" /> </center></td> </tr> </table> </td> @@ -36,7 +37,7 @@ decho($member); <table width="100%" border="0" cellpadding="5"> <tr> <th class="header" scope="row">Location</th> - <td class="info"><?php echo $this->evalData($member->location) ?> </td> + <td class="info"><?php echo $this->evalData($member->location); ?> </td> <th class="header">Superior</th> <td class="info"><?php if(!is_null($member->superior_next->leader_id)) @@ -49,44 +50,48 @@ decho($member); </tr> <tr> <th class="header" scope="row">Status</th> - <td class="info"><?php echo $this->evalData($member->status) ?> </td> + <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->position); ?> </td> </tr> - <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($member->unit_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_name); ?> </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($member->platoon_name); ?> </td> <th class="header" scope="row">Enlisted</th> - <td class="info"><?php echo $this->evalData($member->enlist_date) ?> </td> + <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($member->squad_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> + <td class="info"><?php echo $this->getDiffTime($member->enlist_date_st, $member->discharge_date); ?> </td> <?php else: ?> - <td class="info"><?php echo $this->getDiffTime($member->enlist_date_st)?></td> + <td class="info"><?php echo $this->getDiffTime($member->enlist_date_st); ?></td> <?php endif; ?> </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($member->team_name); ?> </td> <th class="header">Time In Grade</th> - <td class="info"><?php echo $this->getDiffTime($member->promo_date_st) ?> </td> + <?php if($member->discharge_date): ?> + <td class="info"><?php echo $this->getDiffTime($member->promo_date_st, $member->discharge_date); ?> </td> + <?php else: ?> + <td class="info"><?php echo $this->getDiffTime($member->promo_date_st); ?></td> + <?php endif; ?> </tr> <tr> <?php if($member->discharge_date): ?> <td class="info" colspan="2"></td> <th class="header" scope="row">Separated</th> - <td class="info"><?php echo $this->evalData($member->discharge_date) ?> </td> + <td class="info"><?php echo $this->evalData($member->discharge_date); ?> </td> <?php endif; ?> </tr> @@ -100,7 +105,7 @@ decho($member); <th class="header" scope="col">Biography</th> </tr> <tr > - <td style="text-align:left;"><?php echo $member->bio ?> </td> + <td style="text-align:left;"><?php echo $member->bio; ?> </td> </tr> </table> @@ -116,8 +121,8 @@ decho($member); <?php else:?> <?php foreach($member->service_record as $record): ?> <tr> - <th class="header" width="25%"><?php echo $record->date_added ?> </th> - <td><?php echo $record->record_note ?> </td> + <th class="header" width="25%"><?php echo date('M j, Y', strtotime($record->date_added)); ?> </th> + <td style="text-align:left;"><?php echo $record->record_note; ?> </td> </tr> <?php endforeach; ?> <?php endif; ?> @@ -136,10 +141,10 @@ decho($member); <?php else:?> <?php foreach($member->award_record as $record): ?> <tr> - <th class="header" width="25%"><?php echo $record->date_added?> </th> + <th class="header" width="25%"><?php echo $record->date_added; ?> </th> <td ><?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%"><?php echo $record->record_note; ?> </td> </tr> <?php endforeach; ?> <?php endif; ?> @@ -158,9 +163,9 @@ decho($member); <?php else:?> <?php foreach($member->combat_record as $record): ?> <tr> - <th class="header" width="25%"><?php echo $record->date ?> </th> - <td><a href="<?php echo $record->website ?>"><?php echo $record->name ?></a> </td> - <td><?php echo $record->status ?> </td> + <th class="header" width="25%"><?php echo $record->date; ?> </th> + <td><a href="<?php echo $record->website; ?>"><?php echo $record->name; ?></a> </td> + <td><?php echo $record->status; ?> </td> </tr> <?php endforeach; ?> <?php endif; ?> |