From f472c60b18469ff8a06963708174dea1bfc08015 Mon Sep 17 00:00:00 2001 From: Evan O'Connell Date: Sun, 18 Aug 2013 18:29:07 -0400 Subject: Adds untracked changes --- admin/rudi/includes/functions.members.php | 44 +++- admin/rudi/views/view.awards.add.php | 5 +- admin/rudi/views/view.awards.php | 2 +- admin/rudi/views/view.members.delete.php | 31 +++ admin/rudi/views/view.members.new.php | 381 ++++++++++++++++-------------- admin/rudi/views/view.members.php | 24 +- admin/rudi/views/view.members.profile.php | 11 +- 7 files changed, 308 insertions(+), 190 deletions(-) create mode 100644 admin/rudi/views/view.members.delete.php (limited to 'admin/rudi') diff --git a/admin/rudi/includes/functions.members.php b/admin/rudi/includes/functions.members.php index 86848dc..4a93134 100644 --- a/admin/rudi/includes/functions.members.php +++ b/admin/rudi/includes/functions.members.php @@ -37,8 +37,13 @@ function GetMembersRoles($member_id){ global $db; $row = NULL; - $query = sprintf("SELECT r.role_id, r.name AS role_name FROM rudi_roles AS r LEFT OUTER JOIN rudi_roles_container AS rl USING(role_id) INNER JOIN rudi_unit_members AS rm USING(member_id) WHERE rm.member_id = %d AND r.name IS NOT NULL ORDER BY r.role_id ASC", - (int)$member_id); + $query = sprintf("SELECT r.role_id, r.name AS role_name + FROM rudi_roles AS r + LEFT OUTER JOIN rudi_roles_container AS rl USING(role_id) + INNER JOIN rudi_unit_members AS rm USING(member_id) + WHERE rm.member_id = %d + AND r.name IS NOT NULL + ORDER BY r.role_id ASC", (int)$member_id); $result = $db->Query($query); $row = $db->Fetch($result); @@ -299,4 +304,39 @@ CloseTable(); $form->__destruct(); } + + + + + function DeleteMember($member_id) + { + // FROM unit_members, service_record, award_record FOR member_id + global $db; + + $db->Query("DELETE FROM `rudi_unit_members`, + `rudi_service_record`, + `rudi_award_record`, + `rudi_combat_record`, + `rudi_drills_record` + USING `rudi_unit_members` + INNER JOIN `rudi_award_record` USING(member_id) + INNER JOIN `rudi_service_record` USING(member_id) + INNER JOIN `rudi_combat_record` USING(member_id) + INNER JOIN `rudi_drills_record` USING(member_id) + WHERE `member_id` = $member_id"); + decho("DELETE FROM `rudi_unit_members`, + `rudi_service_record`, + `rudi_award_record`, + `rudi_combat_record`, + `rudi_drills_record` + USING `rudi_unit_members` + INNER JOIN `rudi_award_record` USING(member_id) + INNER JOIN `rudi_service_record` USING(member_id) + INNER JOIN `rudi_combat_record` USING(member_id) + INNER JOIN `rudi_drills_record` USING(member_id) + WHERE `member_id` = $member_id"); + decho("Done."); + return; + } + ?> \ No newline at end of file diff --git a/admin/rudi/views/view.awards.add.php b/admin/rudi/views/view.awards.add.php index 9c97c54..71f6a91 100644 --- a/admin/rudi/views/view.awards.add.php +++ b/admin/rudi/views/view.awards.add.php @@ -6,12 +6,13 @@ global $db; $name = $form->request['name']; $text = $form->request['text']; + decho("INSERT INTO `rudi_awards` SET `class_id` = '$class_id', `name` = '$name', `description` = '$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}"); + PageRedirect(1, "?op=rudi&show=awards&cid=".$class_id); return; } - echo LinkInternal("Cancel","?op=rudi&show=awards&cid={$class_id}"); + echo LinkInternal("Cancel","?op=rudi&show=awards&cid=".$class_id); OpenTable(); ?> diff --git a/admin/rudi/views/view.awards.php b/admin/rudi/views/view.awards.php index 3a5729f..4902577 100644 --- a/admin/rudi/views/view.awards.php +++ b/admin/rudi/views/view.awards.php @@ -23,7 +23,7 @@ $class_id = $_GET['cid']; $awards = getAwardsByClass($class_id); echo "

Awards

"; - echo LinkInternal(' Add New Award','?op=rudi&show=awards&cid={$class_id}&add=true'); + echo LinkInternal(' Add New Award','?op=rudi&show=awards&cid='.$class_id.'&add=true'); OpenTable(); foreach($awards as $award){ echo "".$award['name']." diff --git a/admin/rudi/views/view.members.delete.php b/admin/rudi/views/view.members.delete.php new file mode 100644 index 0000000..e0adf5e --- /dev/null +++ b/admin/rudi/views/view.members.delete.php @@ -0,0 +1,31 @@ +Query("SELECT CONCAT(last_name,', ',first_name) AS name FROM `rudi_unit_members` WHERE `member_id` = '$member_id' LIMIT 1"); + $member = $db->FetchRow($result); + $form = new BayonetForm("", "POST"); + + if(isset($_POST['proceed'])) + { + //echo "Soldier '{$member['name']}', was deleted."; + ReportError("This is not completed yet."); + // DELETE unit_members, service_record, award_record FOR member_id + //DeleteMember($member_id); + PageRedirect(2, "?op=rudi&show=members"); + return; + } + if(isset($_POST['cancel'])) + { + echo "User cancelled deletion of soldier: '{$member['name']}'"; + PageRedirect(2, "?op=rudi&show=members&profile={$member_id}"); + return; + } + + OpenTable(); +?> + Are you SURE you want to delete soldier: ''?
All records for this soldier will be permenantly removed. +     +__destruct(); +?> \ No newline at end of file diff --git a/admin/rudi/views/view.members.new.php b/admin/rudi/views/view.members.new.php index cbc086f..ab309ea 100644 --- a/admin/rudi/views/view.members.new.php +++ b/admin/rudi/views/view.members.new.php @@ -1,179 +1,204 @@ -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
-
- - - - -
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
+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&profile=$member_id"); + return; + } +?> + Cancel
+ + + + + + + +
Personnel File of
Rank: + +
Country: + +
ArmA2 ID
ArmA2:OA ID
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Vital Statistics
First:
Last:
Username:
City:
Province:
Status: + +
Primary MOS:
Role: + +
Unit: + +
Primary Weapon: + +
Secondary Weapon: + +
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 9013b8e..7aabb89 100644 --- a/admin/rudi/views/view.members.php +++ b/admin/rudi/views/view.members.php @@ -1,17 +1,31 @@ - - + + + + +
Personal Bio
+ + + +
\ No newline at end of file -- cgit