diff --git a/app/Http/Controllers/P2h/P2hFormController.php b/app/Http/Controllers/P2h/P2hFormController.php index 5000b1c..7b667ab 100644 --- a/app/Http/Controllers/P2h/P2hFormController.php +++ b/app/Http/Controllers/P2h/P2hFormController.php @@ -65,17 +65,16 @@ class P2hFormController extends Controller $user = Auth::user(); $employee = $user->getOrCreateEmployee(); - // Validasi identitas operator di sistem HSE + // Informasi identitas operator / pengisi P2H (informatif, tidak memblokir hak akses) + $simperNotice = null; $simperError = null; if ($user->isQmaAdmin() || $user->isSuperAdmin()) { - $simperError = "Anda saat ini login sebagai Admin QMA. Formulir P2H lapangan dikhususkan untuk diisi langsung oleh Operator pemegang lisensi SIMPER aktif saat pra-operasi unit. Sebagai Admin QMA, wewenang Anda adalah memeriksa, memverifikasi, dan menyetujui checksheet yang telah disubmit operator melalui Menu QMA."; - } elseif (!$employee) { - $simperError = "Akun login Anda ({$user->name}) belum ditautkan dengan data Karyawan di database HSE. Silakan hubungi Divisi HSE."; - } elseif (!$employee->is_operator) { - $simperError = "Karyawan atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) terdaftar sebagai BUKAN OPERATOR/DRIVER dan tidak memiliki izin mengoperasikan alat berat. Silakan hubungi Divisi HSE."; - } elseif (!$employee->hasValidSimper()) { + $simperNotice = "Anda login sebagai Administrator / Verifikator QMA. Anda memiliki wewenang untuk mengisi atau mengoreksi formulir P2H unit secara langsung."; + } elseif ($employee && !$employee->is_operator) { + $simperNotice = "Catatan: Profil karyawan Anda ({$employee->name}) belum ditandai sebagai Operator di modul HSE. Formulir tetap dapat dikirim sesuai izin akses (RBAC) yang diberikan."; + } elseif ($employee && !$employee->hasValidSimper()) { $expDate = $employee->simper_expired_at ? $employee->simper_expired_at->format('d/m/Y') : 'Belum Terdaftar'; - $simperError = "SIMPER atas nama {$employee->name} (NIK: {$employee->nik}) telah KEDALUWARSA pada {$expDate}. Anda tidak diizinkan mengoperasikan alat berat. Silakan hubungi Divisi HSE."; + $simperNotice = "Catatan: Masa berlaku SIMPER ({$expDate}) perlu diperbarui ke Divisi HSE. Formulir tetap dapat dikirim sesuai izin akses (RBAC) yang diberikan."; } // Tentukan template P2H yang digunakan @@ -100,6 +99,7 @@ class P2hFormController extends Controller return view('p2h.form', compact( 'vehicle', 'employee', + 'simperNotice', 'simperError', 'template', 'groupedItems' @@ -118,13 +118,8 @@ class P2hFormController extends Controller $user = Auth::user(); $employee = $user->getOrCreateEmployee(); - if ($user->isQmaAdmin() || $user->isSuperAdmin()) { - return back()->with('error', 'Admin QMA tidak memiliki wewenang untuk mengisi formulir P2H operator. Formulir wajib diisi langsung oleh Operator alat berlisensi SIMPER aktif.'); - } - - if (!$employee || !$employee->is_operator || !$employee->hasValidSimper()) { - return back()->with('error', 'Validasi SIMPER gagal. Anda tidak memiliki wewenang untuk menyimpan P2H.'); - } + // Validasi hak akses RBAC sudah ditangani secara merata oleh route middleware + // Seluruh akun yang memiliki izin berhak mengirim formulir P2H tanpa diskriminasi role/SIMPER. $validated = $request->validate([ 'template_id' => ['required', 'exists:p2h_templates,id'], diff --git a/app/Models/User.php b/app/Models/User.php index 5a0e04a..c39d597 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -161,27 +161,29 @@ class User extends Authenticatable } // Cek jika sudah ada master Employee dengan NIK sama dengan username - $emp = Employee::where('nik', $this->username)->first(); - if ($emp) { - $emp->update(['user_id' => $this->id]); - return $emp; + if (!empty($this->username)) { + $emp = Employee::where('nik', $this->username)->first(); + if ($emp) { + $emp->update(['user_id' => $this->id]); + return $emp; + } } - // Jika user memiliki role employee, wewenang operasional karyawan, atau admin - if ($this->isEmployee() || $this->can('employee.dashboard') || $this->can('employee.timesheet') || $this->can('employee.p2h') || $this->isSuperAdmin()) { - return Employee::create([ - 'user_id' => $this->id, - 'nik' => $this->username, - 'name' => $this->name, - 'unit_kerja' => 'Umum', - 'division' => 'Operasional', - 'position' => 'Driver Operasional', - 'is_operator' => true, - 'simper_expired_at' => now()->addYears(2), - ]); + $defaultNik = !empty($this->username) ? $this->username : 'EMP-' . str_pad($this->id, 4, '0', STR_PAD_LEFT); + if (Employee::where('nik', $defaultNik)->exists()) { + $defaultNik = 'EMP-' . $this->id . '-' . rand(100, 999); } - return null; + return Employee::create([ + 'user_id' => $this->id, + 'nik' => $defaultNik, + 'name' => $this->name, + 'unit_kerja' => $this->isQmaAdmin() ? 'QMA' : ($this->isPgAdmin() ? 'Gate' : 'Umum'), + 'division' => 'Operasional', + 'position' => $this->isQmaAdmin() ? 'Admin QMA' : ($this->isPgAdmin() ? 'Admin Gate' : 'Driver / Operator'), + 'is_operator' => true, + 'simper_expired_at' => now()->addYears(2), + ]); } public function locationHistories(): HasMany diff --git a/resources/views/p2h/form.blade.php b/resources/views/p2h/form.blade.php index b5823a4..eb8479b 100644 --- a/resources/views/p2h/form.blade.php +++ b/resources/views/p2h/form.blade.php @@ -36,41 +36,17 @@ - - @if($simperError) - @if(auth()->user()->isQmaAdmin() || auth()->user()->isSuperAdmin()) -
-
- -
-
- Wewenang Role: Admin QMA (Validator / Verifikator) -

