diff --git a/app/Http/Controllers/Admin/RoomController.php b/app/Http/Controllers/Admin/RoomController.php index 94ed219..4791ce6 100644 --- a/app/Http/Controllers/Admin/RoomController.php +++ b/app/Http/Controllers/Admin/RoomController.php @@ -24,7 +24,7 @@ class RoomController extends Controller { $usersWithoutRooms = User::doesntHave('rooms')->orderBy('last_name')->orderBy('first_name')->get(); $usersWithRooms = User::has('rooms')->orderBy('last_name')->orderBy('first_name')->get(); - $rooms = Room::with('users')->get(); + $rooms = Room::with(['judges.school','auditions'])->get(); return view('admin.rooms.judge_assignments', compact('usersWithoutRooms','usersWithRooms','rooms')); } diff --git a/app/Http/Controllers/Tabulation/TabulationController.php b/app/Http/Controllers/Tabulation/TabulationController.php index 3a960bd..470ed91 100644 --- a/app/Http/Controllers/Tabulation/TabulationController.php +++ b/app/Http/Controllers/Tabulation/TabulationController.php @@ -14,5 +14,17 @@ class TabulationController extends Controller return view('tabulation.choose_entry'); } + public function entryScoreSheet(Request $request) + { + $entry = Entry::with(['student','audition.room.judges'])->find($request->input('entry_id')); + $judges = $entry->audition->room->judges; + $scoring_guide = $entry->audition->scoringGuide; + $subscores = $entry->audition->scoringGuide->subscores->sortBy('display_order'); + if (!$entry) { + return redirect()->route('tabulation.chooseEntry')->with('error','Entry not found'); + } + return view('tabulation.entry_score_sheet', compact('entry','judges','scoring_guide','subscores')); + } + } diff --git a/resources/views/admin/rooms/judge_assignments.blade.php b/resources/views/admin/rooms/judge_assignments.blade.php index 0afe203..a42f3d3 100644 --- a/resources/views/admin/rooms/judge_assignments.blade.php +++ b/resources/views/admin/rooms/judge_assignments.blade.php @@ -61,9 +61,9 @@
{{ $judge->full_name() }}, - Vinita + {{ $judge->school->name }}
-Admin
+{{ $judge->judging_preference }}