matt
/
auditionadmin
1
0
Fork 0
Code Issues 16 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #72 from okorpheus/auditionadmin-69 

Show doubler preference on seating page
This commit is contained in:
Matt 2024-08-24 07:57:39 -05:00 committed by GitHub
parent 4fe7251a4f 0c7baa1cc9
commit a592150c9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/Tabulation/SeatAuditionFormController.php
View File

@ -50,6 +50,7 @@ class SeatAuditionFormController extends Controller
$entryData = []; $entryData = [];
$entries = $this->ranker->rank('seating', $audition); $entries = $this->ranker->rank('seating', $audition);
$entries->load('student.school'); $entries->load('student.school');
$entries->load('student.doublerRequests');
$seatable = [ $seatable = [
'allScored' => true, 'allScored' => true,
'doublersResolved' => true, 'doublersResolved' => true,
@ -71,6 +72,7 @@ class SeatAuditionFormController extends Controller
'totalScore' => $totalScoreColumn, 'totalScore' => $totalScoreColumn,
'fullyScored' => $fullyScored, 'fullyScored' => $fullyScored,
'doubleData' => $doublerData, 'doubleData' => $doublerData,
'doublerRequest' => $entry->student->doublerRequests()->where('event_id', $audition->event_id)->first()?->request,
]; ];
// If this entries double decision isn't made, block seating // If this entries double decision isn't made, block seating
if ($doublerData && $doublerData[$entry->id]['status'] == 'undecided') { if ($doublerData && $doublerData[$entry->id]['status'] == 'undecided') {
@ -97,7 +99,8 @@ class SeatAuditionFormController extends Controller
}); });
} }
return view('tabulation.auditionSeating', compact('entryData', 'audition', 'rightPanel', 'seatableEntries', 'requestedEnsembleAccepts')); return view('tabulation.auditionSeating',
compact('entryData', 'audition', 'rightPanel', 'seatableEntries', 'requestedEnsembleAccepts'));
} }
protected function pickRightPanel(Audition $audition, array $seatable) protected function pickRightPanel(Audition $audition, array $seatable)
@ -106,6 +109,7 @@ class SeatAuditionFormController extends Controller
$resultsWindow = new GetAuditionSeats; $resultsWindow = new GetAuditionSeats;
$rightPanel['view'] = 'tabulation.auditionSeating-show-published-seats'; $rightPanel['view'] = 'tabulation.auditionSeating-show-published-seats';
$rightPanel['data'] = $resultsWindow($audition); $rightPanel['data'] = $resultsWindow($audition);
return $rightPanel; return $rightPanel;
} }
if ($seatable['allScored'] == false || $seatable['doublersResolved'] == false) { if ($seatable['allScored'] == false || $seatable['doublersResolved'] == false) {

3
resources/views/tabulation/auditionSeating-results-table.blade.php
View File

@ -27,6 +27,9 @@
</x-table.td> </x-table.td>
<x-table.td class="!py-0"> <x-table.td class="!py-0">
@if($entry['doubleData']) @if($entry['doubleData'])
@if($entry['doublerRequest'])
<p class="pt-3"><span class="font-semibold">Request: </span>{{$entry['doublerRequest']}}</p>
@endif
@include('tabulation.auditionSeating-doubler-block') @include('tabulation.auditionSeating-doubler-block')
{{-- DOUBLER<br>--}} {{-- DOUBLER<br>--}}
{{-- @foreach($entry['doubleData'] as $double)--}} {{-- @foreach($entry['doubleData'] as $double)--}}