Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions app/Http/Controllers/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

use App\User;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use JamesDordoy\LaravelVueDatatable\Http\Resources\DataTableCollectionResource;

class UserController extends Controller
Expand Down Expand Up @@ -34,15 +35,13 @@ public function queryBuilder(Request $request)
{
$searchValue = $request->input('search');
$orderBy = $request->input('column');
$orderBydir = $request->input("dir");
$length = $request->input('length');
$orderBydir = $request->input("dir", "asc");
$isActive = $request->input('isActive');
$roleId = $request->input('roleId');

$query = \DB::table('users')
->join('roles', 'roles.id', '=', 'users.role_id')
->join('departments', 'departments.id', '=', 'roles.department_id')
->select(
$query = User::join('roles', 'roles.id', '=', 'users.role_id')
->join('departments', 'departments.id', '=', 'roles.department_id')
->select(
'roles.name as role_name',
'users.id',
'users.cost',
Expand All @@ -66,8 +65,8 @@ public function queryBuilder(Request $request)
if (isset($roleId) && ! empty($roleId)) {
$query = $query->where("users.role_id", $roleId);
}
$data = $query->paginate($length);

$data = $query->paginate($request->input('length'));

return new DataTableCollectionResource($data);
}
Expand Down
9,868 changes: 29 additions & 9,839 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"vue-template-compiler": "^2.6.14"
},
"dependencies": {
"@popperjs/core": "^2.11.5",
"laravel-vue-datatable": "^0.6.0"
}
}
Loading