diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 0c1c488..7e494c9 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -25,7 +25,14 @@ class AppServiceProvider extends ServiceProvider // Super Admin bypass: secara otomatis memiliki izin untuk semua ability Gate::before(function ($user, $ability) { - return ($user->role === 'super_admin' || $user->hasRole('super_admin')) ? true : null; + if ($user->role === 'super_admin' || $user->role === 'admin') { + return true; + } + try { + return $user->hasRole('super_admin') ? true : null; + } catch (\Throwable $e) { + return null; + } }); // Konfigurasi durasi "Ingat Saya" (Remember Me) menjadi 30 hari (43.200 menit) diff --git a/config/rbac_permissions.php b/config/rbac_permissions.php index 2372964..ec05dfc 100644 --- a/config/rbac_permissions.php +++ b/config/rbac_permissions.php @@ -70,6 +70,26 @@ return [ 'label' => 'Memperbarui Data Karyawan & SIMPER', 'description' => 'Mengubah data karyawan, status pengemudi, atau memperpanjang tanggal masa berlaku SIMPER.', ], + 'hse.employees.delete' => [ + 'label' => 'Menghapus Data Karyawan', + 'description' => 'Menghapus data personil/karyawan dari database K3.', + ], + 'hse.simper_types.view' => [ + 'label' => 'Melihat Master Jenis SIMPER', + 'description' => 'Melihat daftar kategori jenis SIMPER dan cakupan kendaraan/alat yang diizinkan.', + ], + 'hse.simper_types.create' => [ + 'label' => 'Menambah Jenis SIMPER Baru', + 'description' => 'Membuat kategori izin SIMPER baru dan menentukan cakupan armadanya.', + ], + 'hse.simper_types.edit' => [ + 'label' => 'Mengubah Data Jenis SIMPER', + 'description' => 'Mengubah nama kategori, fleksibilitas cakupan, atau status aktif jenis SIMPER.', + ], + 'hse.simper_types.delete' => [ + 'label' => 'Menghapus Jenis SIMPER', + 'description' => 'Menghapus kategori jenis SIMPER yang sudah tidak memiliki pemegang aktif.', + ], ], ], 'qma' => [ diff --git a/database/migrations/2026_10_27_110000_add_hse_simper_types_permissions.php b/database/migrations/2026_10_27_110000_add_hse_simper_types_permissions.php new file mode 100644 index 0000000..07b367f --- /dev/null +++ b/database/migrations/2026_10_27_110000_add_hse_simper_types_permissions.php @@ -0,0 +1,60 @@ +forgetCachedPermissions(); + + $newPerms = [ + 'hse.employees.delete', + 'hse.simper_types.view', + 'hse.simper_types.create', + 'hse.simper_types.edit', + 'hse.simper_types.delete', + ]; + + foreach ($newPerms as $perm) { + Permission::firstOrCreate(['name' => $perm, 'guard_name' => 'web']); + } + + // Daftarkan ke super_admin + $superAdmin = Role::where('name', 'super_admin')->first(); + if ($superAdmin) { + $superAdmin->givePermissionTo($newPerms); + } + + // Daftarkan ke hse_admin + $hseAdmin = Role::where('name', 'hse_admin')->first(); + if ($hseAdmin) { + $hseAdmin->givePermissionTo($newPerms); + } + + app()[PermissionRegistrar::class]->forgetCachedPermissions(); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + $perms = [ + 'hse.employees.delete', + 'hse.simper_types.view', + 'hse.simper_types.create', + 'hse.simper_types.edit', + 'hse.simper_types.delete', + ]; + + Permission::whereIn('name', $perms)->delete(); + app()[PermissionRegistrar::class]->forgetCachedPermissions(); + } +}; diff --git a/database/seeders/RolePermissionSeeder.php b/database/seeders/RolePermissionSeeder.php index 272ef3e..96f9eb7 100644 --- a/database/seeders/RolePermissionSeeder.php +++ b/database/seeders/RolePermissionSeeder.php @@ -39,6 +39,11 @@ class RolePermissionSeeder extends Seeder 'hse.employees.view', 'hse.employees.create', 'hse.employees.edit', + 'hse.employees.delete', + 'hse.simper_types.view', + 'hse.simper_types.create', + 'hse.simper_types.edit', + 'hse.simper_types.delete', ], 'qma_admin' => [ 'qma.vehicles.view', diff --git a/resources/views/hse/simper_types_index.blade.php b/resources/views/hse/simper_types_index.blade.php index 0d55429..a5a9ce8 100644 --- a/resources/views/hse/simper_types_index.blade.php +++ b/resources/views/hse/simper_types_index.blade.php @@ -34,14 +34,14 @@ Kembali ke Data Personil - @can('hse.employees.edit') + @if(auth()->user()->can('hse.simper_types.create') || auth()->user()->can('hse.employees.create') || auth()->user()->can('hse.employees.edit')) - @endcan + @endif @@ -178,14 +178,15 @@
- @can('hse.employees.edit') + @if(auth()->user()->can('hse.simper_types.edit') || auth()->user()->can('hse.employees.edit')) - @if($st->total_holders_count == 0) + @endif + @if((auth()->user()->can('hse.simper_types.delete') || auth()->user()->can('hse.employees.edit')) && $st->total_holders_count == 0) @endif - @endcan
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index ff4ba37..5d9c320 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -253,25 +253,29 @@ @endif - @can('hse.employees.view') + @if(auth()->user()->can('hse.employees.view') || auth()->user()->can('hse.simper_types.view'))

