diff --git a/app/Http/Controllers/Qma/ActivityLogController.php b/app/Http/Controllers/Qma/ActivityLogController.php index e29a4d9..d30713b 100644 --- a/app/Http/Controllers/Qma/ActivityLogController.php +++ b/app/Http/Controllers/Qma/ActivityLogController.php @@ -36,6 +36,21 @@ class ActivityLogController extends Controller $query->where('direction', $request->input('direction')); } + // Filter Kata Kunci Pencarian (Kode LV, Tipe Kendaraan, Plat, Driver, Keperluan) + if ($request->filled('search')) { + $search = $request->input('search'); + $query->where(function ($q) use ($search) { + $q->whereHas('vehicle', function ($vq) use ($search) { + $vq->where('code', 'like', "%{$search}%") + ->orWhere('brand_type', 'like', "%{$search}%") + ->orWhere('license_plate', 'like', "%{$search}%"); + })->orWhereHas('driver', function ($dq) use ($search) { + $dq->where('name', 'like', "%{$search}%") + ->orWhere('nik', 'like', "%{$search}%"); + })->orWhere('purpose', 'like', "%{$search}%"); + }); + } + // Filter Status Validasi (pending, approved, rejected) if ($request->filled('status')) { $query->where('validation_status', $request->input('status')); diff --git a/resources/views/qma/activity_log.blade.php b/resources/views/qma/activity_log.blade.php index 5372bd9..9a6134b 100644 --- a/resources/views/qma/activity_log.blade.php +++ b/resources/views/qma/activity_log.blade.php @@ -1,20 +1,20 @@ @extends('layouts.app') -@section('title', 'Log Aktivitas Kendaraan QMA - 10 Kolom') +@section('title', 'Log Aktivitas Kendaraan QMA') @section('content')
- +
MANAJEMEN SISTEM
-

+

Log Aktivitas Kendaraan

- +
@@ -27,133 +27,256 @@
- -
-
-
- - + +
+ + +
+
+ + Filter & Pencarian Log +
+ @if(request()->hasAny(['search', 'start_date', 'end_date', 'gate_id', 'direction', 'status'])) + + + Reset Semua Filter + + @endif
-
- - + + +
+ +
+ +
+ +
+
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
+ + +
-
- - -
-
- - -
-
- - - Reset - + + +
+ +
+ + Status PG: + + +
+ + +
+ + + Reset + + +
- -
+ +
- - +
+ - - - - - - - - - - - + + + + + + + + + + + - + @forelse($activities as $act) - - + + - - - - - - - - - - @empty - @endforelse @@ -162,9 +285,11 @@ -
- {{ $activities->links() }} -
+ @if($activities->hasPages()) +
+ {{ $activities->links() }} +
+ @endif @endsection diff --git a/tests/Feature/VehicleActivityTest.php b/tests/Feature/VehicleActivityTest.php index 2c408fa..5d37221 100644 --- a/tests/Feature/VehicleActivityTest.php +++ b/tests/Feature/VehicleActivityTest.php @@ -170,16 +170,16 @@ class VehicleActivityTest extends TestCase $qmaAdmin = User::where('role', 'qma_admin')->first(); $response = $this->actingAs($qmaAdmin)->get('/qma/activity-log'); $response->assertStatus(200); - $response->assertSee('Log Aktivitas Kendaraan QMA'); - $response->assertSee('1. Tanggal'); - $response->assertSee('2. Kode LV'); - $response->assertSee('3. Unit'); - $response->assertSee('4. Penanggung Jawab'); - $response->assertSee('5. Driver'); - $response->assertSee('6. Gate'); - $response->assertSee('7. Akses'); - $response->assertSee('8. KM Sebelumnya'); - $response->assertSee('9. KM Berjalan'); - $response->assertSee('10. Aktifitas'); + $response->assertSee('Log Aktivitas Kendaraan'); + $response->assertSee('Tanggal'); + $response->assertSee('Kode LV'); + $response->assertSee('Unit'); + $response->assertSee('Penanggung Jawab'); + $response->assertSee('Driver'); + $response->assertSee('Gate'); + $response->assertSee('Akses'); + $response->assertSee('KM Sebelumnya'); + $response->assertSee('KM Berjalan'); + $response->assertSee('Aktivitas'); } }
1. Tanggal2. Kode LV3. Unit4. Penanggung Jawab5. Driver6. Gate7. Akses8. KM Sebelumnya9. KM Berjalan10. AktifitasStatus PGTanggalKode LVUnitPenanggung JawabDriverGateAksesKM SebelumnyaKM BerjalanAktivitasStatus PG
- {{ $act->recorded_at->format('d/m/Y H:i') }} +
+
{{ $act->recorded_at->format('d/m/Y') }}
+
{{ $act->recorded_at->format('H:i') }} WIB
- + + + + {{ $act->vehicle->code }} -
{{ $act->vehicle->brand_type }}
- {{ $act->vehicle->license_plate ?? '-' }} + + +
+
{{ $act->vehicle->brand_type }}
+ @if($act->vehicle->license_plate) + + {{ $act->vehicle->license_plate }} + + @else + - + @endif
+ + + {{ $act->vehicle->ownership ?? '-' }} - {{ $act->driver->name }} + + + +
{{ $act->driver->name }}
{{ $act->driver->division ?? '-' }}
- + + + + {{ $act->gate->name }} + + + @if($act->direction === 'in') - - MASUK + + MASUK @else - - KELUAR + + KELUAR @endif - {{ number_format($act->previous_km, 0, ',', '.') }} KM + + + + {{ number_format($act->previous_km, 0, ',', '.') }} + KM - +{{ number_format($act->distance, 0, ',', '.') }} KM -
Akhir: {{ number_format($act->current_km, 0, ',', '.') }}
+ + +
+
+ +{{ number_format($act->distance, 0, ',', '.') }} KM +
+
+ Akhir: {{ number_format($act->current_km, 0, ',', '.') }} +
- {{ $act->purpose }} + + + +
{{ $act->purpose }}
+ + + @if($act->validation_status === 'approved') - - Disetujui + + Disetujui @elseif($act->validation_status === 'rejected') - - Ditolak + + Ditolak @else - - Menunggu PG + + Menunggu PG @endif
- - Belum ada catatan aktivitas kendaraan yang sesuai dengan kriteria filter. + +
+
+ +
+
Belum Ada Data Log Aktivitas
+

+ Tidak ditemukan catatan aktivitas kendaraan yang sesuai dengan kriteria filter saat ini. +

+ @if(request()->hasAny(['search', 'start_date', 'end_date', 'gate_id', 'direction', 'status'])) + + + Reset Filter + + @endif +