diff --git a/app/Http/Controllers/PermissionsController.php b/app/Http/Controllers/PermissionsController.php index d7c27e7..68a7caa 100644 --- a/app/Http/Controllers/PermissionsController.php +++ b/app/Http/Controllers/PermissionsController.php @@ -281,15 +281,18 @@ $totalRecords = $query->count(); // Apply pagination if provided - if ($request->has('start') && $request->has('length')) { - $start = $request->get('start'); - $length = $request->get('length'); - $query->skip($start)->take($length); + if ($request->has('page') && $request->has('size')) { + $page = $request->get('page'); + $size = $request->get('size'); + $offset = ($page - 1) * $size; // Calculate the offset + + $query->skip($offset)->take($size); } // Get the filtered count of records $filteredRecords = $query->count(); + // Get the data for the current page $permissions = $query->get(); @@ -301,7 +304,7 @@ }); // Calculate the page count - $pageCount = ceil($totalRecords); + $pageCount = ceil($totalRecords/$request->get('size')); // Calculate the current page number $currentPage = 0 + 1; diff --git a/app/Http/Controllers/RolesController.php b/app/Http/Controllers/RolesController.php index 7fcfb95..e8bb944 100644 --- a/app/Http/Controllers/RolesController.php +++ b/app/Http/Controllers/RolesController.php @@ -254,10 +254,12 @@ $totalRecords = $query->count(); // Apply pagination if provided - if ($request->has('start') && $request->has('length')) { - $start = $request->get('start'); - $length = $request->get('length'); - $query->skip($start)->take($length); + if ($request->has('page') && $request->has('size')) { + $page = $request->get('page'); + $size = $request->get('size'); + $offset = ($page - 1) * $size; // Calculate the offset + + $query->skip($offset)->take($size); } // Get the filtered count of records @@ -267,7 +269,7 @@ $roles = $query->get(); // Calculate the page count - $pageCount = ceil($totalRecords); + $pageCount = ceil($totalRecords/$request->get('size')); // Calculate the current page number $currentPage = 0 + 1; diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 8592373..baca7ab 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -78,11 +78,13 @@ }); } - // Apply sorting if provided - if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) { - $order = $request->get('sortOrder'); - $column = $request->get('sortField'); - $query->orderBy($column, $order); + // Apply pagination if provided + if ($request->has('page') && $request->has('size')) { + $page = $request->get('page'); + $size = $request->get('size'); + $offset = ($page - 1) * $size; // Calculate the offset + + $query->skip($offset)->take($size); } // Get the total count of records @@ -102,7 +104,7 @@ $users = $query->get(); // Calculate the page count - $pageCount = ceil($totalRecords); + $pageCount = ceil($totalRecords/$request->get('size')); // Calculate the current page number $currentPage = 0 + 1;