From a65e949fefc86be87118238ccde7b6a55c29b0be Mon Sep 17 00:00:00 2001 From: jhunkeler Date: Sat, 16 Jan 2010 22:40:46 +0000 Subject: Looks like I'm about to break something terribly, so it's time to save. Initial rewrite of drill displays -jhunk Truncated date display for service records -OC git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@461 c5b2fb0a-d05d-0410-98c8-828840a80ff6 --- modules/rudi/includes/common.class.php | 25 +++++----- modules/rudi/index.php | 10 +++- modules/rudi/views/view.drills.php | 86 +++++++++++++++++++++++----------- modules/rudi/views/view.profile.php | 53 +++++++++++---------- 4 files changed, 110 insertions(+), 64 deletions(-) diff --git a/modules/rudi/includes/common.class.php b/modules/rudi/includes/common.class.php index 21c7ccc..ab8120e 100644 --- a/modules/rudi/includes/common.class.php +++ b/modules/rudi/includes/common.class.php @@ -199,6 +199,7 @@ class RUDI_Common public function __construct() { + decho("Constructing " . get_parent_class($this)); global $config, $db; $this->images_path = $config['rudi']['images_path']; @@ -210,7 +211,7 @@ class RUDI_Common public function __destruct() { - + decho("Destructing " . get_parent_class($this)); } /** @@ -264,9 +265,9 @@ class RUDI_Common $m_mod = NULL; $d_mod = NULL; - if($test['years'] > 1) + if($test['years'] > 1 || $test['years'] < 1) $y_mod = 's'; - if($test['months'] > 1) + if($test['months'] > 1 || $test['months'] < 1) $m_mod = 's'; if($test['days'] > 1 && $test['days'] < 1) $d_mod = 's'; @@ -674,7 +675,7 @@ class RUDI_Common rank_short}.png"; ?>" alt="rank_short; ?>" /> - last_name . ', ' . $member->first_name; ?> + last_name . ', ' . $member->first_name; ?> \ No newline at end of file diff --git a/modules/rudi/index.php b/modules/rudi/index.php index 2bc08a3..995c90d 100644 --- a/modules/rudi/index.php +++ b/modules/rudi/index.php @@ -4,6 +4,7 @@ //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'; OpenContent(); @@ -15,6 +16,7 @@ class RUDI_Gateway extends RUDI_Common public function __construct() { + decho("Constructing " . get_class($this)); parent::__construct(); if(isset($_GET['admin'])) @@ -61,7 +63,8 @@ class RUDI_Gateway extends RUDI_Common include 'views/view.ranks.php'; break; case 'drills': - $this->drills = $this->getDrills($_GET['id']); + //$this->drills = $this->getDrills($_GET['id']); + $drills = new RUDI_Drills($_GET['id']); include 'views/view.drills.php'; break; } @@ -82,6 +85,11 @@ class RUDI_Gateway extends RUDI_Common return; } } + + public function __destruct() + { + decho("Destructing " . get_class($this)); + } } ob_start(); 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 " - Soldier - Performance Rating - Initiative Rating - Early Excusal - Excusal Reason - - "; + echo " + + Soldier + Performance Rating + Initiative Rating + Early Excusal + Excusal Reason + "; + foreach($drills->manifest['members'] as $drill) + { + $name = $drill->last_name . ', ' . $drill->first_name; + $pRating = Rating($drill->performance); + $iRating = Rating($drill->initiative); - echo " - {$name} - {$pRating} - {$iRating} - {$drill->excusal} - {$drill->excusal_reason} + echo " + + {$name} + {$pRating} + {$iRating} + " . ($drill->excusal ? "Yes" : "No") . " + {$drill->excusal_reason} - "; + "; } CloseTable(); echo "Back"; + decho('DATA FOR QUERY'); + decho($drills->manifest); return; } @@ -61,7 +68,7 @@ echo " Notes "; -foreach($this->drills as $drill) +foreach($drills->manifest as $drill) { echo " drill_id}\">View @@ -71,5 +78,28 @@ foreach($this->drills as $drill) "; } +/* +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); ?>