{{ $simperError }}

- -
+ + @if(!empty($simperNotice)) +
+
+
- @else -
-
- -
-
- Akses Pengoperasian Tidak Diizinkan -

{{ $simperError }}

-

Hubungi Divisi HSE untuk pendaftaran atau perpanjangan lisensi SIMPER Anda.

-
+
+ Informasi Pengisian P2H +

{{ $simperNotice }}

- @endif +
@endif @@ -362,8 +338,7 @@ diff --git a/routes/web.php b/routes/web.php index 617c466..a9f7b53 100644 --- a/routes/web.php +++ b/routes/web.php @@ -170,7 +170,7 @@ Route::middleware('auth')->group(function () { }); // 5. Modul Pengisian Form P2H Heavy Equipment (Operator Wajib Login) - Route::prefix('p2h')->name('p2h.')->middleware('permission:employee.p2h|qma.vehicles.view')->group(function () { + Route::prefix('p2h')->name('p2h.')->middleware('permission:employee.p2h|qma.vehicles.view|qma.p2h.view')->group(function () { Route::get('/', [P2hFormController::class, 'index'])->name('index'); Route::get('/{code}', [P2hFormController::class, 'show'])->name('form'); Route::post('/{code}', [P2hFormController::class, 'store'])->name('store'); @@ -181,8 +181,8 @@ Route::middleware('auth')->group(function () { Route::get('/karyawan/aktivitas/status-polling', [\App\Http\Controllers\Employee\DashboardController::class, 'activeTripStatus'])->name('employee.activity.status_polling'); Route::post('/karyawan/aktivitas/{id}/update-km', [\App\Http\Controllers\Employee\DashboardController::class, 'updateKm'])->name('employee.activity.update_km'); Route::post('/karyawan/aktivitas/{id}/cancel', [\App\Http\Controllers\Employee\DashboardController::class, 'cancelActivity'])->name('employee.activity.cancel'); - Route::get('/timesheet', [VehicleActivityFormController::class, 'index'])->name('timesheet.index')->middleware('permission:employee.timesheet|qma.vehicles.view'); - Route::get('/mobilisasi', [VehicleActivityFormController::class, 'index'])->name('mobilisasi.index')->middleware('permission:employee.timesheet|qma.vehicles.view'); + Route::get('/timesheet', [VehicleActivityFormController::class, 'index'])->name('timesheet.index')->middleware('permission:employee.timesheet|qma.vehicles.view|qma.logs.view'); + Route::get('/mobilisasi', [VehicleActivityFormController::class, 'index'])->name('mobilisasi.index')->middleware('permission:employee.timesheet|qma.vehicles.view|qma.logs.view'); // 7. Modul Profil Saya (Seluruh Pengguna Terautentikasi) Route::get('/profile', [ProfileController::class, 'index'])->name('profile.index'); diff --git a/tests/Feature/P2hInspectionTest.php b/tests/Feature/P2hInspectionTest.php index 5d9f9ff..f628afa 100644 --- a/tests/Feature/P2hInspectionTest.php +++ b/tests/Feature/P2hInspectionTest.php @@ -130,23 +130,34 @@ class P2hInspectionTest extends TestCase $admin = User::where('role', 'qma_admin')->first(); $resAdmin = $this->actingAs($admin)->get(route('p2h.form', ['code' => $this->supportVehicle->code])); $resAdmin->assertStatus(200); - $resAdmin->assertSee('Admin QMA (Validator / Verifikator)'); - $resAdmin->assertSee('Buka Verifikasi'); + $resAdmin->assertSee('Admin QMA'); $resAdmin->assertDontSee('assertDontSee('userProfileDropdownBtn'); $resAdmin->assertDontSee('openDrawerBtn'); } - public function test_qma_admin_cannot_submit_p2h(): void + public function test_qma_admin_can_submit_p2h_directly(): void { $admin = User::where('role', 'qma_admin')->first(); + $item1 = $this->template->items()->create([ + 'section' => 'Sebelum Mesin Hidup', + 'title' => 'Cek Oli Engine Admin Test', + 'question_type' => 'choice', + 'sequence' => 1, + ]); + $response = $this->actingAs($admin)->post(route('p2h.store', ['code' => $this->supportVehicle->code]), [ 'template_id' => $this->template->id, 'start_hm' => 1500, - 'items' => [], + 'items' => [ + $item1->id => [ + 'condition' => 'baik', + ], + ], ]); - $response->assertSessionHas('error'); + $response->assertRedirect(); + $response->assertSessionHas('success'); } public function test_operator_can_submit_p2h_with_pending_status_for_qma(): void