From c46d82bc075461ee1e729535b0a7fc212a07fb67 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Thu, 30 May 2019 21:00:32 -0600 Subject: [PATCH] Add AXXXL shirt, "rank as of June", and Tiger parent note --- action.php | 2 +- pages/editperson.php | 3 ++- pages/home.php | 4 +++- public/actions/submit.php | 2 +- public/parts/template_person.php | 13 ++++++++++--- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/action.php b/action.php index 9df3f07..1fffd9a 100644 --- a/action.php +++ b/action.php @@ -106,7 +106,7 @@ switch ($VARS['action']) { "zip" => "[0-9]{5}(-?[0-9]{4})?", "phone1" => "[0-9]{10}", "email" => "_EMAIL_", - "shirt" => ["NO", "YS", "YM", "YL", "AS", "AM", "AL", "AX", "A2"], + "shirt" => ["NO", "YS", "YM", "YL", "AS", "AM", "AL", "AX", "A2", "A3"], "sex" => ["M", "F"] ]; diff --git a/pages/editperson.php b/pages/editperson.php index 0e023bf..7ce04ca 100644 --- a/pages/editperson.php +++ b/pages/editperson.php @@ -341,7 +341,8 @@ if (!empty($VARS['id']) && $database->has('people', ['personid' => $VARS['id']]) "AM" => "Adult Medium", "AL" => "Adult Large", "AX" => "Adult Extra Large", - "A2" => "Adult 2X Large" + "A2" => "Adult 2X Large", + "A3" => "Adult 3X Large" ], "error" => "Choose a shirt size." ], diff --git a/pages/home.php b/pages/home.php index 03c324d..bdeddae 100644 --- a/pages/home.php +++ b/pages/home.php @@ -97,7 +97,7 @@

select("people", "shirt"); - $shirts = ["YS" => 0, "YM" => 0, "YL" => 0, "AS" => 0, "AM" => 0, "AL" => 0, "AX" => 0, "A2" => 0]; + $shirts = ["YS" => 0, "YM" => 0, "YL" => 0, "AS" => 0, "AM" => 0, "AL" => 0, "AX" => 0, "A2" => 0, "A3" => 0]; foreach ($shirtcount as $str) { if ($str == "NO") { continue; @@ -112,6 +112,8 @@ echo "AXL"; } else if ($shirt == "A2") { echo "AXXL"; + } else if ($shirt == "A3") { + echo "AXXXL"; } else { echo $shirt; } diff --git a/public/actions/submit.php b/public/actions/submit.php index 93702d7..14a46b8 100644 --- a/public/actions/submit.php +++ b/public/actions/submit.php @@ -38,7 +38,7 @@ $database->action(function($database) { "zip" => "[0-9]{5}(-?[0-9]{4})?", "phone1" => "[0-9]{10}", "email" => "_EMAIL_", - "shirt" => ["NO", "YS", "YM", "YL", "AS", "AM", "AL", "AX", "A2"], + "shirt" => ["NO", "YS", "YM", "YL", "AS", "AM", "AL", "AX", "A2", "A3"], "sex" => ["M", "F"] ]; diff --git a/public/parts/template_person.php b/public/parts/template_person.php index 96af316..9dea637 100644 --- a/public/parts/template_person.php +++ b/public/parts/template_person.php @@ -153,7 +153,7 @@ if (isset($personid) && $database->has('people', ['personid' => $personid])) { "error" => "Enter the pack number." ], [ - "label" => "Rank", + "label" => "Rank (as of June " . date("Y") . ")", "name" => "rank", "type" => "select", "width" => 2, @@ -257,7 +257,8 @@ if (isset($personid) && $database->has('people', ['personid' => $personid])) { "AM" => "Adult Medium", "AL" => "Adult Large", "AX" => "Adult Extra Large", - "A2" => "Adult 2X Large" + "A2" => "Adult 2X Large", + "A3" => "Adult 3X Large" ], "error" => "Choose a shirt size." ] @@ -278,7 +279,8 @@ if (isset($personid) && $database->has('people', ['personid' => $personid])) { "AM" => "Adult Medium", "AL" => "Adult Large", "AX" => "Adult Extra Large", - "A2" => "Adult 2X Large" + "A2" => "Adult 2X Large", + "A3" => "Adult 3X Large" ], "error" => "Choose a shirt size." ] @@ -383,4 +385,9 @@ if (isset($personid) && $database->has('people', ['personid' => $personid])) { } ?> + +
+ Tigers (boys entering the first grade in the Fall) must be accompanied by a parent or guardian. +
+ \ No newline at end of file