From 25aa76c63c40ce36b7ea4ed15aa49ff48bd4b2a2 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Thu, 27 Jun 2024 00:48:23 -0500 Subject: [PATCH] Show votes on Tabulation Advancement page --- .../Tabulation/AdvancementController.php | 2 ++ app/Models/JudgeAdvancementVote.php | 2 +- resources/views/components/tooltip.blade.php | 15 ++++++++++++ .../advancement/results-table.blade.php | 24 +++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 resources/views/components/tooltip.blade.php diff --git a/app/Http/Controllers/Tabulation/AdvancementController.php b/app/Http/Controllers/Tabulation/AdvancementController.php index 9581faa..93eac92 100644 --- a/app/Http/Controllers/Tabulation/AdvancementController.php +++ b/app/Http/Controllers/Tabulation/AdvancementController.php @@ -27,6 +27,8 @@ class AdvancementController extends Controller public function ranking(Request $request, Audition $audition) { $entries = $this->tabulationService->auditionEntries($audition->id, 'advancement'); + $entries->load('advancementVotes'); + $scoringComplete = $entries->every(function ($entry) { return $entry->scoring_complete; diff --git a/app/Models/JudgeAdvancementVote.php b/app/Models/JudgeAdvancementVote.php index e02f95d..0ee328c 100644 --- a/app/Models/JudgeAdvancementVote.php +++ b/app/Models/JudgeAdvancementVote.php @@ -19,7 +19,7 @@ class JudgeAdvancementVote extends Model public function judge(): BelongsTo { - return $this->belongsTo(User::class); + return $this->belongsTo(User::class, 'user_id'); } } diff --git a/resources/views/components/tooltip.blade.php b/resources/views/components/tooltip.blade.php new file mode 100644 index 0000000..bdbdc4f --- /dev/null +++ b/resources/views/components/tooltip.blade.php @@ -0,0 +1,15 @@ +@php + $classes = "pointer-events-none absolute bg-white transform -translate-y-12 z-50 p-3 max-w-sm rounded-lg shadow-lg ring-1 ring-black ring-opacity-5"; +@endphp +
merge(['class'=>$classes]) }} x-cloak + x-transition:enter="transform ease-out duration-300 transition " + x-transition:enter-start="-translate-y-12 opacity-0 sm:translate-y-0 sm:translate-x-2" + x-transition:enter-end="translate-y-0 opacity-100 sm:translate-x-0" + x-transition:leave="transition ease-in duration-100" + x-transition:leave-start="opacity-100" + x-transition:leave-end="opacity-0"> + {{ $slot }} +
+ + + diff --git a/resources/views/tabulation/advancement/results-table.blade.php b/resources/views/tabulation/advancement/results-table.blade.php index 5fcd732..049e6e3 100644 --- a/resources/views/tabulation/advancement/results-table.blade.php +++ b/resources/views/tabulation/advancement/results-table.blade.php @@ -8,6 +8,7 @@ Student Name Total Score All Scores? + Votes @if($scoringComplete) Pass? @endif @@ -30,6 +31,29 @@ @endif + + @foreach($entry->advancementVotes as $vote) +
+ + + {{ $vote->judge->full_name() }} + + @switch($vote->vote) + @case('yes') + + @break + @case('no') + + @break + @case('dq') + + @break + @endswitch +
+ @endforeach +
@if( $audition->hasFlag('advancement_published') ) @if($entry->hasFlag('will_advance'))