diff --git a/sms/solidarity_transport/driver_accept.tmpl b/sms/solidarity_transport/driver_accept.tmpl index 2c62e2d..d435dff 100644 --- a/sms/solidarity_transport/driver_accept.tmpl +++ b/sms/solidarity_transport/driver_accept.tmpl @@ -1 +1 @@ -{{ define "sms_template" }}[{{ .name }}] Un conducteur solidaire vient d'accepter votre trajet vers {{.address}} le {{.date}}. Son numéro : {{.phone_number}}.{{ end }} +{{ define "sms_template" }}[{{ .name }}] {{ .driver_first_name }} {{ .driver_last_name }} vient d'accepter votre trajet vers {{.address}} le {{.date}}.{{ end }} diff --git a/web/layouts/beneficiaries/display.html b/web/layouts/beneficiaries/display.html index 56b662f..06cd488 100644 --- a/web/layouts/beneficiaries/display.html +++ b/web/layouts/beneficiaries/display.html @@ -40,6 +40,16 @@
+
+
Profil validé
+
+ {{if beneficiaryValidatedProfile .ViewState.beneficiary .ViewState.documents}} + Oui + {{else}} + Non + {{end}} +
+
{{if .ViewState.beneficiary.Data.email}}
Email
diff --git a/web/layouts/journeys/_partials/journeys-all.html b/web/layouts/journeys/_partials/journeys-all.html index 3e26d01..bef6860 100644 --- a/web/layouts/journeys/_partials/journeys-all.html +++ b/web/layouts/journeys/_partials/journeys-all.html @@ -28,7 +28,7 @@
{{range $itinerary.Legs }} - {{if or (or (eq .Mode "BUS") (eq .Mode "REGIONAL_FAST_RAIL")) (eq .Mode "REGIONAL_RAIL") }} + {{if or (or (or (eq .Mode "BUS") (eq .Mode "REGIONAL_FAST_RAIL")) (eq .Mode "REGIONAL_RAIL") (eq .Mode "COACH")) }} diff --git a/web/layouts/journeys/_partials/journeys-public-transit-motis.html b/web/layouts/journeys/_partials/journeys-public-transit-motis.html index 32fa860..8ae1a9f 100644 --- a/web/layouts/journeys/_partials/journeys-public-transit-motis.html +++ b/web/layouts/journeys/_partials/journeys-public-transit-motis.html @@ -39,7 +39,7 @@ {{end}} {{end}} - {{if eq .Mode "BUS"}} + {{if or (eq .Mode "BUS") (eq .Mode "COACH")}}
  • diff --git a/web/layouts/journeys/_partials/journeys-solidarity-transport.html b/web/layouts/journeys/_partials/journeys-solidarity-transport.html index 538ff66..c93eef7 100644 --- a/web/layouts/journeys/_partials/journeys-solidarity-transport.html +++ b/web/layouts/journeys/_partials/journeys-solidarity-transport.html @@ -25,6 +25,10 @@ class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"> Commentaire + + Profil validé +   @@ -33,7 +37,6 @@ {{ range .ViewState.driver_journeys }} - {{if lt .DriverDistance 250}} {{ $driver := (index $.ViewState.solidarity_drivers .DriverId)}} @@ -41,6 +44,13 @@ {{ .DriverDistance }} km {{ .PassengerDistance }} km {{if $driver.Data.other_properties}}{{ $driver.Data.other_properties.comment }}{{end}} + + {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID) }} + Oui + {{else}} + Non + {{end}} + @@ -48,7 +58,6 @@ - {{end}} {{ end }} diff --git a/web/layouts/solidarity_transport/_partials/drivers_list.html b/web/layouts/solidarity_transport/_partials/drivers_list.html index 2335db1..79b360f 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 (and .Data.other_properties.last_subscription_date (gt .Data.other_properties.last_subscription_date "2025"))}} + {{if solidarityDriverValidatedProfile . (solidarityDocuments .ID) }} Oui {{else}} Non diff --git a/web/layouts/solidarity_transport/_partials/journey_preview.html b/web/layouts/solidarity_transport/_partials/journey_preview.html index 2ff77b7..d0f858a 100644 --- a/web/layouts/solidarity_transport/_partials/journey_preview.html +++ b/web/layouts/solidarity_transport/_partials/journey_preview.html @@ -190,6 +190,16 @@ {{ else }}
    +
    +
    Profil validé
    +
    + {{if beneficiaryValidatedProfile .passenger (beneficiaryDocuments .passenger.ID)}} + Oui + {{else}} + Non + {{end}} +
    +
    {{if .passenger.Data.email}}
    Email
    diff --git a/web/layouts/solidarity_transport/driver_display.html b/web/layouts/solidarity_transport/driver_display.html index 3f55e61..0410231 100644 --- a/web/layouts/solidarity_transport/driver_display.html +++ b/web/layouts/solidarity_transport/driver_display.html @@ -42,6 +42,16 @@
    +
    +
    Profil validé
    +
    + {{if solidarityDriverValidatedProfile .ViewState.driver .ViewState.documents}} + Oui + {{else}} + Non + {{end}} +
    +
    {{if .ViewState.driver.Data.email}}
    Email
    diff --git a/web/layouts/solidarity_transport/driver_journey.html b/web/layouts/solidarity_transport/driver_journey.html index 1233d6d..a76f509 100644 --- a/web/layouts/solidarity_transport/driver_journey.html +++ b/web/layouts/solidarity_transport/driver_journey.html @@ -42,6 +42,16 @@ class="p-2 mt-1 mb-4 focus:ring-co-blue focus:border-co-blue block shadow-sm sm:text-sm rounded-2xl bg-white m-auto" />
    {{end}} +
    + + +
    {{template "submit_with_sms" dict "IconSet" .IconSet "Viewstate" .ViewState diff --git a/web/layouts/solidarity_transport/ext/booking_proposal.html b/web/layouts/solidarity_transport/ext/booking_proposal.html index b1b2b34..0351e30 100644 --- a/web/layouts/solidarity_transport/ext/booking_proposal.html +++ b/web/layouts/solidarity_transport/ext/booking_proposal.html @@ -78,6 +78,8 @@ "headerText" "Validez le trajet" "infoText" "Le message suivant sera envoyé à votre passager. Vous pouvez le personnaliser.") "SMSState" (dict "name" (.ViewState.config.GetString "service_name") + "driver_first_name" .ViewState.driver.Data.first_name + "driver_last_name" .ViewState.driver.Data.last_name "address" .ViewState.booking.Journey.PassengerDrop.Properties.label "date" (.ViewState.booking.Journey.PassengerPickupDate.Format "02/01/2006 15:04") "phone_number" .ViewState.driver.Data.phone_number)}}