From fd35913fd6d7ab208e41807baa22fcccddaddd9a Mon Sep 17 00:00:00 2001 From: Matt Young Date: Thu, 27 Mar 2025 18:07:43 -0500 Subject: [PATCH] MEOBDA rules - allow admin to filter nominations to those without an assigned split. --- .../MeobdaNominationAdminController.php | 15 +++++++++++---- .../meobda/admin/nominations.blade.php | 4 ++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/NominationEnsembles/MeobdaNominationAdminController.php b/app/Http/Controllers/NominationEnsembles/MeobdaNominationAdminController.php index 4d9d65f..9e32643 100644 --- a/app/Http/Controllers/NominationEnsembles/MeobdaNominationAdminController.php +++ b/app/Http/Controllers/NominationEnsembles/MeobdaNominationAdminController.php @@ -72,13 +72,20 @@ class MeobdaNominationAdminController extends Controller implements NominationAd } if ($filterData['split'] ?? false) { - $splitFilter = explode('---', $filterData['split']); - $nominations = $nominations->where('nomination_ensemble_id', $splitFilter[0]); - if ($splitFilter[1] != 'all') { - $nominations = $nominations->where('data->split', $splitFilter[1]); + if ($filterData['split'] == 'NO-SPLIT-ASSIGNED') { + $nominations = $nominations->whereNull('data->split'); + } else { + $splitFilter = explode('---', $filterData['split']); + $nominations = $nominations->where('nomination_ensemble_id', $splitFilter[0]); + if ($splitFilter[1] != 'all') { + $nominations = $nominations->where('data->split', $splitFilter[1]); + } } } + // Sort + $nominations = $nominations->orderBy('id', 'desc'); + $nominations = $nominations->paginate(50); return view('nomination_ensembles.meobda.admin.nominations', diff --git a/resources/views/nomination_ensembles/meobda/admin/nominations.blade.php b/resources/views/nomination_ensembles/meobda/admin/nominations.blade.php index 4d61677..84d88e0 100644 --- a/resources/views/nomination_ensembles/meobda/admin/nominations.blade.php +++ b/resources/views/nomination_ensembles/meobda/admin/nominations.blade.php @@ -31,6 +31,10 @@ Split + @foreach ($splits as $value => $name)