From 22626baf4699aadbcd25575c0973b69451921d0f Mon Sep 17 00:00:00 2001
From: Olivier Legat <olivier.legat@ldc.fr>
Date: Wed, 13 Oct 2021 11:20:42 +0200
Subject: [PATCH] =?UTF-8?q?Pr=C3=A9=20filtre=20Actifs/archiv=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/TicketController.php |  2 +-
 resources/views/ticket/index.blade.php    | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/TicketController.php b/app/Http/Controllers/TicketController.php
index dde2737..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);
         }
diff --git a/resources/views/ticket/index.blade.php b/resources/views/ticket/index.blade.php
index e73d37f..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([]);
                 <div class="col">
                     <div class="btn-group float-end">
                         <a href="{{ route('ticket.create') }}" class="btn btn-primary">{{ __('Créer un ticket') }}</a>
-                        @if(request()->status)
-                        <a href="{{ route('ticket.index') }}" class="btn btn-success">{{ __('Tickets en cours') }}</a>
+                        @if(session('tickets.st') == TicketStatus::archived())
+                        <a href="{{ route('ticket.index', ['sts' => -1 ]) }}" class="btn btn-success">{{ __('Tickets Actifs') }}</a>
                         @else
-                        <a href="{{ route('ticket.index', ['status' => TicketStatus::archived()]) }}" class="float-end btn btn-secondary">{{ __('Tickets Archivés') }}</a>
+                        <a href="{{ route('ticket.index', ['st' => TicketStatus::archived()]) }}" class="float-end btn btn-secondary">{{ __('Tickets Archivés') }}</a>
                         @endif
                         <a href="{{ route('ticket.index', ['rst' => 1]) }}" class="btn btn-dark">{{ __('Réinitialiser le tri') }}</a>
                     </div>
@@ -35,11 +35,7 @@ $userPr = Auth::user()->sites ?? collect([]);
                         <select class="form-select" onchange="window.location='{{ route('ticket.index') }}?'+(this.value == -1 ? 'sts=-1' : 'st='+this.value);">
                             <option value="-1">{{ __('Tous') }}</option>
                             @foreach($status as $statut)
-                            @if (Auth::user()->isAdmin())
-                            <option value="{{ $statut->value }}" @if(intval(session('tickets.st')) == $statut->value)selected="selected" @endif>{{ $statut->label }}</option>
-                            @elseif ($userPr->filter(function($pr) use($site) { return $pr->id === $statut->value; })->count())
-                            <option value="{{ $statut->value }}" @if(intval(session('tickets.st')) == $statut->value)selected="selected" @endif>{{ $statut->label }}</option>
-                            @endif
+                                <option value="{{ $statut->value }}" @if(intval(session('tickets.st')) == $statut->value)selected="selected" @endif>{{ $statut->label }}</option>
                             @endforeach
                         </select>
                     </div>