prevent errors in javascript generation
This commit is contained in:
Arnaud Delcasse
parent
3cc4d9452a
commit
2e5351847d
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -4,22 +4,25 @@
|
|||
{{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.DriverId}}',
|
||||
driverFirstName: '{{ (index $.ViewState.drivers_map $booking.DriverId).Data.first_name }}',
|
||||
driverLastName: '{{ (index $.ViewState.drivers_map $booking.DriverId).Data.last_name }}',
|
||||
passengerId: '{{$booking.PassengerId}}',
|
||||
passengerFirstName: '{{ (index $.ViewState.passengers_map $booking.PassengerId).Data.first_name }}',
|
||||
passengerLastName: '{{ (index $.ViewState.passengers_map $booking.PassengerId).Data.last_name }}',
|
||||
pickupLabel: '{{$booking.Journey.PassengerPickup.Properties.label}}',
|
||||
dropLabel: '{{$booking.Journey.PassengerDrop.Properties.label}}',
|
||||
pickupDate: '{{ $booking.Journey.PassengerPickupDate.Format "02/01/2006 15:04" }}',
|
||||
status: '{{$booking.Status}}',
|
||||
price: '{{ printf "%.2f" (round2 $booking.Journey.Price.Amount) }}',
|
||||
currency: '{{$booking.Journey.Price.Currency}}'
|
||||
{{range .ViewState.bookings_history}}{{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}}',
|
||||
price: '{{if .Journey}}{{ printf "%.2f" (round2 .Journey.Price.Amount) }}{{end}}',
|
||||
currency: '{{if .Journey}}{{.Journey.Price.Currency}}{{end}}',
|
||||
motivation: {{ if .Data.motivation }}'{{ jsEscape .Data.motivation }}'{{ else }}''{{ end }}
|
||||
}{{end}}
|
||||
],
|
||||
currentPage: 1,
|
||||
|
|
@ -46,6 +49,10 @@
|
|||
if (status === 'VALIDATED') return { class: 'p-1 text-xs bg-co-green rounded-xl', text: 'Validé' };
|
||||
if (status === 'CANCELLED') return { class: 'p-1 text-xs bg-co-red text-white rounded-xl', text: 'Annulé' };
|
||||
return { class: '', text: '' };
|
||||
},
|
||||
guaranteedMotivations: {{ json .ViewState.guaranteed_trip_motivations }},
|
||||
isGuaranteedTrip(motivation) {
|
||||
return this.guaranteedMotivations.includes(motivation);
|
||||
}
|
||||
}">
|
||||
|
||||
|
|
@ -80,6 +87,11 @@
|
|||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6" x-text="booking.pickupDate"></td>
|
||||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
|
||||
<span :class="getStatusBadge(booking.status).class" x-text="getStatusBadge(booking.status).text"></span>
|
||||
<template x-if="booking.motivation && isGuaranteedTrip(booking.motivation)">
|
||||
<div class="mt-4">
|
||||
<span class="text-xs p-2 bg-co-green text-white rounded-2xl" x-text="'Trajet garanti : ' + booking.motivation"></span>
|
||||
</div>
|
||||
</template>
|
||||
</td>
|
||||
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
|
||||
<span x-text="booking.price + ' ' + booking.currency"></span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue