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 @@
Catatan pergerakan dan mutasi gerbang terakhir kendaraan ini.
+| Waktu | +Pengemudi | +Pos Gerbang | +Arah | +Odometer | +Status | +
|---|---|---|---|---|---|
| + {{ $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 + | +
Belum ada riwayat pergerakan gerbang yang tercatat untuk unit {{ $vehicle->code }}.
+