From bf502f4cbb61fb1cd979a383eeb473c90b9067d3 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Mon, 8 Dec 2025 15:49:44 -0600 Subject: [PATCH] fix duplicate route name --- .../Controllers/Judging/PrelimJudgingController.php | 10 +++++++++- .../Controllers/Tabulation/AdvancementController.php | 2 +- resources/views/judging/prelim_entry_form.blade.php | 8 +++----- routes/judging.php | 2 +- .../Controllers/Admin/YearEndResetControllerTest.php | 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Judging/PrelimJudgingController.php b/app/Http/Controllers/Judging/PrelimJudgingController.php index 21fd1e0..d8f34f5 100644 --- a/app/Http/Controllers/Judging/PrelimJudgingController.php +++ b/app/Http/Controllers/Judging/PrelimJudgingController.php @@ -45,7 +45,15 @@ class PrelimJudgingController extends Controller $oldSheet = PrelimScoreSheet::where('user_id', Auth::id())->where('entry_id', $entry->id)->value('subscores') ?? null; - return view('judging.prelim_entry_form', compact('entry', 'oldSheet')); + if ($oldSheet) { + $formRoute = 'update.savePrelimScoreSheet'; + $formMethod = 'PATCH'; + } else { + $formRoute = 'judging.savePrelimScoreSheet'; + $formMethod = 'POST'; + } + + return view('judging.prelim_entry_form', compact('entry', 'oldSheet', 'formRoute', 'formMethod')); } /** diff --git a/app/Http/Controllers/Tabulation/AdvancementController.php b/app/Http/Controllers/Tabulation/AdvancementController.php index 20fddbc..2a9913a 100644 --- a/app/Http/Controllers/Tabulation/AdvancementController.php +++ b/app/Http/Controllers/Tabulation/AdvancementController.php @@ -81,7 +81,7 @@ class AdvancementController extends Controller return $entry->hasFlag('no_show'); }); - $scoringComplete = $audition->entries->where('for_advancement, true')->every(function ($entry) { + $scoringComplete = $audition->entries->where('for_advancement', true)->every(function ($entry) { return $entry->totalScore || $entry->hasFlag('no_show'); }); diff --git a/resources/views/judging/prelim_entry_form.blade.php b/resources/views/judging/prelim_entry_form.blade.php index 58ca75b..8c76861 100644 --- a/resources/views/judging/prelim_entry_form.blade.php +++ b/resources/views/judging/prelim_entry_form.blade.php @@ -15,11 +15,9 @@ - - @if($oldSheet) - {{-- if there are existing scores, make this a patch request --}} - @method('PATCH') - @endif + + @method($formMethod) + @foreach($entry->audition->prelimDefinition->scoringGuide->subscores()->orderBy('display_order')->get() as $subscore) @php diff --git a/routes/judging.php b/routes/judging.php index b4b6d78..2f1fbb0 100644 --- a/routes/judging.php +++ b/routes/judging.php @@ -22,7 +22,7 @@ Route::middleware(['auth', 'verified', CheckIfCanJudge::class])->prefix('judging Route::get('/{prelimDefinition}', 'prelimEntryList')->name('judging.prelimEntryList'); route::get('/enterScore/{entry}', 'prelimScoreEntryForm')->name('judging.prelimScoreEntryForm'); route::post('/enterScore/{entry}', 'savePrelimScoreSheet')->name('judging.savePrelimScoreSheet'); - route::patch('/enterScore/{entry}', 'updatePrelimScoreSheet')->name('judging.savePrelimScoreSheet'); + route::patch('/enterScore/{entry}', 'updatePrelimScoreSheet')->name('judging.updatePrelimScoreSheet'); }); // Bonus score judging routes diff --git a/tests/Feature/app/Http/Controllers/Admin/YearEndResetControllerTest.php b/tests/Feature/app/Http/Controllers/Admin/YearEndResetControllerTest.php index 5aa0938..2cb61bf 100644 --- a/tests/Feature/app/Http/Controllers/Admin/YearEndResetControllerTest.php +++ b/tests/Feature/app/Http/Controllers/Admin/YearEndResetControllerTest.php @@ -25,7 +25,7 @@ it('calls the YearEndCleanup action', function () { $mock->shouldReceive('__invoke')->once(); app()->instance(YearEndCleanup::class, $mock); actAsAdmin(); - $response = $this->post(route('execute_admin.year_end_procedures')); + $response = $this->post(route('admin.execute_year_end_procedures')); $response->assertRedirect(route('dashboard')) ->with('success', 'Year end cleanup completed. '); });