diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php index bb804f5..59e3631 100644 --- a/app/Http/Controllers/TicketController.php +++ b/app/Http/Controllers/TicketController.php @@ -70,7 +70,7 @@ class TicketController extends Controller }); }); } - $tickets = $tickets->where('status', $request->status ? '=' : '<>', TicketStatus::archived()); + $tickets = $tickets->where('status', ($request->st==TicketStatus::archived()) ? '=' : '<>', TicketStatus::archived()); if ($request->search) { $tickets = $this->searchTicket($tickets, $request); } @@ -78,13 +78,15 @@ class TicketController extends Controller $tickets = $tickets->paginate(); $sites = Site::select('id', 'name')->orderBy('name')->get(); + $status = TicketStatus::toArray(); - return view('ticket.index', compact('tickets', 'sites')); + return view('ticket.index', compact('tickets', 'sites', 'status')); } private function filterTickets(Builder $tickets, Request $request): Builder { if ($request->rst) { + Session::remove('tickets.st'); Session::remove('tickets.pr'); Session::remove('tickets.sort_col'); Session::remove('tickets.sort_way'); @@ -92,6 +94,9 @@ class TicketController extends Controller if ($request->prs) { Session::remove('tickets.pr'); } + if ($request->sts) { + Session::remove('tickets.st'); + } if ($request->sort_col) { Session::put('tickets.sort_col', $request->sort_col); } @@ -101,12 +106,19 @@ class TicketController extends Controller if ($request->pr) { Session::put('tickets.pr', $request->pr); } + if ($request->st) { + Session::put('tickets.st', $request->st); + } Session::save(); if (Session::has('tickets.pr')) { $tickets = $tickets->where('site_id', Session::get('tickets.pr')); } + if (Session::has('tickets.st')) { + $tickets = $tickets->where('status', Session::get('tickets.st')); + } + if ( Session::has('tickets.sort_col') and Session::has('tickets.sort_way') and diff --git a/resources/views/ticket/index.blade.php b/resources/views/ticket/index.blade.php index e71a3ac..4d861e8 100644 --- a/resources/views/ticket/index.blade.php +++ b/resources/views/ticket/index.blade.php @@ -12,10 +12,10 @@ $userPr = Auth::user()->sites ?? collect([]);