diff --git a/resources/views/qma/support_timesheet.blade.php b/resources/views/qma/support_timesheet.blade.php index b4745ec..e22c42d 100644 --- a/resources/views/qma/support_timesheet.blade.php +++ b/resources/views/qma/support_timesheet.blade.php @@ -1,6 +1,10 @@ @extends('layouts.app') -@section('title', (request()->routeIs('qma.activity.support_timesheet') ? 'History Timesheet Unit Support' : 'Timesheet Unit Support') . ' - Admin QMA | PT Kerinci Merangin Hidro') +@php + $isHistoryRoute = request()->routeIs('qma.activity.support_timesheet'); +@endphp + +@section('title', ($isHistoryRoute ? 'History Timesheet Unit Support' : 'Timesheet Unit Support') . ' - Admin QMA | PT Kerinci Merangin Hidro') @section('content')
@@ -14,14 +18,18 @@ • - {{ request()->routeIs('qma.activity.support_timesheet') ? 'Log Aktifitas' : 'Operasional Unit' }} + {{ $isHistoryRoute ? 'Log Aktifitas' : 'Operasional Unit' }}

- {{ request()->routeIs('qma.activity.support_timesheet') ? 'History Timesheet Unit Support' : 'Timesheet Unit Support' }} + {{ $isHistoryRoute ? 'History Timesheet Unit Support' : 'Timesheet Unit Support' }}

- Pencatatan jam kerja (HM/KM), penugasan operator, utilisasi shift, serta pemakaian solar alat berat. + @if($isHistoryRoute) + Riwayat log operasional, utilisasi shift, pencatatan jam kerja mesin (HM/KM), serta konsumsi solar alat berat. + @else + Pencatatan jam kerja (HM/KM), penugasan operator, utilisasi shift, serta pemakaian solar alat berat. + @endif

@@ -50,15 +58,17 @@ - - @can('qma.logs.edit_odometer') - - @endcan + @if(!$isHistoryRoute) + + @can('qma.logs.edit_odometer') + + @endcan + @endif @@ -367,21 +377,61 @@
- @can('qma.logs.edit_odometer') + - + @can('qma.logs.edit_odometer') + @if(!$isHistoryRoute) + + + + @else + + + @endif @endcan
@@ -391,7 +441,11 @@

Belum ada data timesheet unit support

-

Gunakan tombol "Catat Timesheet" di atas untuk menambahkan laporan harian.

+ @if(!$isHistoryRoute) +

Gunakan tombol "Catat Timesheet" di atas untuk menambahkan laporan harian.

+ @else +

Tidak ditemukan catatan timesheet yang sesuai dengan kriteria filter saat ini.

+ @endif @if(request()->anyFilled(['start_date', 'end_date', 'vehicle_id', 'shift', 'search']))
@@ -422,6 +476,7 @@
+@if(!$isHistoryRoute) @@ -683,6 +738,104 @@ +@endif + + + + + @@ -996,13 +1149,50 @@ // 2. Modal Tambah Timesheet function openAddModal() { const modal = document.getElementById('addTimesheetModal'); - modal.classList.remove('hidden'); - modal.style.display = 'block'; + if (modal) { + modal.classList.remove('hidden'); + modal.style.display = 'block'; + } } function closeAddModal() { const modal = document.getElementById('addTimesheetModal'); - modal.classList.add('hidden'); - modal.style.display = 'none'; + if (modal) { + modal.classList.add('hidden'); + modal.style.display = 'none'; + } + } + + // Modal Detail Riwayat Timesheet + function openDetailModalFromBtn(btn) { + try { + const ts = JSON.parse(btn.getAttribute('data-timesheet')); + document.getElementById('detailTimesheetNo').textContent = ts.timesheet_no; + document.getElementById('detailDateShift').textContent = `${ts.date} • ${ts.shift}`; + 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.end_meter} ${ts.meter_type}`; + document.getElementById('detailHours').textContent = `${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} L` : '-'; + document.getElementById('detailLocation').textContent = ts.location; + document.getElementById('detailActivity').textContent = ts.activity_type; + document.getElementById('detailTask').textContent = ts.task_description !== '-' ? `"${ts.task_description}"` : '-'; + document.getElementById('detailStatus').textContent = ts.status; + + const modal = document.getElementById('detailTimesheetModal'); + modal.classList.remove('hidden'); + modal.style.display = 'block'; + } catch (err) { + console.error('Failed to parse detail timesheet data:', err); + } + } + + function closeDetailModal() { + const modal = document.getElementById('detailTimesheetModal'); + if (modal) { + modal.classList.add('hidden'); + modal.style.display = 'none'; + } } // 3. Modal Edit Timesheet diff --git a/tests/Feature/QmaSupportTimesheetTest.php b/tests/Feature/QmaSupportTimesheetTest.php index a7c5277..b86f955 100644 --- a/tests/Feature/QmaSupportTimesheetTest.php +++ b/tests/Feature/QmaSupportTimesheetTest.php @@ -99,6 +99,7 @@ class QmaSupportTimesheetTest extends TestCase $response->assertStatus(200); $response->assertSee('Timesheet Unit Support'); + $response->assertSee('Catat Timesheet'); $response->assertSee('TS-US-20261020-0001'); $response->assertSee('EX01'); $response->assertSee('Joko Operator'); @@ -107,7 +108,7 @@ class QmaSupportTimesheetTest extends TestCase } /** - * Admin QMA dapat mengakses riwayat timesheet melalui rute Log Aktifitas. + * Admin QMA dapat mengakses riwayat timesheet melalui rute Log Aktifitas (tanpa tombol penambahan). */ public function test_qma_admin_can_view_support_timesheet_history_via_activity_log_route(): void { @@ -116,6 +117,7 @@ class QmaSupportTimesheetTest extends TestCase $response->assertStatus(200); $response->assertSee('History Timesheet Unit Support'); + $response->assertDontSee('Catat Timesheet'); } /**