MANAJEMEN HSE

- @endcan + @endif @if(auth()->user()->canAny(['qma.vehicles.view', 'qma.logs.view', 'qma.summary.view', 'qma.p2h.view', 'qma.p2h.templates'])) @@ -631,23 +635,27 @@ @endif - @can('hse.employees.view') + @if(auth()->user()->can('hse.employees.view') || auth()->user()->can('hse.simper_types.view'))

MANAJEMEN HSE

- @endcan + @endif @if(auth()->user()->canAny(['qma.vehicles.view', 'qma.logs.view', 'qma.summary.view', 'qma.p2h.view', 'qma.p2h.templates'])) diff --git a/routes/web.php b/routes/web.php index 5893451..bb9c04e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -66,10 +66,10 @@ Route::middleware('auth')->group(function () { Route::post('/employees/{id}', [EmployeeController::class, 'update'])->name('employees.update')->middleware('permission:hse.employees.edit'); // Master Jenis SIMPER (Konfigurasi Fleksibel HSE) - Route::get('/simper-types', [SimperTypeController::class, 'index'])->name('simper_types.index')->middleware('permission:hse.employees.view'); - Route::post('/simper-types', [SimperTypeController::class, 'store'])->name('simper_types.store')->middleware('permission:hse.employees.create|hse.employees.edit'); - Route::put('/simper-types/{id}', [SimperTypeController::class, 'update'])->name('simper_types.update')->middleware('permission:hse.employees.edit'); - Route::delete('/simper-types/{id}', [SimperTypeController::class, 'destroy'])->name('simper_types.destroy')->middleware('permission:hse.employees.edit'); + Route::get('/simper-types', [SimperTypeController::class, 'index'])->name('simper_types.index')->middleware('permission:hse.simper_types.view|hse.employees.view'); + Route::post('/simper-types', [SimperTypeController::class, 'store'])->name('simper_types.store')->middleware('permission:hse.simper_types.create|hse.employees.create|hse.employees.edit'); + Route::put('/simper-types/{id}', [SimperTypeController::class, 'update'])->name('simper_types.update')->middleware('permission:hse.simper_types.edit|hse.employees.edit'); + Route::delete('/simper-types/{id}', [SimperTypeController::class, 'destroy'])->name('simper_types.destroy')->middleware('permission:hse.simper_types.delete|hse.employees.edit'); }); // 3. Modul QMA: Admin QMA - Dashboard, Data Kendaraan & Log Aktivitas diff --git a/tests/TestCase.php b/tests/TestCase.php index 51015c7..25f8268 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -19,7 +19,7 @@ abstract class TestCase extends BaseTestCase { parent::setUp(); - if (Schema::hasTable('permissions') && \Spatie\Permission\Models\Permission::count() === 0) { + if (Schema::hasTable('roles') && \Spatie\Permission\Models\Role::where('name', 'super_admin')->count() === 0) { $this->seed(RolePermissionSeeder::class); }