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 }}

diff --git a/resources/views/components/card/heading.blade.php b/resources/views/components/card/heading.blade.php index a42fe2b..508e710 100644 --- a/resources/views/components/card/heading.blade.php +++ b/resources/views/components/card/heading.blade.php @@ -8,7 +8,7 @@ @endif @if($right_side) -
+
attributes->merge([]) }}> {{ $right_side }}
@endif diff --git a/resources/views/tabulation/choose_entry.blade.php b/resources/views/tabulation/choose_entry.blade.php index d8091f9..d11664b 100644 --- a/resources/views/tabulation/choose_entry.blade.php +++ b/resources/views/tabulation/choose_entry.blade.php @@ -3,7 +3,7 @@ Choose Entry
- + diff --git a/resources/views/tabulation/entry_score_sheet.blade.php b/resources/views/tabulation/entry_score_sheet.blade.php new file mode 100644 index 0000000..6dc53d3 --- /dev/null +++ b/resources/views/tabulation/entry_score_sheet.blade.php @@ -0,0 +1,51 @@ + + Entry Score Sheet + + + {{ $entry->audition->name }} #{{ $entry->draw_number }} + ID #{{ $entry->id }} + +

{{ $entry->student->full_name() }}

+

{{ $entry->student->school->name }}

+
+
+ + + + + + Judges + @foreach($subscores as $subscore) + {{ $subscore->name }} + @endforeach + Total (unweighted) + + + + @foreach($judges as $judge) + + {{ $judge->full_name() }} + @foreach($subscores as $subscore) + + + + @endforeach + + + + + @endforeach + + + + Save Scores + + + +
+
diff --git a/routes/web.php b/routes/web.php index 97dfabf..c684be9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -22,8 +22,9 @@ Route::view('/','welcome')->middleware('guest'); Route::middleware(['auth','verified',CheckIfCanTab::class])->prefix('tabulation/')->group(function() { // Generic Tabulation Routes Route::controller(\App\Http\Controllers\Tabulation\TabulationController::class)->group(function() { - Route::get('/enter_scores','chooseEntry'); + Route::get('/enter_scores','chooseEntry')->name('tabulation.chooseEntry'); Route::get('/record_noshow','chooseEntry'); + Route::get('/entries','entryScoreSheet'); }); });