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">