diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 13c074f..1549fd6 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -105,7 +105,7 @@ $filteredRecords = $query->count(); // Get the data for the current page - $users = $query->with('branch')->get(); + $users = $query->with(['branch','roles'])->get(); // Calculate the page count $pageCount = ceil($totalRecords / $request->get('size')); diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 17ec5ea..d7b7cb8 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -72,6 +72,10 @@ Branch + + Role + + Action @@ -162,6 +166,12 @@ return data.branch.name; }, }, + role: { + title: 'Role', + render: (item, data) => { + return data.roles.map(role => role.name).join(', '); + }, + }, actions: { title: 'Status', render: (item, data) => {