diff --git a/config.yaml b/config.yaml index f8f97cf..2a99cca 100644 --- a/config.yaml +++ b/config.yaml @@ -261,6 +261,11 @@ views: files: - web/layouts/_partials/address_autocomplete.html - web/layouts/solidarity_transport/driver_create.html + driver_update: + files: + - web/layouts/agenda/_partials/address.html + - web/layouts/_partials/address_autocomplete.html + - web/layouts/solidarity_transport/driver_update.html driver_display: files: - web/layouts/_partials/address_autocomplete.html @@ -367,6 +372,8 @@ icons: svg: coopgo:parcoursmob/monogram: hero:outline/archive-box: + hero:outline/arrow-long-right: + hero:outline/arrow-path-rounded-square: hero:outline/briefcase: hero:outline/support: hero:outline/group_module: diff --git a/web/layouts/beneficiaries/update.html b/web/layouts/beneficiaries/update.html index a011eb9..0316160 100644 --- a/web/layouts/beneficiaries/update.html +++ b/web/layouts/beneficiaries/update.html @@ -15,12 +15,7 @@ file_number: '{{ .ViewState.Data.file_number }}', gender: {{.ViewState.Data.gender}} }, - other_properties: { - situation: '{{.ViewState.Data.other_properties.situation}}', - subscription_reason: '{{.ViewState.Data.other_properties.subscription_reason}}', - status: '{{.ViewState.Data.other_properties.status}}', - comment: '{{.ViewState.Data.other_properties.comment}}' - }, + other_properties: {{if .ViewState.Data.other_properties}}{{ json .ViewState.Data.other_properties }}{{else}}{}{{end}}, other_properties_serialized: null, rules: { first_name: ['required'], @@ -49,6 +44,7 @@ this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field]) }, submit(event) { + this.other_properties_serialized = JSON.stringify(this.other_properties) this.validate() if(!this.formValidation.valid) { this.isFormValid = false @@ -58,6 +54,7 @@ } }">
+
@@ -133,8 +130,8 @@
- diff --git a/web/layouts/journeys/_partials/journeys-solidarity-transport.html b/web/layouts/journeys/_partials/journeys-solidarity-transport.html index e797591..538ff66 100644 --- a/web/layouts/journeys/_partials/journeys-solidarity-transport.html +++ b/web/layouts/journeys/_partials/journeys-solidarity-transport.html @@ -21,6 +21,10 @@ class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"> Distance passager + + Commentaire +   @@ -36,6 +40,7 @@ {{ $driver.Data.first_name }} {{ $driver.Data.last_name }} {{ .DriverDistance }} km {{ .PassengerDistance }} km + {{if $driver.Data.other_properties}}{{ $driver.Data.other_properties.comment }}{{end}} diff --git a/web/layouts/solidarity_transport/_partials/driver_availabilities.html b/web/layouts/solidarity_transport/_partials/driver_availabilities.html index 832f093..eff51da 100644 --- a/web/layouts/solidarity_transport/_partials/driver_availabilities.html +++ b/web/layouts/solidarity_transport/_partials/driver_availabilities.html @@ -66,10 +66,10 @@
De
-
à
-
diff --git a/web/layouts/solidarity_transport/_partials/drivers_list.html b/web/layouts/solidarity_transport/_partials/drivers_list.html index 337e37e..2335db1 100644 --- a/web/layouts/solidarity_transport/_partials/drivers_list.html +++ b/web/layouts/solidarity_transport/_partials/drivers_list.html @@ -59,7 +59,7 @@ {{if .Data.address}}{{.Data.address.properties.label}}{{end}} {{ .Data.phone_number }} - {{if and .Data.other_properties (gt .Data.other_properties.last_subscription_date "2025")}} + {{if and .Data.other_properties (and .Data.other_properties.last_subscription_date (gt .Data.other_properties.last_subscription_date "2025"))}} Oui {{else}} Non diff --git a/web/layouts/solidarity_transport/_partials/journey_preview.html b/web/layouts/solidarity_transport/_partials/journey_preview.html index 19f1ff5..2ff77b7 100644 --- a/web/layouts/solidarity_transport/_partials/journey_preview.html +++ b/web/layouts/solidarity_transport/_partials/journey_preview.html @@ -5,6 +5,9 @@

Le trajet

Informations sur le trajet

