From b83a8fa843ad99a77e5267adb38e10fae61b4420 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Sun, 1 Nov 2026 21:26:22 +0700 Subject: [PATCH] feat: fix HSE simper 500 error, enhance PG rejection, P2H wizard, simper renewal, QMA table UI, and nginx upload timeouts --- .../Controllers/Hse/EmployeeController.php | 97 ++++++- .../Pg/GateInspectionController.php | 12 +- docker/nginx/default.conf | 8 +- resources/views/admin/backups/index.blade.php | 20 ++ resources/views/hse/employees_edit.blade.php | 17 +- resources/views/hse/employees_index.blade.php | 212 ++++++++++++--- resources/views/p2h/form.blade.php | 157 ++++++++++-- resources/views/pg/gate_inspection.blade.php | 139 ++++++++++ .../views/pg/partials/queue_cards.blade.php | 49 ++-- .../views/qma/unit_transfers_index.blade.php | 147 +++++------ tests/Feature/GateInspectionTest.php | 91 +++++++ ...eEmployeeFlexibleUnitKerjaAndModalTest.php | 241 ++++++++++++++++++ 12 files changed, 1020 insertions(+), 170 deletions(-) diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index 3561c18..03c9aa4 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -588,6 +588,10 @@ class EmployeeController extends Controller 'is_operator' => ['required', 'in:1,0'], 'simper_expired_at' => ['nullable', 'date'], 'photo' => ['nullable', 'image', 'mimes:jpeg,png,jpg,webp', 'max:10240'], + 'simper_assignments' => ['nullable', 'array'], + 'simper_assignments.*.expired_at' => ['nullable', 'date'], + 'simper_assignments.*.simper_number' => ['nullable', 'string', 'max:100'], + 'renew_simper_type_id' => ['nullable', 'string'], ], [ 'nik.required' => 'NIK wajib diisi.', 'nik.unique' => 'NIK sudah terdaftar dalam sistem.', @@ -696,6 +700,10 @@ class EmployeeController extends Controller 'is_operator' => ['required', 'in:1,0'], 'simper_expired_at' => ['nullable', 'date'], 'photo' => ['nullable', 'image', 'mimes:jpeg,png,jpg,webp', 'max:10240'], + 'simper_assignments' => ['nullable', 'array'], + 'simper_assignments.*.expired_at' => ['nullable', 'date'], + 'simper_assignments.*.simper_number' => ['nullable', 'string', 'max:100'], + 'renew_simper_type_id' => ['nullable', 'string'], ], [ 'nik.unique' => 'NIK sudah digunakan oleh karyawan lain.', 'name.required' => 'Nama lengkap wajib diisi.', @@ -810,7 +818,8 @@ class EmployeeController extends Controller private function syncEmployeeSimpers(Employee $employee, Request $request, bool $isOperator, ?string $fallbackDate): void { if (! $isOperator) { - $employee->simpers()->delete(); + $employee->simpers()->forceDelete(); + $employee->update(['simper_expired_at' => null]); return; } @@ -821,20 +830,30 @@ class EmployeeController extends Controller $maxExpiredAt = null; foreach ($simperAssignments as $typeId => $data) { - $isEnabled = ! empty($data['enabled']) || (! isset($data['enabled']) && ! empty($data['expired_at'])); + // Hanya aktif jika dicentang eksplisit, ATAU fallback jika form tidak menyertakan checkbox enabled namun memiliki tanggal + $isEnabled = ! empty($data['enabled']); + if (! $isEnabled && ! isset($data['enabled']) && ! empty($data['expired_at'])) { + $isEnabled = true; + } + 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 = EmployeeSimper::withTrashed()->updateOrCreate( + ['employee_id' => $employee->id, 'simper_type_id' => (int) $typeId], [ 'simper_number' => $simperNum, 'expired_at' => $expDate, 'status' => 'active', + 'deleted_at' => null, ] ); + if ($simper->trashed()) { + $simper->restore(); + } + $activeTypeIds[] = (int) $typeId; if (! $maxExpiredAt || $expDate > $maxExpiredAt) { @@ -843,26 +862,84 @@ class EmployeeController extends Controller } } - // Hapus jenis SIMPER yang sudah tidak dicentang + // Hapus jenis SIMPER yang sudah tidak dicentang (Gunakan forceDelete agar tidak memicu benturan Unique Index) EmployeeSimper::where('employee_id', $employee->id) ->whereNotIn('simper_type_id', $activeTypeIds) - ->delete(); + ->forceDelete(); - if ($maxExpiredAt && $employee->simper_expired_at != $maxExpiredAt) { - $employee->update(['simper_expired_at' => $maxExpiredAt]); + $employee->update(['simper_expired_at' => $maxExpiredAt]); + } elseif ($request->filled('renew_simper_type_id')) { + // Khusus alur Perpanjang SIMPER via Modal (#renewModal) + $renewTypeId = $request->input('renew_simper_type_id'); + $newExpiry = $request->input('simper_expired_at'); + + if ($newExpiry) { + if ($renewTypeId === 'all') { + // Perpanjang semua SIMPER yang aktif dimiliki oleh karyawan + $existingSimpers = $employee->simpers; + if ($existingSimpers->isNotEmpty()) { + foreach ($existingSimpers as $s) { + $s->update([ + 'expired_at' => $newExpiry, + 'status' => 'active', + ]); + } + } else { + // Jika belum ada SIMPER sama sekali, buatkan SIMPER-LV default + $lvTypeId = SimperType::where('code', 'SIMPER-LV')->value('id'); + if ($lvTypeId) { + $simper = EmployeeSimper::withTrashed()->updateOrCreate( + ['employee_id' => $employee->id, 'simper_type_id' => $lvTypeId], + [ + 'simper_number' => 'SMP-' . str_pad($employee->id, 4, '0', STR_PAD_LEFT), + 'expired_at' => $newExpiry, + 'status' => 'active', + 'deleted_at' => null, + ] + ); + if ($simper->trashed()) { + $simper->restore(); + } + } + } + } else { + // Perpanjang jenis SIMPER spesifik yang dipilih pada dropdown + $targetTypeId = (int) $renewTypeId; + $simper = EmployeeSimper::withTrashed()->updateOrCreate( + ['employee_id' => $employee->id, 'simper_type_id' => $targetTypeId], + [ + 'simper_number' => 'SMP-' . str_pad($employee->id, 4, '0', STR_PAD_LEFT), + 'expired_at' => $newExpiry, + 'status' => 'active', + 'deleted_at' => null, + ] + ); + if ($simper->trashed()) { + $simper->restore(); + } + } + + // Sinkronkan simper_expired_at master karyawan dengan tanggal terlama di antara simper aktif + $latestMax = $employee->simpers()->max('expired_at'); + $employee->update(['simper_expired_at' => $latestMax]); } } elseif ($fallbackDate) { - // Fallback untuk form sederhana / pengujian yang mengirimkan 1 tanggal simper_expired_at + // Fallback untuk pengujian sederhana yang mengirimkan 1 tanggal simper_expired_at $lvTypeId = SimperType::where('code', 'SIMPER-LV')->value('id'); if ($lvTypeId) { - EmployeeSimper::updateOrCreate( + $simper = EmployeeSimper::withTrashed()->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', + 'deleted_at' => null, ] ); + if ($simper->trashed()) { + $simper->restore(); + } + $employee->update(['simper_expired_at' => $fallbackDate]); } } } diff --git a/app/Http/Controllers/Pg/GateInspectionController.php b/app/Http/Controllers/Pg/GateInspectionController.php index bb797ce..d6ff49a 100644 --- a/app/Http/Controllers/Pg/GateInspectionController.php +++ b/app/Http/Controllers/Pg/GateInspectionController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Pg; use App\Http\Controllers\Controller; +use App\Models\AdminActivityLog; use App\Models\Gate; use App\Models\SecurityGuard; use App\Models\VehicleActivity; @@ -268,6 +269,15 @@ class GateInspectionController extends Controller 'validated_at' => Carbon::now(), ]); - return back()->with('success', "Aktivitas kendaraan {$activity->vehicle->code} telah ditolak."); + AdminActivityLog::record( + 'reject', + 'pos_gerbang', + "Penolakan perlintasan gerbang untuk kendaraan {$activity->vehicle?->code} (Driver: {$activity->driver?->name}). Alasan: {$activity->rejection_note}", + 'vehicle_activity', + $activity->id, + $activity->transaction_no + ); + + return back()->with('success', "Aktivitas perlintasan kendaraan {$activity->vehicle->code} telah ditolak."); } } diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf index ebd4b63..5ae15d8 100644 --- a/docker/nginx/default.conf +++ b/docker/nginx/default.conf @@ -9,6 +9,11 @@ server { index index.php index.html; client_max_body_size 500M; + client_body_buffer_size 1M; + client_body_timeout 600s; + client_header_timeout 600s; + send_timeout 600s; + keepalive_timeout 600s; # Security Headers add_header X-Frame-Options "SAMEORIGIN" always; @@ -56,7 +61,8 @@ server { fastcgi_hide_header X-Powered-By; fastcgi_buffers 16 16k; fastcgi_buffer_size 32k; - fastcgi_read_timeout 300; + fastcgi_read_timeout 600; + fastcgi_send_timeout 600; } location ~ /\.(?!well-known).* { diff --git a/resources/views/admin/backups/index.blade.php b/resources/views/admin/backups/index.blade.php index 48cf611..31e480e 100644 --- a/resources/views/admin/backups/index.blade.php +++ b/resources/views/admin/backups/index.blade.php @@ -1012,6 +1012,7 @@ const xhr = new XMLHttpRequest(); xhr.open('POST', form.action, true); + xhr.timeout = 600000; // 10 Menit timeout untuk berkas backup besar xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); xhr.upload.onprogress = function(e) { @@ -1074,6 +1075,18 @@ document.getElementById('directRestoreError').classList.remove('hidden'); }; + xhr.ontimeout = function() { + loading.classList.add('hidden'); + document.getElementById('directRestoreDropzoneContainer').classList.remove('hidden'); + if (btn) { + btn.disabled = false; + btn.classList.remove('opacity-75', 'cursor-not-allowed'); + } + if (text) text.textContent = 'Mulai Pemulihan Sistem'; + document.getElementById('directRestoreErrorMessage').textContent = 'Waktu pengunggahan habis (Timeout 10 Menit). Silakan periksa kestabilan jaringan internet Anda.'; + document.getElementById('directRestoreError').classList.remove('hidden'); + }; + xhr.send(formData); return false; } @@ -1239,6 +1252,7 @@ const xhr = new XMLHttpRequest(); xhr.open('POST', `{{ route('admin.backups.converter.inspect') }}`, true); + xhr.timeout = 600000; // 10 Menit timeout xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); xhr.setRequestHeader('Accept', 'application/json'); @@ -1314,6 +1328,12 @@ showConverterError('Koneksi terputus saat mengunggah berkas.'); }; + xhr.ontimeout = function() { + loading.classList.add('hidden'); + document.getElementById('panelConverterUpload').classList.remove('hidden'); + showConverterError('Waktu pengunggahan habis (Timeout 10 Menit). Silakan periksa kestabilan jaringan internet Anda.'); + }; + xhr.send(formData); } diff --git a/resources/views/hse/employees_edit.blade.php b/resources/views/hse/employees_edit.blade.php index 0b4e9a4..8b065c1 100644 --- a/resources/views/hse/employees_edit.blade.php +++ b/resources/views/hse/employees_edit.blade.php @@ -242,9 +242,11 @@ + class="w-full text-xs px-3 py-2 rounded-xl border border-slate-200 bg-white text-slate-800 font-mono font-bold focus:outline-none focus:border-emerald-600 disabled:opacity-50 disabled:bg-slate-100">
+ {{ $isChecked ? '' : 'disabled' }} + class="w-full text-xs px-3 py-2 rounded-xl border border-slate-200 bg-white text-slate-800 font-semibold focus:outline-none focus:border-emerald-600 disabled:opacity-50 disabled:bg-slate-100">
@@ -359,11 +363,20 @@ function toggleSimperRow(id) { const chk = document.getElementById(`chkSimper_${id}`); const fields = document.getElementById(`fieldsSimper_${id}`); + const numInp = document.getElementById(`inputSimperNum_${id}`); + const expInp = document.getElementById(`inputSimperExp_${id}`); if (chk && fields) { if (chk.checked) { fields.classList.remove('hidden'); + if (numInp) numInp.disabled = false; + if (expInp) expInp.disabled = false; } else { fields.classList.add('hidden'); + if (numInp) numInp.disabled = true; + if (expInp) { + expInp.disabled = true; + expInp.value = ''; + } } } } diff --git a/resources/views/hse/employees_index.blade.php b/resources/views/hse/employees_index.blade.php index 85f1ab0..1a00e8c 100644 --- a/resources/views/hse/employees_index.blade.php +++ b/resources/views/hse/employees_index.blade.php @@ -281,7 +281,7 @@ | - -
+ @csrf -
- Pengemudi: - + +
+
+ Pengemudi / Operator: + + +
+ + Driver Aktif +
+ + + + +
- - + +

+ +
- + + class="w-full text-xs px-3.5 py-2.5 rounded-xl border border-slate-200 bg-white text-slate-800 font-semibold focus:outline-none focus:border-[#1b5e20] focus:ring-2 focus:ring-[#1b5e20]/10 transition"> + + +
+ Pintas: + + +
-
+ +
@@ -1152,13 +1190,20 @@ function toggleEditSimperFields(id) { const check = document.getElementById(`editSimperCheck_${id}`); const fields = document.getElementById(`editSimperFields_${id}`); + const numInp = document.getElementById(`editSimperNum_${id}`); + const expInp = document.getElementById(`editSimperExp_${id}`); if (check && fields) { if (check.checked) { fields.classList.remove('hidden'); + if (numInp) numInp.disabled = false; + if (expInp) expInp.disabled = false; } else { fields.classList.add('hidden'); - const expInp = document.getElementById(`editSimperExp_${id}`); - if (expInp) expInp.value = ''; + if (numInp) numInp.disabled = true; + if (expInp) { + expInp.disabled = true; + expInp.value = ''; + } } } syncEditPrimarySimperDate(); @@ -1248,9 +1293,9 @@ const fields = document.getElementById(`editSimperFields_${id}`); if (fields) fields.classList.add('hidden'); const num = document.getElementById(`editSimperNum_${id}`); - if (num) num.value = ''; + if (num) { num.value = ''; num.disabled = true; } const exp = document.getElementById(`editSimperExp_${id}`); - if (exp) exp.value = ''; + if (exp) { exp.value = ''; exp.disabled = true; } }); // Isi checklist SIMPER dari data emp.simpers @@ -1263,8 +1308,8 @@ 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); + if (num) { num.value = s.simper_number || ''; num.disabled = false; } + if (exp && s.expired_at) { exp.value = s.expired_at.substring(0, 10); exp.disabled = false; } } }); } else if (emp.is_operator && expDate) { @@ -1274,8 +1319,10 @@ const id = firstCb.id.replace('editSimperCheck_', ''); const fields = document.getElementById(`editSimperFields_${id}`); if (fields) fields.classList.remove('hidden'); + const num = document.getElementById(`editSimperNum_${id}`); + if (num) num.disabled = false; const exp = document.getElementById(`editSimperExp_${id}`); - if (exp) exp.value = expDate; + if (exp) { exp.value = expDate; exp.disabled = false; } } } syncEditPrimarySimperDate(); @@ -1327,21 +1374,118 @@ if (modal) modal.classList.add('hidden'); } - function openRenewModal(id, name, expiredDate, isOperator) { - document.getElementById('renewName').textContent = name; - document.getElementById('renewOperator').value = isOperator ? '1' : '0'; - document.getElementById('renewDate').value = expiredDate; - - // Cek status driver untuk mengunci/membuka input SIMPER - toggleSimperInput('renew'); + let currentRenewEmployee = null; - document.getElementById('renewForm').action = `/hse/employees/${id}`; + function openRenewModal(empOrId, legacyName, legacyDate, legacyIsOp) { + let emp = null; + if (typeof empOrId === 'object' && empOrId !== null) { + emp = empOrId; + } else { + emp = { + id: empOrId, + name: legacyName || '', + nik: '', + is_operator: legacyIsOp ? 1 : 0, + simper_expired_at: legacyDate || '', + simpers: [] + }; + } + currentRenewEmployee = emp; + + document.getElementById('renewName').textContent = emp.name || '-'; + document.getElementById('renewNik').textContent = emp.nik ? `NIK: ${emp.nik}` : ''; + document.getElementById('renewOperator').value = '1'; + + const select = document.getElementById('renewSimperTypeSelect'); + const badge = document.getElementById('renewSimperBadge'); + select.innerHTML = ''; + + const simpers = Array.isArray(emp.simpers) ? emp.simpers : []; + const simperCount = simpers.length; + + if (simperCount > 1) { + badge.textContent = `${simperCount} Izin SIMPER`; + // Opsi Semua SIMPER Sekaligus + const allOpt = document.createElement('option'); + allOpt.value = 'all'; + allOpt.textContent = '★ Perpanjang Semua Jenis SIMPER Sekaligus'; + select.appendChild(allOpt); + + simpers.forEach(s => { + const opt = document.createElement('option'); + opt.value = s.simper_type_id; + const typeName = s.simper_type ? s.simper_type.name : `SIMPER ID #${s.simper_type_id}`; + const expText = s.expired_at ? s.expired_at.substring(0, 10) : 'Belum diatur'; + opt.textContent = `${typeName} (s/d ${expText})`; + opt.dataset.exp = s.expired_at ? s.expired_at.substring(0, 10) : ''; + select.appendChild(opt); + }); + } else if (simperCount === 1) { + badge.textContent = '1 Izin SIMPER'; + const s = simpers[0]; + const opt = document.createElement('option'); + opt.value = s.simper_type_id; + const typeName = s.simper_type ? s.simper_type.name : 'SIMPER'; + const expText = s.expired_at ? s.expired_at.substring(0, 10) : 'Belum diatur'; + opt.textContent = `${typeName} (Masa berlaku saat ini: ${expText})`; + opt.dataset.exp = s.expired_at ? s.expired_at.substring(0, 10) : ''; + select.appendChild(opt); + } else { + badge.textContent = 'Belum Ada SIMPER'; + const opt = document.createElement('option'); + opt.value = 'all'; + opt.textContent = 'SIMPER Standar / Default (Semua)'; + select.appendChild(opt); + } + + // Sinkronisasi tanggal + onRenewSimperTypeChange(select.value); + + document.getElementById('renewForm').action = `/hse/employees/${emp.id}`; document.getElementById('renewModal').classList.remove('hidden'); } + function onRenewSimperTypeChange(val) { + const select = document.getElementById('renewSimperTypeSelect'); + const selectedOpt = select.options[select.selectedIndex]; + const infoEl = document.getElementById('renewCurrentExpInfo'); + const dateInput = document.getElementById('renewDate'); + + let currentExp = ''; + if (selectedOpt && selectedOpt.dataset.exp) { + currentExp = selectedOpt.dataset.exp; + } else if (currentRenewEmployee && currentRenewEmployee.simper_expired_at) { + currentExp = currentRenewEmployee.simper_expired_at.substring(0, 10); + } + + if (currentExp) { + infoEl.innerHTML = ` Masa berlaku saat ini: ${currentExp}`; + // Preset tanggal baru: 1 tahun dari masa berlaku sekarang (jika masa depan) atau 1 tahun dari hari ini + const currDateObj = new Date(currentExp); + const today = new Date(); + const targetBase = (!isNaN(currDateObj) && currDateObj > today) ? currDateObj : today; + const newDate = new Date(targetBase); + newDate.setFullYear(newDate.getFullYear() + 1); + dateInput.value = newDate.toISOString().substring(0, 10); + } else { + infoEl.innerHTML = ` Belum ada masa berlaku sebelumnya.`; + const now = new Date(); + now.setFullYear(now.getFullYear() + 1); + dateInput.value = now.toISOString().substring(0, 10); + } + } + + function setRenewDateOffset(months) { + const dateInput = document.getElementById('renewDate'); + const now = new Date(); + now.setMonth(now.getMonth() + months); + dateInput.value = now.toISOString().substring(0, 10); + } + function closeRenewModal() { const modal = document.getElementById('renewModal'); if (modal) modal.classList.add('hidden'); + currentRenewEmployee = null; } function openDeleteEmployeeModal(id, name, nik) { diff --git a/resources/views/p2h/form.blade.php b/resources/views/p2h/form.blade.php index eb8479b..24c83c7 100644 --- a/resources/views/p2h/form.blade.php +++ b/resources/views/p2h/form.blade.php @@ -165,8 +165,13 @@ onclick="switchP2hSection('{{ $secKey }}')" id="p2h-tab-{{ $secKey }}" data-section-key="{{ $secKey }}" - class="p2h-section-tab group inline-flex items-center px-4 py-2.5 rounded-xl text-xs font-bold transition whitespace-nowrap cursor-pointer shrink-0 {{ $isFirst ? 'bg-[#1b5e20] text-white shadow-xs border border-[#1b5e20]' : 'bg-white border border-slate-200 text-slate-700 hover:bg-slate-50 hover:border-slate-300' }}"> + data-section-index="{{ $loop->index }}" + class="p2h-section-tab group inline-flex items-center space-x-1.5 px-4 py-2.5 rounded-xl text-xs font-bold transition whitespace-nowrap cursor-pointer shrink-0 {{ $isFirst ? 'bg-[#1b5e20] text-white shadow-xs border border-[#1b5e20]' : 'bg-white border border-slate-200 text-slate-700 hover:bg-slate-50 hover:border-slate-300' }}"> + #{{ $loop->iteration }} {{ $sectionName }} + @endforeach
@@ -289,15 +294,15 @@ @endforeach
- + @if(count($groupedItems) > 1)
@if($prevKey) @else
@@ -305,15 +310,18 @@ @if($nextKey) @else - - Bagian Terakhir - + @endif
@endif @@ -330,18 +338,29 @@ - -
- - Batal - + +
+
+
+ + Harap selesaikan pemeriksaan pada seluruh bagian (section) di atas untuk memunculkan tombol pengiriman formulir P2H ke QMA. +
+
- +
+ + Batal + + +
+ +
+
@@ -349,20 +368,26 @@ @section('scripts') @endsection diff --git a/resources/views/pg/gate_inspection.blade.php b/resources/views/pg/gate_inspection.blade.php index 2b00b2d..1ac865a 100644 --- a/resources/views/pg/gate_inspection.blade.php +++ b/resources/views/pg/gate_inspection.blade.php @@ -471,6 +471,38 @@ openGateSelectionModal(true); }); @endif + + // Modal Tolak Perjalanan Kendaraan di Pos Gerbang + function openRejectModal(id, unit, driver, direction) { + document.getElementById('rejectUnitDisplay').textContent = unit || '-'; + document.getElementById('rejectDriverDisplay').textContent = driver || '-'; + const dirEl = document.getElementById('rejectDirectionDisplay'); + if (direction === 'in') { + dirEl.textContent = 'Masuk Gerbang (IN)'; + dirEl.className = 'font-bold text-xs uppercase px-2 py-0.5 rounded-md bg-blue-100 text-blue-800'; + } else { + dirEl.textContent = 'Keluar Gerbang (OUT)'; + dirEl.className = 'font-bold text-xs uppercase px-2 py-0.5 rounded-md bg-amber-100 text-amber-800'; + } + + document.getElementById('rejectNoteInput').value = ''; + document.getElementById('rejectForm').action = `/pg/gate-inspection/${id}/reject`; + const modal = document.getElementById('rejectModal'); + if (modal) modal.classList.remove('hidden'); + } + + function closeRejectModal() { + const modal = document.getElementById('rejectModal'); + if (modal) modal.classList.add('hidden'); + } + + function setQuickReason(text) { + const input = document.getElementById('rejectNoteInput'); + if (input) { + input.value = text; + input.focus(); + } + } @@ -581,4 +613,111 @@ + + + + @endsection diff --git a/resources/views/pg/partials/queue_cards.blade.php b/resources/views/pg/partials/queue_cards.blade.php index 8cb5a47..c3dfe1a 100644 --- a/resources/views/pg/partials/queue_cards.blade.php +++ b/resources/views/pg/partials/queue_cards.blade.php @@ -113,32 +113,41 @@ @endif - +
- @can('gate.approve') -
- @csrf - @if($currentGuard) - - @elseif($guards->isNotEmpty()) - - @endif - - -
- @else - Tidak memiliki izin verifikasi - @endcan + @endcan + + @can('gate.approve') +
+ @csrf + @if($currentGuard) + + @elseif($guards->isNotEmpty()) + + @endif + + +
+ @endcan +
diff --git a/resources/views/qma/unit_transfers_index.blade.php b/resources/views/qma/unit_transfers_index.blade.php index c406f36..35b0e18 100644 --- a/resources/views/qma/unit_transfers_index.blade.php +++ b/resources/views/qma/unit_transfers_index.blade.php @@ -173,99 +173,91 @@ - +
- - - - - - - - + + + + + + + @forelse($transfers as $index => $t) - - - - - - - - - + + + - - - - - - - - @empty -
NOTANGGAL & NO TRANSFERBERITA ACARA (BAST)UNIT ALAT BERATPERPINDAHAN LOKASIARMADA & SUPIRPELAPORAKSINODOKUMEN & TANGGALUNIT ALAT BERATRUTE PEMINDAHANPENGANGKUT & SUPIRPELAPORAKSI
+ {{ $transfers->firstItem() + $index }} -
- {{ $t->transfer_date ? $t->transfer_date->translatedFormat('d M Y') : '-' }} -
- - {{ $t->transfer_no }} - -
- @if($t->document_number) -
- {{ $t->document_number }} -
-
- {{ $t->document_title }} -
- @if($t->document_file_path) - - - Lihat Lampiran - - @endif - @else - - Tanpa BAST (Internal Site) - - @endif -
-
- @if($t->vehicle && $t->vehicle->photo_url) - {{ $t->vehicle->code }} + +
+
+ @if($t->document_number) + + {{ $t->document_number }} + + @if($t->document_file_path) + + + + @endif @else -
- + + Internal Site + + @endif +
+
+ {{ $t->transfer_date ? $t->transfer_date->translatedFormat('d M Y') : '-' }} + • + {{ $t->transfer_no }} +
+
+
+ @if($t->vehicle && $t->vehicle->photo_url) + {{ $t->vehicle->code }} + @else +
+
@endif
-
+
{{ $t->vehicle?->code ?? '-' }}
-
+
{{ $t->vehicle?->brand_type ?? '-' }}
-
+ +
+
{{ $t->from_location }} - - {{ $t->to_location }} + + {{ $t->to_location }}
-
+
@if($t->isToInsideSite()) - + Di Dalam Site @else - + Di Luar Site @@ -273,34 +265,33 @@
-
- - {{ $t->transporter_unit_name ?: ($t->transporterVehicle?->code ?? 'Tanpa Pengangkut') }} + +
+
+ + {{ $t->transporter_unit_name ?: ($t->transporterVehicle?->code ?? 'Tanpa Pengangkut') }}
- {{ $t->transporter_driver_name ?: ($t->transporterDriver?->name ?? '-') }}
-
+ +
+
{{ $t->reported_by }}
- Petugas QMA + QMA
-
+ +
+
@@ -309,7 +300,7 @@ @can('qma.vehicles.delete') @@ -319,12 +310,12 @@
-
+
+
-

