diff --git a/app/Http/Controllers/Admin/RoomController.php b/app/Http/Controllers/Admin/RoomController.php index e8e128e..5b85165 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(); + #$unassignedAuditions = Audition::with('entries')->where('room_id','=','0')->orderBy('score_order')->get(); $rooms = Room::with('auditions.entries')->orderBy('name')->get(); - return view('admin.rooms.index', ['rooms' => $rooms, 'unassignedAuditions' => $unassignedAuditions]); + return view('admin.rooms.index', ['rooms' => $rooms]); } } diff --git a/app/Models/ScoringGuide.php b/app/Models/ScoringGuide.php index f32d3f1..89d0eaf 100644 --- a/app/Models/ScoringGuide.php +++ b/app/Models/ScoringGuide.php @@ -15,4 +15,9 @@ class ScoringGuide extends Model { return $this->hasMany(Audition::class)->orderBy('score_order'); } + + public function subscores(): HasMany + { + return $this->hasMany(SubscoreDefinition::class); + } } diff --git a/database/factories/RoomFactory.php b/database/factories/RoomFactory.php index 86ea39c..de64aad 100644 --- a/database/factories/RoomFactory.php +++ b/database/factories/RoomFactory.php @@ -17,7 +17,8 @@ class RoomFactory extends Factory public function definition(): array { return [ - // + 'name' => 'Room ' . fake()->numberBetween(7,500), + 'description' => fake()->sentence() ]; } } diff --git a/resources/views/admin/scoring/edit-detail.blade.php b/resources/views/admin/scoring/edit-detail.blade.php index 01a1f4b..0c5b100 100644 --- a/resources/views/admin/scoring/edit-detail.blade.php +++ b/resources/views/admin/scoring/edit-detail.blade.php @@ -54,3 +54,4 @@ +{{-- TODO need to be able to edit subscores --}} diff --git a/resources/views/admin/scoring/index-scoring-guide-management-card.blade.php b/resources/views/admin/scoring/index-scoring-guide-management-card.blade.php index f55eab2..bc1c047 100644 --- a/resources/views/admin/scoring/index-scoring-guide-management-card.blade.php +++ b/resources/views/admin/scoring/index-scoring-guide-management-card.blade.php @@ -17,7 +17,7 @@ @continue @endif