From 01152a426023ada088c7a32236c7c1b57ec92bc0 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Sun, 25 Oct 2026 23:04:20 +0700 Subject: [PATCH] feat: redesign employee edit modal to spacious 2-column layout, add dedicated edit view, and sync simper scopes with qma heavy categories --- .../Controllers/Hse/EmployeeController.php | 18 + .../Controllers/Hse/SimperTypeController.php | 16 +- app/Models/Employee.php | 24 +- app/Models/SimperType.php | 58 ++ resources/views/hse/employees_edit.blade.php | 277 ++++++++ resources/views/hse/employees_index.blade.php | 654 ++++++++++-------- .../views/hse/simper_types_index.blade.php | 52 +- routes/web.php | 1 + tests/Feature/HseSimperTypeTest.php | 49 ++ 9 files changed, 824 insertions(+), 325 deletions(-) create mode 100644 resources/views/hse/employees_edit.blade.php diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index 254560d..178b865 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -636,6 +636,24 @@ class EmployeeController extends Controller return back()->with('success', "Data karyawan {$validated['name']} berhasil ditambahkan."); } + /** + * Tampilkan halaman khusus edit data personil & SIMPER (View Terpisah). + */ + public function edit(int $id): View + { + $employee = Employee::with(['simpers.simperType'])->findOrFail($id); + $availableSimperTypes = SimperType::active()->orderBy('name')->get(); + + $employeeTypes = Employee::distinct() + ->whereNotNull('employee_type') + ->where('employee_type', '!=', '') + ->pluck('employee_type') + ->values() + ->all(); + + return view('hse.employees_edit', compact('employee', 'availableSimperTypes', 'employeeTypes')); + } + /** * Perpanjang atau perbarui data karyawan & SIMPER. */ diff --git a/app/Http/Controllers/Hse/SimperTypeController.php b/app/Http/Controllers/Hse/SimperTypeController.php index cf6bcb2..3d17f24 100644 --- a/app/Http/Controllers/Hse/SimperTypeController.php +++ b/app/Http/Controllers/Hse/SimperTypeController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers\Hse; use App\Http\Controllers\Controller; use App\Models\SimperType; +use App\Models\Vehicle; use Carbon\Carbon; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; @@ -30,9 +31,13 @@ class SimperTypeController extends Controller ->orderBy('name') ->get(); - $categoryScopes = SimperType::SCOPES; + $categoryScopes = SimperType::getAvailableScopes(); - return view('hse.simper_types_index', compact('simperTypes', 'categoryScopes')); + $heavyCategories = Vehicle::unitSupportCategories() + ->orderBy('unit_category') + ->get(['id', 'code', 'brand_type', 'unit_category']); + + return view('hse.simper_types_index', compact('simperTypes', 'categoryScopes', 'heavyCategories')); } /** @@ -40,10 +45,12 @@ class SimperTypeController extends Controller */ public function store(Request $request): RedirectResponse { + $validScopes = array_keys(SimperType::getAvailableScopes()); + $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))], + 'category_scope' => ['required', 'string', Rule::in($validScopes)], 'description' => ['nullable', 'string', 'max:500'], 'is_active' => ['nullable', 'boolean'], ]); @@ -67,11 +74,12 @@ class SimperTypeController extends Controller public function update(Request $request, int $id): RedirectResponse { $simperType = SimperType::findOrFail($id); + $validScopes = array_keys(SimperType::getAvailableScopes()); $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))], + 'category_scope' => ['required', 'string', Rule::in($validScopes)], 'description' => ['nullable', 'string', 'max:500'], 'is_active' => ['nullable', 'boolean'], ]); diff --git a/app/Models/Employee.php b/app/Models/Employee.php index 694ee96..3c18a6c 100644 --- a/app/Models/Employee.php +++ b/app/Models/Employee.php @@ -152,18 +152,30 @@ class Employee extends Model // 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') + return $this->hasValidSimperForType('SIMPER-LV') + || $this->hasValidSimperForScope('light_vehicle') || $this->hasValidSimperForScope(SimperType::SCOPE_ALL); } if ($vehicle->isUnitSupport()) { + // Cek apakah personil memiliki izin SIMPER dengan scope kategori alat berat ini (misal: 'Dump Truck', 'Excavator', dll.) + if ($vehicle->unit_category && $this->hasValidSimperForScope($vehicle->unit_category)) { + return true; + } + if ($vehicle->brand_type && $this->hasValidSimperForScope($vehicle->brand_type)) { + return true; + } + + if ($vehicle->is_timesheet_mobile) { + return $this->hasValidSimperForType('SIMPER-DT') + || $this->hasValidSimperForType('SIMPER-HEAVY') + || $this->hasValidSimperForScope('unit_support_mobile') + || $this->hasValidSimperForScope(SimperType::SCOPE_ALL); + } + return $this->hasValidSimperForType('SIMPER-HEAVY') || $this->hasValidSimperForType('SIMPER-DT') + || $this->hasValidSimperForScope('unit_support_heavy') || $this->hasValidSimperForScope(SimperType::SCOPE_ALL); } diff --git a/app/Models/SimperType.php b/app/Models/SimperType.php index 6cd58c9..0046e53 100644 --- a/app/Models/SimperType.php +++ b/app/Models/SimperType.php @@ -24,6 +24,64 @@ class SimperType extends Model self::SCOPE_ALL => 'Semua Kategori Armada', ]; + /** + * Dapatkan daftar cakupan armada yang disinkronisasikan langsung + * dengan data Master Kategori Heavy Equipment dari modul QMA. + * + * @return array + */ + public static function getAvailableScopes(): array + { + $scopes = [ + self::SCOPE_ALL => 'Semua Kategori (Universal)', + self::SCOPE_LIGHT_VEHICLE => 'Light Vehicle (LV)', + ]; + + // Baseline kategori Heavy Equipment umum + $defaultHeavy = [ + 'Dump Truck', + 'Excavator', + 'Wheel Loader', + 'Motor Grader', + 'Truk Mixer', + 'Water Truck', + 'Forklift', + 'Crane Truck', + 'Crawler Crane', + 'Concrete Pump Truck', + ]; + foreach ($defaultHeavy as $dh) { + $scopes[$dh] = "Heavy: {$dh}"; + } + + // Sinkronisasi kategori Heavy Equipment dari data master QMA + try { + $heavyCategories = Vehicle::unitSupportCategories() + ->orderBy('unit_category') + ->get(); + + foreach ($heavyCategories as $cat) { + $key = $cat->unit_category ?: $cat->brand_type; + if ($key) { + $codeSuffix = !empty($cat->code) ? " ({$cat->code})" : ''; + $scopes[$key] = "Heavy: {$key}{$codeSuffix}"; + } + } + } catch (\Throwable $e) { + // Fallback saat migrasi awal jika tabel belum siap + } + + // Dukungan fallback untuk cakupan legacy + if (!isset($scopes[self::SCOPE_UNIT_SUPPORT_MOBILE])) { + $scopes[self::SCOPE_UNIT_SUPPORT_MOBILE] = 'Heavy Mobile / Dump Truck (Legacy)'; + } + if (!isset($scopes[self::SCOPE_UNIT_SUPPORT_HEAVY])) { + $scopes[self::SCOPE_UNIT_SUPPORT_HEAVY] = 'Alat Berat Operasional (Legacy)'; + } + + return $scopes; + } + protected $fillable = [ 'code', 'name', diff --git a/resources/views/hse/employees_edit.blade.php b/resources/views/hse/employees_edit.blade.php new file mode 100644 index 0000000..958cb03 --- /dev/null +++ b/resources/views/hse/employees_edit.blade.php @@ -0,0 +1,277 @@ +@extends('layouts.app') + +@section('title', 'Kelola SIMPER - ' . $employee->name) + +@section('content') +
+ +
+
+
+ Dashboard HSE + + Data SIMPER + + Kelola SIMPER +
+

