From 4e85d96b8347ae7d669c3489f3424fc56d987703 Mon Sep 17 00:00:00 2001
From: Ilham Wara Nugroho <ilhamwara@gmail.com>
Date: Mon, 20 Oct 2025 15:40:29 +0700
Subject: [PATCH] update

---
 app/Http/Controllers/Management/UserController.php      | 5 ++++-
 resources/views/modules/management/user/index.blade.php | 4 +---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Management/UserController.php b/app/Http/Controllers/Management/UserController.php
index 704fd3c..9de0aa2 100644
--- a/app/Http/Controllers/Management/UserController.php
+++ b/app/Http/Controllers/Management/UserController.php
@@ -59,12 +59,15 @@ class UserController extends Controller
                 }
                 $action .= '</div>';
             }
+            $role = '';
+            $role .= 'Role & Hak Akses : '.@$row->group->name.'<br>';
+            $role .= 'Instansi : '.@$instansi->name;
             
            $_data[] = [
             'no'                => $key+1,
             'id'                => encode_id($row->id),
             'name'              => @$row->name,
-            'role'              => @$row->group->name,
+            'role'              => @$role,
             'username'          => @$row->username,
             'instansi'          => @$instansi->name,
             'email'             => @$row->email,
diff --git a/resources/views/modules/management/user/index.blade.php b/resources/views/modules/management/user/index.blade.php
index ba6da5b..e9b15ac 100644
--- a/resources/views/modules/management/user/index.blade.php
+++ b/resources/views/modules/management/user/index.blade.php
@@ -32,10 +32,8 @@
                     <tr class="gridjs-tr bg-primary-light">
                       <th class="gridjs-td gridjs-th text-sm text-gray-500" data-width="10" data-field="action">#</th>
                       <th class="gridjs-td gridjs-th text-sm text-gray-500" data-width="10" data-field="no">No</th>
-                      <th class="gridjs-td gridjs-th text-sm text-gray-500" data-field="role">Role</th>
-                      <th class="gridjs-td gridjs-th text-sm text-gray-500" data-field="instansi">Instansi</th>
-                      <th class="gridjs-td gridjs-th text-sm text-gray-500" data-field="email">Email</th>
                       <th class="gridjs-td gridjs-th text-sm text-gray-500" data-field="name">Name</th>
+                      <th class="gridjs-td gridjs-th text-sm text-gray-500" data-field="role">Role</th>
                     </tr>
                   </thead>
                   <tbody class="gridjs-tbody"></tbody>