From 9d4fa2963b1059fed54aaeae583bf02a30c42239 Mon Sep 17 00:00:00 2001 From: jhunkeler Date: Mon, 4 Jan 2010 04:54:14 +0000 Subject: Fixed SVN maybe. git-svn-id: http://svn.3rd-infantry-division.org/testing/branches/Bayonet CMS v2@448 c5b2fb0a-d05d-0410-98c8-828840a80ff6 --- admin/adjutant/functions.php | 154 +++++++++++++++++++++++++++++++++++++++ admin/adjutant/index.php | 58 +++++++++++++++ admin/adjutant/style.css | 13 ++++ admin/admin_functions.php | 4 +- admin/blocks/functions.php | 2 +- admin/calendar/functions.php | 4 +- admin/calendar/index.php | 2 +- admin/images/adjutant.png | Bin 0 -> 6496 bytes admin/index.php | 3 +- admin/settings/index.php | 2 +- admin/style.css | 167 +------------------------------------------ 11 files changed, 237 insertions(+), 172 deletions(-) create mode 100644 admin/adjutant/functions.php create mode 100644 admin/adjutant/index.php create mode 100644 admin/adjutant/style.css create mode 100644 admin/images/adjutant.png (limited to 'admin') 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 @@ +. + */ + + 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; + } +?> +
+ + + +"; + else + echo ""; + echo " + + + + "; + + + echo "\n"; + } + CloseTable(); + echo ""; + + } + + 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); +?> + +'; + for($x=1; $x<4; $x++){ + if($status_id == $x) + echo ''; + else + echo ''; + } + echo ''; + +?> +
RankSoldierStatusPointsDrills Missed
{$soldier['shortname']}{$soldier['first_name']} {$soldier['last_name']}".getStatus($soldier['status_id'])."/100/3
+ +"; + else + echo ""; + echo ""; + $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); +?> +
RankSoldierStatus
{$member['shortname']}{$member['first_name']} {$member['last_name']}Edit
+ + + + + + +
RankSoldierStatus
+ radioButton('status', 1, true); ?>Active
+ radioButton('status', 2); ?>On Leave
+ radioButton('status', 3); ?>On Extended Leave +
+__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 @@ +. + */ + + ?> + +

- Adjutant Control Panel

+ Edit Points   + Edit LOAs + + +
+ Edit Points"; + EditPoints(); + } + if($_GET['edit'] == "loas"){ + echo "

Edit LOAs

"; + 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); + } + } + } + ?> +
\ 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 ""; } - echo "$td\n"; - if($num%6 == 0){ + echo "$td\n"; + if($num%8 == 0){ echo ""; $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 ''; //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 . */ ?> - +

- Manage Calendar & Events


News','?op=news'), LinkInternal('
Calendar','?op=calendar'), LinkInternal('
Downloads', '?op=downloads'), - LinkInternal('
RUDI','?op=rudi') + LinkInternal('
RUDI','?op=rudi'), + LinkInternal('
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 . */ ?> - +

- Account Settings

-Change password, email, name
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 -- cgit