diff --git a/app/Actions/Tabulation/RankAuditionEntries.php b/app/Actions/Tabulation/RankAuditionEntries.php index 21e1049..cd3586e 100644 --- a/app/Actions/Tabulation/RankAuditionEntries.php +++ b/app/Actions/Tabulation/RankAuditionEntries.php @@ -40,7 +40,7 @@ class RankAuditionEntries { $this->basicValidation($mode, $audition); $entries = match ($mode) { - 'seating' => $audition->entries()->forSeating()->with('scoreSheets')->get(), + 'seating' => $audition->entries()->forSeating()->with('scoreSheets')->withCount('bonusScores')->get(), 'advancement' => $audition->entries()->forAdvancement()->with('scoreSheets')->get(), }; diff --git a/app/Http/Controllers/Tabulation/SeatAuditionFormController.php b/app/Http/Controllers/Tabulation/SeatAuditionFormController.php index e2ad8d6..b95a162 100644 --- a/app/Http/Controllers/Tabulation/SeatAuditionFormController.php +++ b/app/Http/Controllers/Tabulation/SeatAuditionFormController.php @@ -120,6 +120,7 @@ class SeatAuditionFormController extends Controller 'drawNumber' => $entry->draw_number, 'totalScore' => $totalScoreColumn, 'fullyScored' => $fullyScored, + 'hasBonusScores' => $entry->bonus_scores_count > 0, 'doubleData' => $doublerData, 'doublerRequest' => $entry->student->doublerRequests()->where('event_id', $audition->event_id)->first()?->request, diff --git a/app/Models/Entry.php b/app/Models/Entry.php index a758368..2bcde85 100644 --- a/app/Models/Entry.php +++ b/app/Models/Entry.php @@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOne; use Illuminate\Database\Eloquent\Relations\HasOneThrough; @@ -55,9 +54,9 @@ class Entry extends Model } - public function bonusScores(): BelongsToMany + public function bonusScores(): HasMany { - return $this->belongsToMany(BonusScore::class); + return $this->hasMany(BonusScore::class); } public function advancementVotes(): HasMany diff --git a/resources/views/tabulation/auditionSeating-results-table.blade.php b/resources/views/tabulation/auditionSeating-results-table.blade.php index 64155d3..8d043ea 100644 --- a/resources/views/tabulation/auditionSeating-results-table.blade.php +++ b/resources/views/tabulation/auditionSeating-results-table.blade.php @@ -10,6 +10,9 @@ {{-- @foreach($judges as $judge)--}} {{-- {{ $judge->short_name() }}--}} {{-- @endforeach--}} + @if($audition->bonusScore()->count() > 0) + Bonus Score + @endif Total Score All Scores? @@ -45,6 +48,13 @@ {{-- @include('tabulation.auditionSeating-doubler-block')--}} {{-- @endif--}} + @if($audition->bonusScore()->count() > 0) + @if($entry['hasBonusScores']) + + @else + + @endif + @endif {{ $entry['totalScore'] }} @if($entry['fullyScored'])