From bfb4b54e18798e1364ffdbd74e26206cb7e2c6dc Mon Sep 17 00:00:00 2001 From: Matt Young Date: Mon, 15 Jul 2024 14:29:39 -0500 Subject: [PATCH] Work on assigning bonus judges #20 Implement bonus scores Add controls on judge assignment page to access a screen for bonus score judges. --- .../Admin/BonusScoreDefinitionController.php | 5 +++++ app/Http/Controllers/Admin/RoomController.php | 6 ++++-- .../views/admin/rooms/judge_assignments.blade.php | 14 +++++++++++++- routes/admin.php | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/BonusScoreDefinitionController.php b/app/Http/Controllers/Admin/BonusScoreDefinitionController.php index a0b9f45..f47c60d 100644 --- a/app/Http/Controllers/Admin/BonusScoreDefinitionController.php +++ b/app/Http/Controllers/Admin/BonusScoreDefinitionController.php @@ -79,4 +79,9 @@ class BonusScoreDefinitionController extends Controller return redirect()->route('admin.bonus-scores.index')->with('success', 'Audition unassigned from bonus score'); } + + public function judges() + { + echo 'boo'; + } } diff --git a/app/Http/Controllers/Admin/RoomController.php b/app/Http/Controllers/Admin/RoomController.php index 0b64b1f..6d301d0 100644 --- a/app/Http/Controllers/Admin/RoomController.php +++ b/app/Http/Controllers/Admin/RoomController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Admin; use App\Http\Controllers\Controller; +use App\Models\BonusScoreDefinition; use App\Models\Room; use App\Models\User; use Illuminate\Http\Request; @@ -17,7 +18,7 @@ class RoomController extends Controller if (! Auth::user()->is_admin) { abort(403); } - $rooms = Room::with('auditions.entries','entries')->orderBy('name')->get(); + $rooms = Room::with('auditions.entries', 'entries')->orderBy('name')->get(); return view('admin.rooms.index', ['rooms' => $rooms]); } @@ -27,8 +28,9 @@ 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(['judges.school', 'auditions'])->get(); + $bonusScoresExist = BonusScoreDefinition::count() > 0; - return view('admin.rooms.judge_assignments', compact('usersWithoutRooms', 'usersWithRooms', 'rooms')); + return view('admin.rooms.judge_assignments', compact('usersWithoutRooms', 'usersWithRooms', 'rooms', 'bonusScoresExist')); } public function updateJudgeAssignment(Request $request, Room $room) diff --git a/resources/views/admin/rooms/judge_assignments.blade.php b/resources/views/admin/rooms/judge_assignments.blade.php index 6ae2aec..eada06f 100644 --- a/resources/views/admin/rooms/judge_assignments.blade.php +++ b/resources/views/admin/rooms/judge_assignments.blade.php @@ -1,5 +1,17 @@ -