From d1711ee292d53c0b30d1142bc1c724e692075161 Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Thu, 22 Oct 2026 08:34:15 +0700 Subject: [PATCH] feat(qma): add start time and remove breakdown hours from support timesheet form --- .../Qma/SupportTimesheetController.php | 21 +- .../views/qma/support_timesheet.blade.php | 208 +++++++----------- tests/Feature/QmaSupportTimesheetTest.php | 7 + 3 files changed, 108 insertions(+), 128 deletions(-) diff --git a/app/Http/Controllers/Qma/SupportTimesheetController.php b/app/Http/Controllers/Qma/SupportTimesheetController.php index 12a3658..c9f96df 100644 --- a/app/Http/Controllers/Qma/SupportTimesheetController.php +++ b/app/Http/Controllers/Qma/SupportTimesheetController.php @@ -197,6 +197,16 @@ class SupportTimesheetController extends Controller $request->merge(['shift' => 'Shift Siang']); } + // 4. Tangani normalisasi format jam mulai (start_time) + if ($request->filled('start_time')) { + $st = trim((string) $request->input('start_time')); + if (strlen($st) >= 5) { + $request->merge(['start_time' => substr($st, 0, 5)]); + } + } else { + $request->merge(['start_time' => '08:00']); + } + $validated = $request->validate([ 'vehicle_id' => ['required', 'exists:vehicles,id'], 'operator_id' => ['required', 'exists:employees,id'], @@ -256,7 +266,7 @@ class SupportTimesheetController extends Controller 'date' => $validated['date'], 'shift' => $shift, 'meter_type' => $validated['meter_type'], - 'start_time' => $validated['start_time'] ?? null, + 'start_time' => $validated['start_time'] ?? '08:00', 'end_time' => $validated['end_time'] ?? null, 'start_meter' => $startMeter, 'end_meter' => $endMeter, @@ -337,6 +347,13 @@ class SupportTimesheetController extends Controller $request->merge(['shift' => 'Shift Siang']); } + if ($request->filled('start_time')) { + $st = trim((string) $request->input('start_time')); + if (strlen($st) >= 5) { + $request->merge(['start_time' => substr($st, 0, 5)]); + } + } + $validated = $request->validate([ 'vehicle_id' => ['required', 'exists:vehicles,id'], 'operator_id' => ['required', 'exists:employees,id'], @@ -370,7 +387,7 @@ class SupportTimesheetController extends Controller 'date' => $validated['date'], 'shift' => $shift, 'meter_type' => $validated['meter_type'], - 'start_time' => $validated['start_time'] ?? null, + 'start_time' => $validated['start_time'] ?? $timesheet->start_time ?? '08:00', 'end_time' => $validated['end_time'] ?? null, 'start_meter' => $startMeter, 'end_meter' => $endMeter, diff --git a/resources/views/qma/support_timesheet.blade.php b/resources/views/qma/support_timesheet.blade.php index 5dc2a1f..5233241 100644 --- a/resources/views/qma/support_timesheet.blade.php +++ b/resources/views/qma/support_timesheet.blade.php @@ -265,6 +265,9 @@ {{ $ts->shift }} + @if($ts->start_time) + • {{ \Carbon\Carbon::parse($ts->start_time)->format('H:i') }} + @endif @@ -342,6 +345,7 @@ data-timesheet="{{ json_encode([ 'timesheet_no' => $ts->timesheet_no, 'date' => $ts->date ? $ts->date->format('d/m/Y') : '-', + 'start_time' => $ts->start_time ? \Carbon\Carbon::parse($ts->start_time)->format('H:i') : null, 'shift' => $ts->shift, 'code' => $ts->vehicle?->code ?: '-', 'brand_type' => $ts->vehicle?->brand_type ?: '-', @@ -560,27 +564,40 @@ - -
+ +
+
+ + +
+
-
+
- Shift Siang + Shift Siang
@@ -588,56 +605,28 @@ -
- -
-
- -
- - HM -
-
- - -
-
- - -
-
- - -
+ +
+ +
+ + HM
@@ -731,23 +720,12 @@
- Meter Awal - Akhir + Meter Awal (Start Meter)
- Total Jam Operasi - -
-
- -
-
- Standby / Breakdown - -
-
- Pengisian Solar - + Jam Mulai Kerja +
@@ -902,8 +880,8 @@
- -
+ +
+
+ + +
+
-
+
- Shift Siang + Shift Siang
@@ -930,58 +919,28 @@ -
- -
-
- -
- - HM -
-
- - -
-
- - -
-
- - -
+ +
+ +
+ + HM
@@ -1009,15 +968,6 @@ placeholder="Keterangan rincian galian, muatan ritase, kendala lapangan, atau catatan foreman..." class="w-full text-xs px-3.5 py-2 rounded-xl border border-slate-200 bg-white text-slate-800 placeholder-slate-400 focus:outline-none focus:border-[#1b5e20] transition resize-none">
- - -
@@ -1135,6 +1085,9 @@ const startMeter = document.getElementById('addStartMeter'); if (startMeter) startMeter.value = ''; + const startTime = document.getElementById('addStartTime'); + if (startTime) startTime.value = '08:00'; + modal.classList.remove('hidden'); modal.style.display = 'block'; } @@ -1156,9 +1109,10 @@ document.getElementById('detailUnit').textContent = `${ts.code} - ${ts.brand_type}`; document.getElementById('detailOperator').textContent = `${ts.operator_name} (NIK: ${ts.operator_nik})`; document.getElementById('detailMeter').textContent = `${ts.start_meter} ${ts.meter_type}`; - document.getElementById('detailHours').textContent = ts.operating_hours && ts.operating_hours !== '0,0' ? `${ts.operating_hours} ${ts.meter_type}` : '-'; - document.getElementById('detailStandbyBreakdown').textContent = `Standby: ${ts.standby_hours}h | Breakdown: ${ts.breakdown_hours}h`; - document.getElementById('detailFuel').textContent = ts.fuel_liters && ts.fuel_liters !== '-' ? `${ts.fuel_liters} L` : '-'; + const detailStartTimeEl = document.getElementById('detailStartTime'); + if (detailStartTimeEl) { + detailStartTimeEl.textContent = ts.start_time ? (ts.start_time.substring(0, 5) + ' WIB') : '08:00 WIB'; + } document.getElementById('detailLocation').textContent = ts.location; document.getElementById('detailActivity').textContent = ts.activity_type; document.getElementById('detailTask').textContent = ts.task_description !== '-' ? `"${ts.task_description}"` : '-'; @@ -1236,12 +1190,14 @@ // Format tanggal YYYY-MM-DD const d = ts.date ? ts.date.split('T')[0] : ''; document.getElementById('editDate').value = d; + const startTimeInput = document.getElementById('editStartTime'); + if (startTimeInput) { + startTimeInput.value = ts.start_time ? ts.start_time.substring(0, 5) : '08:00'; + } document.getElementById('editShift').value = ts.shift || 'Shift Siang'; document.getElementById('editMeterType').value = ts.meter_type || 'HM'; document.getElementById('editStartMeter').value = ts.start_meter; - document.getElementById('editStandbyHours').value = ts.standby_hours || 0; - document.getElementById('editBreakdownHours').value = ts.breakdown_hours || 0; document.getElementById('editActivityType').value = ts.activity_type; document.getElementById('editStatus').value = ts.status || 'Operation'; diff --git a/tests/Feature/QmaSupportTimesheetTest.php b/tests/Feature/QmaSupportTimesheetTest.php index 3fc4b3f..943a8f1 100644 --- a/tests/Feature/QmaSupportTimesheetTest.php +++ b/tests/Feature/QmaSupportTimesheetTest.php @@ -120,6 +120,7 @@ class QmaSupportTimesheetTest extends TestCase 'vehicle_code' => 'EX01', // Diketik langsung 'operator_id' => $this->operator->id, 'date' => Carbon::today()->toDateString(), + 'start_time' => '08:15', 'shift' => 'Shift Siang', 'meter_type' => 'HM', 'start_meter' => 1265.50, // Odometer awal saja @@ -147,6 +148,10 @@ class QmaSupportTimesheetTest extends TestCase 'status' => 'Operation', ]); + $saved = UnitSupportTimesheet::where('vehicle_id', $this->supportUnit->id)->first(); + $this->assertNotNull($saved); + $this->assertStringStartsWith('08:15', (string) $saved->start_time); + // Verifikasi odometer kendaraan terupdate ke start_meter terbaru $this->supportUnit->refresh(); $this->assertEquals(1265.50, (float) $this->supportUnit->current_km); @@ -275,6 +280,7 @@ class QmaSupportTimesheetTest extends TestCase 'vehicle_id' => $this->supportUnit->id, 'operator_id' => $this->operator->id, 'date' => Carbon::today()->toDateString(), + 'start_time' => '07:45', 'shift' => 'Shift 2 (Malam)', 'meter_type' => 'HM', 'start_meter' => 1250.00, @@ -293,6 +299,7 @@ class QmaSupportTimesheetTest extends TestCase $timesheet->refresh(); $this->assertEquals(9.50, (float) $timesheet->operating_hours); $this->assertEquals('Shift 2 (Malam)', $timesheet->shift); + $this->assertStringStartsWith('07:45', (string) $timesheet->start_time); $this->assertEquals('Vertical Shaft', $timesheet->location); $this->assertEquals('Standby', $timesheet->status); }