From 0041c62008776aa3b046cf5de150c0bc868c40e1 Mon Sep 17 00:00:00 2001 From: Matt Young Date: Sat, 2 Nov 2024 07:49:25 -0500 Subject: [PATCH] Allow filtering of entries on admin screen by entry type --- app/Http/Controllers/Admin/EntryController.php | 13 +++++++++++++ app/Http/Controllers/FilterController.php | 1 + resources/views/admin/entries/index.blade.php | 14 ++++++++++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Admin/EntryController.php b/app/Http/Controllers/Admin/EntryController.php index 5611aeb..cb7bb3f 100644 --- a/app/Http/Controllers/Admin/EntryController.php +++ b/app/Http/Controllers/Admin/EntryController.php @@ -66,6 +66,19 @@ class EntryController extends Controller $query->where('last_name', 'like', '%'.$filters['last_name'].'%'); }); } + + if ($filters['entry_type']) { + // TODO define actions for each possible type filter from index.blade.php of the admin entry + match ($filters['entry_type']) { + 'all' => null, + 'seats' => $entries->where('for_seating', true), + 'advancement' => $entries->where('for_advancement', true), + 'seatsOnly' => $entries->where('for_seating', true)->where('for_advancement', false) , + 'advancementOnly' => $entries->where('for_seating', false)->where('for_advancement', true), + default => null, + }; + } + } $entries = $entries->paginate(25); diff --git a/app/Http/Controllers/FilterController.php b/app/Http/Controllers/FilterController.php index f22fbd1..6bd829e 100644 --- a/app/Http/Controllers/FilterController.php +++ b/app/Http/Controllers/FilterController.php @@ -15,6 +15,7 @@ class FilterController extends Controller $filters['grade'] = request('grade_filter') ? request('grade_filter') : null; $filters['first_name'] = request('first_name_filter') ? request('first_name_filter') : null; $filters['last_name'] = request('last_name_filter') ? request('last_name_filter') : null; + $filters['entry_type'] = request('entry_type_filter') ? request('entry_type_filter') : null; session(['adminEntryFilters' => $filters]); diff --git a/resources/views/admin/entries/index.blade.php b/resources/views/admin/entries/index.blade.php index cda18dc..8ec95b0 100644 --- a/resources/views/admin/entries/index.blade.php +++ b/resources/views/admin/entries/index.blade.php @@ -36,8 +36,18 @@ @php($n++); @endwhile - - + + + @if(auditionSetting('advanceTo')) + + Entry Type + + + + + + + @endif Clear Filters