From 7728707f5d469a4dbc526a049a1ad12d1492e035 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Sun, 14 Jul 2024 00:35:32 -0500 Subject: [PATCH] Marking advancement and publishing is working. --- app/Http/Controllers/Tabulation/AdvancementController.php | 7 ++++--- .../views/tabulation/advancement/results-table.blade.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Tabulation/AdvancementController.php b/app/Http/Controllers/Tabulation/AdvancementController.php index 7120070..b5499fc 100644 --- a/app/Http/Controllers/Tabulation/AdvancementController.php +++ b/app/Http/Controllers/Tabulation/AdvancementController.php @@ -7,6 +7,7 @@ use App\Http\Controllers\Controller; use App\Models\Audition; use App\Models\Entry; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Cache; class AdvancementController extends Controller { @@ -57,7 +58,7 @@ class AdvancementController extends Controller $entries->load('advancementVotes'); $scoringComplete = $entries->every(function ($entry) { - return $entry->scoring_complete; + return $entry->score_totals[0] >= 0; }); return view('tabulation.advancement.ranking', compact('audition', 'entries', 'scoringComplete')); @@ -72,7 +73,7 @@ class AdvancementController extends Controller foreach ($entries as $entry) { $entry->addFlag('will_advance'); } - + Cache::forget('audition'.$audition->id.'advancement'); return redirect()->route('advancement.ranking', ['audition' => $audition->id])->with('success', 'Passers have been set successfully'); } @@ -83,7 +84,7 @@ class AdvancementController extends Controller foreach ($audition->entries as $entry) { $entry->removeFlag('will_advance'); } - + Cache::forget('audition'.$audition->id.'advancement'); return redirect()->route('advancement.ranking', ['audition' => $audition->id])->with('success', 'Passers have been cleared successfully'); } diff --git a/resources/views/tabulation/advancement/results-table.blade.php b/resources/views/tabulation/advancement/results-table.blade.php index 4c024aa..0cba0b4 100644 --- a/resources/views/tabulation/advancement/results-table.blade.php +++ b/resources/views/tabulation/advancement/results-table.blade.php @@ -32,7 +32,7 @@ {{ $entry->student->school->name }} {{ $score }} - + @foreach($entry->advancementVotes as $vote)