diff --git a/app/Http/Controllers/Hse/EmployeeController.php b/app/Http/Controllers/Hse/EmployeeController.php index 9e2e9a5..bfee284 100644 --- a/app/Http/Controllers/Hse/EmployeeController.php +++ b/app/Http/Controllers/Hse/EmployeeController.php @@ -509,18 +509,24 @@ class EmployeeController extends Controller continue; } - $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'; + $rawUnitKerja = $colMap['unit_kerja'] !== null ? trim((string) ($row[$colMap['unit_kerja']] ?? '')) : ''; + $rawDivision = $colMap['division'] !== null ? trim((string) ($row[$colMap['division']] ?? '')) : ''; + $rawPosition = $colMap['position'] !== null ? trim((string) ($row[$colMap['position']] ?? '')) : ''; + $rawEmployeeType = $colMap['employee_type'] !== null ? trim((string) ($row[$colMap['employee_type']] ?? '')) : ''; + $rawOperator = $colMap['is_operator'] !== null ? trim((string) ($row[$colMap['is_operator']] ?? '')) : ''; + $rawSimper = $colMap['simper_expired_at'] !== null ? trim((string) ($row[$colMap['simper_expired_at']] ?? '')) : ''; + + $unitKerja = $rawUnitKerja ?: 'Umum'; + $division = $rawDivision ?: '-'; + $position = $rawPosition ?: '-'; + $employeeType = $rawEmployeeType ?: 'Karyawan'; // Deteksi status driver (jika kolom ada dan berisi ya/driver) - $operatorRaw = $colMap['is_operator'] !== null ? strtolower(trim((string) ($row[$colMap['is_operator']] ?? ''))) : ''; + $operatorRaw = strtolower($rawOperator); $isOperator = in_array($operatorRaw, ['ya', 'yes', '1', 'true', 'driver', 'operator', 'y']); // Deteksi tanggal SIMPER - $simperRaw = $colMap['simper_expired_at'] !== null ? trim((string) ($row[$colMap['simper_expired_at']] ?? '')) : ''; - $simperExpiredAt = $isOperator ? SimpleXlsxImporter::normalizeDate($simperRaw) : null; + $simperExpiredAt = $isOperator ? SimpleXlsxImporter::normalizeDate($rawSimper) : null; // 1. Sinkronisasi Akun User untuk login karyawan (gunakan withTrashed agar tidak bentrok dengan data di Tong Sampah) $cleanEmail = strtolower(str_replace(['-', ' '], '', $nik)) . '@kmh.co.id'; @@ -557,16 +563,40 @@ class EmployeeController extends Controller if ($isExisting->trashed()) { $isExisting->restore(); } - $isExisting->update([ + + $updateData = [ 'name' => $name, - 'employee_type' => $employeeType, - 'unit_kerja' => $unitKerja ?: 'Umum', - 'division' => $division ?: '-', - 'position' => $position ?: '-', - 'is_operator' => $isOperator, - 'simper_expired_at' => $simperExpiredAt, 'user_id' => $user->id, - ]); + ]; + + // Perbarui kolom secara selektif jika pada berkas Excel terisi data baru + if ($rawEmployeeType !== '') { + $updateData['employee_type'] = $employeeType; + } + if ($rawUnitKerja !== '') { + $updateData['unit_kerja'] = $unitKerja; + } elseif (empty($isExisting->unit_kerja) || $isExisting->unit_kerja === '-') { + $updateData['unit_kerja'] = 'Umum'; + } + + if ($rawDivision !== '') { + $updateData['division'] = $division; + } + + if ($rawPosition !== '') { + $updateData['position'] = $position; + } + + if ($rawOperator !== '') { + $updateData['is_operator'] = $isOperator; + if ($rawSimper !== '' && $isOperator) { + $updateData['simper_expired_at'] = $simperExpiredAt; + } + } elseif ($rawSimper !== '' && $isExisting->is_operator) { + $updateData['simper_expired_at'] = SimpleXlsxImporter::normalizeDate($rawSimper); + } + + $isExisting->update($updateData); $updatedCount++; } else { Employee::create([ diff --git a/tests/Feature/HseEmployeeImportTest.php b/tests/Feature/HseEmployeeImportTest.php index d3141b5..f48ae5d 100644 --- a/tests/Feature/HseEmployeeImportTest.php +++ b/tests/Feature/HseEmployeeImportTest.php @@ -337,4 +337,44 @@ class HseEmployeeImportTest extends TestCase $this->assertEquals('Ruadi Baru Terpulihkan', $employee->name); $this->assertEquals('Pembangkit', $employee->unit_kerja); } + + public function test_import_updates_only_division_without_overwriting_other_existing_fields(): void + { + $existing = Employee::create([ + 'nik' => 'KMH-DIV-001', + 'name' => 'Budi Santoso', + 'unit_kerja' => 'Pembangkit', + 'division' => '-', + 'position' => 'Supervisor Listrik', + 'is_operator' => true, + 'simper_expired_at' => '2027-01-01', + ]); + + // Excel hanya mengisi NIK, Nama, dan Divisi (kolom lainnya kosong/None) + $csvContent = implode("\n", [ + 'No,NIK,Nama Lengkap,Unit Kerja,Divisi,Jabatan,Operator Driver,Masa Berlaku SIMPER', + '1,KMH-DIV-001,Budi Santoso,,Electrical & Instrumentation,,,', + ]); + + $file = UploadedFile::fake()->createWithContent('update_division_only.csv', $csvContent); + + $response = $this->actingAs($this->hseAdmin) + ->post(route('hse.employees.import'), [ + 'file' => $file, + ]); + + $response->assertRedirect(); + $response->assertSessionHas('success'); + + $existing->refresh(); + + // Divisi terupdate + $this->assertEquals('Electrical & Instrumentation', $existing->division); + + // Data lain yang tidak diisi di Excel tetap dipertahankan utuh + $this->assertEquals('Pembangkit', $existing->unit_kerja); + $this->assertEquals('Supervisor Listrik', $existing->position); + $this->assertTrue((bool)$existing->is_operator); + $this->assertEquals('2027-01-01 00:00:00', $existing->simper_expired_at); + } }