Fixed SVN maybe.

git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@448 c5b2fb0a-d05d-0410-98c8-828840a80ff6

11 files changed, 237 insertions, 172 deletions

diff --git a/admin/adjutant/functions.php b/admin/adjutant/functions.php
new file mode 100644
index 0000000..261c122
--- /dev/null
+++ b/admin/adjutant/functions.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+ 
+	function EditPoints(){
+		
+		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");
+		$row = $db->Fetch($result);
+		
+		if(isset($_POST['processed'])){
+			echo "Updating data... Please wait.";
+			foreach($row as $soldier){
+				$mID = $soldier['member_id'];
+		    	$missed = $_POST[$mID.'missed'];
+		    	$points = $_POST[$mID.'points'];
+	
+		    	if($missed !="" && $points != ""){
+		    		$db->Query("UPDATE `rudi_unit_members` SET `points` = $points, `drillcount` = $missed WHERE `member_id` = $mID LIMIT 1");
+	    		}else{
+	    			ReportError("Error updating points for soldier id# '$mID'. Please contact administrator.");    		
+	    		}			
+			}
+			PageRedirect(1,"?op=adjutant&edit=points");
+			return;		
+		}
+?>
+		<form method="POST" action="<?php $_SERVER['PHP_SELF']?>">
+		<table style="text-align:center;" width="100%">
+		<?php //OpenTable(); ?>
+		<tr><th>Rank</th><th>Soldier</th><th>Status</th><th>Points</th><th>Drills Missed</th></tr>
+<?php
+		foreach($row as $soldier){
+			$memberID = $soldier['member_id'];
+			if($soldier['status_id'] != 1)
+				echo "<tr class=\"inactive\">";
+			else
+				echo "<tr>";
+			echo "<td>{$soldier['shortname']}</td>
+	  <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>";		
+			
+			
+		echo "<input type=\"hidden\" value=\"{$memberID}\" name=\"{$memberID}id\" />\n";
+		}
+		CloseTable();
+		echo "<input type=\"submit\" name=\"processed\" value=\"Update Points\" /></form>";
+
+	}
+	
+	function editLOAs($status_id = 1){
+	
+		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 = '$status_id' ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC");
+		$row = $db->Fetch($result);
+?>		
+ 	<script type="text/javascript">
+
+		function switchOption(id)
+		{ 
+			var op = document.getElementById(id).value;
+			location.href="?op=adjutant&edit=loas&id="+op+"";	
+		}
+	</script>
+<?php
+	 
+	 $opArr = Array();
+	 $opArr[1] = "Active Soldiers";
+	 $opArr[2] = "Soldiers on Leave";
+	 $opArr[3] = "Soldiers on Extended Leave";
+	 
+	 echo 'Viewing: <select id="option" name="option" onchange="switchOption(this.id)">';
+		for($x=1; $x<4; $x++){
+			if($status_id == $x)
+				echo '<option value="'.$x.'" selected>'.$opArr[$x].'</option>';
+			else
+				echo '<option value="'.$x.'">'.$opArr[$x].'</option>';	
+		}
+	 echo '</select>';
+		
+?>
+		<table style="text-align:center;" width="100%">
+		<tr><th>Rank</th><th>Soldier</th><th>Status</th></tr>
+<?php
+$num = 1;
+		foreach($row as $member){
+			if($num %2 == 0)
+				echo "<tr style=\"background-color:#c6c6c6;\">";
+			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>";
+			$num++;
+		}
+		CloseTable();
+	}
+	
+	function EditStatus($member_id){
+		global $db;
+		
+		$form = new BayonetForm($_SERVER['PHP_SELF'], "POST");
+		if($form->VerifySubmit('processed')){
+			
+			return;
+		}
+		
+		$result = $db->Query("SELECT * FROM `rudi_unit_members` JOIN `rudi_ranks` ON rudi_unit_members.rank_id=rudi_ranks.rank_id WHERE `member_id` = '$member_id' LIMIT 1");
+		$row = $db->FetchRow($result);
+?>
+		<table width="100%" style="text-align:center;">
+		<tr><th>Rank</th><th>Soldier</th><th>Status</th></tr>
+		<tr>
+			<td><?php echo $row['shortname']; ?></td>
+			<td><?php echo $row['first_name']." ".$row['last_name']; ?></td>
+			<td style="text-align:left;">
+				<?php $form->radioButton('status', 1, true); ?>Active<br />
+				<?php $form->radioButton('status', 2); ?>On Leave<br />
+				<?php $form->radioButton('status', 3); ?>On Extended Leave
+			</td>
+		</tr>
+		</table>
+<?php
+		$form->__destruct();
+		
+	}
+	
+  function getStatus($sID){
+  	global $db;
+  	$gStatusName = "N/A";
+  	
+ 		$result = $db->Query("SELECT `name` FROM `rudi_statuses` WHERE `status_id` = $sID LIMIT 1");
+	    $row = $db->FetchRow($result);    	
+		
+	return $row['name'];
+  }
+ ?>
\ No newline at end of file
diff --git a/admin/adjutant/index.php b/admin/adjutant/index.php
new file mode 100644
index 0000000..5149c28
--- /dev/null
+++ b/admin/adjutant/index.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+ 
+ ?>
+ <link rel="stylesheet" type="text/css" href="adjutant/style.css" media="screen"/>
+ <div style="text-align:left;"><h2>- Adjutant Control Panel</h2></div>
+ <a href="?op=adjutant&edit=points">Edit Points</a>&nbsp;&nbsp;
+ <a href="?op=adjutant&edit=loas">Edit LOAs</a>
+ <table class="panel" width="100%">
+ 	<tr><td style="text-align:center; vertical-align:top;">
+ <?php
+	if(!defined("ADMIN_FILE"))
+	{
+	  die("Access denied.");
+	}
+	
+	include $basedir.'adjutant/functions.php';
+	
+ 	//chek to see if the person is indeed an adjutant
+ 	
+ 	if(isset($_GET['edit'])){
+ 		if($_GET['edit'] == "points"){
+ 			echo "<h3>Edit Points</h3>";
+ 			EditPoints();
+ 		} 
+ 		if($_GET['edit'] == "loas"){
+ 			echo "<h3>Edit LOAs</h3>";
+ 			if(isset($_GET['member'])){
+ 				$member_id = $_GET['member'];
+ 				EditStatus($member_id);
+ 			}else{
+ 				if(isset($_GET['id']))
+ 					$status_id = $_GET['id'];
+ 				else
+ 					$status_id = 1;
+ 				EditLOAs($status_id);
+ 			}
+ 		} 	
+ 	}
+ ?>
+ 	</td></tr>
+ 	</table>
\ No newline at end of file
diff --git a/admin/adjutant/style.css b/admin/adjutant/style.css
new file mode 100644
index 0000000..24a3eb8
--- /dev/null
+++ b/admin/adjutant/style.css
@@ -0,0 +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;	

