prevent errors in javascript generation

This commit is contained in:
Arnaud Delcasse 2025-10-09 11:55:16 +02:00
parent b9d343dd08
commit 3cc4d9452a
1 changed files with 16 additions and 14 deletions

View File

@ -5,21 +5,23 @@
{{if eq (len .ViewState.bookings) 0}}
<div class="m-10 text-center text-gray-600">Aucun trajet déclaré</div>
{{else}}
{{$inrange := false}}
<div x-data="{
bookings: [
{{range $index, $booking := .ViewState.bookings}}{{if $index}},{{end}}{
id: '{{$booking.Id}}',
driverId: '{{$booking.DriverId}}',
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: '{{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 }}
{{range .ViewState.bookings}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .DriverId}}{{$passenger := index $.ViewState.passengers_map .PassengerId}}{
id: '{{.Id}}',
driverId: '{{.DriverId}}',
driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
passengerId: '{{ .PassengerId }}',
passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
pickupLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerPickup.Properties.label }}{{end}}',
dropLabel: '{{if .Journey}}{{ jsEscape .Journey.PassengerDrop.Properties.label }}{{end}}',
pickupDate: '{{if .Journey}}{{ timeFormat .Journey.PassengerPickupDate "02/01/2006 15:04" }}{{end}}',
status: '{{.Status}}',
motivation: {{ if .Data.motivation }}'{{ jsEscape .Data.motivation }}'{{ else }}''{{ end }}
}{{end}}
],
currentPage: 1,