diff --git a/app/Http/Controllers/Judging/JudgingController.php b/app/Http/Controllers/Judging/JudgingController.php index 2b2b506..38f9849 100644 --- a/app/Http/Controllers/Judging/JudgingController.php +++ b/app/Http/Controllers/Judging/JudgingController.php @@ -27,7 +27,7 @@ class JudgingController extends Controller public function index() { - $rooms = Auth::user()->judgingAssignments()->with('auditions')->get(); + $rooms = Auth::user()->judgingAssignments()->with('auditions')->with('prelimAuditions')->get(); $bonusScoresToJudge = Auth::user()->bonusJudgingAssignments()->with('auditions')->get(); //$rooms->load('auditions'); diff --git a/app/Models/Room.php b/app/Models/Room.php index ce615ad..aa4de9a 100644 --- a/app/Models/Room.php +++ b/app/Models/Room.php @@ -19,6 +19,11 @@ class Room extends Model return $this->hasMany(Audition::class)->orderBy('order_in_room')->orderBy('score_order'); } + public function prelimAuditions(): HasMany + { + return $this->hasMany(PrelimDefinition::class); + } + public function entries(): HasManyThrough { return $this->hasManyThrough( diff --git a/resources/views/judging/index.blade.php b/resources/views/judging/index.blade.php index 5d371f4..a13016a 100644 --- a/resources/views/judging/index.blade.php +++ b/resources/views/judging/index.blade.php @@ -13,6 +13,11 @@ {{ $audition->name }} @endforeach + @foreach($room->prelimAuditions as $prelimAudition) + + {{ $prelimAudition->audition->name }} Prelims + + @endforeach @endforeach diff --git a/routes/judging.php b/routes/judging.php index f5b59ab..914816a 100644 --- a/routes/judging.php +++ b/routes/judging.php @@ -14,6 +14,9 @@ Route::middleware(['auth', 'verified', CheckIfCanJudge::class])->prefix('judging Route::get('/entry/{entry}', 'entryScoreSheet')->name('judging.entryScoreSheet'); Route::post('/entry/{entry}', 'saveScoreSheet')->name('judging.saveScoreSheet'); Route::patch('/entry/{entry}', 'updateScoreSheet')->name('judging.updateScoreSheet'); + + // Prelim Audition Related Routes + Route::get('/audition/{audition}/prelim', 'prelimEntryList')->name('judging.prelimEntryList'); }); // Bonus score judging routes