diff --git a/app/Http/Controllers/Pg/GateInspectionController.php b/app/Http/Controllers/Pg/GateInspectionController.php index d6ff49a..4c41d63 100644 --- a/app/Http/Controllers/Pg/GateInspectionController.php +++ b/app/Http/Controllers/Pg/GateInspectionController.php @@ -160,19 +160,23 @@ class GateInspectionController extends Controller public function approve(Request $request, int $id): RedirectResponse { $user = $request->user(); - $currentGuard = $user ? $user->securityGuard : null; - $guardId = $request->input('security_guard_id') ?? ($currentGuard ? $currentGuard->id : null); + $guard = $user ? ($user->securityGuard ?: SecurityGuard::where('user_id', $user->id)->first() ?: SecurityGuard::where('name', $user->name)->first() ?: SecurityGuard::where('badge_id', $user->username)->first()) : null; - if (!$guardId) { - $request->validate([ - 'security_guard_id' => ['required', 'exists:security_guards,id'], - ], [ - 'security_guard_id.required' => 'Silakan pilih nama petugas Satpam yang melakukan pemeriksaan fisik.', - 'security_guard_id.exists' => 'Petugas Satpam yang dipilih tidak valid dalam sistem.', - ]); - $guardId = $request->input('security_guard_id'); + if (!$guard && $user) { + $guard = SecurityGuard::firstOrCreate( + ['user_id' => $user->id], + [ + 'badge_id' => $user->username ?: ('PG-' . str_pad($user->id, 3, '0', STR_PAD_LEFT)), + 'name' => $user->name, + 'team' => 1, + 'gate_id' => session('active_gate_id') ?: Gate::first()?->id, + 'is_active' => true, + ] + ); } + $guardId = $guard?->id ?: ($request->input('security_guard_id') ?: SecurityGuard::value('id')); + $activity = VehicleActivity::with(['vehicle', 'gate'])->findOrFail($id); if ($activity->validation_status !== 'pending') { @@ -238,18 +242,23 @@ class GateInspectionController extends Controller public function reject(Request $request, int $id): RedirectResponse { $user = $request->user(); - $currentGuard = $user ? $user->securityGuard : null; - $guardId = $request->input('security_guard_id') ?? ($currentGuard ? $currentGuard->id : null); + $guard = $user ? ($user->securityGuard ?: SecurityGuard::where('user_id', $user->id)->first() ?: SecurityGuard::where('name', $user->name)->first() ?: SecurityGuard::where('badge_id', $user->username)->first()) : null; - if (!$guardId) { - $request->validate([ - 'security_guard_id' => ['required', 'exists:security_guards,id'], - ], [ - 'security_guard_id.required' => 'Silakan pilih nama petugas Satpam.', - ]); - $guardId = $request->input('security_guard_id'); + if (!$guard && $user) { + $guard = SecurityGuard::firstOrCreate( + ['user_id' => $user->id], + [ + 'badge_id' => $user->username ?: ('PG-' . str_pad($user->id, 3, '0', STR_PAD_LEFT)), + 'name' => $user->name, + 'team' => 1, + 'gate_id' => session('active_gate_id') ?: Gate::first()?->id, + 'is_active' => true, + ] + ); } + $guardId = $guard?->id ?: ($request->input('security_guard_id') ?: SecurityGuard::value('id')); + $request->validate([ 'rejection_note' => ['required', 'string', 'max:500'], ], [ diff --git a/app/Http/Controllers/Qma/VehicleController.php b/app/Http/Controllers/Qma/VehicleController.php index 1807d1e..0074da9 100644 --- a/app/Http/Controllers/Qma/VehicleController.php +++ b/app/Http/Controllers/Qma/VehicleController.php @@ -1471,18 +1471,30 @@ class VehicleController extends Controller { $vehicle = Vehicle::findOrFail($id); $oldCode = $vehicle->code; - $newCode = strtoupper(trim($request->input('code'))); + $newCode = strtoupper(trim($request->input('code', $vehicle->code))); + + // Pra-proses untuk unit support: auto-sintesis brand_type dan default current_km + if ($vehicle->isUnitSupport() || $request->input('category') === 'unit_support') { + if (!$request->filled('brand_type')) { + $brandPart = trim(($request->input('brand') ?? '') . ' ' . ($request->input('model_number') ?? '')); + $synthesizedBrand = $brandPart ?: ($vehicle->brand_type ?: ($request->input('unit_type') ?: $vehicle->code)); + $request->merge(['brand_type' => $synthesizedBrand]); + } + if (!$request->filled('current_km')) { + $request->merge(['current_km' => $vehicle->current_km ?? 0]); + } + } $rules = [ 'code' => ['required', 'string', 'max:50', Rule::unique('vehicles', 'code')->ignore($vehicle->id)], 'category' => ['required', 'in:light_vehicle,unit_support'], - 'brand_type' => [$vehicle->isSupportCategory() ? 'nullable' : 'required', 'string', 'max:150'], + 'brand_type' => ['nullable', 'string', 'max:150'], 'license_plate' => ['nullable', 'string', 'max:30'], 'serial_number' => ['nullable', 'string', 'max:100'], 'ownership' => ['nullable', 'string', 'max:150'], 'division' => ['nullable', 'string', 'max:100'], 'status' => ['required', 'string', 'in:Operation,Standby,Breakdown,Maintenance'], - 'current_km' => [$vehicle->isSupportCategory() ? 'nullable' : 'required', 'numeric', 'min:0'], + 'current_km' => ['nullable', 'numeric', 'min:0'], 'operational_group' => ['nullable', 'string', 'max:50'], 'unit_category' => ['nullable', 'string', 'max:100'], 'unit_type' => ['nullable', 'string', 'max:100'], @@ -1504,11 +1516,9 @@ class VehicleController extends Controller $validated = $request->validate($rules, [ 'code.required' => 'Kode kendaraan wajib diisi.', 'code.unique' => 'Kode sudah ada, silakan gunakan kode lain.', - 'brand_type.required' => 'Merek dan tipe wajib diisi.', - 'current_km.required' => 'Nilai KM / HM wajib diisi.', ]); - if ($vehicle->isSupportCategory()) { + if ($vehicle->isUnitSupport() || ($validated['category'] ?? '') === 'unit_support') { $validated['code'] = strtoupper(trim($validated['code'])); if (!empty($validated['operational_group'])) { $validated['operational_group'] = strtoupper(trim($validated['operational_group'])); diff --git a/resources/views/pg/gate_inspection.blade.php b/resources/views/pg/gate_inspection.blade.php index 1ac865a..c432dd8 100644 --- a/resources/views/pg/gate_inspection.blade.php +++ b/resources/views/pg/gate_inspection.blade.php @@ -657,20 +657,14 @@