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

Meobda nomination ensemble #107

Merged
okorpheus merged 16 commits from meobda_nomination_ensemble into master 2025-02-17 16:20:06 +00:00
Conversation 0 Commits 16 Files Changed 16 +6 -7
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 60abd7de0f - Show all commits

9
app/Http/Controllers/NominationEnsembles/MeobdaNominationEnsembleEntryController.php
View File

@ -21,6 +21,7 @@ class MeobdaNominationEnsembleEntryController extends Controller implements Nomi
$availableStudents = []; $availableStudents = [];
$existingNominations = []; $existingNominations = [];
$nominationsAvailable = []; $nominationsAvailable = [];
$past_deadline = [];
foreach ($ensembles as $ensemble) { foreach ($ensembles as $ensemble) {
// Get existing nominations // Get existing nominations
@ -58,14 +59,12 @@ class MeobdaNominationEnsembleEntryController extends Controller implements Nomi
} }
$availableStudents[$ensemble->id] = $students; $availableStudents[$ensemble->id] = $students;
$nominationsAvailable[$ensemble->id] = $existingNominations[$ensemble->id]->count() < $ensemble->data['max_nominations']; $nominationsAvailable[$ensemble->id] = $existingNominations[$ensemble->id]->count() < $ensemble->data['max_nominations'];
if ($currentDate > $ensemble->entry_deadline) { $past_deadline[$ensemble->id] = $currentDate > $ensemble->entry_deadline;
$nominationsAvailable[$ensemble->id] = false;
}
} }
return view('nomination_ensembles.meobda.entries.index', return view('nomination_ensembles.meobda.entries.index',
compact('ensembles', 'currentDate', 'availableInstruments', 'availableStudents', 'existingNominations', compact('ensembles', 'currentDate', 'availableInstruments', 'availableStudents', 'existingNominations',
'nominationsAvailable')); 'nominationsAvailable', 'past_deadline'));
} }
public function show(NominationEnsembleEntry $entry) public function show(NominationEnsembleEntry $entry)
@ -118,7 +117,7 @@ class MeobdaNominationEnsembleEntryController extends Controller implements Nomi
} }
// Check that the user's school has nominations available // Check that the user's school has nominations available
$existing_nominations = auth()->user()->school->nominations; $existing_nominations = auth()->user()->school->nominations()->where('nomination_ensemble_id', $validData['ensemble']);
if ($existing_nominations->count() >= $ensemble->data['max_nominations']) { if ($existing_nominations->count() >= $ensemble->data['max_nominations']) {
return redirect()->route('nomination.entry.index')->with('error', return redirect()->route('nomination.entry.index')->with('error',
'You have already used all of your nominations for this ensemble'); 'You have already used all of your nominations for this ensemble');

4
resources/views/nomination_ensembles/meobda/entries/index.blade.php
View File

@ -27,7 +27,7 @@
</x-table.td> </x-table.td>
<x-table.td>{{ $nom->student->grade }}</x-table.td> <x-table.td>{{ $nom->student->grade }}</x-table.td>
<x-table.td>{{ $nom->data['instrument'] }}</x-table.td> <x-table.td>{{ $nom->data['instrument'] }}</x-table.td>
@if($nominationsAvailable[$ensemble->id]) @if(!$past_deadline[$ensemble->id])
<x-table.td> <x-table.td>
<x-delete-resource-modal <x-delete-resource-modal
title="Delete Nomination" title="Delete Nomination"
@ -45,7 +45,7 @@
</x-table.table> </x-table.table>
</x-card.card> </x-card.card>
@if($nominationsAvailable[$ensemble->id]) @if($nominationsAvailable[$ensemble->id] && !$past_deadline[$ensemble->id])
<x-card.card> <x-card.card>
<x-card.heading>New Entry</x-card.heading> <x-card.heading>New Entry</x-card.heading>
<x-form.form method="POST" action="{{ route('nomination.entry.store') }}"> <x-form.form method="POST" action="{{ route('nomination.entry.store') }}">