Belum Ada Data Pemindahan Unit

-

+

Belum Ada Data Pemindahan Unit

+

Belum ada transaksi pemindahan alat berat yang tercatat. Silakan klik tombol "Buat Transfer Unit" untuk membuat Berita Acara baru.

@canany(['qma.vehicles.create', 'qma.vehicles.edit']) diff --git a/tests/Feature/GateInspectionTest.php b/tests/Feature/GateInspectionTest.php index df6ad65..ffbc841 100644 --- a/tests/Feature/GateInspectionTest.php +++ b/tests/Feature/GateInspectionTest.php @@ -190,4 +190,95 @@ class GateInspectionTest extends TestCase 'gate_id' => null, ]); } + + public function test_guard_can_reject_vehicle_activity_with_rejection_note(): void + { + $vehicle = Vehicle::create([ + 'code' => 'LV-REJECT-01', + 'category' => 'light_vehicle', + 'brand_type' => 'Mitsubishi Triton', + 'current_km' => 2000, + ]); + + $driver = Employee::create([ + 'name' => 'Driver Mau Lewat', + 'nik' => 'KMH-REJ-01', + ]); + + $activity = VehicleActivity::create([ + 'transaction_no' => 'TRX-REJ-001', + 'vehicle_id' => $vehicle->id, + 'driver_id' => $driver->id, + 'gate_id' => $this->gate1->id, + 'direction' => 'out', + 'previous_km' => 2000, + 'current_km' => 2050, + 'distance' => 50, + 'purpose' => 'Ambil Material Proyek', + 'validation_status' => 'pending', + 'recorded_at' => now(), + ]); + + $response = $this->actingAs($this->guardUser) + ->post(route('pg.gate.reject', $activity->id), [ + 'security_guard_id' => $this->guard->id, + 'rejection_note' => 'Masa berlaku SIMPER pengemudi telah kedaluwarsa (Expired)', + ]); + + $response->assertRedirect(); + $response->assertSessionHas('success'); + + $activity->refresh(); + $this->assertEquals('rejected', $activity->validation_status); + $this->assertEquals($this->guard->id, $activity->security_guard_id); + $this->assertEquals('Masa berlaku SIMPER pengemudi telah kedaluwarsa (Expired)', $activity->rejection_note); + $this->assertNotNull($activity->validated_at); + + // Verifikasi tercatat di AdminActivityLog + $this->assertDatabaseHas('admin_activity_logs', [ + 'action_type' => 'reject', + 'module' => 'pos_gerbang', + 'target_type' => 'vehicle_activity', + 'target_id' => $activity->id, + ]); + } + + public function test_cannot_reject_vehicle_activity_without_rejection_note(): void + { + $vehicle = Vehicle::create([ + 'code' => 'LV-REJECT-02', + 'category' => 'light_vehicle', + 'brand_type' => 'Toyota Hilux', + 'current_km' => 1500, + ]); + + $driver = Employee::create([ + 'name' => 'Driver No Note', + 'nik' => 'KMH-REJ-02', + ]); + + $activity = VehicleActivity::create([ + 'transaction_no' => 'TRX-REJ-002', + 'vehicle_id' => $vehicle->id, + 'driver_id' => $driver->id, + 'gate_id' => $this->gate1->id, + 'direction' => 'in', + 'previous_km' => 1500, + 'current_km' => 1520, + 'distance' => 20, + 'purpose' => 'Patroli', + 'validation_status' => 'pending', + 'recorded_at' => now(), + ]); + + $response = $this->actingAs($this->guardUser) + ->post(route('pg.gate.reject', $activity->id), [ + 'security_guard_id' => $this->guard->id, + 'rejection_note' => '', + ]); + + $response->assertSessionHasErrors('rejection_note'); + $activity->refresh(); + $this->assertEquals('pending', $activity->validation_status); + } } diff --git a/tests/Feature/HseEmployeeFlexibleUnitKerjaAndModalTest.php b/tests/Feature/HseEmployeeFlexibleUnitKerjaAndModalTest.php index 33ef6bf..3f8c3ae 100644 --- a/tests/Feature/HseEmployeeFlexibleUnitKerjaAndModalTest.php +++ b/tests/Feature/HseEmployeeFlexibleUnitKerjaAndModalTest.php @@ -430,4 +430,245 @@ class HseEmployeeFlexibleUnitKerjaAndModalTest extends TestCase 'position' => 'Anggota', ]); } + + public function test_unchecking_and_readding_simper_does_not_trigger_500_unique_constraint_violation(): void + { + $simperLv = \App\Models\SimperType::firstOrCreate( + ['code' => 'SIMPER-LV'], + ['name' => 'SIMPER Light Vehicle', 'category_scope' => 'light_vehicle', 'is_active' => true] + ); + + $simperDt = \App\Models\SimperType::firstOrCreate( + ['code' => 'SIMPER-DT'], + ['name' => 'SIMPER Dump Truck', 'category_scope' => 'unit_support_mobile', 'is_active' => true] + ); + + $employee = Employee::create([ + 'nik' => 'KMH-MULTI-SIMPER', + 'name' => 'Driver Multi Izin', + 'employee_type' => 'Karyawan', + 'unit_kerja' => 'Umum', + 'division' => 'Operasi', + 'position' => 'Driver Tambang', + 'is_operator' => true, + 'simper_expired_at' => '2026-12-31', + ]); + + // 1. Tambah 2 SIMPER awal + \App\Models\EmployeeSimper::create([ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperLv->id, + 'simper_number' => 'SMP-001-LV', + 'expired_at' => '2026-12-31', + 'status' => 'active', + ]); + \App\Models\EmployeeSimper::create([ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperDt->id, + 'simper_number' => 'SMP-001-DT', + 'expired_at' => '2026-12-31', + 'status' => 'active', + ]); + + // 2. Edit Karyawan: Hilangkan (uncheck) SIMPER-DT (hanya sisakan SIMPER-LV) + $responseUncheck = $this->actingAs($this->hseAdmin) + ->post(route('hse.employees.update', $employee->id), [ + 'name' => 'Driver Multi Izin', + 'is_operator' => '1', + 'simper_assignments' => [ + $simperLv->id => [ + 'enabled' => '1', + 'simper_number' => 'SMP-001-LV', + 'expired_at' => '2026-12-31', + ], + $simperDt->id => [ + // Unchecked: enabled tidak dikirim + 'simper_number' => 'SMP-001-DT', + 'expired_at' => '', + ], + ], + ]); + + $responseUncheck->assertSessionHasNoErrors(); + $responseUncheck->assertRedirect(); + + // SIMPER-DT harus terhapus + $this->assertDatabaseMissing('employee_simpers', [ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperDt->id, + 'deleted_at' => null, + ]); + + // 3. Edit Karyawan LAGI: Centang kembali (re-add) SIMPER-DT + // Ini adalah skenario yang sebelumnya memicu 500 Duplicate entry + $responseReadd = $this->actingAs($this->hseAdmin) + ->post(route('hse.employees.update', $employee->id), [ + 'name' => 'Driver Multi Izin', + 'is_operator' => '1', + 'simper_assignments' => [ + $simperLv->id => [ + 'enabled' => '1', + 'simper_number' => 'SMP-001-LV', + 'expired_at' => '2026-12-31', + ], + $simperDt->id => [ + 'enabled' => '1', + 'simper_number' => 'SMP-001-DT-RENEWED', + 'expired_at' => '2027-06-30', + ], + ], + ]); + + $responseReadd->assertSessionHasNoErrors(); + $responseReadd->assertRedirect(); + + // Verifikasi bahwa SIMPER-DT berhasil aktif kembali tanpa error 500 + $this->assertDatabaseHas('employee_simpers', [ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperDt->id, + 'simper_number' => 'SMP-001-DT-RENEWED', + 'expired_at' => '2027-06-30 00:00:00', + 'status' => 'active', + 'deleted_at' => null, + ]); + + $employee->refresh(); + $this->assertEquals('2027-06-30', $employee->simper_expired_at->format('Y-m-d')); + } + + public function test_hse_can_renew_specific_simper_with_dropdown_selection(): void + { + $simperLv = \App\Models\SimperType::firstOrCreate( + ['code' => 'SIMPER-LV'], + ['name' => 'SIMPER Light Vehicle', 'category_scope' => 'light_vehicle', 'is_active' => true] + ); + + $simperDt = \App\Models\SimperType::firstOrCreate( + ['code' => 'SIMPER-DT'], + ['name' => 'SIMPER Dump Truck', 'category_scope' => 'unit_support_mobile', 'is_active' => true] + ); + + $employee = Employee::create([ + 'nik' => 'KMH-RENEW-TEST', + 'name' => 'Operator Perpanjang', + 'employee_type' => 'Karyawan', + 'unit_kerja' => 'Operasi', + 'division' => 'Operasi', + 'position' => 'Driver', + 'is_operator' => true, + 'simper_expired_at' => '2026-10-01', + ]); + + \App\Models\EmployeeSimper::create([ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperLv->id, + 'simper_number' => 'SMP-LV-01', + 'expired_at' => '2026-10-01', + 'status' => 'active', + ]); + + \App\Models\EmployeeSimper::create([ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperDt->id, + 'simper_number' => 'SMP-DT-01', + 'expired_at' => '2026-09-01', + 'status' => 'active', + ]); + + // Perpanjang HANYA SIMPER-DT via modal dropdown (renew_simper_type_id = DT) + $response = $this->actingAs($this->hseAdmin) + ->post(route('hse.employees.update', $employee->id), [ + 'is_operator' => '1', + 'renew_simper_type_id' => (string) $simperDt->id, + 'simper_expired_at' => '2027-12-31', + ]); + + $response->assertSessionHasNoErrors(); + $response->assertRedirect(); + + // SIMPER-DT harus diperpanjang ke 2027-12-31 + $this->assertDatabaseHas('employee_simpers', [ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperDt->id, + 'expired_at' => '2027-12-31 00:00:00', + ]); + + // SIMPER-LV harus tetap 2026-10-01 (tidak berubah) + $this->assertDatabaseHas('employee_simpers', [ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperLv->id, + 'expired_at' => '2026-10-01 00:00:00', + ]); + + // Max expired_at master employee harus ikut naik ke 2027-12-31 + $employee->refresh(); + $this->assertEquals('2027-12-31', $employee->simper_expired_at->format('Y-m-d')); + } + + public function test_hse_can_renew_all_simpers_simultaneously(): void + { + $simperLv = \App\Models\SimperType::firstOrCreate( + ['code' => 'SIMPER-LV'], + ['name' => 'SIMPER Light Vehicle', 'category_scope' => 'light_vehicle', 'is_active' => true] + ); + + $simperDt = \App\Models\SimperType::firstOrCreate( + ['code' => 'SIMPER-DT'], + ['name' => 'SIMPER Dump Truck', 'category_scope' => 'unit_support_mobile', 'is_active' => true] + ); + + $employee = Employee::create([ + 'nik' => 'KMH-RENEW-ALL', + 'name' => 'Operator All Renew', + 'employee_type' => 'Karyawan', + 'unit_kerja' => 'Operasi', + 'division' => 'Operasi', + 'position' => 'Driver', + 'is_operator' => true, + 'simper_expired_at' => '2026-05-01', + ]); + + \App\Models\EmployeeSimper::create([ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperLv->id, + 'simper_number' => 'SMP-LV-02', + 'expired_at' => '2026-05-01', + 'status' => 'active', + ]); + + \App\Models\EmployeeSimper::create([ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperDt->id, + 'simper_number' => 'SMP-DT-02', + 'expired_at' => '2026-06-01', + 'status' => 'active', + ]); + + // Perpanjang SEMUA SIMPER sekaligus (renew_simper_type_id = all) + $response = $this->actingAs($this->hseAdmin) + ->post(route('hse.employees.update', $employee->id), [ + 'is_operator' => '1', + 'renew_simper_type_id' => 'all', + 'simper_expired_at' => '2028-01-01', + ]); + + $response->assertSessionHasNoErrors(); + $response->assertRedirect(); + + // Keduanya harus naik ke 2028-01-01 + $this->assertDatabaseHas('employee_simpers', [ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperLv->id, + 'expired_at' => '2028-01-01 00:00:00', + ]); + + $this->assertDatabaseHas('employee_simpers', [ + 'employee_id' => $employee->id, + 'simper_type_id' => $simperDt->id, + 'expired_at' => '2028-01-01 00:00:00', + ]); + + $employee->refresh(); + $this->assertEquals('2028-01-01', $employee->simper_expired_at->format('Y-m-d')); + } }