+
+ {{if eq .driver_journey.Noreturn true}}Aller simple{{else}}Aller-retour{{end}} +
diff --git a/web/layouts/solidarity_transport/driver_create.html b/web/layouts/solidarity_transport/driver_create.html index a892688..82c4288 100644 --- a/web/layouts/solidarity_transport/driver_create.html +++ b/web/layouts/solidarity_transport/driver_create.html @@ -135,6 +135,12 @@ class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl" x-model="other_properties.last_subscription_date">
+
+ + +
- +
@@ -85,6 +85,12 @@
{{ .ViewState.driver.Data.other_properties.last_subscription_date}}
{{end}} + {{if and .ViewState.driver.Data.other_properties .ViewState.driver.Data.other_properties.comment}} +
+
Commentaire
+
{{ .ViewState.driver.Data.other_properties.comment}}
+
+ {{end}} diff --git a/web/layouts/solidarity_transport/driver_journey.html b/web/layouts/solidarity_transport/driver_journey.html index 52b97bd..1233d6d 100644 --- a/web/layouts/solidarity_transport/driver_journey.html +++ b/web/layouts/solidarity_transport/driver_journey.html @@ -2,6 +2,28 @@ {{define "content"}}

Organiser le transport solidaire

+
+
+

+
+
+ + {{if .ViewState.driver_journey.Noreturn}} + + {{else}} + + {{end}} + +
+
{{template "journey_preview" (dict "driver_journey" .ViewState.driver_journey "driver" .ViewState.driver "passenger" .ViewState.passenger "beneficiaries" .ViewState.beneficiaries)}} @@ -13,6 +35,13 @@

Le solde du compte mobilité est insuffisant.

{{end}}
+ {{if not .ViewState.driver_journey.Noreturn}} +
+ + +
+ {{end}} {{template "submit_with_sms" dict "IconSet" .IconSet "Viewstate" .ViewState diff --git a/web/layouts/solidarity_transport/driver_update.html b/web/layouts/solidarity_transport/driver_update.html new file mode 100644 index 0000000..e4b54fa --- /dev/null +++ b/web/layouts/solidarity_transport/driver_update.html @@ -0,0 +1,195 @@ +{{ define "content" }} + +
+

Modifier le conducteur

+
+ +
+ + +
+
+
+

Informations obligatoires

+

Informations personnelles obligatoires pour créer le conducteur

+
+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ {{ $fieldName := "address" }} + {{if .ViewState.driver.Data.address}} + {{$default := .ViewState.driver.Data.address}} + {{ template "address" dict "FieldName" $fieldName "Default" $default}} + {{else}} + {{ template "address_autocomplete" dict "FieldName" $fieldName}} + {{end}} +
+
+
+
+ +
+
+
+

Informations optionnelles

+

Autres informations de profil optionnelles

+
+
+
+ +
+ +
+ +
+
+ +
+ + +
+
+ + +
+ + + + +
+
+
+
+ + +
+

Certains champs de sont pas valides.

+ + + + +
+ +
+{{end}} + diff --git a/web/layouts/solidarity_transport/ext/booking_proposal.html b/web/layouts/solidarity_transport/ext/booking_proposal.html index d321578..b1b2b34 100644 --- a/web/layouts/solidarity_transport/ext/booking_proposal.html +++ b/web/layouts/solidarity_transport/ext/booking_proposal.html @@ -37,29 +37,32 @@
-
Départ passager
+
Type de de trajet
+ {{if .ViewState.booking.Journey.Noreturn}}
Aller simple (pas de retour)
+ {{else}}
Aller-retour ({{.ViewState.booking.ReturnWaitingDuration | shortDuration}} d'attente estimée sur place)
{{end}} +
+
+
Passager
+
{{.ViewState.passenger.Data.first_name}} {{.ViewState.passenger.Data.last_name}}
+
+
+
Lieu de récupération du passager
{{.ViewState.booking.Journey.PassengerPickup.Properties.label}}
-
Destination passager
+
Lieu de destination
{{.ViewState.booking.Journey.PassengerDrop.Properties.label}}
-
Kilomètres passager
-
{{.ViewState.booking.Journey.PassengerDistance}} km
-
-
-
Kilomètres conducteur
-
{{.ViewState.booking.Journey.DriverDistance}} km
-
-
-
Horaire rendez vous passager
+
Date et heure du rendez-vous
{{ .ViewState.booking.Journey.PassengerPickupDate.Format "02/01/2006 15:04"}}
+ {{if eq .ViewState.booking.Status "VALIDATED"}}
-
Temps de trajet
-
{{ printf "%.0f" .ViewState.booking.Journey.Duration.Minutes }} min
+
Numéro de téléphone du passager
+
{{ .ViewState.passenger.Data.phone_number}}
+ {{end}}