From 9897404f6152f0f75d04ebdb5ec51990a2397b57 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Sun, 25 Oct 2026 22:34:11 +0700 Subject: [PATCH] feat: implement flexible hse simper types, multi-simper personil, and mobile heavy timesheet integration --- .../SyncTimesheetMobileUnitsCommand.php | 119 +++++ .../Controllers/Hse/EmployeeController.php | 79 ++- .../Controllers/Hse/SimperTypeController.php | 106 ++++ .../Pg/VerificationLogController.php | 2 +- .../Public/VehicleActivityFormController.php | 87 +-- .../Controllers/Qma/ActivityLogController.php | 2 +- .../Qma/SupportTimesheetController.php | 3 +- .../Controllers/Qma/VehicleController.php | 20 +- .../Requests/StoreVehicleActivityRequest.php | 11 +- app/Models/Employee.php | 97 ++++ app/Models/EmployeeSimper.php | 64 +++ app/Models/SimperType.php | 55 ++ app/Models/Vehicle.php | 29 + ...mper_types_and_employee_simpers_tables.php | 156 ++++++ resources/views/hse/employees_index.blade.php | 264 +++++++++- .../views/hse/simper_types_index.blade.php | 496 ++++++++++++++++++ resources/views/layouts/app.blade.php | 11 + resources/views/mobilisasi/index.blade.php | 45 +- .../views/pg/verification_logs.blade.php | 11 +- .../public/vehicle_activity_form.blade.php | 17 +- resources/views/qma/activity_log.blade.php | 11 +- .../qma/vehicles_support_units.blade.php | 79 ++- routes/web.php | 7 + tests/Feature/HseSimperTypeTest.php | 192 +++++++ .../VehicleActivitySimperValidationTest.php | 203 +++++++ 25 files changed, 2096 insertions(+), 70 deletions(-) create mode 100644 app/Console/Commands/SyncTimesheetMobileUnitsCommand.php create mode 100644 app/Http/Controllers/Hse/SimperTypeController.php create mode 100644 app/Models/EmployeeSimper.php create mode 100644 app/Models/SimperType.php create mode 100644 database/migrations/2026_10_25_214800_create_simper_types_and_employee_simpers_tables.php create mode 100644 resources/views/hse/simper_types_index.blade.php create mode 100644 tests/Feature/HseSimperTypeTest.php create mode 100644 tests/Feature/VehicleActivitySimperValidationTest.php diff --git a/app/Console/Commands/SyncTimesheetMobileUnitsCommand.php b/app/Console/Commands/SyncTimesheetMobileUnitsCommand.php new file mode 100644 index 0000000..41dd2f4 --- /dev/null +++ b/app/Console/Commands/SyncTimesheetMobileUnitsCommand.php @@ -0,0 +1,119 @@ +option('file') ?: base_path('Berkas/DATA LOKASI TERBARU RKM KMH.xlsx'); + + if (!file_exists($filePath)) { + $this->error("File Excel tidak ditemukan pada path: {$filePath}"); + return Command::FAILURE; + } + + $this->info("Membaca data dari: {$filePath}"); + $rows = SimpleXlsxImporter::parse($filePath); + + if (empty($rows)) { + $this->error("Gagal membaca atau file Excel kosong."); + return Command::FAILURE; + } + + $simperCode = $this->option('simper') ?: 'SIMPER-DT'; + $simperType = SimperType::where('code', $simperCode)->first(); + + if (!$simperType) { + $this->warn("SIMPER type dengan kode '{$simperCode}' belum ada. Menggunakan SIMPER pertama atau default."); + $simperType = SimperType::first(); + } + + $simperTypeId = $simperType ? $simperType->id : null; + $this->info("SIMPER yang diasosiasikan: " . ($simperType ? "{$simperType->name} ({$simperType->code})" : 'None')); + + $matchedCount = 0; + $unmatchedCount = 0; + $updatedList = []; + + foreach ($rows as $index => $row) { + if ($index === 0) { + continue; // Skip header + } + + $jenis = isset($row[7]) ? trim((string) $row[7]) : ''; + if (strtoupper($jenis) !== 'TIMESHEET MOBILE') { + continue; + } + + $code1 = isset($row[4]) ? trim((string) $row[4]) : ''; + $code2 = isset($row[5]) ? trim((string) $row[5]) : ''; + $desc = isset($row[6]) ? trim((string) $row[6]) : ''; + $lokasi = isset($row[8]) ? trim((string) $row[8]) : ''; + + $vehicle = Vehicle::where('code', $code1) + ->orWhere('code', $code2) + ->orWhere('license_plate', $code1) + ->orWhere('license_plate', $code2) + ->first(); + + if ($vehicle) { + $vehicle->is_timesheet_mobile = true; + if ($simperTypeId) { + $vehicle->required_simper_type_id = $simperTypeId; + } + if ($lokasi && empty($vehicle->location)) { + $vehicle->location = $lokasi; + } + $vehicle->save(); + + $matchedCount++; + if (count($updatedList) < 15) { + $updatedList[] = [ + 'code' => $vehicle->code, + 'category' => $vehicle->category, + 'unit_type' => $vehicle->unit_type ?: $desc, + 'required_simper' => $simperType ? $simperType->code : '-', + ]; + } + } else { + $unmatchedCount++; + $this->warn("Tidak ditemukan unit di database: Code1='{$code1}', Code2='{$code2}'"); + } + } + + $this->newLine(); + $this->table(['Unit Code', 'Kategori', 'Tipe Unit', 'Wajib SIMPER'], $updatedList); + + $this->info("Berhasil sinkronisasi {$matchedCount} unit heavy equipment mobile ke Timesheet!"); + if ($unmatchedCount > 0) { + $this->warn("Terdapat {$unmatchedCount} unit yang tidak cocok di database."); + } + + return Command::SUCCESS; + } +} diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index b700a96..254560d 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -4,6 +4,8 @@ namespace App\Http\Controllers\Hse; use App\Http\Controllers\Controller; use App\Models\Employee; +use App\Models\EmployeeSimper; +use App\Models\SimperType; use App\Models\User; use App\Services\ImageCompressionService; use App\Services\SimperPdfExporter; @@ -73,7 +75,7 @@ class EmployeeController extends Controller */ private function getFilteredEmployees(Request $request): Builder { - $query = Employee::query(); + $query = Employee::with(['simpers.simperType']); // 1. Pencarian Kata Kunci (NIK, Nama, Jabatan, Unit, Divisi) if ($request->filled('search')) { @@ -156,7 +158,9 @@ class EmployeeController extends Controller $employeeTypes[] = 'Sukon'; } - return view('hse.employees_index', compact('employees', 'employeeTypes')); + $availableSimperTypes = SimperType::active()->orderBy('name')->get(); + + return view('hse.employees_index', compact('employees', 'employeeTypes', 'availableSimperTypes')); } /** @@ -613,7 +617,7 @@ class EmployeeController extends Controller $user->update(['photo_path' => $photoPath]); } - Employee::create([ + $employee = Employee::create([ 'nik' => $validated['nik'], 'name' => $validated['name'], 'employee_type' => $employeeType, @@ -626,6 +630,9 @@ class EmployeeController extends Controller 'user_id' => $user->id, ]); + // Sinkronisasi Multi-SIMPER Personil + $this->syncEmployeeSimpers($employee, $request, $isOperator, $simperExpiredAt); + return back()->with('success', "Data karyawan {$validated['name']} berhasil ditambahkan."); } @@ -677,6 +684,9 @@ class EmployeeController extends Controller 'photo_path' => $photoPath, ]); + // Sinkronisasi Multi-SIMPER Personil + $this->syncEmployeeSimpers($employee, $request, $isOperator, $simperExpiredAt); + // Sinkronkan akun login User terkait $linkedUser = $employee->user ?: User::where('username', $employee->nik)->first(); if ($linkedUser) { @@ -691,4 +701,67 @@ class EmployeeController extends Controller return back()->with('success', "Data SIMPER untuk {$employee->name} berhasil diperbarui."); } + + /** + * Helper sinkronisasi multi-SIMPER personil. + */ + private function syncEmployeeSimpers(Employee $employee, Request $request, bool $isOperator, ?string $fallbackDate): void + { + if (! $isOperator) { + $employee->simpers()->delete(); + return; + } + + $simperAssignments = $request->input('simper_assignments') ?? $request->input('simpers'); + + if (is_array($simperAssignments) && count($simperAssignments) > 0) { + $activeTypeIds = []; + $maxExpiredAt = null; + + foreach ($simperAssignments as $typeId => $data) { + $isEnabled = ! empty($data['enabled']) || (! isset($data['enabled']) && ! empty($data['expired_at'])); + if ($isEnabled && ! empty($data['expired_at'])) { + $expDate = $data['expired_at']; + $simperNum = ! empty($data['simper_number']) ? trim($data['simper_number']) : ('SMP-' . str_pad($employee->id, 4, '0', STR_PAD_LEFT)); + + EmployeeSimper::updateOrCreate( + ['employee_id' => $employee->id, 'simper_type_id' => $typeId], + [ + 'simper_number' => $simperNum, + 'expired_at' => $expDate, + 'status' => 'active', + ] + ); + + $activeTypeIds[] = (int) $typeId; + + if (! $maxExpiredAt || $expDate > $maxExpiredAt) { + $maxExpiredAt = $expDate; + } + } + } + + // Hapus jenis SIMPER yang sudah tidak dicentang + EmployeeSimper::where('employee_id', $employee->id) + ->whereNotIn('simper_type_id', $activeTypeIds) + ->delete(); + + if ($maxExpiredAt && $employee->simper_expired_at != $maxExpiredAt) { + $employee->update(['simper_expired_at' => $maxExpiredAt]); + } + } elseif ($fallbackDate) { + // Fallback untuk form sederhana / pengujian yang mengirimkan 1 tanggal simper_expired_at + $lvTypeId = SimperType::where('code', 'SIMPER-LV')->value('id'); + if ($lvTypeId) { + EmployeeSimper::updateOrCreate( + ['employee_id' => $employee->id, 'simper_type_id' => $lvTypeId], + [ + 'simper_number' => 'SMP-' . str_pad($employee->id, 4, '0', STR_PAD_LEFT), + 'expired_at' => $fallbackDate, + 'status' => 'active', + ] + ); + } + } + } } diff --git a/app/Http/Controllers/Hse/SimperTypeController.php b/app/Http/Controllers/Hse/SimperTypeController.php new file mode 100644 index 0000000..cf6bcb2 --- /dev/null +++ b/app/Http/Controllers/Hse/SimperTypeController.php @@ -0,0 +1,106 @@ +toDateString(); + + $simperTypes = SimperType::withCount([ + 'employeeSimpers as active_holders_count' => function ($q) use ($today) { + $q->where('status', 'active') + ->whereNotNull('expired_at') + ->where('expired_at', '>=', $today); + }, + 'employeeSimpers as total_holders_count', + ]) + ->orderBy('name') + ->get(); + + $categoryScopes = SimperType::SCOPES; + + return view('hse.simper_types_index', compact('simperTypes', 'categoryScopes')); + } + + /** + * Tambah jenis SIMPER baru. + */ + public function store(Request $request): RedirectResponse + { + $validated = $request->validate([ + 'code' => ['required', 'string', 'max:50', 'unique:simper_types,code'], + 'name' => ['required', 'string', 'max:100'], + 'category_scope' => ['required', 'string', Rule::in(array_keys(SimperType::SCOPES))], + 'description' => ['nullable', 'string', 'max:500'], + 'is_active' => ['nullable', 'boolean'], + ]); + + $code = strtoupper(trim($validated['code'])); + + SimperType::create([ + 'code' => $code, + 'name' => trim($validated['name']), + 'category_scope' => $validated['category_scope'], + 'description' => $validated['description'] ?? null, + 'is_active' => $request->boolean('is_active', true), + ]); + + return back()->with('success', "Jenis SIMPER '{$validated['name']}' ({$code}) berhasil ditambahkan."); + } + + /** + * Perbarui data jenis SIMPER. + */ + public function update(Request $request, int $id): RedirectResponse + { + $simperType = SimperType::findOrFail($id); + + $validated = $request->validate([ + 'code' => ['required', 'string', 'max:50', Rule::unique('simper_types', 'code')->ignore($simperType->id)], + 'name' => ['required', 'string', 'max:100'], + 'category_scope' => ['required', 'string', Rule::in(array_keys(SimperType::SCOPES))], + 'description' => ['nullable', 'string', 'max:500'], + 'is_active' => ['nullable', 'boolean'], + ]); + + $simperType->update([ + 'code' => strtoupper(trim($validated['code'])), + 'name' => trim($validated['name']), + 'category_scope' => $validated['category_scope'], + 'description' => $validated['description'] ?? null, + 'is_active' => $request->boolean('is_active', true), + ]); + + return back()->with('success', "Jenis SIMPER '{$simperType->name}' berhasil diperbarui."); + } + + /** + * Hapus jenis SIMPER. + */ + public function destroy(int $id): RedirectResponse + { + $simperType = SimperType::withCount('employeeSimpers')->findOrFail($id); + + if ($simperType->employee_simpers_count > 0) { + return back()->with('error', "Jenis SIMPER '{$simperType->name}' tidak dapat dihapus karena masih digunakan oleh {$simperType->employee_simpers_count} personil. Anda dapat menonaktifkan statusnya."); + } + + $name = $simperType->name; + $simperType->delete(); + + return back()->with('success', "Jenis SIMPER '{$name}' berhasil dihapus."); + } +} diff --git a/app/Http/Controllers/Pg/VerificationLogController.php b/app/Http/Controllers/Pg/VerificationLogController.php index 396b705..6cc0eae 100644 --- a/app/Http/Controllers/Pg/VerificationLogController.php +++ b/app/Http/Controllers/Pg/VerificationLogController.php @@ -26,7 +26,7 @@ class VerificationLogController extends Controller // Otomatis batalkan antrean pending yang melewati batas 5 jam VehicleActivity::expireOverduePendingActivities(); - $query = VehicleActivity::with(['vehicle', 'driver', 'gate', 'securityGuard']) + $query = VehicleActivity::with(['vehicle', 'driver.simpers.simperType', 'gate', 'securityGuard']) ->orderByRaw('COALESCE(validated_at, recorded_at) DESC'); // Filter Rentang Tanggal (Default Hari Ini) diff --git a/app/Http/Controllers/Public/VehicleActivityFormController.php b/app/Http/Controllers/Public/VehicleActivityFormController.php index 8831754..2724a84 100644 --- a/app/Http/Controllers/Public/VehicleActivityFormController.php +++ b/app/Http/Controllers/Public/VehicleActivityFormController.php @@ -24,7 +24,14 @@ class VehicleActivityFormController extends Controller */ public function index(Request $request): View { - $query = Vehicle::lightVehicles(); + $type = $request->input('type', 'all'); + $query = Vehicle::timesheetEligible(); + + if ($type === 'light_vehicle') { + $query->where('category', 'light_vehicle'); + } elseif ($type === 'unit_support') { + $query->where('category', 'unit_support')->where('is_timesheet_mobile', true); + } if ($request->filled('search')) { $search = trim($request->input('search')); @@ -43,7 +50,7 @@ class VehicleActivityFormController extends Controller $employee = auth()->user()->getOrCreateEmployee(); } - return view('mobilisasi.index', compact('vehicles', 'employee')); + return view('mobilisasi.index', compact('vehicles', 'employee', 'type')); } /** @@ -51,8 +58,8 @@ class VehicleActivityFormController extends Controller */ public function show(Request $request, string $code): View|RedirectResponse { - $vehicle = Vehicle::where('code', $code) - ->where('category', 'light_vehicle') + $vehicle = Vehicle::timesheetEligible() + ->where('code', $code) ->firstOrFail(); // Jika pengemudi scan lewat kamera luar dan belum login, arahkan ke login dengan intended URL @@ -77,11 +84,13 @@ class VehicleActivityFormController extends Controller $nikErrorTitle = 'Verifikasi Gagal'; $inputNik = trim((string) ($request->input('nik') ?? $request->input('driver_nik') ?? '')); + $requiredSimper = $vehicle->requiredSimperType ? $vehicle->requiredSimperType->name : ($vehicle->isLightVehicle() ? 'SIMPER LV' : 'SIMPER Dump Truck / Heavy Mobile'); + // Cek jika ada pengemudi yang sudah terverifikasi sebelumnya (via form error redirect atau query string NIK) $oldDriverId = old('driver_id'); if ($oldDriverId) { $emp = Employee::find($oldDriverId); - if ($emp && $emp->is_operator && $emp->hasValidSimper()) { + if ($emp && $emp->is_operator && $emp->hasValidSimperForVehicle($vehicle)) { $verifiedDriver = $emp; } } elseif ($inputNik !== '') { @@ -95,14 +104,19 @@ class VehicleActivityFormController extends Controller } elseif (!$emp->is_operator) { $nikErrorTitle = 'Bukan Driver Terdaftar'; $nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) terdaftar sebagai BUKAN DRIVER dan tidak memiliki izin mengemudi (SIMPER). Anda tidak diizinkan mengoperasikan kendaraan unit. Silakan hubungi Divisi HSE."; - } elseif (!$emp->hasValidSimper()) { - if ($emp->simper_expired_at) { - $expiredDate = $emp->simper_expired_at->format('d/m/Y'); - $nikErrorTitle = 'Peringatan: SIMPER Kedaluwarsa'; - $nikError = "SIMPER atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) telah KEDALUWARSA pada {$expiredDate}. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER."; + } elseif (!$emp->hasValidSimperForVehicle($vehicle)) { + if (!$emp->hasValidSimper()) { + if ($emp->simper_expired_at) { + $expiredDate = $emp->simper_expired_at->format('d/m/Y'); + $nikErrorTitle = 'Peringatan: SIMPER Kedaluwarsa'; + $nikError = "SIMPER atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) telah KEDALUWARSA pada {$expiredDate}. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER."; + } else { + $nikErrorTitle = 'SIMPER Belum Terdaftar'; + $nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) belum memiliki tanggal masa berlaku SIMPER aktif. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE."; + } } else { - $nikErrorTitle = 'SIMPER Belum Terdaftar'; - $nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) belum memiliki tanggal masa berlaku SIMPER aktif. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE."; + $nikErrorTitle = 'Izin SIMPER Tidak Sesuai'; + $nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) tidak memiliki izin SIMPER aktif yang sesuai untuk mengoperasikan unit {$vehicle->code} (Wajib: {$requiredSimper}). Silakan hubungi Divisi HSE."; } } else { $verifiedDriver = $emp; @@ -113,9 +127,14 @@ class VehicleActivityFormController extends Controller if (!$emp->is_operator) { $nikErrorTitle = 'Bukan Driver Terdaftar'; $nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) terdaftar sebagai BUKAN DRIVER dan tidak memiliki izin mengemudi (SIMPER). Anda tidak diizinkan mengoperasikan kendaraan unit. Silakan hubungi Divisi HSE."; - } elseif (!$emp->hasValidSimper()) { - $nikErrorTitle = 'Peringatan: SIMPER Kedaluwarsa'; - $nikError = "SIMPER atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) telah KEDALUWARSA. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER."; + } elseif (!$emp->hasValidSimperForVehicle($vehicle)) { + if (!$emp->hasValidSimper()) { + $nikErrorTitle = 'Peringatan: SIMPER Kedaluwarsa'; + $nikError = "SIMPER atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) telah KEDALUWARSA. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER."; + } else { + $nikErrorTitle = 'Izin SIMPER Tidak Sesuai'; + $nikError = "Karyawan atas nama {$emp->name} (NIK: {$emp->nik} - {$emp->division}) tidak memiliki izin SIMPER aktif yang sesuai untuk mengoperasikan unit {$vehicle->code} (Wajib: {$requiredSimper}). Silakan hubungi Divisi HSE."; + } } else { $verifiedDriver = $emp; $inputNik = $emp->nik; @@ -147,8 +166,8 @@ class VehicleActivityFormController extends Controller */ public function checkNik(Request $request, string $code): JsonResponse { - $vehicle = Vehicle::where('code', $code) - ->where('category', 'light_vehicle') + $vehicle = Vehicle::timesheetEligible() + ->where('code', $code) ->firstOrFail(); $rawNik = trim((string) $request->input('nik', '')); @@ -188,16 +207,24 @@ class VehicleActivityFormController extends Controller ], 422); } - // Pengecekan 2: Karyawan adalah Driver, tapi masa berlaku SIMPER kedaluwarsa - if (!$employee->hasValidSimper()) { - if ($employee->simper_expired_at) { - $expiredDate = $employee->simper_expired_at->format('d/m/Y'); - $title = 'Peringatan: SIMPER Kedaluwarsa'; - $message = "SIMPER atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) telah KEDALUWARSA pada {$expiredDate}. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER."; + $requiredSimper = $vehicle->requiredSimperType ? $vehicle->requiredSimperType->name : ($vehicle->isLightVehicle() ? 'SIMPER LV' : 'SIMPER Dump Truck / Heavy Mobile'); + + // Pengecekan 2: Karyawan adalah Driver, tapi masa berlaku SIMPER tidak sesuai untuk unit ini + if (!$employee->hasValidSimperForVehicle($vehicle)) { + if (!$employee->hasValidSimper()) { + if ($employee->simper_expired_at) { + $expiredDate = $employee->simper_expired_at->format('d/m/Y'); + $title = 'Peringatan: SIMPER Kedaluwarsa'; + $message = "SIMPER atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) telah KEDALUWARSA pada {$expiredDate}. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE untuk perpanjangan masa berlaku SIMPER."; + } else { + $expiredDate = 'Belum Ada'; + $title = 'SIMPER Belum Terdaftar'; + $message = "Karyawan atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) belum memiliki tanggal masa berlaku SIMPER aktif. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE."; + } } else { - $expiredDate = 'Belum Ada'; - $title = 'SIMPER Belum Terdaftar'; - $message = "Karyawan atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) belum memiliki tanggal masa berlaku SIMPER aktif. Anda tidak diizinkan mengoperasikan kendaraan. Silakan hubungi Divisi HSE."; + $expiredDate = $employee->simper_expired_at ? $employee->simper_expired_at->format('d/m/Y') : '-'; + $title = 'Izin SIMPER Tidak Sesuai'; + $message = "Karyawan atas nama {$employee->name} (NIK: {$employee->nik} - {$employee->division}) tidak memiliki izin SIMPER aktif yang sesuai untuk mengoperasikan unit {$vehicle->code} (Wajib: {$requiredSimper}). Silakan hubungi Divisi HSE."; } return response()->json([ @@ -218,14 +245,14 @@ class VehicleActivityFormController extends Controller return response()->json([ 'status' => 'valid', 'title' => 'SIMPER Valid', - 'message' => "SIMPER valid. Selamat bertugas, {$employee->name}!", + 'message' => "SIMPER valid ({$requiredSimper}). Selamat bertugas, {$employee->name}!", 'employee' => [ 'id' => $employee->id, 'name' => $employee->name, 'nik' => $employee->nik, 'division' => $employee->division ?? 'Umum', 'position' => $employee->position ?? 'Karyawan', - 'simper_expired_at' => $employee->simper_expired_at->format('d/m/Y'), + 'simper_expired_at' => $employee->simper_expired_at ? $employee->simper_expired_at->format('d/m/Y') : '-', 'is_operator' => true, ], ]); @@ -241,8 +268,8 @@ class VehicleActivityFormController extends Controller ->with('warning', 'Sesi login Anda telah berakhir. Silakan login kembali.'); } - $vehicle = Vehicle::where('code', $code) - ->where('category', 'light_vehicle') + $vehicle = Vehicle::timesheetEligible() + ->where('code', $code) ->firstOrFail(); $previousKm = (float) $vehicle->current_km; diff --git a/app/Http/Controllers/Qma/ActivityLogController.php b/app/Http/Controllers/Qma/ActivityLogController.php index 4e7cc8c..8c71592 100644 --- a/app/Http/Controllers/Qma/ActivityLogController.php +++ b/app/Http/Controllers/Qma/ActivityLogController.php @@ -26,7 +26,7 @@ class ActivityLogController extends Controller // Otomatis update status perjalanan pending yang kedaluwarsa (> 5 jam) VehicleActivity::expireOverduePendingActivities(); - $query = VehicleActivity::with(['vehicle', 'driver', 'gate', 'securityGuard']) + $query = VehicleActivity::with(['vehicle', 'driver.simpers.simperType', 'gate', 'securityGuard']) ->latest('recorded_at'); // Filter Rentang Tanggal (Default Hari Ini jika tidak diisi) diff --git a/app/Http/Controllers/Qma/SupportTimesheetController.php b/app/Http/Controllers/Qma/SupportTimesheetController.php index 440aa7e..4ec69af 100644 --- a/app/Http/Controllers/Qma/SupportTimesheetController.php +++ b/app/Http/Controllers/Qma/SupportTimesheetController.php @@ -138,7 +138,8 @@ class SupportTimesheetController extends Controller ->orderBy('code') ->get(); - $operators = Employee::orderBy('name') + $operators = Employee::with(['simpers.simperType']) + ->orderBy('name') ->get(['id', 'nik', 'name', 'position', 'is_operator', 'employee_type', 'simper_expired_at']); $shifts = self::SHIFTS; diff --git a/app/Http/Controllers/Qma/VehicleController.php b/app/Http/Controllers/Qma/VehicleController.php index 60a6066..9338557 100644 --- a/app/Http/Controllers/Qma/VehicleController.php +++ b/app/Http/Controllers/Qma/VehicleController.php @@ -7,6 +7,7 @@ use App\Models\Employee; use App\Models\Gate; use App\Models\P2hRecord; use App\Models\P2hTemplate; +use App\Models\SimperType; use App\Models\Vehicle; use App\Models\VehicleActivity; use App\Services\ImageCompressionService; @@ -414,6 +415,8 @@ class VehicleController extends Controller ->values() ->all(); + $simperTypes = SimperType::active()->orderBy('name')->get(); + return view('qma.vehicles_support_units', compact( 'category', 'units', @@ -425,7 +428,8 @@ class VehicleController extends Controller 'nextUnitNumber', 'nextUnitCode', 'existingCodes', - 'masterLocations' + 'masterLocations', + 'simperTypes' )); } @@ -897,6 +901,8 @@ class VehicleController extends Controller 'ownership' => ['nullable', 'string', 'max:150'], 'division' => ['nullable', 'string', 'max:100'], 'photo' => ['nullable', 'image', 'mimes:jpeg,png,jpg,webp', 'max:10240'], + 'is_timesheet_mobile' => ['nullable', 'boolean'], + 'required_simper_type_id' => ['nullable', 'exists:simper_types,id'], ]); return DB::transaction(function () use ($request, $category) { @@ -947,6 +953,8 @@ class VehicleController extends Controller 'silo_document' => $request->input('silo_document'), 'kir_document' => $request->input('kir_document'), 'photo_path' => $photoPath, + 'is_timesheet_mobile' => $request->boolean('is_timesheet_mobile'), + 'required_simper_type_id' => $request->input('required_simper_type_id') ?: null, ]); return back()->with('success', "Unit fisik [{$unit->code}] berhasil ditambahkan ke kategori {$category->unit_category}."); @@ -971,6 +979,8 @@ class VehicleController extends Controller 'status' => [$category === 'unit_support' ? 'nullable' : 'required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'], 'current_km' => [$category === 'unit_support' ? 'nullable' : 'required', 'numeric', 'min:0'], 'photo' => ['nullable', 'image', 'mimes:jpeg,png,jpg,webp', 'max:10240'], + 'is_timesheet_mobile' => ['nullable', 'boolean'], + 'required_simper_type_id' => ['nullable', 'exists:simper_types,id'], ]; // Atribut opsional spesifik Heavy Equipment (Kendaraan Berat) @@ -1003,6 +1013,9 @@ class VehicleController extends Controller $validated['current_km'] = $validated['current_km'] ?? 0; } + $validated['is_timesheet_mobile'] = $request->boolean('is_timesheet_mobile'); + $validated['required_simper_type_id'] = $request->input('required_simper_type_id') ?: null; + if ($request->hasFile('photo')) { $validated['photo_path'] = ImageCompressionService::uploadAndCompress($request->file('photo'), 'vehicles', 800, 800, 75); } @@ -1060,6 +1073,8 @@ class VehicleController extends Controller 'pajak_document' => ['nullable', 'string', 'max:150'], 'kir_document' => ['nullable', 'string', 'max:150'], 'photo' => ['nullable', 'image', 'mimes:jpeg,png,jpg,webp', 'max:10240'], + 'is_timesheet_mobile' => ['nullable', 'boolean'], + 'required_simper_type_id' => ['nullable', 'exists:simper_types,id'], ]; $validated = $request->validate($rules, [ @@ -1075,6 +1090,9 @@ class VehicleController extends Controller } unset($validated['photo']); + $validated['is_timesheet_mobile'] = $request->boolean('is_timesheet_mobile'); + $validated['required_simper_type_id'] = $request->input('required_simper_type_id') ?: null; + DB::transaction(function () use ($vehicle, $validated, $oldCode, $newCode) { $vehicle->update($validated); diff --git a/app/Http/Requests/StoreVehicleActivityRequest.php b/app/Http/Requests/StoreVehicleActivityRequest.php index 882a792..f101d7c 100644 --- a/app/Http/Requests/StoreVehicleActivityRequest.php +++ b/app/Http/Requests/StoreVehicleActivityRequest.php @@ -55,12 +55,12 @@ class StoreVehicleActivityRequest extends FormRequest { $validator->after(function ($validator) { $vehicleCode = $this->route('code'); - $vehicle = Vehicle::where('code', $vehicleCode) - ->where('category', 'light_vehicle') + $vehicle = Vehicle::timesheetEligible() + ->where('code', $vehicleCode) ->first(); if (!$vehicle) { - $validator->errors()->add('vehicle', 'Kendaraan ringan tidak valid atau tidak terdaftar.'); + $validator->errors()->add('vehicle', 'Kendaraan tidak valid atau tidak diizinkan untuk timesheet mobilisasi.'); return; } @@ -72,11 +72,12 @@ class StoreVehicleActivityRequest extends FormRequest 'driver_id', "Karyawan ({$driver->name}) terdaftar sebagai Bukan Driver dan tidak memiliki izin mengemudi (SIMPER)." ); - } elseif (!$driver->hasValidSimper()) { + } elseif (!$driver->hasValidSimperForVehicle($vehicle)) { + $requiredSimper = $vehicle->requiredSimperType ? $vehicle->requiredSimperType->name : ($vehicle->isLightVehicle() ? 'SIMPER LV' : 'SIMPER Dump Truck / Heavy Mobile'); $expiredText = $driver->simper_expired_at ? $driver->simper_expired_at->format('d/m/Y') : 'Belum Terdaftar'; $validator->errors()->add( 'driver_id', - "Masa berlaku SIMPER pengemudi ({$driver->name}) telah kedaluwarsa pada {$expiredText}. Karyawan wajib memperpanjang SIMPER ke Divisi HSE sebelum mengoperasikan kendaraan." + "Pengemudi ({$driver->name}) tidak memiliki izin SIMPER aktif yang sesuai untuk mengoperasikan unit {$vehicle->code} (Wajib: {$requiredSimper}). Tanggal SIMPER terakhir: {$expiredText}. Silakan hubungi Divisi HSE." ); } } diff --git a/app/Models/Employee.php b/app/Models/Employee.php index d4f8aa7..694ee96 100644 --- a/app/Models/Employee.php +++ b/app/Models/Employee.php @@ -7,6 +7,7 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; class Employee extends Model @@ -73,6 +74,102 @@ class Employee extends Model return $this->simper_expired_at->isFuture() || $this->simper_expired_at->isToday(); } + public function simpers(): HasMany + { + return $this->hasMany(EmployeeSimper::class)->with('simperType'); + } + + public function simperTypes(): BelongsToMany + { + return $this->belongsToMany(SimperType::class, 'employee_simpers') + ->withPivot(['simper_number', 'expired_at', 'status', 'notes']) + ->withTimestamps(); + } + + /** + * Cek apakah personil memiliki SIMPER aktif untuk kode jenis SIMPER tertentu. + */ + public function hasValidSimperForType(string $code): bool + { + $hasAnySimper = $this->relationLoaded('simpers') ? $this->simpers->isNotEmpty() : $this->simpers()->exists(); + + // Jika belum ada record di employee_simpers, gunakan fallback kolom simper_expired_at + if (! $hasAnySimper) { + return $this->hasValidSimper(); + } + + $simpers = $this->relationLoaded('simpers') ? $this->simpers : $this->simpers()->with('simperType')->get(); + + foreach ($simpers as $s) { + if ($s->simperType && $s->simperType->code === $code && $s->isValid()) { + return true; + } + } + + return false; + } + + /** + * Cek apakah personil memiliki SIMPER dengan cakupan scope tertentu. + */ + public function hasValidSimperForScope(string $scope): bool + { + $simpers = $this->relationLoaded('simpers') ? $this->simpers : $this->simpers()->with('simperType')->get(); + foreach ($simpers as $s) { + if ($s->simperType && $s->simperType->category_scope === $scope && $s->isValid()) { + return true; + } + } + return false; + } + + /** + * Cek apakah personil memiliki izin SIMPER yang sah untuk kendaraan tertentu. + */ + public function hasValidSimperForVehicle(Vehicle $vehicle): bool + { + if (! $this->is_operator) { + return false; + } + + $hasAnySimper = $this->relationLoaded('simpers') ? $this->simpers->isNotEmpty() : $this->simpers()->exists(); + + // Fallback jika belum dimigrasikan ke employee_simpers + if (! $hasAnySimper) { + return $this->hasValidSimper(); + } + + // 1. Jika kendaraan mensyaratkan spesifik required_simper_type_id + if ($vehicle->required_simper_type_id) { + $simpers = $this->relationLoaded('simpers') ? $this->simpers : $this->simpers()->get(); + foreach ($simpers as $s) { + if ($s->simper_type_id === $vehicle->required_simper_type_id && $s->isValid()) { + return true; + } + } + return false; + } + + // 2. Berdasarkan kategori kendaraan + if ($vehicle->isLightVehicle()) { + return $this->hasValidSimperForType('SIMPER-LV') || $this->hasValidSimperForScope(SimperType::SCOPE_ALL); + } + + if ($vehicle->isUnitSupport() && $vehicle->is_timesheet_mobile) { + return $this->hasValidSimperForType('SIMPER-DT') + || $this->hasValidSimperForType('SIMPER-HEAVY') + || $this->hasValidSimperForScope(SimperType::SCOPE_ALL); + } + + if ($vehicle->isUnitSupport()) { + return $this->hasValidSimperForType('SIMPER-HEAVY') + || $this->hasValidSimperForType('SIMPER-DT') + || $this->hasValidSimperForScope(SimperType::SCOPE_ALL); + } + + return $this->hasValidSimper(); + } + public function getPhotoUrlAttribute(): ?string { $path = $this->photo_path; diff --git a/app/Models/EmployeeSimper.php b/app/Models/EmployeeSimper.php new file mode 100644 index 0000000..a46158e --- /dev/null +++ b/app/Models/EmployeeSimper.php @@ -0,0 +1,64 @@ + 'date', + ]; + + public function employee(): BelongsTo + { + return $this->belongsTo(Employee::class); + } + + public function simperType(): BelongsTo + { + return $this->belongsTo(SimperType::class); + } + + public function isValid(): bool + { + if ($this->status !== self::STATUS_ACTIVE || ! $this->expired_at) { + return false; + } + + return $this->expired_at->isFuture() || $this->expired_at->isToday(); + } + + public function scopeActive(Builder $query): Builder + { + return $query->where('status', self::STATUS_ACTIVE); + } + + public function scopeValid(Builder $query): Builder + { + $today = Carbon::today()->toDateString(); + + return $query->where('status', self::STATUS_ACTIVE) + ->whereNotNull('expired_at') + ->where('expired_at', '>=', $today); + } +} diff --git a/app/Models/SimperType.php b/app/Models/SimperType.php new file mode 100644 index 0000000..6cd58c9 --- /dev/null +++ b/app/Models/SimperType.php @@ -0,0 +1,55 @@ + 'Armada Ringan (Light Vehicle)', + self::SCOPE_UNIT_SUPPORT_MOBILE => 'Armada Berat Bergerak (Heavy Mobile / Dump Truck)', + self::SCOPE_UNIT_SUPPORT_HEAVY => 'Alat Berat Operasional (Statis / Tambang)', + self::SCOPE_ALL => 'Semua Kategori Armada', + ]; + + protected $fillable = [ + 'code', + 'name', + 'category_scope', + 'description', + 'is_active', + ]; + + protected $casts = [ + 'is_active' => 'boolean', + ]; + + public function employeeSimpers(): HasMany + { + return $this->hasMany(EmployeeSimper::class); + } + + public function employees(): BelongsToMany + { + return $this->belongsToMany(Employee::class, 'employee_simpers') + ->withPivot(['simper_number', 'expired_at', 'status', 'notes']) + ->withTimestamps(); + } + + public function scopeActive(Builder $query): Builder + { + return $query->where('is_active', true); + } +} diff --git a/app/Models/Vehicle.php b/app/Models/Vehicle.php index 295839e..fe426ff 100644 --- a/app/Models/Vehicle.php +++ b/app/Models/Vehicle.php @@ -33,6 +33,8 @@ class Vehicle extends Model 'production_year', 'location', 'site_status', + 'is_timesheet_mobile', + 'required_simper_type_id', 'location_updated_at', 'location_updated_by', 'location_note', @@ -48,6 +50,7 @@ class Vehicle extends Model 'fuel_consumption' => 'decimal:2', 'production_year' => 'integer', 'parent_id' => 'integer', + 'is_timesheet_mobile' => 'boolean', 'location_updated_at' => 'datetime', ]; @@ -76,6 +79,32 @@ class Vehicle extends Model return $this->category === 'light_vehicle'; } + public function isTimesheetMobile(): bool + { + return (bool) ($this->is_timesheet_mobile ?? false); + } + + public function requiredSimperType(): BelongsTo + { + return $this->belongsTo(SimperType::class, 'required_simper_type_id'); + } + + /** + * Scope unit yang diizinkan untuk formulir timesheet mobilisasi gerbang: + * - Seluruh Light Vehicle (LV) + * - Unit Support yang ditandai sebagai Timesheet Mobile (Dump Truck, dsb.) + */ + public function scopeTimesheetEligible(Builder $query): Builder + { + return $query->where(function (Builder $q) { + $q->where('category', 'light_vehicle') + ->orWhere(function (Builder $sq) { + $sq->where('category', 'unit_support') + ->where('is_timesheet_mobile', true); + }); + }); + } + public function getPhotoUrlAttribute(): ?string { if (!$this->photo_path) { diff --git a/database/migrations/2026_10_25_214800_create_simper_types_and_employee_simpers_tables.php b/database/migrations/2026_10_25_214800_create_simper_types_and_employee_simpers_tables.php new file mode 100644 index 0000000..5c32c23 --- /dev/null +++ b/database/migrations/2026_10_25_214800_create_simper_types_and_employee_simpers_tables.php @@ -0,0 +1,156 @@ +id(); + $table->string('code', 50)->unique(); + $table->string('name', 100); + $table->string('category_scope', 50)->default('all')->index(); + $table->text('description')->nullable(); + $table->boolean('is_active')->default(true)->index(); + $table->timestamps(); + }); + + // 2. Tabel Relasi Multi-SIMPER Personil (Karyawan & Sukon) + Schema::create('employee_simpers', function (Blueprint $table) { + $table->id(); + $table->foreignId('employee_id')->constrained('employees')->cascadeOnDelete(); + $table->foreignId('simper_type_id')->constrained('simper_types')->cascadeOnDelete(); + $table->string('simper_number', 100)->nullable(); + $table->date('expired_at')->index(); + $table->string('status', 20)->default('active')->index(); + $table->text('notes')->nullable(); + $table->timestamps(); + + $table->unique(['employee_id', 'simper_type_id']); + }); + + // 3. Tambahkan kolom pendukung di tabel vehicles + Schema::table('vehicles', function (Blueprint $table) { + $table->boolean('is_timesheet_mobile')->default(false)->after('site_status')->index(); + $table->foreignId('required_simper_type_id')->nullable()->after('is_timesheet_mobile')->constrained('simper_types')->nullOnDelete(); + }); + + // 4. Inisialisasi Data Master Default SIMPER + $now = now(); + $defaultTypes = [ + [ + 'code' => 'SIMPER-LV', + 'name' => 'SIMPER Light Vehicle (LV)', + 'category_scope' => 'light_vehicle', + 'description' => 'Izin mengemudi armada ringan proyek (Hilux, Triton, Avanza, dsb.)', + 'is_active' => true, + 'created_at' => $now, + 'updated_at' => $now, + ], + [ + 'code' => 'SIMPER-DT', + 'name' => 'SIMPER Dump Truck / Heavy Mobile', + 'category_scope' => 'unit_support_mobile', + 'description' => 'Izin mengemudi armada berat bergerak (Dump Truck, Mixer Truck, Water Truck, Fuel Truck, Manhaul, dsb.)', + 'is_active' => true, + 'created_at' => $now, + 'updated_at' => $now, + ], + [ + 'code' => 'SIMPER-HEAVY', + 'name' => 'SIMPER Alat Berat Operasional', + 'category_scope' => 'unit_support_heavy', + 'description' => 'Izin operasi alat berat konstruksi & tambang (Excavator, Dozer, Wheel Loader, Crane, Drilling Rig, dsb.)', + 'is_active' => true, + 'created_at' => $now, + 'updated_at' => $now, + ], + ]; + + DB::table('simper_types')->insert($defaultTypes); + + // Ambil ID SIMPER default + $lvTypeId = DB::table('simper_types')->where('code', 'SIMPER-LV')->value('id'); + $dtTypeId = DB::table('simper_types')->where('code', 'SIMPER-DT')->value('id'); + $heavyTypeId = DB::table('simper_types')->where('code', 'SIMPER-HEAVY')->value('id'); + + // 5. Migrasi Data SIMPER Karyawan Lama agar 100% Tidak Ada yang Terganggu + $existingEmployees = DB::table('employees') + ->where('is_operator', 1) + ->whereNotNull('simper_expired_at') + ->get(); + + foreach ($existingEmployees as $emp) { + $pos = strtolower($emp->position ?? ''); + $empType = $emp->employee_type ?? 'Karyawan'; + + // Karyawan LV selalu dapat SIMPER-LV + if ($lvTypeId) { + DB::table('employee_simpers')->insertOrIgnore([ + 'employee_id' => $emp->id, + 'simper_type_id' => $lvTypeId, + 'simper_number' => 'SMP-' . str_pad($emp->id, 4, '0', STR_PAD_LEFT), + 'expired_at' => $emp->simper_expired_at, + 'status' => 'active', + 'created_at' => $now, + 'updated_at' => $now, + ]); + } + + // Jika posisi terkait alat berat/truk/sukon, berikan juga SIMPER-DT & SIMPER-HEAVY + if ( + $empType === 'Sukon' || + str_contains($pos, 'operator') || + str_contains($pos, 'driver') || + str_contains($pos, 'dump') || + str_contains($pos, 'truck') || + str_contains($pos, 'heavy') + ) { + if ($dtTypeId) { + DB::table('employee_simpers')->insertOrIgnore([ + 'employee_id' => $emp->id, + 'simper_type_id' => $dtTypeId, + 'simper_number' => 'SMP-DT-' . str_pad($emp->id, 4, '0', STR_PAD_LEFT), + 'expired_at' => $emp->simper_expired_at, + 'status' => 'active', + 'created_at' => $now, + 'updated_at' => $now, + ]); + } + if ($heavyTypeId) { + DB::table('employee_simpers')->insertOrIgnore([ + 'employee_id' => $emp->id, + 'simper_type_id' => $heavyTypeId, + 'simper_number' => 'SMP-HV-' . str_pad($emp->id, 4, '0', STR_PAD_LEFT), + 'expired_at' => $emp->simper_expired_at, + 'status' => 'active', + 'created_at' => $now, + 'updated_at' => $now, + ]); + } + } + } + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('vehicles', function (Blueprint $table) { + $table->dropForeign(['required_simper_type_id']); + $table->dropColumn(['is_timesheet_mobile', 'required_simper_type_id']); + }); + + Schema::dropIfExists('employee_simpers'); + Schema::dropIfExists('simper_types'); + } +}; diff --git a/resources/views/hse/employees_index.blade.php b/resources/views/hse/employees_index.blade.php index 6c88254..953cb6c 100644 --- a/resources/views/hse/employees_index.blade.php +++ b/resources/views/hse/employees_index.blade.php @@ -219,10 +219,24 @@ @endif - - + + @if(!$emp->is_operator) - + @elseif($emp->simpers && $emp->simpers->isNotEmpty()) +
+ @foreach($emp->simpers as $sm) + @php + $smValid = $sm->isValid(); + $smCode = $sm->simperType?->code ?: 'SIMPER'; + $shortCode = str_replace('SIMPER-', '', $smCode); + @endphp + + + {{ $shortCode }}: {{ $sm->expired_at ? $sm->expired_at->format('d/m/y') : '-' }} + + @endforeach +
@elseif($isValid) @@ -414,10 +428,61 @@ -
- - +
+
+ + Centang jenis izin & tentukan masa berlakunya +
+ + + + @if(isset($availableSimperTypes) && count($availableSimperTypes) > 0) +
+ @foreach($availableSimperTypes as $st) +
+
+ + + {{ str_replace('_', ' ', $st->category_scope) }} + +
+ +
+ @endforeach +
+ @else +
+ +
+ @endif
@@ -667,11 +732,61 @@ -
- - -

Kosongkan jika bukan driver atau belum memiliki SIMPER.

+
+
+ + Pilih izin & perbarui masa berlakunya +
+ + + + @if(isset($availableSimperTypes) && count($availableSimperTypes) > 0) +
+ @foreach($availableSimperTypes as $st) +
+
+ + + {{ str_replace('_', ' ', $st->category_scope) }} + +
+ +
+ @endforeach +
+ @else +
+ +
+ @endif
@@ -821,6 +936,10 @@ if (type === 'edit') { opSelect = document.getElementById('editOperator'); dateInput = document.getElementById('editSimperDate'); + const wrapper = document.getElementById('editSimperWrapper'); + if (wrapper) { + wrapper.style.display = opSelect.value === '0' ? 'none' : 'block'; + } } else if (type === 'renew') { opSelect = document.getElementById('renewOperator'); dateInput = document.getElementById('renewDate'); @@ -843,6 +962,70 @@ } } + // Toggle Field Multi-SIMPER Tambah + function toggleAddSimperFields(id) { + const check = document.getElementById(`addSimperCheck_${id}`); + const fields = document.getElementById(`addSimperFields_${id}`); + if (check && fields) { + if (check.checked) { + fields.classList.remove('hidden'); + } else { + fields.classList.add('hidden'); + const expInp = document.getElementById(`addSimperExp_${id}`); + if (expInp) expInp.value = ''; + } + } + syncAddPrimarySimperDate(); + } + + function syncAddPrimarySimperDate() { + let maxDate = ''; + const expInputs = document.querySelectorAll('[id^="addSimperExp_"]'); + expInputs.forEach(inp => { + const id = inp.id.replace('addSimperExp_', ''); + const check = document.getElementById(`addSimperCheck_${id}`); + if (check && check.checked && inp.value) { + if (!maxDate || inp.value > maxDate) { + maxDate = inp.value; + } + } + }); + const primaryInp = document.getElementById('addSimperDateInput'); + if (primaryInp) primaryInp.value = maxDate; + } + + // Toggle Field Multi-SIMPER Edit + function toggleEditSimperFields(id) { + const check = document.getElementById(`editSimperCheck_${id}`); + const fields = document.getElementById(`editSimperFields_${id}`); + if (check && fields) { + if (check.checked) { + fields.classList.remove('hidden'); + } else { + fields.classList.add('hidden'); + const expInp = document.getElementById(`editSimperExp_${id}`); + if (expInp) expInp.value = ''; + } + } + syncEditPrimarySimperDate(); + } + + function syncEditPrimarySimperDate() { + let maxDate = ''; + const expInputs = document.querySelectorAll('[id^="editSimperExp_"]'); + expInputs.forEach(inp => { + const id = inp.id.replace('editSimperExp_', ''); + const check = document.getElementById(`editSimperCheck_${id}`); + if (check && check.checked && inp.value) { + if (!maxDate || inp.value > maxDate) { + maxDate = inp.value; + } + } + }); + const primaryInp = document.getElementById('editSimperDate'); + if (primaryInp) primaryInp.value = maxDate; + } + function previewEmployeeImage(input, imgId, placeholderId) { if (input.files && input.files[0]) { const reader = new FileReader(); @@ -891,6 +1074,45 @@ expDate = emp.simper_expired_at.substring(0, 10); } document.getElementById('editSimperDate').value = expDate; + + // Reset semua checklist SIMPER di editModal + document.querySelectorAll('[id^="editSimperCheck_"]').forEach(cb => { + cb.checked = false; + const id = cb.id.replace('editSimperCheck_', ''); + const fields = document.getElementById(`editSimperFields_${id}`); + if (fields) fields.classList.add('hidden'); + const num = document.getElementById(`editSimperNum_${id}`); + if (num) num.value = ''; + const exp = document.getElementById(`editSimperExp_${id}`); + if (exp) exp.value = ''; + }); + + // Isi checklist SIMPER dari data emp.simpers + if (emp.simpers && emp.simpers.length > 0) { + emp.simpers.forEach(s => { + const cb = document.getElementById(`editSimperCheck_${s.simper_type_id}`); + const fields = document.getElementById(`editSimperFields_${s.simper_type_id}`); + const num = document.getElementById(`editSimperNum_${s.simper_type_id}`); + const exp = document.getElementById(`editSimperExp_${s.simper_type_id}`); + if (cb) { + cb.checked = true; + if (fields) fields.classList.remove('hidden'); + if (num) num.value = s.simper_number || ''; + if (exp && s.expired_at) exp.value = s.expired_at.substring(0, 10); + } + }); + } else if (emp.is_operator && expDate) { + const firstCb = document.querySelector('[id^="editSimperCheck_"]'); + if (firstCb) { + firstCb.checked = true; + const id = firstCb.id.replace('editSimperCheck_', ''); + const fields = document.getElementById(`editSimperFields_${id}`); + if (fields) fields.classList.remove('hidden'); + const exp = document.getElementById(`editSimperExp_${id}`); + if (exp) exp.value = expDate; + } + } + syncEditPrimarySimperDate(); // Set jenis personil const editTypeSelect = document.getElementById('editEmployeeType'); @@ -1074,6 +1296,18 @@ addTypeSelect.value = 'Karyawan'; toggleCustomEmployeeType('Karyawan', 'add'); } + document.querySelectorAll('[id^="addSimperCheck_"]').forEach(cb => { + cb.checked = false; + const id = cb.id.replace('addSimperCheck_', ''); + const fields = document.getElementById(`addSimperFields_${id}`); + if (fields) fields.classList.add('hidden'); + const num = document.getElementById(`addSimperNum_${id}`); + if (num) num.value = ''; + const exp = document.getElementById(`addSimperExp_${id}`); + if (exp) exp.value = ''; + }); + const addSimperDateInp = document.getElementById('addSimperDateInput'); + if (addSimperDateInp) addSimperDateInp.value = ''; if (modal) modal.classList.remove('hidden'); } function closeAddKaryawanModal() { @@ -1089,6 +1323,14 @@ } else { wrapper.style.display = 'none'; if (input) input.value = ''; + document.querySelectorAll('[id^="addSimperCheck_"]').forEach(cb => { + cb.checked = false; + const id = cb.id.replace('addSimperCheck_', ''); + const fields = document.getElementById(`addSimperFields_${id}`); + if (fields) fields.classList.add('hidden'); + const exp = document.getElementById(`addSimperExp_${id}`); + if (exp) exp.value = ''; + }); } } } diff --git a/resources/views/hse/simper_types_index.blade.php b/resources/views/hse/simper_types_index.blade.php new file mode 100644 index 0000000..a9474fd --- /dev/null +++ b/resources/views/hse/simper_types_index.blade.php @@ -0,0 +1,496 @@ +@extends('layouts.app') + +@section('title', 'Master Jenis SIMPER - Admin HSE | PT Kerinci Merangin Hidro') + +@section('content') +
+ + +
+
+
+ + MANAJEMEN HSE + + +
+

+ Jenis SIMPER +

+

+ Kelola kategori izin mengemudi (SIMPER) dan cakupan kendaraan yang diizinkan untuk personil. +

+
+ +
+ + + Kembali ke Data Personil + + + @can('hse.employees.edit') + + @endcan +
+
+ + + @if(session('success')) +
+
+ + {{ session('success') }} +
+ +
+ @endif + + @if(session('error')) +
+
+ + {{ session('error') }} +
+ +
+ @endif + + @if($errors->any()) +
+
+ + {{ $errors->first() }} +
+ +
+ @endif + + +
+
+
+ +
+
+

Total Kategori

+

{{ count($simperTypes) }} Jenis

+
+
+ +
+
+ +
+
+

Pemegang Aktif

+

+ {{ $simperTypes->sum('active_holders_count') }} Personil +

+
+
+ +
+
+ +
+
+

Status Fleksibilitas

+

Siap Dikustomisasi HSE

+
+
+
+ + +
+
+ + + + + + + + + + + + + + + @forelse($simperTypes as $idx => $st) + + + + + + + + + + + @empty + + + + @endforelse + +
NOKODENAMA JENIS SIMPERCAKUPAN KENDARAANPEMEGANG AKTIFSTATUSKETERANGANAKSI
{{ $idx + 1 }} + + {{ $st->code }} + + + {{ $st->name }} + + @if($st->category_scope === 'light_vehicle') + + Light Vehicle (LV) + + @elseif($st->category_scope === 'unit_support_mobile') + + Heavy Mobile / Dump Truck + + @elseif($st->category_scope === 'unit_support_heavy') + + Alat Berat Operasional + + @else + + Semua Kategori + + @endif + + + {{ $st->active_holders_count }} Personil + + + @if($st->is_active) + + Aktif + + @else + + Nonaktif + + @endif + + {{ $st->description ?: '-' }} + +
+ @can('hse.employees.edit') + + @if($st->total_holders_count == 0) + + @endif + @endcan +
+
+ +

Belum ada data jenis SIMPER

+

Klik tombol "+ Tambah Jenis SIMPER" untuk membuat kategori baru.

+
+
+
+
+ + + + + + + + + + + + + + + + + + + + +@endsection + +@section('scripts') + +@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index ece56b0..ff4ba37 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -264,6 +264,11 @@ Data Simper + + + Jenis SIMPER +
@endcan @@ -636,6 +641,10 @@ Data Simper + + + Jenis SIMPER + @endcan @@ -902,6 +911,8 @@ Dashboard @elseif(request()->routeIs('hse.employees.*')) Data Simper + @elseif(request()->routeIs('hse.simper_types.*')) + Jenis SIMPER @elseif(request()->routeIs('qma.vehicles.lv')) Light Vehicle @elseif(request()->routeIs('qma.vehicles.support.units*')) diff --git a/resources/views/mobilisasi/index.blade.php b/resources/views/mobilisasi/index.blade.php index 001e29d..c50c3a0 100644 --- a/resources/views/mobilisasi/index.blade.php +++ b/resources/views/mobilisasi/index.blade.php @@ -9,10 +9,10 @@

- Timesheet Kendaraan Ringan + Timesheet Kendaraan Ringan & Armada Mobile

- Kendaraan Ringan (LV) + Kendaraan Ringan (LV) & Heavy Mobile
@@ -33,8 +33,25 @@
+ + +
+
@@ -68,9 +85,15 @@
- - Kendaraan Ringan (LV) - + @if($v->isLightVehicle()) + + LV + + @else + + Heavy Mobile + + @endif @php $statusBadge = match($v->status) { @@ -122,9 +145,15 @@ Unit Sedang Breakdown
@else - - Isi Form Mobilisasi LV - + @if($v->isLightVehicle()) + + Isi Form Mobilisasi LV + + @else + + Isi Form Mobilisasi Unit + + @endif @endif
diff --git a/resources/views/pg/verification_logs.blade.php b/resources/views/pg/verification_logs.blade.php index 1e3721b..f3ccc6c 100644 --- a/resources/views/pg/verification_logs.blade.php +++ b/resources/views/pg/verification_logs.blade.php @@ -348,8 +348,15 @@ @endif
-
- {{ $item->driver->name }} +
+ {{ $item->driver->name }} + @if($item->driver->simpers && $item->driver->simpers->isNotEmpty()) + @foreach($item->driver->simpers->take(2) as $s) + + {{ $s->simperType?->code ?? 'SIMPER' }} + + @endforeach + @endif
{{ $item->driver->nik }} diff --git a/resources/views/public/vehicle_activity_form.blade.php b/resources/views/public/vehicle_activity_form.blade.php index 9a48f90..b6f458c 100644 --- a/resources/views/public/vehicle_activity_form.blade.php +++ b/resources/views/public/vehicle_activity_form.blade.php @@ -9,7 +9,7 @@ @if(auth()->check()) - Kembali ke Katalog LV + Kembali ke Katalog Armada @else
@@ -20,9 +20,15 @@
- - Kendaraan Ringan (LV) - + @if($vehicle->isLightVehicle()) + + Kendaraan Ringan (LV) + + @else + + Heavy Equipment Mobile + + @endif Scan QR Code Aktif @@ -44,7 +50,8 @@
Nopol: {{ $vehicle->license_plate ?? '-' }}
Merk / Tipe: {{ $vehicle->brand_type }}
Penanggung Jawab: {{ $vehicle->ownership ?? '-' }}
-
KM Sebelumnya: {{ number_format($vehicle->current_km, 0, ',', '.') }} KM
+
Odometer Sebelumnya: {{ number_format($vehicle->current_km, 0, ',', '.') }} KM
+
Wajib SIMPER: {{ $vehicle->requiredSimperType ? $vehicle->requiredSimperType->name : ($vehicle->isLightVehicle() ? 'SIMPER LV' : 'SIMPER Dump Truck / Heavy Mobile') }}
diff --git a/resources/views/qma/activity_log.blade.php b/resources/views/qma/activity_log.blade.php index 537af6b..b054b77 100644 --- a/resources/views/qma/activity_log.blade.php +++ b/resources/views/qma/activity_log.blade.php @@ -255,7 +255,16 @@ -
{{ $act->driver?->name ?? '-' }}
+
+ {{ $act->driver?->name ?? '-' }} + @if($act->driver && $act->driver->simpers && $act->driver->simpers->isNotEmpty()) + @foreach($act->driver->simpers->take(2) as $s) + + {{ $s->simperType?->code ?? 'SIMPER' }} + + @endforeach + @endif +
{{ $act->driver?->division ?? '-' }}
diff --git a/resources/views/qma/vehicles_support_units.blade.php b/resources/views/qma/vehicles_support_units.blade.php index 56615ff..493de50 100644 --- a/resources/views/qma/vehicles_support_units.blade.php +++ b/resources/views/qma/vehicles_support_units.blade.php @@ -165,6 +165,11 @@ {{ $u->code }} + @if($u->is_timesheet_mobile) + + Mobile + + @endif
@@ -492,7 +497,30 @@
- + +
+
+ + +
+ +
+
+ +
+
+ + +
+ +
+
@@ -714,6 +766,18 @@