From 0077cb99704fe863cf731fc5cab792af2ede96c2 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sun, 17 Apr 2011 20:13:07 -0400 Subject: Backporting retarded amount of changes outside of version control --- admin/rudi/views/view.awards.add.php | 27 +++++ admin/rudi/views/view.awards.delete.php | 29 +++++ admin/rudi/views/view.awards.edit.php | 54 ++++----- admin/rudi/views/view.awards.php | 78 ++++++------- admin/rudi/views/view.battles.list.php | 18 +++ admin/rudi/views/view.battles.php | 36 ++++++ admin/rudi/views/view.members.award.php | 39 ++++--- admin/rudi/views/view.members.new.php | 179 ++++++++++++++++++++++++++++++ admin/rudi/views/view.members.php | 20 ++-- admin/rudi/views/view.members.profile.php | 50 +++++++-- admin/rudi/views/view.units.php | 51 +++++---- 11 files changed, 457 insertions(+), 124 deletions(-) create mode 100644 admin/rudi/views/view.awards.add.php create mode 100644 admin/rudi/views/view.awards.delete.php create mode 100644 admin/rudi/views/view.battles.list.php create mode 100644 admin/rudi/views/view.battles.php create mode 100644 admin/rudi/views/view.members.new.php (limited to 'admin/rudi/views') diff --git a/admin/rudi/views/view.awards.add.php b/admin/rudi/views/view.awards.add.php new file mode 100644 index 0000000..9c97c54 --- /dev/null +++ b/admin/rudi/views/view.awards.add.php @@ -0,0 +1,27 @@ +verifySubmit('processed')) + { + global $db; + $name = $form->request['name']; + $text = $form->request['text']; + $db->Query("INSERT INTO `rudi_awards` SET `class_id` = '$class_id', `name` = '$name', `image` = '', `description` = '$text'"); + + PageRedirect(1, "?op=rudi&show=awards&cid={$class_id}"); + return; + } + echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$class_id}"); + OpenTable(); +?> + +Name:textField('name', "", false, "50"); ?> +Image: +Text:textArea('text',10,30); ?> +submitButton('processed', 'Add'); ?> + +__destruct(); +?> + diff --git a/admin/rudi/views/view.awards.delete.php b/admin/rudi/views/view.awards.delete.php new file mode 100644 index 0000000..6fde068 --- /dev/null +++ b/admin/rudi/views/view.awards.delete.php @@ -0,0 +1,29 @@ +Query("SELECT `name`, `class_id` FROM `rudi_awards` WHERE `award_id` = '$award_id' LIMIT 1"); + $award = $db->FetchRow($result); + $form = new BayonetForm("", "POST"); + + if(isset($_POST['proceed'])) + { + echo "Award '{$award['name']}', was deleted."; + $db->Query("DELETE FROM `rudi_awards` WHERE `award_id` = '$award_id' LIMIT 1"); + PageRedirect(2, "?op=rudi&show=awards&cid={$award['class_id']}"); + return; + } + if(isset($_POST['cancel'])) + { + echo "User cancelled deletion of award: '{$award['name']}'"; + PageRedirect(2, "?op=rudi&show=awards&cid={$award['class_id']}"); + return; + } + + OpenTable(); +?> + Are you SURE you want to delete the award titled: ''?
All users who have recieved this award will lose it off their records (not yet at least). +     +__destruct(); +?> \ No newline at end of file diff --git a/admin/rudi/views/view.awards.edit.php b/admin/rudi/views/view.awards.edit.php index 21ec156..0b82ef6 100644 --- a/admin/rudi/views/view.awards.edit.php +++ b/admin/rudi/views/view.awards.edit.php @@ -1,27 +1,27 @@ -verifySubmit('processed')) - { - 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(); -?> - -Name:textField('name', $award['name'], false, "50"); ?> -Image: -Text:textArea('text',10,30,$award['description']); ?> -submitButton('processed', 'Update'); ?> - -__destruct(); -?> - +verifySubmit('processed')) + { + 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(); +?> + +Name:textField('name', $award['name'], false, "50"); ?> +Image: +Text:textArea('text',10,30,$award['description']); ?> +submitButton('processed', 'Update'); ?> + +__destruct(); +?> + diff --git a/admin/rudi/views/view.awards.php b/admin/rudi/views/view.awards.php index b4c912f..3a5729f 100644 --- a/admin/rudi/views/view.awards.php +++ b/admin/rudi/views/view.awards.php @@ -1,40 +1,40 @@ -Award Classes"; - $classes = getAwardClasses(); - OpenTable(); - echo ""; - foreach($classes as $class){ - echo "".LinkInternal($class['name'],'?op=rudi&show=awards&cid='.$class['class_id']).""; - } - echo ""; - CloseTable(); - - if(isset($_GET['cid'])){ - $class_id = $_GET['cid']; - $awards = getAwardsByClass($class_id); - echo "

Awards

"; - echo LinkInternal(' Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true'); - OpenTable(); - foreach($awards as $award){ - echo "".$award['name']." - Edit - Delete"; - } - CloseTable(); - //include 'view.members.profile.php'; - }else if(isset($_GET['aid'])){ - $award_id = $_GET['aid']; - //include 'view.members.service.php'; - } - } +Award Classes"; + $classes = getAwardClasses(); + OpenTable(); + echo ""; + foreach($classes as $class){ + echo "".LinkInternal($class['name'],'?op=rudi&show=awards&cid='.$class['class_id']).""; + } + echo ""; + CloseTable(); + + if(isset($_GET['cid'])){ + $class_id = $_GET['cid']; + $awards = getAwardsByClass($class_id); + echo "

Awards

"; + echo LinkInternal(' Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true'); + OpenTable(); + foreach($awards as $award){ + echo "".$award['name']." + Edit + Delete"; + } + CloseTable(); + //include 'view.members.profile.php'; + }else if(isset($_GET['aid'])){ + $award_id = $_GET['aid']; + //include 'view.members.service.php'; + } + } ?> \ No newline at end of file diff --git a/admin/rudi/views/view.battles.list.php b/admin/rudi/views/view.battles.list.php new file mode 100644 index 0000000..573d422 --- /dev/null +++ b/admin/rudi/views/view.battles.list.php @@ -0,0 +1,18 @@ + Use AJAX oncheck to save the status of that member + + $battle = getBattleInfo($war_id); + + decho($battle); + + $members = getCombatSoldiers($war_id); + + decho($members); + +?> +

Engagement :

\ No newline at end of file diff --git a/admin/rudi/views/view.battles.php b/admin/rudi/views/view.battles.php new file mode 100644 index 0000000..d00452e --- /dev/null +++ b/admin/rudi/views/view.battles.php @@ -0,0 +1,36 @@ + click one to view who was attending (lists everyone in the unit and those attending) + // buttons to add/edit/delete battles + + // definitely gonna use ajax for this... + + include $basedir.'rudi/includes/functions.battles.php'; + + if(isset($_GET['id'])){ + $war_id = $_GET['id']; + include 'view.battles.list.php'; + }else if(isset($_GET['service'])){ + $member_id = $_GET['service']; + include 'view.members.service.php'; + }else{ + + // list all battles + $battles = getAllBattles(); + decho($battles); + +?> +

Unit Engagement:

+ + +"; + + } + CloseTable(); + } +?> \ No newline at end of file diff --git a/admin/rudi/views/view.members.award.php b/admin/rudi/views/view.members.award.php index cda8595..db6f88e 100644 --- a/admin/rudi/views/view.members.award.php +++ b/admin/rudi/views/view.members.award.php @@ -1,19 +1,22 @@ -Query("SELECT `first_name`, `last_name` FROM `rudi_unit_members` WHERE `member_id` = '$member_id' LIMIT 1"); - $member = $db->FetchRow($result); - echo "

Award Record of {$member['first_name']} {$member['last_name']}

"; - - if(isset($_GET['edit'])){ - $record_id = $_GET['edit']; - EditAwardRecord($record_id); - }else if(isset($_GET['add'])){ - if($_GET['add']){ - AddAwardRecord($_GET['award']); - } - }else{ - - echo "
".LinkInternal('Back to Roster', '?op=rudi&show=members')."
"; - ListAwardRecord($_GET['award']); - } +Query("SELECT `first_name`, `last_name` FROM `rudi_unit_members` WHERE `member_id` = '$member_id' LIMIT 1"); + $member = $db->FetchRow($result); + echo "

Award Record of {$member['first_name']} {$member['last_name']}

"; + + if(isset($_GET['edit'])){ + $record_id = $_GET['edit']; + EditAwardRecord($record_id); + }else if(isset($_GET['add'])){ + if($_GET['add']){ + AddAwardRecord($_GET['award']); + } + }else if(isset($_GET['delete'])){ + $record_id = $_GET['delete']; + DeleteAwardRecord($record_id); + }else{ + + echo "
".LinkInternal('Back to Roster', '?op=rudi&show=members')."
"; + ListAwardRecord($_GET['award']); + } ?> \ No newline at end of file diff --git a/admin/rudi/views/view.members.new.php b/admin/rudi/views/view.members.new.php new file mode 100644 index 0000000..cbc086f --- /dev/null +++ b/admin/rudi/views/view.members.new.php @@ -0,0 +1,179 @@ +Query($query); + + $member_id = $db->InsertID(); + decho($member_id); + $db->Query("INSERT INTO `rudi_roles_container` SET `role_id` = '$role_id', `member_id` = '$member_id'"); + + PageRedirect(1, "?op=rudi&show=members"); + return; + } +?> + Cancel
+ +
TitleOpponentResultDate
{$battle['title']}vs {$battle['name']}{$battle['status']} {$battle['home_score']}-{$battle['visit_score']}"; + echo date("M j Y", strtotime($battle['date'])); + echo "
+ + + +
Personnel File of
Rank: + +
Country: + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Vital Statistics
First:
Last:
Username:
City:
Province:
Status: + +
Primary MOS:
Role: + +
Unit: + +
Weapons: + +
Enlisted Date:
Promotion Date: + +
Discharge Date:
Xfire:
E-Mail:
+
+ + + + +
Personal Bio
+ \ No newline at end of file diff --git a/admin/rudi/views/view.members.php b/admin/rudi/views/view.members.php index 38929df..9013b8e 100644 --- a/admin/rudi/views/view.members.php +++ b/admin/rudi/views/view.members.php @@ -9,13 +9,18 @@ }else if(isset($_GET['award'])){ $member_id = $_GET['award']; include 'view.members.award.php'; + }else if(isset($_GET['create']) && $_GET['create'] == "soldier"){ + include 'view.members.new.php'; }else{ global $db; - echo "

Current Members

"; - echo ""; - echo ""; + echo LinkInternal('New Soldier','?op=rudi&show=members&create=soldier'); +?> +

Current Members

+
RankSoldierMain InfoService RecordMedal Record
+ +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); @@ -28,10 +33,11 @@ echo ""; } CloseTable(); - - echo "

