Jessus christ

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

7 files changed, 42 insertions, 8 deletions

diff --git a/admin/images/bayonet_logo.jpg b/admin/images/bayonet_logo.jpg
index d957c7d..5127ad2 100644
--- a/admin/images/bayonet_logo.jpg
+++ b/admin/images/bayonet_logo.jpg
diff --git a/admin/rudi/index.php b/admin/rudi/index.php
index 3d93bf0..2e4a42a 100644
--- a/admin/rudi/index.php
+++ b/admin/rudi/index.php
@@ -49,6 +49,7 @@
 		$th = array('Rudi Options','');

         $td = array(

 			LinkInternal('Roster','?op=rudi&show=members'),

+			LinkInternal('Units','?op=rudi&show=units'),

 			LinkInternal('Awards', '?op=rudi&show=awards')   

         );

         

diff --git a/admin/rudi/views/view.awards.edit.php b/admin/rudi/views/view.awards.edit.php
index 09f041c..21ec156 100644
--- a/admin/rudi/views/view.awards.edit.php
+++ b/admin/rudi/views/view.awards.edit.php
@@ -3,19 +3,22 @@
 	$form = new BayonetForm("", "POST");

 	if($form->verifySubmit('processed'))

 	{

-		echo "Key states<br/>\n";

-		$keydump = print_r($form->getKeyStates($form->request), true);

-		echo "<pre>{$keydump}</pre>\n";

-			

-		echo "<p>Transaction processed</p>\n";

-			

+		global $db;

+		$name = $form->request['name'];

+		$text = $form->request['text'];

+		$db->Query("UPDATE `rudi_awards` SET `name` = '$name', `description` = '$text' WHERE `award_id` = '$award_id' LIMIT 1");

+		

+		PageRedirect(1, "?op=rudi&show=awards&award={$award_id}");

+		return;		

 	}

+	echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$award['class_id']}");

 	OpenTable();

 ?>

 

 <tr><th>Name:</th><td><?php $form->textField('name', $award['name'], false, "50"); ?></td><tr>

 <tr><th>Image:</th><td><?php ?></td></tr>

 <tr><th>Text:</th><td><?php $form->textArea('text',10,30,$award['description']); ?></td></tr>

+<tr><td><?php $form->submitButton('processed', 'Update'); ?></td></tr>

 

 <?php

 	CloseTable();

diff --git a/admin/rudi/views/view.awards.php b/admin/rudi/views/view.awards.php
index 2455018..b4c912f 100644
--- a/admin/rudi/views/view.awards.php
+++ b/admin/rudi/views/view.awards.php
@@ -3,6 +3,11 @@
 		if(isset($_GET['award'])){

 			$award_id = $_GET['award'];

 			include 'view.awards.edit.php';

+		}else if(isset($_GET['add'])){

+			include 'view.awards.add.php';

+		}else if(isset($_GET['delete'])){

+			$award_id = $_GET['delete'];

+			include 'view.awards.delete.php';

 		}else{

 			echo "<h3>Award Classes</h3>";

 			$classes = getAwardClasses();

@@ -18,6 +23,7 @@
 				$class_id = $_GET['cid'];

 				$awards = getAwardsByClass($class_id);

 				echo "<h3>Awards</h3>";

+				echo LinkInternal('<img src="images/add.png" />&nbsp;Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true');

 				OpenTable();

 				foreach($awards as $award){

 					echo "<tr><td>".$award['name']."</td>

diff --git a/admin/rudi/views/view.members.php b/admin/rudi/views/view.members.php
index 659ef2b..38929df 100644
--- a/admin/rudi/views/view.members.php
+++ b/admin/rudi/views/view.members.php
@@ -16,7 +16,7 @@
 			 echo "<h3>Current Members</h3>";
 			 echo "<table width=\"100%\" style=\"text-align:center;\">";
 			 echo "<tr><th>Rank</th><th>Soldier</th><th>Main Info</th><th>Service Record</th><th>Medal Record</th></tr>";
-			 $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 <= 3 ORDER BY rudi_ranks.weight DESC , rudi_unit_members.date_promotion ASC , rudi_unit_members.date_enlisted ASC");
 			 $row = $db->Fetch($result);
 			 
 			 foreach($row as $member){
@@ -32,7 +32,7 @@
 			 echo "<h3>Previous Members</h3>";
 			 echo "<table width=\"100%\" style=\"text-align:center;\">";
 			 echo "<tr><th>Rank</th><th>Soldier</th><th>Main Info</th><th>Service Record</th><th>Medal Record</th></tr>";
-			 $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 OR 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 > 3 ORDER BY rudi_ranks.weight DESC, rudi_unit_members.date_promotion ASC, rudi_unit_members.date_enlisted ASC");
 			 $row = $db->Fetch($result);
 			 
 			 foreach($row as $member){
diff --git a/admin/rudi/views/view.members.profile.php b/admin/rudi/views/view.members.profile.php
index fedabdd..bd776d7 100644
--- a/admin/rudi/views/view.members.profile.php
+++ b/admin/rudi/views/view.members.profile.php
@@ -51,6 +51,8 @@
 			decho($query);
 		 	$db->Query($query);
 		 	
+		 	$db->Query("UPDATE `rudi_roles_container` SET `role_id` = '$role_id' WHERE `member_id` = '$member_id' LIMIT 1");
+		 	
 		 	/* do the role query as well */
 		 	PageRedirect(1, "?op=rudi&show=members&profile={$member_id}");
 		 	return;		 
diff --git a/admin/rudi/views/view.units.php b/admin/rudi/views/view.units.php
index e69de29..2ccf35a 100644
--- a/admin/rudi/views/view.units.php
+++ b/admin/rudi/views/view.units.php
@@ -0,0 +1,22 @@
+<?php

+	include $basedir.'rudi/includes/functions.units.php';

+	if(isset($_GET['unit'])){

+			

+	}else{

+		//list units	

+		DisplayUnits();

+		

+	}

+

+

+?>

+<div style="text-align:left;">

+<img src="images/tree_branch.gif" />&nbsp;Kilo Company<br />

+<img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;1st Platoon<br />

+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;1st Squad<br />

+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_leaf.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Alpha<br />

+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_leaf.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Bravo<br />

+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;2nd Squad<br />

+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Alpha<br />

+<img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_blank.gif" /><img src="images/tree_branch.gif" />&nbsp;Fireteam Bravo<br />

+</div>
\ No newline at end of file