diff --git a/app/Http/Controllers/Api/V1/Admin/AdminTripController.php b/app/Http/Controllers/Api/V1/Admin/AdminTripController.php index 93d578e..20f6881 100644 --- a/app/Http/Controllers/Api/V1/Admin/AdminTripController.php +++ b/app/Http/Controllers/Api/V1/Admin/AdminTripController.php @@ -99,6 +99,7 @@ class AdminTripController extends ApiController $trip->load([ 'route', 'team.driver', 'team.scanner', 'truck', 'dumpsite', 'stops.dropOffPoint', 'timelineEvents.recordedBy', + 'dumpsiteReleases.dumpsite', 'dumpsiteReleases.releasedByDriver', ]); return $this->ok(new TripResource($trip)); diff --git a/app/Http/Resources/TripResource.php b/app/Http/Resources/TripResource.php index 14f82db..c96da05 100644 --- a/app/Http/Resources/TripResource.php +++ b/app/Http/Resources/TripResource.php @@ -20,6 +20,7 @@ class TripResource extends JsonResource 'dumpsite_arrival_time' => $this->dumpsite_arrival_time?->toIso8601String(), 'dumpsite_departure_time' => $this->dumpsite_departure_time?->toIso8601String(), 'total_load_kg' => $this->total_load_kg, + 'current_load_kg' => $this->current_load_kg, 'is_detouring' => $this->is_detouring, 'route' => RouteResource::make($this->whenLoaded('route')), 'team' => CollectionTeamResource::make($this->whenLoaded('team')), @@ -28,6 +29,16 @@ class TripResource extends JsonResource 'stops' => TripStopResource::collection($this->whenLoaded('stops')), 'timeline' => TripTimelineEventResource::collection($this->whenLoaded('timelineEvents')), 'notes' => $this->notes, + 'releases' => $this->whenLoaded('dumpsiteReleases', fn () => $this->dumpsiteReleases->map(fn ($r) => [ + 'id' => $r->id, + 'weight_kg' => $r->weight_kg, + 'released_at' => $r->released_at?->toIso8601String(), + 'dumpsite_name' => $r->dumpsite?->name, + 'driver_name' => $r->releasedByDriver?->full_name, + 'gate_pass_number' => $r->gate_pass_number, + 'dumpsite_attendant' => $r->dumpsite_attendant_name, + 'notes' => $r->notes, + ])), 'created_at' => $this->created_at?->toIso8601String(), ]; } diff --git a/resources/views/admin/trips.blade.php b/resources/views/admin/trips.blade.php index d023b67..5138b4b 100644 --- a/resources/views/admin/trips.blade.php +++ b/resources/views/admin/trips.blade.php @@ -226,12 +226,33 @@
No releases recorded yet
' + } `; if (tripMapInstance) {