Previous Members

"; - echo "
RankSoldierMain InfoService RecordMedal Record
"; - echo ""; +?> +

Previous Members

+
RankSoldierMain InfoService RecordMedal Record
+ +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); diff --git a/admin/rudi/views/view.members.profile.php b/admin/rudi/views/view.members.profile.php index bd776d7..6355d2e 100644 --- a/admin/rudi/views/view.members.profile.php +++ b/admin/rudi/views/view.members.profile.php @@ -10,7 +10,10 @@ $status_id = $_POST['status']; $role_id = $_POST['role']; $unit_id = $_POST['unit']; + $a2_id = $_POST['a2_id']; + $oa_id = $_POST['oa_id']; $weapon_id = $_POST['weapon']; + $weapon2_id = $_POST['weapon2']; $first_name = addslashes($_POST['first']); $last_name = addslashes($_POST['last']); $username = addslashes($_POST['username']); @@ -29,9 +32,13 @@ $query = "UPDATE `rudi_unit_members` SET" ." `rank_id` = '$rank_id'," ." `country_id` = '$country_id'," + ." `role_id` = '$role_id', " ." `status_id` = '$status_id'," ." `cunit_id` = '$unit_id'," ." `weapon_id` = '$weapon_id'," + ." `weapon2_id` = '$weapon2_id'," + ." `a2_id` = '$a2_id'," + ." `oa_id` = '$oa_id'," ." `username` = '$username'," ." `email` = '$email'," ." `xfire` = '$xfire'," @@ -51,10 +58,10 @@ decho($query); $db->Query($query); - $db->Query("UPDATE `rudi_roles_container` SET `role_id` = '$role_id' WHERE `member_id` = '$member_id' LIMIT 1"); + //$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}"); + PageRedirect(1, "?op=rudi&show=members"); return; } $member = GetMember($member_id); @@ -87,6 +94,8 @@ ?> + +
RankSoldierMain InfoService RecordMedal Record
ArmA2 ID
ArmA2:OA ID
@@ -118,15 +127,21 @@ - + diff --git a/admin/rudi/views/view.units.php b/admin/rudi/views/view.units.php index 2ccf35a..ab3dedd 100644 --- a/admin/rudi/views/view.units.php +++ b/admin/rudi/views/view.units.php @@ -1,22 +1,29 @@ - -
- Kilo Company
- 1st Platoon
- 1st Squad
- Fireteam Alpha
- Fireteam Bravo
- 2nd Squad
- Fireteam Alpha
- Fireteam Bravo
-
\ No newline at end of file +

Unit Structure

+
+'; + DisplayUnits(); + echo ''; + + } + + +?> +
+ \ No newline at end of file -- cgit
Vital Statistics
Role: @@ -153,7 +168,7 @@
Weapons: +
Primary Weapon: +
Secondary Weapon: +