From c2116712e79d9a4ac31e86d8865fab8cfcc8c362 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Sun, 25 Oct 2026 21:26:11 +0700 Subject: [PATCH] feat: integrate sukon and employee operator type across hse and qma heavy timesheet --- .../Controllers/Hse/EmployeeController.php | 51 +++- .../Qma/SupportTimesheetController.php | 18 +- app/Models/Employee.php | 27 +++ ...1_add_employee_type_to_employees_table.php | 31 +++ resources/views/hse/employees_index.blade.php | 137 ++++++++++- .../views/qma/support_timesheet.blade.php | 219 ++++++++++++++++-- tests/Feature/QmaSupportTimesheetTest.php | 82 +++++++ 7 files changed, 545 insertions(+), 20 deletions(-) create mode 100644 database/migrations/2026_10_25_210321_add_employee_type_to_employees_table.php diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index e100429..b700a96 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -121,6 +121,18 @@ class EmployeeController extends Controller } } + // 4. Filter Jenis Personil / Karyawan (Karyawan, Sukon, dll) + if ($request->filled('employee_type')) { + $empType = trim($request->input('employee_type')); + if ($empType === 'Karyawan') { + $query->where(function ($q) { + $q->where('employee_type', 'Karyawan')->orWhereNull('employee_type'); + }); + } else { + $query->where('employee_type', $empType); + } + } + return $query->orderBy('name'); } @@ -131,7 +143,20 @@ class EmployeeController extends Controller { $employees = $this->getFilteredEmployees($request)->paginate(20)->withQueryString(); - return view('hse.employees_index', compact('employees')); + $employeeTypes = Employee::whereNotNull('employee_type') + ->where('employee_type', '!=', '') + ->distinct() + ->pluck('employee_type') + ->all(); + + if (!in_array('Karyawan', $employeeTypes)) { + array_unshift($employeeTypes, 'Karyawan'); + } + if (!in_array('Sukon', $employeeTypes)) { + $employeeTypes[] = 'Sukon'; + } + + return view('hse.employees_index', compact('employees', 'employeeTypes')); } /** @@ -163,6 +188,7 @@ class EmployeeController extends Controller 'No' => 6, 'NIK' => 16, 'Nama Lengkap' => 30, + 'Jenis' => 16, 'Jabatan' => 24, 'Unit Kerja' => 20, 'Divisi' => 20, @@ -195,6 +221,7 @@ class EmployeeController extends Controller $idx + 1, $emp->nik, $emp->name, + $emp->employee_type ?: 'Karyawan', $emp->position ?: '-', $emp->unit_kerja ?: '-', $emp->division ?: '-', @@ -208,6 +235,7 @@ class EmployeeController extends Controller 'center', // No 'center', // NIK 'left', // Nama + 'center', // Jenis 'left', // Jabatan 'left', // Unit Kerja 'left', // Divisi @@ -383,6 +411,7 @@ class EmployeeController extends Controller 'unit_kerja' => null, 'division' => null, 'position' => null, + 'employee_type' => null, 'is_operator' => null, 'simper_expired_at' => null, ]; @@ -405,6 +434,8 @@ class EmployeeController extends Controller $colMap['division'] = $cIdx; } elseif (str_contains($cellText, 'jabatan') || str_contains($cellText, 'posisi') || str_contains($cellText, 'position')) { $colMap['position'] = $cIdx; + } elseif (str_contains($cellText, 'jenis') || str_contains($cellText, 'tipe') || str_contains($cellText, 'sukon')) { + $colMap['employee_type'] = $cIdx; } elseif (str_contains($cellText, 'operator') || str_contains($cellText, 'driver')) { $colMap['is_operator'] = $cIdx; } elseif (str_contains($cellText, 'simper') || str_contains($cellText, 'berlaku') || str_contains($cellText, 'expired')) { @@ -452,6 +483,7 @@ class EmployeeController extends Controller $unitKerja = trim((string) ($colMap['unit_kerja'] !== null ? ($row[$colMap['unit_kerja']] ?? 'Umum') : 'Umum')); $division = trim((string) ($colMap['division'] !== null ? ($row[$colMap['division']] ?? '-') : '-')); $position = trim((string) ($colMap['position'] !== null ? ($row[$colMap['position']] ?? '-') : '-')); + $employeeType = trim((string) ($colMap['employee_type'] !== null ? ($row[$colMap['employee_type']] ?? 'Karyawan') : 'Karyawan')) ?: 'Karyawan'; // Deteksi status driver (jika kolom ada dan berisi ya/driver) $operatorRaw = $colMap['is_operator'] !== null ? strtolower(trim((string) ($row[$colMap['is_operator']] ?? ''))) : ''; @@ -482,6 +514,7 @@ class EmployeeController extends Controller if ($isExisting) { $isExisting->update([ 'name' => $name, + 'employee_type' => $employeeType, 'unit_kerja' => $unitKerja ?: 'Umum', 'division' => $division ?: '-', 'position' => $position ?: '-', @@ -494,6 +527,7 @@ class EmployeeController extends Controller Employee::create([ 'nik' => $nik, 'name' => $name, + 'employee_type' => $employeeType, 'unit_kerja' => $unitKerja ?: 'Umum', 'division' => $division ?: '-', 'position' => $position ?: '-', @@ -551,6 +585,14 @@ class EmployeeController extends Controller $isOperator = (bool) $validated['is_operator']; $simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? null) : null; + $employeeType = $request->input('employee_type'); + if ($employeeType === '__CUSTOM__' && $request->filled('custom_employee_type')) { + $employeeType = trim($request->input('custom_employee_type')); + } + if (empty($employeeType)) { + $employeeType = 'Karyawan'; + } + $user = User::firstOrCreate( ['username' => $validated['nik']], [ @@ -574,6 +616,7 @@ class EmployeeController extends Controller Employee::create([ 'nik' => $validated['nik'], 'name' => $validated['name'], + 'employee_type' => $employeeType, 'unit_kerja' => $validated['unit_kerja'], 'division' => $validated['division'], 'position' => $validated['position'], @@ -611,6 +654,11 @@ class EmployeeController extends Controller $isOperator = (bool) $validated['is_operator']; $simperExpiredAt = $isOperator ? ($validated['simper_expired_at'] ?? $employee->simper_expired_at) : null; + $employeeType = $request->input('employee_type'); + if ($employeeType === '__CUSTOM__' && $request->filled('custom_employee_type')) { + $employeeType = trim($request->input('custom_employee_type')); + } + $photoPath = $employee->photo_path; if ($request->hasFile('photo')) { ImageCompressionService::deleteIfExists($employee->photo_path); @@ -620,6 +668,7 @@ class EmployeeController extends Controller $employee->update([ 'nik' => $validated['nik'] ?? $employee->nik, 'name' => $validated['name'] ?? $employee->name, + 'employee_type' => $employeeType ?? $employee->employee_type ?? 'Karyawan', 'unit_kerja' => $validated['unit_kerja'] ?? $employee->unit_kerja, 'division' => $validated['division'] ?? $employee->division, 'position' => $validated['position'] ?? $employee->position, diff --git a/app/Http/Controllers/Qma/SupportTimesheetController.php b/app/Http/Controllers/Qma/SupportTimesheetController.php index cd2ec42..440aa7e 100644 --- a/app/Http/Controllers/Qma/SupportTimesheetController.php +++ b/app/Http/Controllers/Qma/SupportTimesheetController.php @@ -65,6 +65,13 @@ class SupportTimesheetController extends Controller $query->where('operator_id', $request->input('operator_id')); } + // Filter Jenis Personil / Operator (Karyawan / Sukon / dsb) + if ($request->filled('operator_type')) { + $query->whereHas('operator', function (Builder $oq) use ($request) { + $oq->where('employee_type', $request->input('operator_type')); + }); + } + // Filter Shift if ($request->filled('shift')) { $query->where('shift', $request->input('shift')); @@ -132,7 +139,7 @@ class SupportTimesheetController extends Controller ->get(); $operators = Employee::orderBy('name') - ->get(['id', 'nik', 'name', 'position', 'is_operator']); + ->get(['id', 'nik', 'name', 'position', 'is_operator', 'employee_type', 'simper_expired_at']); $shifts = self::SHIFTS; $activityTypes = self::PRESET_ACTIVITIES; @@ -439,6 +446,7 @@ class SupportTimesheetController extends Controller 'KODE UNIT' => 14, 'MEREK / MODEL' => 26, 'OPERATOR' => 24, + 'JENIS' => 14, 'NIK' => 16, 'SATUAN' => 10, 'START' => 14, @@ -463,6 +471,7 @@ class SupportTimesheetController extends Controller $ts->vehicle?->code ?: '-', $ts->vehicle?->brand_type ?: '-', $ts->operator?->name ?: '-', + $ts->operator?->employee_type ?: 'Karyawan', $ts->operator?->nik ?: '-', $ts->meter_type, number_format($ts->start_meter, 2, ',', '.'), @@ -484,6 +493,7 @@ class SupportTimesheetController extends Controller 'TANGGAL' => 'center', 'SHIFT' => 'center', 'KODE UNIT' => 'center', + 'JENIS' => 'center', 'NIK' => 'center', 'SATUAN' => 'center', 'START' => 'right', @@ -537,8 +547,8 @@ class SupportTimesheetController extends Controller ['title' => 'TANGGAL', 'width' => 20, 'align' => 'C'], ['title' => 'KODE', 'width' => 18, 'align' => 'C', 'bold' => true], ['title' => 'TIPE ALAT', 'width' => 38, 'align' => 'L', 'max_char' => 25], - ['title' => 'OPERATOR', 'width' => 35, 'align' => 'L', 'max_char' => 22], - ['title' => 'SHIFT', 'width' => 25, 'align' => 'C'], + ['title' => 'OPERATOR', 'width' => 40, 'align' => 'L', 'max_char' => 26], + ['title' => 'SHIFT', 'width' => 23, 'align' => 'C'], ['title' => 'START', 'width' => 18, 'align' => 'R'], ['title' => 'END', 'width' => 18, 'align' => 'R'], ['title' => 'JAM (HM)', 'width' => 18, 'align' => 'R', 'bold' => true], @@ -553,7 +563,7 @@ class SupportTimesheetController extends Controller $ts->date ? $ts->date->format('d/m/Y') : '-', $ts->vehicle?->code ?: '-', $ts->vehicle?->brand_type ?: '-', - $ts->operator?->name ?: '-', + $ts->operator?->name ? ($ts->operator->name . ' (' . ($ts->operator->employee_type ?: 'Karyawan') . ')') : '-', $ts->shift, number_format($ts->start_meter, 1, ',', '.'), number_format($ts->end_meter, 1, ',', '.'), diff --git a/app/Models/Employee.php b/app/Models/Employee.php index 8a62934..d4f8aa7 100644 --- a/app/Models/Employee.php +++ b/app/Models/Employee.php @@ -13,10 +13,14 @@ class Employee extends Model { use HasFactory; + public const TYPE_KARYAWAN = 'Karyawan'; + public const TYPE_SUKON = 'Sukon'; + protected $fillable = [ 'user_id', 'nik', 'name', + 'employee_type', 'unit_kerja', 'division', 'position', @@ -34,6 +38,29 @@ class Employee extends Model 'photo_url', ]; + public function isSukon(): bool + { + return strcasecmp($this->employee_type ?? '', self::TYPE_SUKON) === 0; + } + + public function isKaryawan(): bool + { + return empty($this->employee_type) || strcasecmp($this->employee_type, self::TYPE_KARYAWAN) === 0; + } + + public function scopeSukon(Builder $query): Builder + { + return $query->where('employee_type', self::TYPE_SUKON); + } + + public function scopeKaryawan(Builder $query): Builder + { + return $query->where(function ($q) { + $q->where('employee_type', self::TYPE_KARYAWAN) + ->orWhereNull('employee_type'); + }); + } + /** * Cek apakah SIMPER masih aktif hari ini. */ diff --git a/database/migrations/2026_10_25_210321_add_employee_type_to_employees_table.php b/database/migrations/2026_10_25_210321_add_employee_type_to_employees_table.php new file mode 100644 index 0000000..ba3cd64 --- /dev/null +++ b/database/migrations/2026_10_25_210321_add_employee_type_to_employees_table.php @@ -0,0 +1,31 @@ +string('employee_type', 50)->default('Karyawan')->after('name')->index(); + }); + + DB::table('employees')->whereNull('employee_type')->update(['employee_type' => 'Karyawan']); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('employees', function (Blueprint $table) { + $table->dropIndex(['employee_type']); + $table->dropColumn('employee_type'); + }); + } +}; diff --git a/resources/views/hse/employees_index.blade.php b/resources/views/hse/employees_index.blade.php index e797a8c..6c88254 100644 --- a/resources/views/hse/employees_index.blade.php +++ b/resources/views/hse/employees_index.blade.php @@ -88,6 +88,18 @@
+ + + + + + @if(isset($employeeTypes)) + @foreach($employeeTypes as $t) + @if($t !== 'Karyawan' && $t !== 'Sukon') + + @endif + @endforeach + @endif + + + +
+
@@ -579,6 +634,30 @@
+ +
+ + + +
+
@@ -715,6 +794,27 @@ } } + // Logika Jenis Personil (Karyawan / Sukon / Custom) + function toggleCustomEmployeeType(val, mode) { + const wrapper = document.getElementById(mode === 'edit' ? 'editCustomEmployeeTypeWrapper' : 'addCustomEmployeeTypeWrapper'); + const input = document.getElementById(mode === 'edit' ? 'editCustomEmployeeTypeInput' : 'addCustomEmployeeTypeInput'); + if (wrapper) { + if (val === '__CUSTOM__') { + wrapper.classList.remove('hidden'); + if (input) { + input.required = true; + input.focus(); + } + } else { + wrapper.classList.add('hidden'); + if (input) { + input.required = false; + input.value = ''; + } + } + } + } + // Logika Penguncian Input SIMPER jika Bukan Driver function toggleSimperInput(type) { let opSelect, dateInput; @@ -792,6 +892,36 @@ } document.getElementById('editSimperDate').value = expDate; + // Set jenis personil + const editTypeSelect = document.getElementById('editEmployeeType'); + const editCustomWrapper = document.getElementById('editCustomEmployeeTypeWrapper'); + const editCustomInput = document.getElementById('editCustomEmployeeTypeInput'); + const empType = emp.employee_type || 'Karyawan'; + let found = false; + if (editTypeSelect) { + for (let i = 0; i < editTypeSelect.options.length; i++) { + if (editTypeSelect.options[i].value === empType) { + editTypeSelect.value = empType; + found = true; + break; + } + } + if (!found) { + editTypeSelect.value = '__CUSTOM__'; + if (editCustomWrapper) editCustomWrapper.classList.remove('hidden'); + if (editCustomInput) { + editCustomInput.required = true; + editCustomInput.value = empType; + } + } else { + if (editCustomWrapper) editCustomWrapper.classList.add('hidden'); + if (editCustomInput) { + editCustomInput.required = false; + editCustomInput.value = ''; + } + } + } + // Cek status driver untuk mengunci/membuka input SIMPER toggleSimperInput('edit'); @@ -939,6 +1069,11 @@ if (addPhotoPlaceholder) { addPhotoPlaceholder.classList.remove('hidden'); } + const addTypeSelect = document.getElementById('addEmployeeTypeSelect'); + if (addTypeSelect) { + addTypeSelect.value = 'Karyawan'; + toggleCustomEmployeeType('Karyawan', 'add'); + } if (modal) modal.classList.remove('hidden'); } function closeAddKaryawanModal() { diff --git a/resources/views/qma/support_timesheet.blade.php b/resources/views/qma/support_timesheet.blade.php index 70dc5ec..77eee65 100644 --- a/resources/views/qma/support_timesheet.blade.php +++ b/resources/views/qma/support_timesheet.blade.php @@ -157,11 +157,20 @@ @endforeach + + +
- @if(request()->anyFilled(['search', 'vehicle_id', 'shift']) || (request('start_date') && request('start_date') !== now()->toDateString()) || (request('end_date') && request('end_date') !== now()->toDateString())) + @if(request()->anyFilled(['search', 'vehicle_id', 'shift', 'operator_type']) || (request('start_date') && request('start_date') !== now()->toDateString()) || (request('end_date') && request('end_date') !== now()->toDateString())) @@ -259,8 +268,25 @@ -
- {{ $ts->operator?->name ?: '-' }} +
+ + {{ $ts->operator?->name ?: '-' }} + + @if($ts->operator) + @if($ts->operator->employee_type === 'Sukon') + + Sukon + + @elseif($ts->operator->employee_type && $ts->operator->employee_type !== 'Karyawan') + + {{ $ts->operator->employee_type }} + + @else + + Karyawan + + @endif + @endif
NIK: {{ $ts->operator?->nik ?: '-' }} @@ -324,6 +350,7 @@ 'code' => $ts->vehicle?->code ?: '-', 'brand_type' => $ts->vehicle?->brand_type ?: '-', 'operator_name' => $ts->operator?->name ?: '-', + 'operator_type' => $ts->operator?->employee_type ?: 'Karyawan', 'operator_nik' => $ts->operator?->nik ?: '-', 'start_meter' => number_format($ts->start_meter, 1, ',', '.'), 'end_meter' => number_format($ts->end_meter, 1, ',', '.'), @@ -499,20 +526,55 @@
- +
+ + +
+ + + +
+
+

+ Total personil: {{ count($operators) }} + Filter: Semua +

@@ -796,19 +858,55 @@
- +
+ + +
+ + + +
+
+

+ Total personil: {{ count($operators) }} + Filter: Semua +

@@ -1062,6 +1160,75 @@ @section('scripts')