diff --git a/app/Http/Controllers/Admin/PermissionController.php b/app/Http/Controllers/Admin/PermissionController.php index 3b30ad4..7cbda3e 100644 --- a/app/Http/Controllers/Admin/PermissionController.php +++ b/app/Http/Controllers/Admin/PermissionController.php @@ -19,7 +19,7 @@ class PermissionController extends Controller ->get() ->groupBy('group'); - $roles = ['admin', 'bk', 'wali_kelas', 'staff']; + $roles = ['admin', 'bk', 'wali_kelas', 'staff', 'other']; $rolePermissions = []; foreach ($roles as $role) { diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 0be26c6..192a915 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -40,7 +40,7 @@ class UserController extends Controller 'username' => ['required', 'string', 'max:255', 'unique:users,username'], 'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email'], 'password' => ['required', 'string', 'min:6'], - 'role' => ['required', 'in:admin,bk,wali_kelas,staff'], + 'role' => ['required', 'in:admin,bk,wali_kelas,staff,other'], 'is_active' => ['boolean'], ]); @@ -60,7 +60,7 @@ class UserController extends Controller 'username' => ['required', 'string', 'max:255', 'unique:users,username,' . $user->id], 'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email,' . $user->id], 'password' => ['nullable', 'string', 'min:6'], - 'role' => ['required', 'in:admin,bk,wali_kelas,staff'], + 'role' => ['required', 'in:admin,bk,wali_kelas,staff,other'], 'is_active' => ['boolean'], ]); diff --git a/app/Models/User.php b/app/Models/User.php index 704ce6c..2e8cd05 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -29,6 +29,8 @@ class User extends Authenticatable public function isBK(): bool { return $this->role === 'bk'; } public function isWaliKelas(): bool { return $this->role === 'wali_kelas'; } public function isStaff(): bool { return $this->role === 'staff'; } + public function isOther(): bool { return $this->role === 'other'; } + public function isStaff(): bool { return $this->role === 'staff'; } public function canPermission(string $permission): bool { diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index a1e1435..002d629 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -34,6 +34,7 @@ +