From 38ead6f3eb759b74d60ad76a5493a080497a39eb Mon Sep 17 00:00:00 2001 From: Matt Young Date: Tue, 4 Jun 2024 16:14:53 -0500 Subject: [PATCH] Unassigned now working, but showing an extra column --- app/Http/Controllers/Admin/RoomController.php | 2 +- ...nsure_room_id_0_for_unassigned_entries.php | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2024_06_04_205015_ensure_room_id_0_for_unassigned_entries.php diff --git a/app/Http/Controllers/Admin/RoomController.php b/app/Http/Controllers/Admin/RoomController.php index 022ee9d..e8e128e 100644 --- a/app/Http/Controllers/Admin/RoomController.php +++ b/app/Http/Controllers/Admin/RoomController.php @@ -13,8 +13,8 @@ class RoomController extends Controller public function index() { if(! Auth::user()->is_admin) abort(403); + $unassignedAuditions = Audition::with('entries')->where('room_id','=','0')->orderBy('score_order')->get(); $rooms = Room::with('auditions.entries')->orderBy('name')->get(); - $unassignedAuditions = Audition::with('entries')->whereNull('room_id')->orderBy('score_order')->get(); return view('admin.rooms.index', ['rooms' => $rooms, 'unassignedAuditions' => $unassignedAuditions]); } } diff --git a/database/migrations/2024_06_04_205015_ensure_room_id_0_for_unassigned_entries.php b/database/migrations/2024_06_04_205015_ensure_room_id_0_for_unassigned_entries.php new file mode 100644 index 0000000..922db69 --- /dev/null +++ b/database/migrations/2024_06_04_205015_ensure_room_id_0_for_unassigned_entries.php @@ -0,0 +1,32 @@ + 0, + 'name' => 'Unassigned', + 'description' => 'These auditions have no room', + ], + uniqueBy: ['id'], + update: ['name','description'] + ); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // + } +};