From 022fb26e9267d0a12aaa0d74076e8c62378f0b0c Mon Sep 17 00:00:00 2001 From: Alexei Karpenko Date: Tue, 1 Jul 2025 17:37:32 +0200 Subject: [PATCH 1/2] uhstat1 form: removed staatenlos code from dropdowns --- application/controllers/codex/UHSTAT1.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php index 60eb6695e..d65752b4f 100644 --- a/application/controllers/codex/UHSTAT1.php +++ b/application/controllers/codex/UHSTAT1.php @@ -10,6 +10,7 @@ class UHSTAT1 extends FHC_Controller const CODEX_OESTERREICH = 'A'; const CODEX_UNKNOWN_YEAR = 9999; const CODEX_UNKNOWN_NATION = 'XXX'; + const CODEX_EXCLUDED_NATIONS = ['ZZZ']; const CODEX_UNKNOWN_BILDUNGMAX = 999; const LOWER_BOUNDARY_YEARS = 160; const UPPER_BOUNDARY_YEARS = 20; @@ -339,15 +340,19 @@ class UHSTAT1 extends FHC_Controller if (hasData($nationRes)) { + $dropdownNations = []; $nations = getData($nationRes); - // put austria in beginning of selection foreach ($nations as $nation) { - if ($nation->nation_code == self::CODEX_OESTERREICH) array_unshift($nations, $nation); + // put austria in beginning of selection + if ($nation->nation_code == self::CODEX_OESTERREICH) + array_unshift($dropdownNations, $nation); + elseif (!in_array($nation->nation_code, self::CODEX_EXCLUDED_NATIONS)) // add nation if not excluded + $dropdownNations[] = $nation; } - $formMetaData['nation'] = $nations; + $formMetaData['nation'] = $dropdownNations; } // get abschluss list From 0782de055084a22239fa90fd4432744cfef9ced0 Mon Sep 17 00:00:00 2001 From: Alexei Karpenko Date: Wed, 2 Jul 2025 10:46:34 +0200 Subject: [PATCH 2/2] uhstat form: moved constant down for better readability --- application/controllers/codex/UHSTAT1.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php index d65752b4f..c1d4d0abf 100644 --- a/application/controllers/codex/UHSTAT1.php +++ b/application/controllers/codex/UHSTAT1.php @@ -10,8 +10,8 @@ class UHSTAT1 extends FHC_Controller const CODEX_OESTERREICH = 'A'; const CODEX_UNKNOWN_YEAR = 9999; const CODEX_UNKNOWN_NATION = 'XXX'; - const CODEX_EXCLUDED_NATIONS = ['ZZZ']; const CODEX_UNKNOWN_BILDUNGMAX = 999; + const CODEX_EXCLUDED_NATIONS = ['ZZZ']; const LOWER_BOUNDARY_YEARS = 160; const UPPER_BOUNDARY_YEARS = 20;