+	}
\ No newline at end of file
diff --git a/admin/admin_functions.php b/admin/admin_functions.php
index 1f5f866..46572e5 100644
--- a/admin/admin_functions.php
+++ b/admin/admin_functions.php
@@ -127,8 +127,8 @@ $num = 1;
   	if($num==1){
   		echo "<tr style=\"text-align:center; height:90px;\">";	
   	}
-    echo "<td class=\"center\" style=\"width:16%;\">$td</td>\n";
-    if($num%6 == 0){
+    echo "<td class=\"center\" style=\"width:12%;\">$td</td>\n";
+    if($num%8 == 0){
     	echo "</tr>";
 		$num=0;  
     }
diff --git a/admin/blocks/functions.php b/admin/blocks/functions.php
index fadf610..84c20b5 100644
--- a/admin/blocks/functions.php
+++ b/admin/blocks/functions.php
@@ -117,7 +117,7 @@ function EditBlock($block_id)
     }
     
     //Update the database with the new data.
-    $db->Query("UPDATE bayonet_blocks SET weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active' WHERE block_id = '$block_id'");
+    $db->Query("UPDATE bayonet_blocks SET title = '$title', weight = '$weight', dir_name = '$dir_name', position = '$position', active = '$active' WHERE block_id = '$block_id'");
     //$isActive = $active ? "IS" : "IS NOT";
     echo "Block, '$dir_name', at position '$weight'(order) has been edited.\n";
     PageRedirect(3, "?op=blocks");
