From b9d343dd08be88ee416ee24d4afa4fc77ebdb39c Mon Sep 17 00:00:00 2001
From: Arnaud Delcasse <arnaud.delcasse@mobicoop.org>
Date: Thu, 9 Oct 2025 09:57:27 +0200
Subject: [PATCH] prevent errors in javascript generation

---
 .../_partials/bookings_list.html                   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/web/layouts/solidarity_transport/_partials/bookings_list.html b/web/layouts/solidarity_transport/_partials/bookings_list.html
index 9a32f7a..b9c3a27 100644
--- a/web/layouts/solidarity_transport/_partials/bookings_list.html
+++ b/web/layouts/solidarity_transport/_partials/bookings_list.html
@@ -10,14 +10,14 @@
     {{range $index, $booking := .ViewState.bookings}}{{if $index}},{{end}}{
       id: '{{$booking.Id}}',
       driverId: '{{$booking.DriverId}}',
-      driverFirstName: '{{ jsEscape (index $.ViewState.drivers_map $booking.DriverId).Data.first_name }}',
-      driverLastName: '{{ jsEscape (index $.ViewState.drivers_map $booking.DriverId).Data.last_name }}',
+      driverFirstName: '{{if index $.ViewState.drivers_map $booking.DriverId}}{{ jsEscape (index $.ViewState.drivers_map $booking.DriverId).Data.first_name }}{{end}}',
+      driverLastName: '{{if index $.ViewState.drivers_map $booking.DriverId}}{{ jsEscape (index $.ViewState.drivers_map $booking.DriverId).Data.last_name }}{{end}}',
       passengerId: '{{$booking.PassengerId}}',
-      passengerFirstName: '{{ jsEscape (index $.ViewState.passengers_map $booking.PassengerId).Data.first_name }}',
-      passengerLastName: '{{ jsEscape (index $.ViewState.passengers_map $booking.PassengerId).Data.last_name }}',
-      pickupLabel: '{{ jsEscape $booking.Journey.PassengerPickup.Properties.label }}',
-      dropLabel: '{{ jsEscape $booking.Journey.PassengerDrop.Properties.label }}',
-      pickupDate: '{{ timeFormat $booking.Journey.PassengerPickupDate "02/01/2006 15:04" }}',
+      passengerFirstName: '{{if index $.ViewState.passengers_map $booking.PassengerId}}{{ jsEscape (index $.ViewState.passengers_map $booking.PassengerId).Data.first_name }}{{end}}',
+      passengerLastName: '{{if index $.ViewState.passengers_map $booking.PassengerId}}{{ jsEscape (index $.ViewState.passengers_map $booking.PassengerId).Data.last_name }}{{end}}',
+      pickupLabel: '{{if $booking.Journey}}{{ jsEscape $booking.Journey.PassengerPickup.Properties.label }}{{end}}',
+      dropLabel: '{{if $booking.Journey}}{{ jsEscape $booking.Journey.PassengerDrop.Properties.label }}{{end}}',
+      pickupDate: '{{if $booking.Journey}}{{ timeFormat $booking.Journey.PassengerPickupDate "02/01/2006 15:04" }}{{end}}',
       status: '{{$booking.Status}}',
       motivation: {{ if $booking.Data.motivation }}'{{ jsEscape $booking.Data.motivation }}'{{ else }}''{{ end }}
     }{{end}}