From 126c0a12e3f55bf221d15b0970a342edbd3a460a Mon Sep 17 00:00:00 2001 From: Ray1111-aa Date: Thu, 22 Oct 2026 16:46:09 +0700 Subject: [PATCH] feat: add recent trip history to vehicle activity form and clean background decorations --- .../Public/VehicleActivityFormController.php | 10 +- resources/views/employee/dashboard.blade.php | 4 - .../public/vehicle_activity_form.blade.php | 98 ++++++++++++++++++- 3 files changed, 106 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Public/VehicleActivityFormController.php b/app/Http/Controllers/Public/VehicleActivityFormController.php index ae681e4..8831754 100644 --- a/app/Http/Controllers/Public/VehicleActivityFormController.php +++ b/app/Http/Controllers/Public/VehicleActivityFormController.php @@ -123,6 +123,13 @@ class VehicleActivityFormController extends Controller } } + // Ambil 5 riwayat perjalanan terakhir dari unit ini + $recentActivities = VehicleActivity::with(['driver', 'gate', 'securityGuard']) + ->where('vehicle_id', $vehicle->id) + ->latest('recorded_at') + ->take(5) + ->get(); + return view('public.vehicle_activity_form', compact( 'vehicle', 'gates', @@ -130,7 +137,8 @@ class VehicleActivityFormController extends Controller 'verifiedDriver', 'nikError', 'nikErrorTitle', - 'inputNik' + 'inputNik', + 'recentActivities' )); } diff --git a/resources/views/employee/dashboard.blade.php b/resources/views/employee/dashboard.blade.php index 491a3fd..b583e04 100644 --- a/resources/views/employee/dashboard.blade.php +++ b/resources/views/employee/dashboard.blade.php @@ -62,10 +62,6 @@
- {{-- Dekorasi Latar Belakang --}} -
- -
{{-- Header Card Perjalanan --}} diff --git a/resources/views/public/vehicle_activity_form.blade.php b/resources/views/public/vehicle_activity_form.blade.php index 31c1381..9a48f90 100644 --- a/resources/views/public/vehicle_activity_form.blade.php +++ b/resources/views/public/vehicle_activity_form.blade.php @@ -3,7 +3,7 @@ @section('title', 'Input Timesheet Unit - ' . $vehicle->code) @section('content') -
+
@if(auth()->check()) @@ -220,6 +220,102 @@
@endif + + +
+
+
+
+ +
+
+

Riwayat Perjalanan Unit {{ $vehicle->code }}

+

Catatan pergerakan dan mutasi gerbang terakhir kendaraan ini.

+
+
+ + {{ isset($recentActivities) ? $recentActivities->count() : 0 }} Aktivitas Terakhir + +
+ + @if(isset($recentActivities) && $recentActivities->isNotEmpty()) +
+ + + + + + + + + + + + + @foreach($recentActivities as $act) + + + + + + + + + @endforeach + +
WaktuPengemudiPos GerbangArahOdometerStatus
+ {{ $act->recorded_at->locale('id')->translatedFormat('d M Y') }} + {{ $act->recorded_at->format('H:i') }} WIB + + {{ $act->driver->name ?? 'Pengemudi' }} + NIK: {{ $act->driver->nik ?? '-' }} + + {{ $act->gate->name ?? '-' }} + + @if($act->direction === 'in') + + MASUK + + @else + + KELUAR + + @endif + +
{{ number_format($act->current_km, 0, ',', '.') }} KM
+
+{{ number_format($act->distance, 0, ',', '.') }} KM
+
+ @if($act->validation_status === 'approved') + + Disetujui + + @elseif($act->validation_status === 'cancelled') + @if($act->isCancelledBySystem()) + + Batal Sistem + + @else + + Batal Sopir + + @endif + @elseif($act->validation_status === 'rejected') + + Ditolak + + @else + + Menunggu + + @endif +
+
+ @else +
+

Belum ada riwayat pergerakan gerbang yang tercatat untuk unit {{ $vehicle->code }}.

+
+ @endif +
@endsection