From 50c7a4afa741d545d416d6bb12ab16dc2b09b795 Mon Sep 17 00:00:00 2001 From: Skylar Ittner Date: Wed, 20 Mar 2019 00:37:33 -0600 Subject: [PATCH] Add den, health, and notes columns to reports --- langs/en/labels.json | 3 +++ lib/reports.php | 28 ++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/langs/en/labels.json b/langs/en/labels.json index c1b24a2..133c2c2 100644 --- a/langs/en/labels.json +++ b/langs/en/labels.json @@ -30,6 +30,9 @@ "ZIP": "ZIP", "Shirt": "Shirt", "Shirts": "Shirts", + "Den": "Den", + "Health": "Health", + "Notes": "Notes", "Total": "Total", "Yes": "Yes", "No": "No", diff --git a/lib/reports.php b/lib/reports.php index c77d126..94c6d38 100644 --- a/lib/reports.php +++ b/lib/reports.php @@ -60,7 +60,10 @@ function getPeopleReport($filter = ""): Report { $Strings->get("Address", false), $Strings->get("ZIP", false), $Strings->get("Shirt", false), - $Strings->get("Sex", false) + $Strings->get("Sex", false), + $Strings->get("Den", false), + $Strings->get("Health", false), + $Strings->get("Notes", false) ]; break; case "Adults": @@ -76,7 +79,8 @@ function getPeopleReport($filter = ""): Report { $Strings->get("Days", false), $Strings->get("Position", false), $Strings->get("Shirt", false), - $Strings->get("Sex", false) + $Strings->get("Sex", false), + $Strings->get("Notes", false) ]; break; case "Youth": @@ -94,7 +98,8 @@ function getPeopleReport($filter = ""): Report { $Strings->get("Days", false), $Strings->get("Position", false), $Strings->get("Shirt", false), - $Strings->get("Sex", false) + $Strings->get("Sex", false), + $Strings->get("Notes", false) ]; break; default: @@ -107,7 +112,8 @@ function getPeopleReport($filter = ""): Report { $Strings->get("Address", false), $Strings->get("ZIP", false), $Strings->get("Shirt", false), - $Strings->get("Sex", false) + $Strings->get("Sex", false), + $Strings->get("Notes", false) ]; } @@ -144,7 +150,10 @@ function getPeopleReport($filter = ""): Report { $p['address'], $p['zip'], $p['shirt'], - $p['sex'] + $p['sex'], + $p['den'], + $p['health'], + $p['notes'] ]; break; case "Adults": @@ -158,7 +167,8 @@ function getPeopleReport($filter = ""): Report { $p['days'], $p['position'], $p['shirt'], - $p['sex'] + $p['sex'], + $p['notes'] ]; break; case "Youth": @@ -174,7 +184,8 @@ function getPeopleReport($filter = ""): Report { $p['days'], $p['position'], $p['shirt'], - $p['sex'] + $p['sex'], + $p['notes'] ]; break; default: @@ -187,7 +198,8 @@ function getPeopleReport($filter = ""): Report { $p['address'], $p['zip'], $p['shirt'], - $p['sex'] + $p['sex'], + $p['notes'] ]; }