+ Kelola SIMPER Personil + @if($employee->isSukon()) + + Sukon + + @else + + Karyawan Internal + + @endif +

+
+ + +
+ + +
+ @csrf +
+ + +
+ +
+
+ PROFIL PERSONIL + + Master Super Admin + +
+ + +
+
+ @if($employee->photo_url) + {{ $employee->name }} + @else +
+ {{ strtoupper(substr($employee->name, 0, 1)) }} +
+ @endif +
+
+ + +
+
+ + +
+
+ NIK: + {{ $employee->nik }} +
+
+ Nama Lengkap: + {{ $employee->name }} +
+
+ Unit Kerja: + {{ $employee->unit_kerja ?? '-' }} +
+
+ Divisi / Jabatan: + {{ $employee->division ?? '-' }} / {{ $employee->position ?? '-' }} +
+
+
+ + +
+ + PENGATURAN STATUS HSE + + + +
+ + + +
+ + +
+ + +
+
+
+ + +
+
+ +
+
+

+ + Izin SIMPER yang Dimiliki +

+

Centang jenis SIMPER dan tentukan nomor serta masa berlakunya.

+
+ + {{ $availableSimperTypes->count() }} Jenis Tersedia + +
+ + +
+ + + @forelse($availableSimperTypes as $st) + @php + $existingSimper = $employee->simpers->firstWhere('simper_type_id', $st->id); + $isChecked = !is_null($existingSimper); + $simperNum = $existingSimper ? $existingSimper->simper_number : ('SMP-' . str_pad($employee->id, 4, '0', STR_PAD_LEFT)); + $simperExp = $existingSimper && $existingSimper->expired_at ? $existingSimper->expired_at->format('Y-m-d') : ($employee->simper_expired_at?->format('Y-m-d') ?? ''); + @endphp + +
+
+ + + @if($st->category_scope === 'light_vehicle') + + LV + + @elseif($st->category_scope === 'all') + + SEMUA ARMADA + + @else + + {{ strtoupper($st->category_scope) }} + + @endif +
+ + +
+
+ + +
+
+ + +
+
+
+ @empty +

Belum ada master jenis SIMPER yang aktif.

+ @endforelse +
+ + +
+ + Batal + + +
+
+
+ +
+
+
+ + +@endsection diff --git a/resources/views/hse/employees_index.blade.php b/resources/views/hse/employees_index.blade.php index 953cb6c..ed3942e 100644 --- a/resources/views/hse/employees_index.blade.php +++ b/resources/views/hse/employees_index.blade.php @@ -253,16 +253,21 @@ @can('hse.employees.edit') -
+
+ + + | @@ -314,183 +319,201 @@