diff --git a/app/Http/Controllers/JudgingController.php b/app/Http/Controllers/JudgingController.php
index bd17aaa..2cf405c 100644
--- a/app/Http/Controllers/JudgingController.php
+++ b/app/Http/Controllers/JudgingController.php
@@ -30,7 +30,9 @@ class JudgingController extends Controller
$entries = Entry::where('audition_id', '=', $audition->id)->orderBy('draw_number')->with('audition')->get();
$subscores = $audition->scoringGuide->subscores()->orderBy('display_order')->get();
- return view('judging.audition_entry_list', compact('audition', 'entries', 'subscores'));
+ $votes = JudgeAdvancementVote::where('user_id', Auth::id())->get();
+
+ return view('judging.audition_entry_list', compact('audition', 'entries', 'subscores', 'votes'));
}
public function entryScoreSheet(Entry $entry)
@@ -107,7 +109,7 @@ class JudgingController extends Controller
protected function advancementVote(Request $request, Entry $entry)
{
- if ($entry->for_advancement) {
+ if ($entry->for_advancement and auditionSetting('advanceTo')) {
$request->validate([
'advancement-vote' => ['required', 'in:yes,no,dq'],
]);
diff --git a/resources/views/components/icons/thumbs-down.blade.php b/resources/views/components/icons/thumbs-down.blade.php
new file mode 100644
index 0000000..1990c19
--- /dev/null
+++ b/resources/views/components/icons/thumbs-down.blade.php
@@ -0,0 +1,4 @@
+@props(['color' => 'currentColor'])
+
diff --git a/resources/views/components/icons/thumbs-up.blade.php b/resources/views/components/icons/thumbs-up.blade.php
new file mode 100644
index 0000000..1f5c405
--- /dev/null
+++ b/resources/views/components/icons/thumbs-up.blade.php
@@ -0,0 +1,4 @@
+@props(['color' => 'currentColor'])
+
diff --git a/resources/views/judging/audition_entry_list.blade.php b/resources/views/judging/audition_entry_list.blade.php
index 878ff4c..8bd90ce 100644
--- a/resources/views/judging/audition_entry_list.blade.php
+++ b/resources/views/judging/audition_entry_list.blade.php
@@ -9,6 +9,9 @@
@foreach($subscores as $subscore)
{{ $subscore->name }}
@endforeach
+ @if(auditionSetting('advanceTo') and $audition->for_advancement)
+ {{ auditionSetting('advanceTo') }}
+ @endif
Timestamp
@@ -27,6 +30,26 @@
@endphp
@endforeach
+ @if(auditionSetting('advanceTo') and $audition->for_advancement)
+
+ @if($votes->contains('entry_id', $entry->id))
+ @php
+ $vote = $votes->where('entry_id',$entry->id)->first();
+ @endphp
+ @switch($vote->vote)
+ @case('yes')
+
+ @break
+ @case('no')
+
+ @break
+ @case('dq')
+
+ @break
+ @endswitch
+ @endif
+
+ @endif
{{ Auth::user()->timeForEntryScores($entry->id)?->setTimezone('America/Chicago')->format('m/d/y H:i') }}
diff --git a/resources/views/judging/entry_score_sheet.blade.php b/resources/views/judging/entry_score_sheet.blade.php
index 36806ad..3d3102e 100644
--- a/resources/views/judging/entry_score_sheet.blade.php
+++ b/resources/views/judging/entry_score_sheet.blade.php
@@ -50,7 +50,7 @@
@endforeach
- @if($entry->for_advancement)
+ @if($entry->for_advancement AND auditionSetting('advanceTo'))
@include('judging.advancement-vote-form')
@endif