diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 1c265bc..13c074f 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -82,6 +82,16 @@ }); } + // Apply sorting if provided + if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) { + $order = $request->get('sortOrder'); + $column = $request->get('sortField'); + $query->orderBy($column, $order); + } + + // Get the total count of records + $totalRecords = $query->count(); + // Apply pagination if provided if ($request->has('page') && $request->has('size')) { $page = $request->get('page'); @@ -91,16 +101,6 @@ $query->skip($offset)->take($size); } - // Get the total count of records - $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); - } - // Get the filtered count of records $filteredRecords = $query->count();