matt
/
auditionadmin
1
0
Fork 0
Code Issues 16 Pull Requests Packages Projects Releases Wiki Activity

fix duplicate route name

This commit is contained in:
Matt Young 2025-12-08 15:49:44 -06:00
parent 2ffe14e43c
commit bf502f4cbb
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Judging/PrelimJudgingController.php
View File

@ -45,7 +45,15 @@ class PrelimJudgingController extends Controller
$oldSheet = PrelimScoreSheet::where('user_id', Auth::id())->where('entry_id', $oldSheet = PrelimScoreSheet::where('user_id', Auth::id())->where('entry_id',
$entry->id)->value('subscores') ?? null; $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'));
} }
/** /**

2
app/Http/Controllers/Tabulation/AdvancementController.php
View File

@ -81,7 +81,7 @@ class AdvancementController extends Controller
return $entry->hasFlag('no_show'); 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'); return $entry->totalScore || $entry->hasFlag('no_show');
}); });

8
resources/views/judging/prelim_entry_form.blade.php
View File

@ -15,11 +15,9 @@
</ul> </ul>
</x-slot:subheading> </x-slot:subheading>
</x-card.heading> </x-card.heading>
<x-form.form method="POST" action="{{ route('judging.savePrelimScoreSheet', $entry) }}"> <x-form.form method="POST" action="{{ route($formRoute, $entry) }}">
@if($oldSheet) @method($formMethod)
{{-- if there are existing scores, make this a patch request --}}
@method('PATCH')
@endif
<x-card.list.body class="mt-1"> <x-card.list.body class="mt-1">
@foreach($entry->audition->prelimDefinition->scoringGuide->subscores()->orderBy('display_order')->get() as $subscore) @foreach($entry->audition->prelimDefinition->scoringGuide->subscores()->orderBy('display_order')->get() as $subscore)
@php @php

2
routes/judging.php
View File

@ -22,7 +22,7 @@ Route::middleware(['auth', 'verified', CheckIfCanJudge::class])->prefix('judging
Route::get('/{prelimDefinition}', 'prelimEntryList')->name('judging.prelimEntryList'); Route::get('/{prelimDefinition}', 'prelimEntryList')->name('judging.prelimEntryList');
route::get('/enterScore/{entry}', 'prelimScoreEntryForm')->name('judging.prelimScoreEntryForm'); route::get('/enterScore/{entry}', 'prelimScoreEntryForm')->name('judging.prelimScoreEntryForm');
route::post('/enterScore/{entry}', 'savePrelimScoreSheet')->name('judging.savePrelimScoreSheet'); 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 // Bonus score judging routes

2
tests/Feature/app/Http/Controllers/Admin/YearEndResetControllerTest.php
View File

@ -25,7 +25,7 @@ it('calls the YearEndCleanup action', function () {
$mock->shouldReceive('__invoke')->once(); $mock->shouldReceive('__invoke')->once();
app()->instance(YearEndCleanup::class, $mock); app()->instance(YearEndCleanup::class, $mock);
actAsAdmin(); actAsAdmin();
$response = $this->post(route('execute_admin.year_end_procedures')); $response = $this->post(route('admin.execute_year_end_procedures'));
$response->assertRedirect(route('dashboard')) $response->assertRedirect(route('dashboard'))
->with('success', 'Year end cleanup completed. '); ->with('success', 'Year end cleanup completed. ');
}); });