diff --git a/app/Http/Controllers/PermissionsController.php b/app/Http/Controllers/PermissionsController.php index ebc9ab5..ef2f1eb 100644 --- a/app/Http/Controllers/PermissionsController.php +++ b/app/Http/Controllers/PermissionsController.php @@ -276,9 +276,7 @@ // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); - $query->where(function ($q) use ($search) { - $q->whereRaw('LOWER(name) LIKE ?', ['%' . strtolower($search) . '%']); - }); + $query->where('name', 'like', '%' . $search . '%'); } // Apply sorting if provided @@ -303,14 +301,11 @@ // Get the filtered count of records $filteredRecords = $query->count(); - // Get the data for the current page - $permissions = $query->get(); + $data = $query->get(); - - $permissions = $permissions->map(function ($permission) { + $data = $data->map(function ($permission) { $permission->roles = $permission->roles($permission); - return $permission; }); @@ -328,7 +323,7 @@ 'pageCount' => $pageCount, 'page' => $currentPage, 'totalCount' => $totalRecords, - 'data' => $permissions, + 'data' => $data, ]); } diff --git a/app/Http/Controllers/PositionsController.php b/app/Http/Controllers/PositionsController.php index dac8350..231a6b4 100644 --- a/app/Http/Controllers/PositionsController.php +++ b/app/Http/Controllers/PositionsController.php @@ -223,11 +223,7 @@ // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); - $query->where(function ($q) use ($search) { - $q->whereRaw('LOWER(code) LIKE ?', ['%' . strtolower($search) . '%']) - ->orWhereRaw('LOWER(name) LIKE ?', ['%' . strtolower($search) . '%']) - ->orWhereRaw('CAST(level AS TEXT) LIKE ?', ['%' . $search . '%']); - }); + $query->whereAny(['code', 'name', 'level'], 'like', '%' . $search . '%'); } // Apply sorting if provided @@ -253,7 +249,7 @@ $filteredRecords = $query->count(); // Get the data for the current page - $positions = $query->get(); + $data = $query->get(); // Calculate the page count $size = $request->get('size', 10); // Default to 10 if not set @@ -270,7 +266,7 @@ 'pageCount' => $pageCount, 'page' => $currentPage, 'totalCount' => $totalRecords, - 'data' => $positions, + 'data' => $data, ]); } diff --git a/app/Http/Controllers/RolesController.php b/app/Http/Controllers/RolesController.php index a7fe2f3..8a20802 100644 --- a/app/Http/Controllers/RolesController.php +++ b/app/Http/Controllers/RolesController.php @@ -273,14 +273,17 @@ // Retrieve data from the database $query = Role::query(); + if(!$this->user->hasRole('administrator')){ + $query->where('name', '!=', 'administrator'); + } + // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); $query->where(function ($q) use ($search) { - $q->whereRaw('LOWER(name) LIKE ?', ['%' . strtolower($search) . '%']) + $q->where('name', 'like', '%' . $search . '%') ->orWhereHas('position', function ($query) use ($search) { - $query->whereRaw('LOWER(name) LIKE ?', ['%' . strtolower($search) . '%']) - ->orWhereRaw('CAST(level AS TEXT) LIKE ?', ['%' . $search . '%']); + $query->whereAny(['name', 'level'], 'like','%'.$search.'%'); }); }); } @@ -290,19 +293,17 @@ $order = $request->get('sortOrder'); $column = $request->get('sortField'); - // Handle sorting for position-related columns if ($column === 'position_name') { $query->leftJoin('positions', 'roles.position_id', '=', 'positions.id') - ->orderByRaw('LOWER(positions.name) ' . $order) + ->orderBy('positions.name', $order) ->select('roles.*'); // Select only from roles table to avoid column conflicts } else if ($column === 'level') { $query->leftJoin('positions', 'roles.position_id', '=', 'positions.id') ->orderBy('positions.level', $order) ->select('roles.*'); // Select only from roles table to avoid column conflicts } else { - // Make sorting case-insensitive for string columns if ($column === 'name') { - $query->orderByRaw('LOWER(roles.name) ' . $order); + $query->orderBy('roles.name', $order); } else { $query->orderBy($column, $order); } @@ -328,7 +329,7 @@ $filteredRecords = $countQuery->distinct()->count('roles.id'); // Get the data for the current page - $roles = $query->with('position')->get(); + $data = $query->with('position')->get(); // Calculate the page count - ensure we don't divide by zero $pageSize = $request->get('size', 10); // Default to 10 if not provided @@ -345,7 +346,7 @@ 'pageCount' => $pageCount, 'page' => $currentPage, 'totalCount' => $totalRecords, - 'data' => $roles, + 'data' => $data, ]); } diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 6aa8cc9..649f535 100644 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -79,10 +79,16 @@ // Retrieve data from the database $query = User::query(); + if(!$this->user->hasRole('administrator')){ + $query->whereHas('roles', function($q){ + $q->where('name', '!=', 'administrator'); + }); + } + // Apply search filter if provided if ($request->has('search') && !empty($request->get('search'))) { $search = $request->get('search'); - $query->whereAny(['name','email'],'like','%'.$search.'%'); + $query->whereAny(['name', 'email'], 'like', '%'.$search.'%'); } // Apply sorting if provided @@ -108,7 +114,7 @@ $filteredRecords = $query->count(); // Get the data for the current page - $users = $query->with(['branch', 'roles'])->get(); + $data = $query->with(['branch', 'roles'])->get(); // Calculate the page count $pageCount = ceil($totalRecords / $request->get('size')); @@ -124,7 +130,7 @@ 'pageCount' => $pageCount, 'page' => $currentPage, 'totalCount' => $totalRecords, - 'data' => $users, + 'data' => $data, ]); } @@ -144,6 +150,9 @@ $user = User::find($id); $roles = Role::all(); + if(!$this->user->hasRole('administrator')){ + $roles = $roles->where('name', '!=', 'administrator'); + } $branches = Branch::all(); return view('usermanagement::users.create', compact('user', 'roles', 'branches')); } @@ -234,6 +243,9 @@ } $roles = Role::all(); + if(!$this->user->hasRole('administrator')){ + $roles = $roles->where('name', '!=', 'administrator'); + } $branches = Branch::all(); return view('usermanagement::users.create', compact('roles', 'branches')); } diff --git a/resources/views/permissions/index.blade.php b/resources/views/permissions/index.blade.php index 52dccad..8fa43b6 100644 --- a/resources/views/permissions/index.blade.php +++ b/resources/views/permissions/index.blade.php @@ -7,8 +7,10 @@ @section('content')
-
-
+
+

