From 8983e9dac18b8e68003f0ac893edad5f304e762d Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Tue, 27 Oct 2026 20:44:35 +0700 Subject: [PATCH] fix(hse): prevent modal auto-close on text selection and make unit kerja input flexible --- .../Controllers/Hse/EmployeeController.php | 29 +++- resources/views/employee/dashboard.blade.php | 5 +- resources/views/hse/dashboard.blade.php | 1 - resources/views/hse/employees_edit.blade.php | 25 +++ resources/views/hse/employees_index.blade.php | 69 +++++--- .../views/hse/simper_types_index.blade.php | 8 +- resources/views/layouts/app.blade.php | 12 ++ resources/views/pg/dashboard.blade.php | 1 - resources/views/pg/guards_index.blade.php | 9 +- .../views/pg/verification_logs.blade.php | 1 - resources/views/profile/index.blade.php | 1 - resources/views/qma/activity_log.blade.php | 3 +- .../views/qma/activity_summary.blade.php | 1 - resources/views/qma/dashboard.blade.php | 1 - resources/views/qma/p2h_index.blade.php | 1 - resources/views/qma/p2h_summary.blade.php | 1 - .../views/qma/p2h_template_detail.blade.php | 10 +- .../views/qma/support_timesheet.blade.php | 1 - resources/views/qma/vehicles_lv.blade.php | 9 +- .../views/qma/vehicles_support.blade.php | 9 +- ...eEmployeeFlexibleUnitKerjaAndModalTest.php | 150 ++++++++++++++++++ 21 files changed, 286 insertions(+), 61 deletions(-) create mode 100644 tests/Feature/HseEmployeeFlexibleUnitKerjaAndModalTest.php diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index c95403d..8d9248d 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -165,7 +165,14 @@ class EmployeeController extends Controller $availableSimperTypes = SimperType::active()->orderBy('name')->get(); - return view('hse.employees_index', compact('employees', 'employeeTypes', 'availableSimperTypes')); + $unitKerjaList = Employee::whereNotNull('unit_kerja') + ->where('unit_kerja', '!=', '') + ->distinct() + ->orderBy('unit_kerja') + ->pluck('unit_kerja') + ->all(); + + return view('hse.employees_index', compact('employees', 'employeeTypes', 'availableSimperTypes', 'unitKerjaList')); } /** @@ -585,8 +592,8 @@ class EmployeeController extends Controller 'nik.required' => 'NIK wajib diisi.', 'nik.unique' => 'NIK sudah terdaftar dalam sistem.', 'name.required' => 'Nama karyawan wajib diisi.', - 'unit_kerja.required' => 'Unit kerja wajib dipilih.', - 'division.required' => 'Divisi wajib dipilih.', + 'unit_kerja.required' => 'Unit kerja wajib diisi.', + 'division.required' => 'Divisi wajib diisi.', 'position.required' => 'Posisi / Jabatan wajib diisi.', 'is_operator.required' => 'Pilih apakah karyawan berstatus Operator / Driver.', ]); @@ -656,7 +663,21 @@ class EmployeeController extends Controller ->values() ->all(); - return view('hse.employees_edit', compact('employee', 'availableSimperTypes', 'employeeTypes')); + if (!in_array('Karyawan', $employeeTypes)) { + array_unshift($employeeTypes, 'Karyawan'); + } + if (!in_array('Sukon', $employeeTypes)) { + $employeeTypes[] = 'Sukon'; + } + + $unitKerjaList = Employee::whereNotNull('unit_kerja') + ->where('unit_kerja', '!=', '') + ->distinct() + ->orderBy('unit_kerja') + ->pluck('unit_kerja') + ->all(); + + return view('hse.employees_edit', compact('employee', 'availableSimperTypes', 'employeeTypes', 'unitKerjaList')); } /** diff --git a/resources/views/employee/dashboard.blade.php b/resources/views/employee/dashboard.blade.php index e6e3a35..e389fee 100644 --- a/resources/views/employee/dashboard.blade.php +++ b/resources/views/employee/dashboard.blade.php @@ -417,7 +417,7 @@ {{-- MODAL 1: KOREKSI ODOMETER DRIVER (HANYA STATUS PENDING) --}}