From e2054dcb8a470a55a8d9fb3f61804130a90b49fd Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Sun, 1 Nov 2026 23:18:17 +0700 Subject: [PATCH] feat: resolve audit items (multi-simper hse dashboard & export, soft-delete conflict handling, p2h blank initial state, qma breakdown recovery, and exclude lv from transporter) --- app/Http/Controllers/Admin/UserController.php | 50 +++++++++--- .../Controllers/Hse/EmployeeController.php | 77 ++++++++++++++----- .../Qma/P2hInspectionController.php | 7 +- .../Qma/SupportTimesheetController.php | 22 +++++- .../Qma/UnitTransferController.php | 15 +++- app/Services/SimperPdfExporter.php | 55 +++++++------ resources/views/hse/dashboard.blade.php | 17 ++++ resources/views/p2h/form.blade.php | 24 +++++- 8 files changed, 204 insertions(+), 63 deletions(-) diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index d9ee4fe..ca25492 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -74,8 +74,8 @@ class UserController extends Controller { $validated = $request->validate([ 'name' => ['required', 'string', 'max:255'], - 'username' => ['required', 'string', 'max:50', 'unique:users,username'], - 'email' => ['required', 'string', 'email', 'max:255', 'unique:users,email'], + 'username' => ['required', 'string', 'max:50', Rule::unique('users', 'username')->whereNull('deleted_at')], + 'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users', 'email')->whereNull('deleted_at')], 'password' => ['required', 'string', 'min:6'], 'role' => ['required', 'string', 'exists:roles,name'], 'gate_id' => ['nullable', 'exists:gates,id'], @@ -102,15 +102,38 @@ class UserController extends Controller $photoPath = ImageCompressionService::uploadAndCompress($request->file('photo'), 'employees', 500, 500, 80); } - $user = User::create([ - 'name' => $validated['name'], - 'username' => $validated['username'], - 'email' => $validated['email'], - 'password' => Hash::make($validated['password']), - 'role' => $validated['role'], // Simpan ke kolom legacy untuk backwards-compat - 'gate_id' => $validated['gate_id'] ?? null, - 'photo_path' => $photoPath, - ]); + $user = User::withTrashed() + ->where('username', $validated['username']) + ->orWhere('email', $validated['email']) + ->first(); + + if ($user) { + if ($user->trashed()) { + $user->restore(); + } + $userData = [ + 'name' => $validated['name'], + 'username' => $validated['username'], + 'email' => $validated['email'], + 'password' => Hash::make($validated['password']), + 'role' => $validated['role'], + 'gate_id' => $validated['gate_id'] ?? null, + ]; + if ($photoPath) { + $userData['photo_path'] = $photoPath; + } + $user->update($userData); + } else { + $user = User::create([ + 'name' => $validated['name'], + 'username' => $validated['username'], + 'email' => $validated['email'], + 'password' => Hash::make($validated['password']), + 'role' => $validated['role'], // Simpan ke kolom legacy untuk backwards-compat + 'gate_id' => $validated['gate_id'] ?? null, + 'photo_path' => $photoPath, + ]); + } // Assign Spatie Role $user->assignRole($validated['role']); @@ -141,7 +164,7 @@ class UserController extends Controller $defaultDivision = ($isGateOfficer || $isPgAdmin) ? 'Private Guard' : '-'; $defaultPosition = $isGateOfficer ? 'Anggota' : ($isPgAdmin ? 'Admin PG' : ($isEmployeeRole ? 'Driver Operasional' : '-')); - $emp = Employee::where('user_id', $user->id)->orWhere('nik', $user->username)->first(); + $emp = Employee::withTrashed()->where('user_id', $user->id)->orWhere('nik', $user->username)->first(); $empData = [ 'user_id' => $user->id, 'nik' => $user->username, @@ -154,6 +177,9 @@ class UserController extends Controller 'photo_path' => $photoPath ?: $emp?->photo_path, ]; if ($emp) { + if ($emp->trashed()) { + $emp->restore(); + } $emp->update($empData); } else { Employee::create($empData); diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index 03c9aa4..c0134d1 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -17,6 +17,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; +use Illuminate\Validation\Rule; use Illuminate\View\View; class EmployeeController extends Controller @@ -42,9 +43,10 @@ class EmployeeController extends Controller ->take(5) ->get(); - // 2. Monitoring Status & Masa Berlaku SIMPER (Prioritas Kedaluwarsa & Segera Habis) + // 2. Monitoring Status & Masa Berlaku SIMPER (Prioritas Kedaluwarsa & Segera Habis dengan Dukungan Multi-SIMPER) $today = now()->toDateString(); $simperLogs = Employee::where('is_operator', true) + ->with(['simpers.simperType']) ->orderByRaw("CASE WHEN simper_expired_at IS NULL THEN 1 WHEN simper_expired_at < ? THEN 0 @@ -209,6 +211,7 @@ class EmployeeController extends Controller 'Unit Kerja' => 20, 'Divisi' => 20, 'Status Driver' => 16, + 'Jenis Izin SIMPER' => 24, 'Masa Berlaku SIMPER' => 22, 'Status SIMPER' => 24, ]; @@ -221,6 +224,13 @@ class EmployeeController extends Controller $isDriver = $emp->is_operator; $expDate = $emp->simper_expired_at ? $emp->simper_expired_at->format('d/m/Y') : '-'; + // Ambil rincian seluruh kode SIMPER yang dipegang + $simperList = $emp->simpers->map(function ($s) { + $code = $s->simperType?->code ?: 'SIMPER'; + return str_replace('SIMPER-', '', $code); + })->filter()->unique()->values(); + $simperTypesText = $simperList->isNotEmpty() ? $simperList->join(', ') : ($isDriver ? 'LV (Default)' : '-'); + if (! $isDriver) { $statusText = 'Bukan Driver'; } elseif (! $emp->simper_expired_at) { @@ -242,6 +252,7 @@ class EmployeeController extends Controller $emp->unit_kerja ?: '-', $emp->division ?: '-', $isDriver ? 'Driver' : 'Bukan Driver', + $simperTypesText, $expDate, $statusText, ]; @@ -256,6 +267,7 @@ class EmployeeController extends Controller 'left', // Unit Kerja 'left', // Divisi 'center', // Status Driver + 'center', // Jenis Izin SIMPER 'center', // Masa Berlaku 'center', // Status SIMPER ]; @@ -580,7 +592,7 @@ class EmployeeController extends Controller public function store(Request $request): RedirectResponse { $validated = $request->validate([ - 'nik' => ['required', 'string', 'max:50', 'unique:employees,nik'], + 'nik' => ['required', 'string', 'max:50', Rule::unique('employees', 'nik')->whereNull('deleted_at')], 'name' => ['required', 'string', 'max:100'], 'unit_kerja' => ['required', 'string'], 'division' => ['required', 'string'], @@ -613,15 +625,24 @@ class EmployeeController extends Controller $employeeType = 'Karyawan'; } - $user = User::firstOrCreate( - ['username' => $validated['nik']], - [ + $user = User::withTrashed()->where('username', $validated['nik'])->first(); + if ($user) { + if ($user->trashed()) { + $user->restore(); + } + $user->update([ + 'name' => $validated['name'], + 'role' => $user->role ?: 'employee', + ]); + } else { + $user = User::create([ + 'username' => $validated['nik'], 'name' => $validated['name'], 'email' => strtolower(str_replace(['-', ' '], '', $validated['nik'])) . '@kmh.co.id', 'password' => Hash::make(config('auth.default_employee_password', '123456')), 'role' => 'employee', - ] - ); + ]); + } if (!$user->hasRole('employee')) { $user->assignRole('employee'); @@ -633,18 +654,36 @@ class EmployeeController extends Controller $user->update(['photo_path' => $photoPath]); } - $employee = Employee::create([ - 'nik' => $validated['nik'], - 'name' => $validated['name'], - 'employee_type' => $employeeType, - 'unit_kerja' => $validated['unit_kerja'], - 'division' => $validated['division'], - 'position' => $validated['position'], - 'is_operator' => $isOperator, - 'simper_expired_at' => $simperExpiredAt, - 'photo_path' => $photoPath, - 'user_id' => $user->id, - ]); + $employee = Employee::withTrashed()->where('nik', $validated['nik'])->first(); + if ($employee) { + if ($employee->trashed()) { + $employee->restore(); + } + $employee->update([ + 'name' => $validated['name'], + 'employee_type' => $employeeType, + 'unit_kerja' => $validated['unit_kerja'], + 'division' => $validated['division'], + 'position' => $validated['position'], + 'is_operator' => $isOperator, + 'simper_expired_at' => $simperExpiredAt, + 'photo_path' => $photoPath ?? $employee->photo_path, + 'user_id' => $user->id, + ]); + } else { + $employee = Employee::create([ + 'nik' => $validated['nik'], + 'name' => $validated['name'], + 'employee_type' => $employeeType, + 'unit_kerja' => $validated['unit_kerja'], + 'division' => $validated['division'], + 'position' => $validated['position'], + 'is_operator' => $isOperator, + 'simper_expired_at' => $simperExpiredAt, + 'photo_path' => $photoPath, + 'user_id' => $user->id, + ]); + } // Sinkronisasi Multi-SIMPER Personil $this->syncEmployeeSimpers($employee, $request, $isOperator, $simperExpiredAt); diff --git a/app/Http/Controllers/Qma/P2hInspectionController.php b/app/Http/Controllers/Qma/P2hInspectionController.php index 6b8f667..6a17c52 100644 --- a/app/Http/Controllers/Qma/P2hInspectionController.php +++ b/app/Http/Controllers/Qma/P2hInspectionController.php @@ -735,8 +735,11 @@ class P2hInspectionController extends Controller ]); // Jika unit dinyatakan aman dan sebelumnya breakdown karena review, status unit disetujui operasi - if (!$record->hasDefects() && $record->vehicle->status === 'Breakdown') { - $record->vehicle->update(['status' => 'Operation']); + if (!$record->hasDefects() && $record->vehicle && $record->vehicle->status === 'Breakdown') { + $record->vehicle->update([ + 'status' => 'Operation', + 'location_note' => "Status dipulihkan ke Operation pasca persetujuan P2H {$record->transaction_no}", + ]); } return back()->with('success', "Inspeksi P2H [{$record->transaction_no}] untuk unit {$record->vehicle->code} berhasil DISETUJUI."); diff --git a/app/Http/Controllers/Qma/SupportTimesheetController.php b/app/Http/Controllers/Qma/SupportTimesheetController.php index 011ff89..58b4307 100644 --- a/app/Http/Controllers/Qma/SupportTimesheetController.php +++ b/app/Http/Controllers/Qma/SupportTimesheetController.php @@ -144,8 +144,14 @@ class SupportTimesheetController extends Controller $activeUnitsCount = $statsItems->pluck('vehicle_id')->unique()->count(); $breakdownCount = $statsItems->where('status', 'Breakdown')->count(); - // Data Master untuk Form & Filter + // Data Master untuk Form & Filter (Alat Berat / Heavy Equipment - Bebas dari Unit LV) $unitSupports = Vehicle::unitSupports() + ->where('category', '!=', 'light_vehicle') + ->where(function (Builder $q) { + $q->where('code', 'not like', 'LV %') + ->where('code', 'not like', 'LV-%') + ->where('code', 'not like', 'LV_%'); + }) ->where(function (Builder $q) { $q->whereNotNull('parent_id') ->orWhereDoesntHave('units'); @@ -425,7 +431,12 @@ class SupportTimesheetController extends Controller ]); }); - return back()->with('success', "Timesheet {$timesheetNo} untuk unit {$vehicle->code} berhasil disimpan."); + $successMsg = "Timesheet {$timesheetNo} untuk unit {$vehicle->code} berhasil disimpan."; + if ($operatingHours !== null && $operatingHours > 24) { + $successMsg .= " (Catatan: Total waktu operasi tercatat {$operatingHours} HM/Jam [> 24 jam]. Harap periksa apakah angka Start HM atau End HM sudah sesuai)."; + } + + return back()->with('success', $successMsg); } /** @@ -527,7 +538,12 @@ class SupportTimesheetController extends Controller 'notes' => $validated['notes'] ?? null, ]); - return back()->with('success', "Timesheet {$timesheet->timesheet_no} berhasil diperbarui."); + $successMsg = "Timesheet {$timesheet->timesheet_no} berhasil diperbarui."; + if ($operatingHours !== null && $operatingHours > 24) { + $successMsg .= " (Catatan: Total waktu operasi tercatat {$operatingHours} HM/Jam [> 24 jam]. Harap periksa apakah angka Start HM atau End HM sudah sesuai)."; + } + + return back()->with('success', $successMsg); } /** diff --git a/app/Http/Controllers/Qma/UnitTransferController.php b/app/Http/Controllers/Qma/UnitTransferController.php index dc50997..03c6115 100644 --- a/app/Http/Controllers/Qma/UnitTransferController.php +++ b/app/Http/Controllers/Qma/UnitTransferController.php @@ -143,9 +143,18 @@ class UnitTransferController extends Controller ->map(fn($group) => $group->count()) ->sortKeys(); - // 2. Daftar unit kendaraan kita untuk armada pengangkut (Truk, Flatbed, Lowbed, Towing, LV, dsb.) - $transporterUnits = Vehicle::trackableUnits() - ->orderBy('category') + // 2. Daftar armada pengangkut khusus truk/alat angkut (Truk, Flatbed, Lowbed, Towing, dsb. - Eksklusif Non-LV) + $transporterUnits = Vehicle::where('category', '!=', 'light_vehicle') + ->where(function (Builder $q) { + $q->where('code', 'not like', 'LV %') + ->where('code', 'not like', 'LV-%') + ->where('code', 'not like', 'LV/%') + ->where('code', 'not like', 'LV_%'); + }) + ->where(function (Builder $q) { + $q->whereNotNull('parent_id') + ->orWhereDoesntHave('units'); + }) ->orderBy('code') ->get(); diff --git a/app/Services/SimperPdfExporter.php b/app/Services/SimperPdfExporter.php index 338d4e0..376d657 100644 --- a/app/Services/SimperPdfExporter.php +++ b/app/Services/SimperPdfExporter.php @@ -104,14 +104,15 @@ class SimperPdfExporter extends FPDF $this->SetFont('Arial', 'B', 7.5); $cols = [ - ['NO', 10, 'C'], - ['NIK', 30, 'C'], - ['NAMA KARYAWAN', 62, 'L'], - ['JABATAN', 45, 'L'], - ['UNIT / DIVISI', 40, 'L'], - ['STATUS DRIVER', 26, 'C'], - ['MASA BERLAKU', 26, 'C'], - ['STATUS SIMPER', 28, 'C'], + ['NO', 8, 'C'], + ['NIK', 25, 'C'], + ['NAMA KARYAWAN', 52, 'L'], + ['JABATAN', 38, 'L'], + ['UNIT / DIVISI', 34, 'L'], + ['DRIVER', 22, 'C'], + ['JENIS SIMPER', 34, 'C'], + ['MASA BERLAKU', 25, 'C'], + ['STATUS', 29, 'C'], ]; foreach ($cols as $col) { @@ -180,32 +181,42 @@ class SimperPdfExporter extends FPDF // Kolom 1: No $pdf->SetFont('Arial', '', 7.5); - $pdf->Cell(10, 6.5, (string) ($idx + 1), 'B', 0, 'C', $fill); + $pdf->Cell(8, 6.5, (string) ($idx + 1), 'B', 0, 'C', $fill); // Kolom 2: NIK (Bold) $pdf->SetFont('Arial', 'B', 7.5); - $pdf->Cell(30, 6.5, $emp->nik, 'B', 0, 'C', $fill); + $pdf->Cell(25, 6.5, $emp->nik, 'B', 0, 'C', $fill); - // Kolom 3: Nama Lengkap (Bold, Truncate jika > 36 karakter) - $nama = mb_strimwidth($emp->name, 0, 36, '...'); - $pdf->Cell(62, 6.5, ' ' . $nama, 'B', 0, 'L', $fill); + // Kolom 3: Nama Lengkap (Bold, Truncate jika > 30 karakter) + $nama = mb_strimwidth($emp->name, 0, 30, '...'); + $pdf->Cell(52, 6.5, ' ' . $nama, 'B', 0, 'L', $fill); // Kolom 4: Jabatan $pdf->SetFont('Arial', '', 7.5); - $jabatan = mb_strimwidth($emp->position ?: '-', 0, 26, '...'); - $pdf->Cell(45, 6.5, ' ' . $jabatan, 'B', 0, 'L', $fill); + $jabatan = mb_strimwidth($emp->position ?: '-', 0, 22, '...'); + $pdf->Cell(38, 6.5, ' ' . $jabatan, 'B', 0, 'L', $fill); // Kolom 5: Unit / Divisi - $unit = mb_strimwidth($emp->unit_kerja ?: ($emp->division ?: '-'), 0, 24, '...'); - $pdf->Cell(40, 6.5, ' ' . $unit, 'B', 0, 'L', $fill); + $unit = mb_strimwidth($emp->unit_kerja ?: ($emp->division ?: '-'), 0, 20, '...'); + $pdf->Cell(34, 6.5, ' ' . $unit, 'B', 0, 'L', $fill); // Kolom 6: Status Driver - $pdf->Cell(26, 6.5, $isDriver ? 'Driver' : 'Non-Driver', 'B', 0, 'C', $fill); + $pdf->Cell(22, 6.5, $isDriver ? 'Driver' : 'Non-Driver', 'B', 0, 'C', $fill); - // Kolom 7: Masa Berlaku - $pdf->Cell(26, 6.5, $expDate, 'B', 0, 'C', $fill); + // Kolom 7: Rincian Jenis SIMPER + $simperList = $emp->simpers->map(function ($s) { + $code = $s->simperType?->code ?: 'SIMPER'; + return str_replace('SIMPER-', '', $code); + })->filter()->unique()->values(); + $simperTypesText = $simperList->isNotEmpty() ? $simperList->join(', ') : ($isDriver ? 'LV' : '-'); + $pdf->SetFont('Arial', 'B', 7); + $pdf->Cell(34, 6.5, $simperTypesText, 'B', 0, 'C', $fill); - // Kolom 8: Status SIMPER (Berwarna) + // Kolom 8: Masa Berlaku + $pdf->SetFont('Arial', '', 7.5); + $pdf->Cell(25, 6.5, $expDate, 'B', 0, 'C', $fill); + + // Kolom 9: Status SIMPER (Berwarna) if ($statusText === 'Masih Berlaku') { $pdf->SetTextColor(4, 120, 87); // #047857 Green } elseif ($statusText === 'Segera Habis') { @@ -216,7 +227,7 @@ class SimperPdfExporter extends FPDF $pdf->SetTextColor(100, 116, 139); // #64748b Slate } $pdf->SetFont('Arial', 'B', 7.5); - $pdf->Cell(28, 6.5, $statusText, 'B', 0, 'C', $fill); + $pdf->Cell(29, 6.5, $statusText, 'B', 0, 'C', $fill); $pdf->Ln(); $fill = ! $fill; diff --git a/resources/views/hse/dashboard.blade.php b/resources/views/hse/dashboard.blade.php index c4a9bda..5fb46cb 100644 --- a/resources/views/hse/dashboard.blade.php +++ b/resources/views/hse/dashboard.blade.php @@ -197,6 +197,23 @@ Berlaku s.d. {{ $log->simper_expired_at->locale('id')->translatedFormat('d M Y') }} ({{ $log->simper_expired_at->locale('id')->diffForHumans() }})

@endif + + + @if($log->simpers && $log->simpers->isNotEmpty()) +
+ @foreach($log->simpers as $smp) + @php + $smpValid = $smp->isValid(); + $smpCode = $smp->simperType?->code ?: 'SIMPER'; + $shortCode = str_replace('SIMPER-', '', $smpCode); + @endphp + + + {{ $shortCode }}: {{ $smp->expired_at ? $smp->expired_at->format('d/m/y') : '-' }} + + @endforeach +
+ @endif diff --git a/resources/views/p2h/form.blade.php b/resources/views/p2h/form.blade.php index 24c83c7..c47120e 100644 --- a/resources/views/p2h/form.blade.php +++ b/resources/views/p2h/form.blade.php @@ -218,13 +218,13 @@ @if(in_array($item->question_type, ['choice', 'condition', 'Multiple choice: only one answer', 'Matrix'])) - +