diff --git a/admin/calendar/functions.php b/admin/calendar/functions.php
index cffaab1..76922cc 100644
--- a/admin/calendar/functions.php
+++ b/admin/calendar/functions.php
@@ -380,8 +380,8 @@ $events = GetEventsOnInterval("{$year}-{$monthNum}-01","{$year}-{$monthNum}-{$da
 				echo '<td class="cal_weekday">';  //weekdays
 			   }
 			   			        
-		       $sqlDate = $year.'-'.$monthNum.'-'.$day_num;  //old way NOT unix
-		      
+		       $sqlDate = date("Y-m-d", mktime(0, 0, 0, $monthNum, $day_num, $year));
+		       
 		  	 	//checks to see if the current day has events
 		       $isEvent=false;
 		       foreach($events as $event){
diff --git a/admin/calendar/index.php b/admin/calendar/index.php
index 1197990..2b631d8 100644
--- a/admin/calendar/index.php
+++ b/admin/calendar/index.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */ 

  ?>

- 

+ <link rel="stylesheet" type="text/css" href="calendar/style.css" media="screen"/>

  <div style="text-align:left;"><h2>- Manage Calendar & Events</h2></div>

 <?php

 

diff --git a/admin/images/adjutant.png b/admin/images/adjutant.png
new file mode 100644
index 0000000..e0dc701
--- /dev/null
+++ b/admin/images/adjutant.png
diff --git a/admin/index.php b/admin/index.php
index e888b6d..511418f 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -98,7 +98,8 @@ include 'header.php';
           LinkInternal('<img src="images/news.png" /><br />News','?op=news'),
           LinkInternal('<img src="images/calendar.png" /><br />Calendar','?op=calendar'),
           LinkInternal('<img src="images/box_download.png" /><br />Downloads', '?op=downloads'),
-		  LinkInternal('<img src="images/rudi.png" /><br />RUDI','?op=rudi')       
+		  LinkInternal('<img src="images/rudi.png" /><br />RUDI','?op=rudi'),
+		  LinkInternal('<img src="images/adjutant.png" /><br />Adjutant','?op=adjutant')       
         );
         
         //render administration table
diff --git a/admin/settings/index.php b/admin/settings/index.php
index 875abc8..e3c8946 100644
--- a/admin/settings/index.php
+++ b/admin/settings/index.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

  */ 

  ?>

- 

+ <link rel="stylesheet" type="text/css" href="settings/style.css" media="screen"/>

  <div style="text-align:left;"><h2>- Account Settings</h2>

  -<a href="?op=settings&change=password" >Change password</a>, email, name<br />

  </div>