List of Permissions

@@ -21,38 +23,43 @@
- Export to Excel - Add Permission + Export to Excel + + Add Permission +
- +
- - - - - - + + + + + +
- - - Permission - - - Roles - - Action
+ + + Permission + + + Roles + + Action
-
-
+
+
Show - per page + per + page
-
+
@@ -70,7 +77,7 @@ function deleteData(data) { Swal.fire({ title: 'Are you sure?', - text: "You won't be able to revert this!" , + text: "You won't be able to revert this!", icon: 'warning', showCancelButton: true, confirmButtonColor: '#3085d6', @@ -80,14 +87,14 @@ if (result.isConfirmed) { $.ajaxSetup({ headers: { - 'X-CSRF-TOKEN': '{{ csrf_token() }}' + 'X-CSRF-TOKEN': '{{ csrf_token() }}' } }); $.ajax(`permissions/${data}`, { type: 'DELETE' }).then((response) => { - swal.fire('Deleted!', 'User has been deleted.','success').then(() => { + swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => { window.location.reload(); }); }).catch((error) => { @@ -102,7 +109,7 @@ const element = document.querySelector('#permissions-table'); const searchInput = document.getElementById('search'); const apiUrl = element.getAttribute('data-api-url'); - const colors = ['','badge-primary', 'badge-success', 'badge-info', 'badge-danger', 'badge-warning', 'badge-dark']; + const colors = ['', 'badge-primary', 'badge-success', 'badge-info', 'badge-danger', 'badge-warning', 'badge-dark']; const dataTableOptions = { @@ -125,12 +132,12 @@ roles: { title: 'Roles', render: (item, data) => { - const _render = data.roles.map((role) =>{ + const _render = data.roles.map((role) => { const randomColor = colors[Math.floor(Math.random() * colors.length)]; return `${role.name}`; - }); + }); - return _render.join(' '); + return _render.join(' '); } }, actions: { @@ -151,10 +158,10 @@ let dataTable = new KTDataTable(element, dataTableOptions); // Custom search functionality - searchInput.addEventListener('input', function () { + searchInput.addEventListener('input', function() { const searchValue = this.value.trim(); dataTable.search(searchValue, true); + dataTable.goPage(1); }); @endpush - diff --git a/resources/views/positions/index.blade.php b/resources/views/positions/index.blade.php index a8ad707..e141cfe 100644 --- a/resources/views/positions/index.blade.php +++ b/resources/views/positions/index.blade.php @@ -7,8 +7,9 @@ @section('content')
-
-
+
+

List of Positions

@@ -20,42 +21,47 @@
- Export to Excel - Add Position + + Export to Excel + Add Position +
- +
- - - - - - - + + + + + + +
- - - Code - - - Name - - - Tingkat Jabatan - - Action
+ + + Code + + + Name + + + Tingkat Jabatan + + Action
-
-
+
+
Show - per page + per + page
-
+
@@ -73,7 +79,7 @@ function deleteData(data) { Swal.fire({ title: 'Are you sure?', - text: "You won't be able to revert this!" , + text: "You won't be able to revert this!", icon: 'warning', showCancelButton: true, confirmButtonColor: '#3085d6', @@ -83,14 +89,14 @@ if (result.isConfirmed) { $.ajaxSetup({ headers: { - 'X-CSRF-TOKEN': '{{ csrf_token() }}' + 'X-CSRF-TOKEN': '{{ csrf_token() }}' } }); $.ajax(`positions/${data}`, { type: 'DELETE' }).then((response) => { - swal.fire('Deleted!', 'Position has been deleted.','success').then(() => { + swal.fire('Deleted!', 'Position has been deleted.', 'success').then(() => { window.location.reload(); }); }).catch((error) => { @@ -150,9 +156,10 @@ const baseExportUrl = exportBtn.getAttribute('href'); // Custom search functionality - searchInput.addEventListener('input', function () { + searchInput.addEventListener('input', function() { const searchValue = this.value.trim(); dataTable.search(searchValue, true); + dataTable.goPage(1); // Update export URL with search parameter if (searchValue) { diff --git a/resources/views/roles/index.blade.php b/resources/views/roles/index.blade.php index e7a0562..f9812a8 100644 --- a/resources/views/roles/index.blade.php +++ b/resources/views/roles/index.blade.php @@ -7,8 +7,9 @@ @section('content')
-
-
+
+

List of Roles

@@ -28,35 +29,38 @@
- +
- - - - - - - + + + + + + +
- - - Role - - - Position - - - Tingkat Jabatan - - Action
+ + + Role + + + Position + + + Tingkat Jabatan + + Action
-
-
+
+
Show - per page + per + page
-
+
@@ -74,7 +78,7 @@ function deleteData(data) { Swal.fire({ title: 'Are you sure?', - text: "You won't be able to revert this!" , + text: "You won't be able to revert this!", icon: 'warning', showCancelButton: true, confirmButtonColor: '#3085d6', @@ -84,14 +88,14 @@ if (result.isConfirmed) { $.ajaxSetup({ headers: { - 'X-CSRF-TOKEN': '{{ csrf_token() }}' + 'X-CSRF-TOKEN': '{{ csrf_token() }}' } }); $.ajax(`roles/${data}`, { type: 'DELETE' }).then((response) => { - swal.fire('Deleted!', 'User has been deleted.','success').then(() => { + swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => { window.location.reload(); }); }).catch((error) => { @@ -156,9 +160,10 @@ let dataTable = new KTDataTable(element, dataTableOptions); // Custom search functionality - searchInput.addEventListener('input', function () { + searchInput.addEventListener('input', function() { const searchValue = this.value.trim(); dataTable.search(searchValue, true); + dataTable.goPage(1); }); @endpush