When appropriate, include bonus score in ranking entrie. Show if an entry has bonus scores when appropriate.

app/Actions/Tabulation/RankAuditionEntries.php

@@ -42,13 +42,19 @@ class RankAuditionEntries
 
     private function get_seating_ranks(Audition $audition): Collection
     {
+        if ($audition->bonusScore()->count() > 0) {
+            $totalColumn = 'seating_total_with_bonus';
+        } else {
+            $totalColumn = 'seating_total';
+        }
+
         $sortedEntries = $audition->entries()
             ->whereHas('totalScore')
             ->with('totalScore')
             ->with('student.school')
             ->with('audition')
             ->join('entry_total_scores', 'entries.id', '=', 'entry_total_scores.entry_id')
-            ->orderBy('entry_total_scores.seating_total', 'desc')
+            ->orderBy('entry_total_scores.'.$totalColumn, 'desc')
             ->orderByRaw('COALESCE(JSON_EXTRACT(entry_total_scores.seating_subscore_totals, "$[0]"), -999999) DESC')
             ->orderByRaw('COALESCE(JSON_EXTRACT(entry_total_scores.seating_subscore_totals, "$[1]"), -999999) DESC')
             ->orderByRaw('COALESCE(JSON_EXTRACT(entry_total_scores.seating_subscore_totals, "$[2]"), -999999) DESC')

resources/views/tabulation/auditionSeating.blade.php

@@ -17,8 +17,7 @@
                             @if($audition->bonusScore()->count() > 0)
                                 <br>
                                 <div class="display: flex">
-                                    <x-icons.checkmark color="green"/>
+                                    <span class="text-yellow-500">No Bonus Score</span>
-                                    Has Bonus
                                 </div>
                             @endif
                         </x-table.th>
@@ -65,7 +64,17 @@
 
 
                             </x-table.td>
-                            <x-table.td class="align-top">{{ $entry->totalScore->seating_total }}</x-table.td>
+                            <x-table.td class="align-top">
+                                @if($audition->bonusScore()->count() > 0)
+                                    @if($entry->totalScore->bonus_total)
+                                        <span>{{ $entry->totalScore->seating_total_with_bonus }}</span>
+                                    @else
+                                        <span class="text-yellow-500">{{ $entry->totalScore->seating_total_with_bonus }}</span>
+                                    @endif
+                                @else
+                                    {{ $entry->totalScore->seating_total }}
+                                @endif
+                            </x-table.td>
                         </tr>
                     @endforeach
                     </tbody>