diff --git a/admin/style.css b/admin/style.css
index 63055ab..281e0b2 100644
--- a/admin/style.css
+++ b/admin/style.css
@@ -24,7 +24,6 @@ a:hover {
 }
 
 h1, h2, h3, h4, h5, h6 {
-	/* font-family: 'Century Gothic'; */
 	font-weight: normal;	
 }
 h2 {
@@ -51,12 +50,12 @@ table.panel {
 	border:1px solid #848484;
 }
 
-.panel-none {
+td.panel-none {
 	width:201px;
 	vertical-align:top;
 }
 
-.panel-shadow {
+td.panel-shadow {
 	background-image:url("../images/rightshadow.png");
 	background-position: left;
 	background-repeat: repeat-y; 
@@ -133,164 +132,4 @@ fieldset {
 		padding:10px;
 		color:#333333;
 	}
-/* START>> CALENDAR STYLES*/
-		.monthTitle{
-  			color:black;
-            text-align:center;
-            font-size:12px;
-            font-weight:bold;
-			font-family:arial;			
-		}
-		td.weekday {
-			width:40px;
-			height:20px;
-            background-color:#cb2121;
-            color:green;
-            text-align:center;
-            font-size:10px;
-            font-weight:bold;
-		}
-		th.weekday {
-			width:40px;
-			height:29px;
-            background-color:white;
-            color:black;
-            text-align:center;
-            font-size:11px;
-            font-weight:bold;
-		}
-		.monthday {
-			width:40px;
-			height:20px;
-            background-color:#aea2a2;
-            color:white;
-            text-align:left;
-            font-size:10pt;
-            font-weight:bold;
-                        
-		}
-		.monthtoday {
-			width:38px;
-			height:38px;
-           /* background-color:#3666ba; */
-            color:#225eac;
-   			text-align:center;
-   			font-size:14px;
-            font-weight:bold;
-            border:1px solid #333333;
-		}
-		.event {
-			width:38px;
-			height:38px;
-            background-color:#225eac;
-   			text-align:center;
-            border:1px solid #333333;					
-		}
-		table.calendar a, table.calendar a:visited, table.calendar a:active, table.calendar a:hover {
-			color:white;		
-		}
-		.eventtoday{
-		 	width:38px;
-			height:38px;
-            background-color:#225eac;
-            color:#ef8e25;
-   			text-align:center;
-   			font-size:14px;
-            font-weight:bold;
-            border:1px solid #333333;			
-		}
-		td.cal_weekday {
-			width:40px;
-			height:40px;
-            background-color:#a1a1a1;
-            vertical-align:top;
-            color:#eeeeee;
-            font-family:arial;
-            text-align:center;
-            font-size:14px;
-		}
-		td.cal_weekend {
-			width:40px;
-			height:40px;
-            background-color:#8f8f8f;
-            vertical-align:top;
-            color:#eeeeee;
-            font-family:arial;
-            text-align:center;
-            font-size:14px;
-		}
-		td.cal_notmonth {
-			width:40px;
-			height:40px;
-            background-color:#6e6e6e;
-            vertical-align:top;
-            color:#d4d4d4;
-            text-align:left;
-            font-size:11px;
-		}
-/* END>> CALENDAR STYLES */
-
-/* START>> PASSWORD STYLES */
-
-input{
-	font-family: "Lucida Grande", "Verdana", sans-serif;
-}
-
-#pwordCont{
-	font-family: "Lucida Grande", "Verdana", sans-serif;
-	width: 820px;
-	font-size:12px;
-	margin-left: auto;
-	margin-right: auto;
-	padding: 50px 0 0 0;
-}
-
-#complexity{
-	color: #000;
-	font-size: 10px;
-	text-align: center;
-}
-
-.outer {
-	width:180px;
-	height:5px;
-	background-color: #CCC;
-}
-
-.default {
-	height:5px;
-	background-color: #CCC; 
-	width:0px;
-}
-.short {
-	height:5px;
-	background-color: #aa0033; 
-	width:15px; 	
-}
-.weak {
-	height:5px;
-	background-color: #aa0033; 
-	width:45px; 
-}
-.good {
-	height:5px;
-	background-color: #6699cc; 
-	width:90px; 
-}
-.strong {
-	height:5px;
-	background-color: #008000; 
-	width:135px; 
-}
-.secure {
-	height:5px;
-	background-color: #008000; 
-	width:180px;
-}
-
-span.value{
-	font-weight:bold;
-	float: right;
-}
-
-/* END>> PASSWORD STYLES */
\ No newline at end of file
+	
\ No newline at end of file