Implementata paginazione pratiche/clienti index

Author: danieledelgiudice

app/Http/Controllers/ClientiController.php

@@ -46,11 +46,13 @@ public function __construct()
     public function index(Request $request)
     {
         if ($request->user()->isAdmin())
-            $clienti = \App\Cliente::filter($request->all())->take(100)->orderBy('cognome')->get();
+            $clienti = \App\Cliente::filter($request->all())->orderBy('cognome');
         else
             $clienti = \App\Cliente::where('filiale_id', $request->user()->filiale->id)
-                                     ->filter($request->all())->take(100)->orderBy('cognome')->get();
-        
+                                     ->filter($request->all())->orderBy('cognome');
+                                    
+        $clienti = $clienti->paginate(50);
+                                     
         $filiali = \App\Filiale::pluck('nome', 'id');
         $professioni = \App\Professione::pluck('nome', 'id');
 
@@ -181,7 +183,7 @@ public function filter(Request $request)
 
         foreach($request->all() as $k => $v)
         {
-            if ($k[0] != '_') {
+            if ($k[0] != '_' && $k != 'page') {
                 if ($v != '')
                     $params[$k] = $v;
                 if ($j > 2 && !in_array($k, $requestedFields))
@@ -201,10 +203,12 @@ public function filter(Request $request)
         }
 
         if ($request->user()->isAdmin())
-            $clienti = \App\Cliente::filter($params)->orderBy('cognome')->get();
+            $clienti = \App\Cliente::filter($params)->orderBy('cognome');
         else
             $clienti = \App\Cliente::where('filiale_id', $request->user()->filiale->id)
-                                     ->filter($params)->orderBy('cognome')->get();
+                                     ->filter($params)->orderBy('cognome');
+                                     
+        $clienti = $clienti->paginate(50);
 
 
         $queryFields = $this->queryFields;

app/Http/Controllers/PraticheController.php

@@ -337,7 +337,7 @@ public function filter(Request $request)
 
         foreach($request->all() as $k => $v)
         {
-            if ($k[0] != '_') {
+            if ($k[0] != '_' && $k != 'page') {
                 if ($v != '')
                     $params[$k] = $v;
                 if ($j > 1 && !in_array($k, $requestedFields))
@@ -358,14 +358,17 @@ public function filter(Request $request)
 
 
         if ($request->user()->isAdmin())
-            $pratiche = \App\Pratica::filter($params)->get();
+            $pratiche = \App\Pratica::filter($params);
         else
             $pratiche = \App\Pratica::whereHas('cliente', function($query) use ($request) {
                 $query->where('filiale_id', $request->user()->filiale->id);
-            })->filter($params)->get();
+            })->filter($params);
 
 
         $queryFields = $this->queryFields;
+        
+        $pratiche = $pratiche->paginate(50);
+        
         return view('pratiche._tabella', compact('pratiche', 'requestedFields', 'queryFields'));
     }
 

public/js/app.js

@@ -202,20 +202,19 @@ var parseQueryString = function() {
         }
     });
 
-    
-    $("#queryForm").off('submit').submit(function(e) {
-        e.preventDefault();
+    var executeQuery = function(page) {
+        var $form = $("#queryForm");
 
         $('#queryBtn').prop('disabled', true);
         $('#queryBtn i').removeClass('fa-search');
         $('#queryBtn i').addClass('fa-spin fa-refresh');
 
-        var queryData = $(this).serializeArray();
+        var queryData = $form.serializeArray();
 
         $.ajax({
             type     : "POST",
             cache    : false,
-            url      : $(this).attr('action'),
+            url      : `${$form.attr('action')}?page=${page}`,
             data     : $.param(queryData),
             success  : function(data) {
                 $("#queryResult").empty().append(data);
@@ -225,6 +224,13 @@ var parseQueryString = function() {
                 $('#queryBtn').prop('disabled', false);
             }
         });
+    };
+    
+    
+    $("#queryForm").off('submit').submit(function(e) {
+        e.preventDefault();
+        
+        executeQuery('1');
     });
 
     $('#newFieldQuerySelect').change(function() {
@@ -475,4 +481,9 @@ var parseQueryString = function() {
         });
     });
 
+    $(document).on('click', '.links .pagination a', function (e) {
+        var page = $(this).attr('href').split('page=')[1];
+        executeQuery(page);
+        e.preventDefault();
+    });
 })();

resources/views/clienti/_tabella.blade.php

@@ -1,5 +1,5 @@
 @if (count($clienti) > 0)
-    <p class="pull-right">{{ count($clienti) }} risultati.</p>
+    <p class="pull-right">{{ $clienti->total() }} risultati.</p>
     <table class="table table-hover table-striped">
         <thead>
             @for ($i = 0; $i < 5; $i++)
@@ -30,6 +30,10 @@
             @endforeach
         </tbody>
     </table>
+    
+    <div class="clienti links text-center">
+        {{ $clienti->render() }}    
+    </div>
 @else
     <p class="text-center">Non sono presenti clienti</p>
 @endif

resources/views/pratiche/_tabella.blade.php

@@ -1,5 +1,5 @@
 @if (count($pratiche) > 0)
-    <p class="pull-right">{{ count($pratiche) }} risultati.</p>
+    <p class="pull-right">{{ $pratiche->total() }} risultati.</p>
     <table class="table table-hover table-striped">
         <thead>
             @for ($i = 0; $i < 6; $i++)
@@ -34,6 +34,9 @@
             @endforeach
         </tbody>
     </table>
+    <div class="pratiche links text-center">
+        {{ $pratiche->render() }}    
+    </div>
 @else
     <p class="text-center">Non sono presenti pratiche</p>
 @endif