Backporting retarded amount of changes outside of version control

2 files changed, 20 insertions, 18 deletions

diff --git a/admin/adjutant/functions.php b/admin/adjutant/functions.php
index 57e9fe8..87bc4b4 100644
--- a/admin/adjutant/functions.php
+++ b/admin/adjutant/functions.php
@@ -21,7 +21,7 @@
 		
 		global $db;
 		
-		$result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id != 4 AND rudi_unit_members.status_id != 5 ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC");
+		$result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE rudi_unit_members.status_id < 4  ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC");
 		$row = $db->Fetch($result);
 		
 		if(isset($_POST['processed'])){
@@ -29,10 +29,11 @@
 			foreach($row as $soldier){
 				$mID = $soldier['member_id'];
 		    	$missed = $_POST[$mID.'missed'];
+		    	$attended = $_POST[$mID.'attended'];
 		    	$points = $_POST[$mID.'points'];
 	
 		    	if($missed !="" && $points != ""){
-		    		$db->Query("UPDATE `rudi_unit_members` SET `points` = $points, `drillcount` = $missed WHERE `member_id` = $mID LIMIT 1");
+		    		$db->Query("UPDATE `rudi_unit_members` SET `points` = $points, `drillcount` = $missed, `attendcount` = $attended WHERE `member_id` = $mID LIMIT 1");
 	    		}else{
 	    			ReportError("Error updating points for soldier id# '$mID'. Please contact administrator.");    		
 	    		}			
@@ -42,9 +43,9 @@
 		}
 ?>
 		<form method="POST" action="<?php $_SERVER['PHP_SELF']?>">
-		<table style="text-align:center;" width="100%">
+		<table style="text-align:center;" width="100%" cellspacing="0">
 		<?php //OpenTable(); ?>
-		<tr><th>Rank</th><th>Soldier</th><th>Status</th><th>Points</th><th>Drills Missed</th></tr>
+		<tr><th>Rank</th><th>Soldier</th><th>Status</th><th>Points</th><th>Drills Missed</th><th>Drills Attended</th></tr>
 <?php
 		foreach($row as $soldier){
 			$memberID = $soldier['member_id'];
@@ -56,7 +57,8 @@
 	  <td>{$soldier['first_name']} {$soldier['last_name']}</td>
 	  <td>".getStatus($soldier['status_id'])."</td>
 	  <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['points']}\" name=\"{$memberID}points\" size=\"1\" maxlength=\"3\" />/100</td>
-	  <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['drillcount']}\" name=\"{$memberID}missed\" size=\"1\" maxlength=\"1\" />/3</td>";		
+	  <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['drillcount']}\" name=\"{$memberID}missed\" size=\"1\" maxlength=\"1\" />/3</td>
+	  <td><input type=\"text\" class=\"lrg\" value=\"{$soldier['attendcount']}\" name=\"{$memberID}attended\" size=\"1\" maxlength=\"1\" />/3</td>";		
 			
 			
 		echo "<input type=\"hidden\" value=\"{$memberID}\" name=\"{$memberID}id\" />\n";
@@ -104,7 +106,7 @@
 $num = 1;
 		foreach($row as $member){
 			if($num %2 == 0)
-				echo "<tr style=\"background-color:#c6c6c6;\">";
+				echo "<tr style=\"background-color:#dfdfdf;\">";
 			else
 				echo "<tr>";
 			echo "<td>{$member['shortname']}</td><td>{$member['first_name']} {$member['last_name']}</td><td><a href=\"?op=adjutant&edit=loas&member={$member['member_id']}\">Edit</a></td></tr>";
diff --git a/admin/adjutant/style.css b/admin/adjutant/style.css
index 24a3eb8..823873b 100644
--- a/admin/adjutant/style.css
+++ b/admin/adjutant/style.css
@@ -1,13 +1,13 @@
-	input.lrg {

-		font-size:14px;

-		font-weight:bold;

-		text-align:center;

-		font-family: Arial, Sans-Serif;

-	}

-	

-	tr.inactive {

-		background-color:#dfdfdf;

-	}

-	tr.inactive td {

-		color:#a2a2a2;	

+	input.lrg {
+		font-size:14px;
+		font-weight:bold;
+		text-align:center;
+		font-family: Arial, Sans-Serif;
+	}
+	
+	tr.inactive {
+		background-color:#dfdfdf;
+	}
+	tr.inactive td {
+		color:#a2a2a2;	
 	}
\ No newline at end of file