From fb9efa056489cb210b5eb7abc1523248be484b09 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Thu, 31 Oct 2024 19:40:56 -0500 Subject: [PATCH] Show failed prelim result on seating form Addresses #45 --- app/Actions/Tabulation/AllowForOlympicScoring.php | 4 ++++ app/Actions/Tabulation/RankAuditionEntries.php | 6 +++--- .../Controllers/Tabulation/SeatAuditionFormController.php | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Actions/Tabulation/AllowForOlympicScoring.php b/app/Actions/Tabulation/AllowForOlympicScoring.php index be88354..66472a6 100644 --- a/app/Actions/Tabulation/AllowForOlympicScoring.php +++ b/app/Actions/Tabulation/AllowForOlympicScoring.php @@ -150,6 +150,10 @@ class AllowForOlympicScoring implements CalculateEntryScore protected function isEntryANoShow(Entry $entry): void { + if ($entry->hasFlag('failed_prelim')) { + throw new TabulationException('Failed Prelim'); + } + if ($entry->hasFlag('no_show')) { throw new TabulationException('No Show'); } diff --git a/app/Actions/Tabulation/RankAuditionEntries.php b/app/Actions/Tabulation/RankAuditionEntries.php index 7071ff2..6ddcb6f 100644 --- a/app/Actions/Tabulation/RankAuditionEntries.php +++ b/app/Actions/Tabulation/RankAuditionEntries.php @@ -72,12 +72,12 @@ class RankAuditionEntries $entry->raw_rank = $rawRank; // We don't really get a rank for seating if we have certain flags if ($mode === 'seating') { - if ($entry->hasFlag('declined')) { + if ($entry->hasFlag('failed_prelim')) { + $entry->rank = 'Failed Prelim'; + } elseif ($entry->hasFlag('declined')) { $entry->rank = 'Declined'; } elseif ($entry->hasFlag('no_show')) { $entry->rank = 'No Show'; - } elseif ($entry->hasFlag('failed_prelim')) { - $entry->rank = 'Failed Prelim'; } } diff --git a/app/Http/Controllers/Tabulation/SeatAuditionFormController.php b/app/Http/Controllers/Tabulation/SeatAuditionFormController.php index 028e649..e2c5b4e 100644 --- a/app/Http/Controllers/Tabulation/SeatAuditionFormController.php +++ b/app/Http/Controllers/Tabulation/SeatAuditionFormController.php @@ -139,6 +139,9 @@ class SeatAuditionFormController extends Controller if ($entry->hasFlag('no_show')) { return true; } + if ($entry->hasFlag('failed_prelim')) { + return true; + } return false; });