diff --git a/app/Http/Controllers/NominationEnsembles/MeobdaNominationEnsembleEntryController.php b/app/Http/Controllers/NominationEnsembles/MeobdaNominationEnsembleEntryController.php index 5261c4d..85cbedd 100644 --- a/app/Http/Controllers/NominationEnsembles/MeobdaNominationEnsembleEntryController.php +++ b/app/Http/Controllers/NominationEnsembles/MeobdaNominationEnsembleEntryController.php @@ -58,6 +58,9 @@ class MeobdaNominationEnsembleEntryController extends Controller implements Nomi } $availableStudents[$ensemble->id] = $students; $nominationsAvailable[$ensemble->id] = $existingNominations[$ensemble->id]->count() < $ensemble->data['max_nominations']; + if ($currentDate > $ensemble->entry_deadline) { + $nominationsAvailable[$ensemble->id] = false; + } } return view('nomination_ensembles.meobda.entries.index', @@ -167,6 +170,20 @@ class MeobdaNominationEnsembleEntryController extends Controller implements Nomi public function destroy(NominationEnsembleEntry $entry) { - // TODO: Implement destroy() method. + if ($entry->student->school_id !== auth()->user()->school_id) { + return redirect()->route('nomination.entry.index')->with('error', + 'You may only delete nominations from your school'); + } + + $currentDate = Carbon::now('America/Chicago'); + $currentDate = $currentDate->format('Y-m-d'); + if ($entry->ensemble->entry_deadline < $currentDate) { + return redirect()->route('nomination.entry.index')->with('error', + 'You cannot delete nominations after the deadline'); + } + + $entry->delete(); + + return redirect()->route('nomination.entry.index')->with('success', 'Nomination Deleted'); } } diff --git a/resources/views/nomination_ensembles/meobda/entries/index.blade.php b/resources/views/nomination_ensembles/meobda/entries/index.blade.php index 98ecccb..cc2d7ce 100644 --- a/resources/views/nomination_ensembles/meobda/entries/index.blade.php +++ b/resources/views/nomination_ensembles/meobda/entries/index.blade.php @@ -22,9 +22,23 @@ @foreach($existingNominations[$ensemble->id] as $nom) - {{ $nom->student->full_name() }} + + {{ $nom->student->full_name() }} + {{ $nom->student->grade }} {{ $nom->data['instrument'] }} + @if($nominationsAvailable[$ensemble->id]) + + + Confirm you wish to delete the nomination + of {{ $nom->student->full_name() }}
+ for the {{ $ensemble->name }} ensemble. +
+
+ @endif @endforeach