diff --git a/app/Http/Controllers/Judging/PrelimJudgingController.php b/app/Http/Controllers/Judging/PrelimJudgingController.php index 20cf3ca..4046279 100644 --- a/app/Http/Controllers/Judging/PrelimJudgingController.php +++ b/app/Http/Controllers/Judging/PrelimJudgingController.php @@ -12,6 +12,10 @@ class PrelimJudgingController extends Controller if (auth()->user()->cannot('judge', $prelimDefinition)) { return redirect()->route('dashboard')->with('error', 'You are not assigned to judge that prelim audition.'); } + $entries = $prelimDefinition->audition->entries; + $subscores = $prelimDefinition->scoringGuide->subscores()->orderBy('display_order')->get(); + $published = $prelimDefinition->audition->hasFlag('seats_published'); + return view('judging.prelim_entry_list', compact('prelimDefinition', 'entries', 'subscores', 'published')); } } diff --git a/resources/views/judging/prelim_entry_list.blade.php b/resources/views/judging/prelim_entry_list.blade.php new file mode 100644 index 0000000..3c70d8a --- /dev/null +++ b/resources/views/judging/prelim_entry_list.blade.php @@ -0,0 +1,54 @@ +@php use Illuminate\Support\Facades\Auth; @endphp + + Judging Dashboard + + + {{ $prelimDefinition->audition->name }} Prelims + @if($published) + Results are published. Scores cannot be changed. + @endif + + + + + Entry + @foreach($subscores as $subscore) + + @endforeach + Timestamp + + + + @foreach($entries as $entry) + {{-- @continue($entry->hasFlag('no_show'))--}} + + + @if(! $published && ! $entry->hasFlag('no_show')) + + @endif + {{ $prelimDefinition->audition->name }} {{ $entry->draw_number }} + @if($entry->hasFlag('no_show')) +

No Show

+ @endif + @if(! $published && ! $entry->hasFlag('no_show')) +
+ @endif +
+{{-- @foreach($subscores as $subscore)--}} +{{-- --}} +{{-- @endforeach--}} + + +{{-- --}} +{{-- {{ Auth::user()->timeForEntryScores($entry->id)?->setTimezone('America/Chicago')->format('m/d/y H:i') }}--}} +{{-- --}} + + @endforeach +
+
+
+
diff --git a/tests/Feature/app/Http/Controllers/Judging/PrelimJudgingControllerTest.php b/tests/Feature/app/Http/Controllers/Judging/PrelimJudgingControllerTest.php index a7f3dfc..45b7416 100644 --- a/tests/Feature/app/Http/Controllers/Judging/PrelimJudgingControllerTest.php +++ b/tests/Feature/app/Http/Controllers/Judging/PrelimJudgingControllerTest.php @@ -1,6 +1,8 @@ create(); + $finalsRoom = Room::factory()->create(); + $audition = Audition::factory()->create(['room_id' => $finalsRoom->id, 'name' => 'Euphonium']); + $room = Room::factory()->create(); + $prelimDefinition = PrelimDefinition::create([ + 'audition_id' => $audition->id, + 'room_id' => $room->id, + 'scoring_guide_id' => 0, + 'passing_score' => 75, + ]); + $room->addJudge($judgeUser); + $entries = Entry::factory()->count(5)->create(['audition_id' => $audition->id]); + app(RunDraw::class)($audition); + + $this->actingAs($judgeUser); + $response = $this->get(route('judging.prelimEntryList', $prelimDefinition)); + $response->assertOk(); + foreach ($entries as $entry) { + + $entry->refresh(); + $identifierString = $entry->audition->name.' '.$entry->draw_number; + $response->assertSee($identifierString); + } }); it('shows scores for previously judged entries', function () {