From 653fcd7f2279ba47c7d90c840f03fc2c60668d61 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Tue, 19 Mar 2019 16:33:34 -0600 Subject: [PATCH] Add more fields to person editor, fix some fields not saving/displaying --- action.php | 18 +++- database.mwb | Bin 13412 -> 13702 bytes langs/en/messages.json | 4 +- pages/editperson.php | 217 +++++++++++++++++++++++++++-------------- 4 files changed, 159 insertions(+), 80 deletions(-) diff --git a/action.php b/action.php index c647fdd..90a9687 100644 --- a/action.php +++ b/action.php @@ -54,7 +54,11 @@ switch ($VARS['action']) { "shirt" => "", "sex" => "", "parentname" => "", - "rank" => "" + "rank" => "", + "den" => "", + "health" => "", + "notes" => "", + "position" => "" ]; if (!empty($VARS['personid']) && $database->has("people", ['personid' => $VARS['personid']])) { $person = $database->get('people', ['personid (id)', @@ -71,7 +75,8 @@ switch ($VARS['action']) { 'email', 'unit', 'shirt', - 'sex'], ['personid' => $VARS['personid']]); + 'sex', + 'notes'], ['personid' => $VARS['personid']]); $editing = true; } @@ -186,7 +191,9 @@ switch ($VARS['action']) { case "camper": $data = [ "parentname" => $people["parentname"], - "rank" => $people["rank"] + "rank" => $people["rank"], + "den" => (empty($people["den"]) ? "" : $people["den"]), + "health" => (empty($people["health"]) ? "" : $people["health"]) ]; if ($editing) { $database->update("campers", $data, ['camperid' => $person['camperid']]); @@ -239,7 +246,8 @@ switch ($VARS['action']) { "email" => empty($people["email"]) ? "" : $people["email"], "unit" => $people["unit"], "shirt" => $people["shirt"], - "sex" => $people["sex"] + "sex" => $people["sex"], + "notes" => (empty($people["notes"]) ? "" : $people["notes"]) ]; if ($editing) { @@ -253,7 +261,7 @@ switch ($VARS['action']) { } }); - returnToSender("person_saved"); + returnToSender("person_saved", "&id=" . htmlentities($VARS['personid'])); break; case "deleteperson": if (!empty($VARS['id']) && $database->count("people", ['personid' => $VARS['id']]) === 1) { diff --git a/database.mwb b/database.mwb index 416b04693dd67c6a2258fd6829e5a9472c21190c..f468e3917a16667f1af003f77aba3d5f944f07cf 100644 GIT binary patch literal 13702 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 literal 13412 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 diff --git a/langs/en/messages.json b/langs/en/messages.json index ed98452..bcc7241 100644 --- a/langs/en/messages.json +++ b/langs/en/messages.json @@ -6,5 +6,7 @@ "Are you sure you want to delete this person?": "Are you sure you want to delete this person?", "This action cannot be undone!": "This action cannot be undone!", "Payment saved.": "Payment saved.", - "Only showing {x}s.": "Only showing {x}s." + "Only showing {x}s.": "Only showing {x}s.", + "Person saved.": "Person saved.", + "Person deleted.": "Person deleted." } diff --git a/pages/editperson.php b/pages/editperson.php index d60a775..e75affc 100644 --- a/pages/editperson.php +++ b/pages/editperson.php @@ -26,7 +26,10 @@ $data = [ "sex" => "", "parentname" => "", "rank" => "", - "days" => "" + "days" => "", + "den" => "", + "health" => "", + "notes" => "" ]; $type = "camper"; if (!empty($VARS['type']) && preg_match("/(camper|adult|youth)/", $VARS['type'])) { @@ -48,10 +51,11 @@ if (!empty($VARS['id']) && $database->has('people', ['personid' => $VARS['id']]) 'email', 'unit', 'shirt', - 'sex'], ['personid' => $personid]); + 'sex', + 'notes'], ['personid' => $personid]); if (!empty($data["camperid"])) { $type = "camper"; - $data = array_merge($data, $database->get('campers', ['parentname', 'rank'], ['camperid' => $data["camperid"]])); + $data = array_merge($data, $database->get('campers', ['parentname', 'rank', 'den', 'health'], ['camperid' => $data["camperid"]])); } else if (!empty($data["adultid"])) { $type = "adult"; $data = array_merge($data, $database->get('adults', ['days', 'position'], ['adultid' => $data["adultid"]])); @@ -288,6 +292,7 @@ if (!empty($VARS['id']) && $database->has('people', ['personid' => $VARS['id']]) "type" => "select", "width" => 5, "options" => $positions, + "value" => $data["position"], "error" => "Choose a position." ] ]); @@ -326,6 +331,39 @@ if (!empty($VARS['id']) && $database->has('people', ['personid' => $VARS['id']]) "error" => "Choose a gender." ], ]); + if ($type == "camper") { + $textboxes = array_merge($textboxes, [ + [ + "label" => "Den", + "name" => "den", + "width" => 5, + "maxlength" => 255, + "value" => $data["den"], + "optional" => true, + "error" => "Enter a den" + ], + [ + "label" => "Health", + "name" => "health", + "type" => "textarea", + "width" => 6, + "value" => $data["health"], + "optional" => true, + "error" => "Error" + ] + ]); + } + $textboxes = array_merge($textboxes, [ + [ + "label" => "Notes", + "name" => "notes", + "type" => "textarea", + "width" => 6, + "value" => $data["notes"], + "optional" => true, + "error" => "Error" + ] + ]); foreach ($textboxes as $item) { ?> @@ -334,81 +372,112 @@ if (!empty($VARS['id']) && $database->has('people', ['personid' => $VARS['id']])
- - " - name="" - data-name="" - class="form-control" - placeholder="" - aria-label="" - maxlength="" - - pattern="" - - - value="" - /> - - $label) { - $selected = ""; - if (!empty($item['value']) && $value == $item['value']) { - $selected = " selected"; - } - echo "\n"; + if (empty($item['optional'])) { + echo "required"; } - ?> - - -
+ ?>> + $label) { + $selected = ""; + if (!empty($item['value']) && $value == $item['value']) { + $selected = " selected"; + } + echo "\n"; + } + ?> + $label) { - ?> -
- - > - -
+ break; + case "checkboxes": + ?> +
$label) { + ?> +
+ > + +
+ +
+ -
- + + + " + name="" + data-name="" + class="form-control" + placeholder="" + aria-label="" + maxlength="" + + min="" + + + pattern="" + + + value="" + /> +
@@ -432,7 +501,7 @@ if (!empty($VARS['id']) && $database->has('people', ['personid' => $VARS['id']]) } ?> - +