coopgo-apps/parcoursmob-default-theme
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

prevent errors in javascript generation

Browse Source
This commit is contained in:
Arnaud Delcasse
2025-10-09 12:22:55 +02:00
parent 3cc4d9452a
commit 2e5351847d
3 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
web/layouts/organized_carpool/_partials/bookings_history.html
View File

@@ -4,22 +4,24 @@
{{if eq (len .ViewState.bookings_history) 0}}
<div class="m-10 text-center text-gray-600">Aucun trajet dans le passé</div>
{{else}}
{{$inrange := false}}
<div x-data="{
bookings: [
{{range $index, $booking := .ViewState.bookings_history}}{{if $index}},{{end}}{
id: '{{$booking.Id}}',
driverId: '{{$booking.Driver.Id}}',
driverFirstName: '{{ (index $.ViewState.drivers_map $booking.Driver.Id).Data.first_name }}',
driverLastName: '{{ (index $.ViewState.drivers_map $booking.Driver.Id).Data.last_name }}',
passengerId: '{{$booking.Passenger.Id}}',
passengerFirstName: '{{ (index $.ViewState.passengers_map $booking.Passenger.Id).Data.first_name }}',
passengerLastName: '{{ (index $.ViewState.passengers_map $booking.Passenger.Id).Data.last_name }}',
pickupAddress: '{{$booking.PassengerPickupAddress}}',
dropAddress: '{{$booking.PassengerDropAddress}}',
pickupDate: '{{ timeFormat $booking.PassengerPickupDate.AsTime "02/01/2006 15:04" }}',
status: '{{$booking.Status.String}}',
price: '{{if $booking.Price}}{{ printf "%.2f" (round2 $booking.Price.Amount) }}{{else}}N/A{{end}}',
currency: '{{if $booking.Price}}{{$booking.Price.Currency}}{{end}}'
{{range .ViewState.bookings_history}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .Driver.Id}}{{$passenger := index $.ViewState.passengers_map .Passenger.Id}}{
id: '{{.Id}}',
driverId: '{{if .Driver}}{{.Driver.Id}}{{end}}',
driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
passengerId: '{{if .Passenger}}{{.Passenger.Id}}{{end}}',
passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
pickupAddress: '{{ jsEscape .PassengerPickupAddress }}',
dropAddress: '{{ jsEscape .PassengerDropAddress }}',
pickupDate: '{{if .PassengerPickupDate}}{{ timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04" }}{{end}}',
status: '{{.Status.String}}',
price: '{{if .Price}}{{ printf "%.2f" (round2 .Price.Amount) }}{{else}}N/A{{end}}',
currency: '{{if .Price}}{{.Price.Currency}}{{end}}'
}{{end}}
],
currentPage: 1,

30
web/layouts/organized_carpool/_partials/bookings_list.html
View File

@@ -4,22 +4,24 @@
{{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.Driver.Id}}',
driverFirstName: '{{ jsEscape (index $.ViewState.drivers_map $booking.Driver.Id).Data.first_name }}',
driverLastName: '{{ jsEscape (index $.ViewState.drivers_map $booking.Driver.Id).Data.last_name }}',
passengerId: '{{$booking.Passenger.Id}}',
passengerFirstName: '{{ jsEscape (index $.ViewState.passengers_map $booking.Passenger.Id).Data.first_name }}',
passengerLastName: '{{ jsEscape (index $.ViewState.passengers_map $booking.Passenger.Id).Data.last_name }}',
pickupAddress: '{{ jsEscape $booking.PassengerPickupAddress }}',
dropAddress: '{{ jsEscape $booking.PassengerDropAddress }}',
pickupDate: '{{ timeFormat $booking.PassengerPickupDate.AsTime "02/01/2006 15:04" }}',
status: '{{$booking.Status.String}}',
price: '{{if $booking.Price}}{{ printf "%.2f" (round2 $booking.Price.Amount) }}{{else}}N/A{{end}}',
currency: '{{if $booking.Price}}{{$booking.Price.Currency}}{{end}}'
{{range .ViewState.bookings}}{{if $inrange}},{{end}}{{$inrange = true}}{{$driver := index $.ViewState.drivers_map .Driver.Id}}{{$passenger := index $.ViewState.passengers_map .Passenger.Id}}{
id: '{{.Id}}',
driverId: '{{if .Driver}}{{.Driver.Id}}{{end}}',
driverFirstName: '{{if $driver.ID}}{{ jsEscape $driver.Data.first_name }}{{end}}',
driverLastName: '{{if $driver.ID}}{{ jsEscape $driver.Data.last_name }}{{end}}',
passengerId: '{{if .Passenger}}{{.Passenger.Id}}{{end}}',
passengerFirstName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.first_name }}{{end}}',
passengerLastName: '{{if $passenger.Data}}{{ jsEscape $passenger.Data.last_name }}{{end}}',
pickupAddress: '{{ jsEscape .PassengerPickupAddress }}',
dropAddress: '{{ jsEscape .PassengerDropAddress }}',
pickupDate: '{{if .PassengerPickupDate}}{{ timeFormat .PassengerPickupDate.AsTime "02/01/2006 15:04" }}{{end}}',
status: '{{.Status.String}}',
price: '{{if .Price}}{{ printf "%.2f" (round2 .Price.Amount) }}{{else}}N/A{{end}}',
currency: '{{if .Price}}{{.Price.Currency}}{{end}}'
}{{end}}
],
currentPage: 1,