diff --git a/app/Http/Controllers/JudgingController.php b/app/Http/Controllers/JudgingController.php index 2cf405c..ed34ab4 100644 --- a/app/Http/Controllers/JudgingController.php +++ b/app/Http/Controllers/JudgingController.php @@ -24,9 +24,11 @@ class JudgingController extends Controller return view('judging.index', compact('rooms')); } - public function auditionEntryList(Audition $audition) + public function auditionEntryList(Request $request, Audition $audition) { - // TODO verify user is assigned to judge this audition + if ($request->user()->cannot('judge', $audition)) { + return redirect()->route('judging.index')->with('error', 'You are not assigned to judge this audition'); + } $entries = Entry::where('audition_id', '=', $audition->id)->orderBy('draw_number')->with('audition')->get(); $subscores = $audition->scoringGuide->subscores()->orderBy('display_order')->get(); diff --git a/app/Policies/AuditionPolicy.php b/app/Policies/AuditionPolicy.php index c216577..a68acb1 100644 --- a/app/Policies/AuditionPolicy.php +++ b/app/Policies/AuditionPolicy.php @@ -63,4 +63,9 @@ class AuditionPolicy { // } + + public function judge(User $user, Audition $audition): bool + { + return $user->rooms->contains($audition->room_id); + } } diff --git a/resources/views/judging/entry_score_sheet.blade.php b/resources/views/judging/entry_score_sheet.blade.php index 3d3102e..2e32c93 100644 --- a/resources/views/judging/entry_score_sheet.blade.php +++ b/resources/views/judging/entry_score_sheet.blade.php @@ -3,7 +3,6 @@ @php $oldScores = session()->get('oldScores') ?? null; - // TODO get old vote @endphp Entry Dashboard diff --git a/resources/views/test.blade.php b/resources/views/test.blade.php index 59a1db0..f36233e 100644 --- a/resources/views/test.blade.php +++ b/resources/views/test.blade.php @@ -16,28 +16,9 @@ Test Page @php - dump($auditionService->getAuditions()); + dump(Auth::user()->rooms->contains(1)); @endphp - - - - Name - Total Entries - Seating Entries - Advancement Entries - - - - @foreach($auditionService->getAuditions() as $a) - - {{ $a->name }} - {{ $a->entries_count }} - {{ $a->seating_entries_count }} - {{ $a->advancement_entries_count }} - - @endforeach - - +