filters

app/Http/Controllers/ContractController.php

@@ -26,6 +26,8 @@ class ContractController extends Controller
 
     public function index(Request $request)
     {
+        session(['gp_contracts' => $request->query()]);
+
         $model = new Contract();
         // fill filters
         $this->createFilters($model, 'year');

app/Http/Controllers/FilterController.php

@@ -15,6 +15,9 @@ class FilterController extends Controller
         'reclamations'  => 'reclamations_view',
         'maf_order'     => 'maf_orders_view',
         'import'        => 'imports',
+        'responsibles'  => 'responsibles',
+        'users'         => 'users',
+        'contracts'     => 'contracts',
     ];
     public function getFilters(FilterRequest $request)
     {
@@ -30,8 +33,8 @@ class FilterController extends Controller
 
         if (Schema::hasColumn($dbTable, $column)) {
             $q = DB::table($dbTable)->select($column)->distinct();
-            if(!in_array($table, ['reclamations', 'import'])) {
-                $q->where('year' , year());
+            if (Schema::hasColumn($dbTable, 'year')) {
+                    $q->where('year' , year());
             }
             if (Schema::hasColumn($dbTable, 'deleted_at')) {
                 $q->whereNull('deleted_at');

app/Http/Controllers/ResponsibleController.php

@@ -39,6 +39,8 @@ class ResponsibleController extends Controller
 
     public function index(Request $request)
     {
+        session(['gp_responsibles' => $request->query()]);
+
         $model = new Responsible;
         $this->createDateFilters($model, 'created_at');
 

app/Http/Controllers/UserController.php

@@ -40,6 +40,8 @@ class UserController extends Controller
      */
     public function index(Request $request)
     {
+        session(['gp_users' => $request->query()]);
+
         $model = new User;
         $this->createFilters($model, 'role');
         $this->createDateFilters($model, 'created_at');

resources/views/layouts/menu.blade.php

@@ -8,7 +8,7 @@
                                 href="{{ route('catalog.index', session('gp_products')) }}">Каталог</a></li>
         <li class="nav-item"><a class="nav-link @if($active == 'reports') active @endif"
                                 href="{{ route('reports.index', session('gp_reports')) }}">Отчёты</a></li>
-        <li class="nav-item"><a class="nav-link" href="{{ route('responsible.index') }}">Ответственные</a></li>
+        <li class="nav-item"><a class="nav-link" href="{{ route('responsible.index', session('gp_responsibles')) }}">Ответственные</a></li>
     @endif
     <li class="nav-item"><a class="nav-link @if($active == 'reclamations') active @endif"
                             href="{{ route('reclamations.index', session('gp_reclamations')) }}">Рекламации</a></li>
@@ -27,9 +27,9 @@
                 Администрирование
             </a>
             <ul class="dropdown-menu dropdown-menu-end">
-                <li class="dropdown-item"><a class="nav-link" href="{{ route('contract.index') }}">Договоры</a></li>
-                <li class="dropdown-item"><a class="nav-link" href="{{ route('user.index') }}">Пользователи</a></li>
-                <li class="dropdown-item"><a class="nav-link" href="{{ route('import.index') }}">Импорт</a></li>
+                <li class="dropdown-item"><a class="nav-link" href="{{ route('contract.index', session('gp_contracts')) }}">Договоры</a></li>
+                <li class="dropdown-item"><a class="nav-link" href="{{ route('user.index', session('gp_users')) }}">Пользователи</a></li>
+                <li class="dropdown-item"><a class="nav-link" href="{{ route('import.index', session('gp_import')) }}">Импорт</a></li>
             </ul>
         </li>