From f12f7f581f98975245d240364e78c6f75d807c16 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Wed, 10 Sep 2025 16:11:47 +0200 Subject: [PATCH] solidarity bookings filters + duplicate solidarity trip + notification when refused --- config.yaml | 7 +- .../booking_driver_decline.html | 2 +- .../_partials/booking_filters.html | 43 +++++ .../_partials/bookings_history.html | 1 + .../_partials/bookings_list.html | 2 + .../solidarity_transport/booking_display.html | 2 + .../ext/booking_proposal.html | 1 + .../solidarity_transport/overview.html | 14 +- web/public/css/main.css | 176 ++++++++++++++++-- 9 files changed, 222 insertions(+), 26 deletions(-) create mode 100644 web/layouts/solidarity_transport/_partials/booking_filters.html diff --git a/config.yaml b/config.yaml index f829ad5..f6bf76d 100644 --- a/config.yaml +++ b/config.yaml @@ -255,6 +255,7 @@ views: overview: files: - web/layouts/solidarity_transport/_partials/drivers_list.html + - web/layouts/solidarity_transport/_partials/booking_filters.html - web/layouts/solidarity_transport/_partials/bookings_list.html - web/layouts/solidarity_transport/_partials/bookings_history.html - web/layouts/solidarity_transport/overview.html @@ -454,16 +455,16 @@ emails: - emails/layout.html - emails/onboarding/delete-subscriber.html solidarity_transport: - boking_driver_accept: + booking_driver_accept: subject: Trajet accepté par un conducteur files: - emails/layout.html - emails/solidarity_transport/booking_driver_accept.html - boking_driver_decline: + booking_driver_decline: subject: Trajet accepté par un conducteur files: - emails/layout.html - - emails/solidarity_transport/booking_driver_accept.html + - emails/solidarity_transport/booking_driver_decline.html sms: solidarity_transport: diff --git a/emails/solidarity_transport/booking_driver_decline.html b/emails/solidarity_transport/booking_driver_decline.html index ac762b4..93b1f91 100644 --- a/emails/solidarity_transport/booking_driver_decline.html +++ b/emails/solidarity_transport/booking_driver_decline.html @@ -1,5 +1,5 @@ {{define "content"}}

Bonjour,

Trajet refusé par un conducteur.

-

Voir le trajet : {{ .baseUrl }}/solidarity-transport/bookings/{{.bookingid}}

+

Voir le trajet : {{ .baseUrl }}/app/solidarity-transport/bookings/{{.bookingid}}

{{end}} diff --git a/web/layouts/solidarity_transport/_partials/booking_filters.html b/web/layouts/solidarity_transport/_partials/booking_filters.html new file mode 100644 index 0000000..fee4c75 --- /dev/null +++ b/web/layouts/solidarity_transport/_partials/booking_filters.html @@ -0,0 +1,43 @@ +{{ define "booking_filters" }} +{{$tab := or .tab "solidarityTransport"}} + +
+ + + +
+ +
+
+ +
+ + +
+
+
+ +
+ +
+ + +
+
+ + +
+ +
+ +
+ +
+{{ end }} diff --git a/web/layouts/solidarity_transport/_partials/bookings_history.html b/web/layouts/solidarity_transport/_partials/bookings_history.html index 000665e..dbe367f 100644 --- a/web/layouts/solidarity_transport/_partials/bookings_history.html +++ b/web/layouts/solidarity_transport/_partials/bookings_history.html @@ -1,5 +1,6 @@ {{ define "solidarity_bookings_history" }} +{{template "booking_filters" dict "tab" "solidarityHistory" "filters" .ViewState.hist_filters }} {{if eq (len .ViewState.bookings_history) 0}}
Aucun trajet dans le passé
{{else}} diff --git a/web/layouts/solidarity_transport/_partials/bookings_list.html b/web/layouts/solidarity_transport/_partials/bookings_list.html index 401e14f..8787c0d 100644 --- a/web/layouts/solidarity_transport/_partials/bookings_list.html +++ b/web/layouts/solidarity_transport/_partials/bookings_list.html @@ -1,5 +1,7 @@ {{ define "solidarity_bookings_list" }} +{{template "booking_filters" dict "tab" "solidarityService" "filters" .ViewState.filters }} + {{if eq (len .ViewState.bookings) 0}}
Aucun trajet déclaré
{{else}} diff --git a/web/layouts/solidarity_transport/booking_display.html b/web/layouts/solidarity_transport/booking_display.html index 47f4fea..5541154 100644 --- a/web/layouts/solidarity_transport/booking_display.html +++ b/web/layouts/solidarity_transport/booking_display.html @@ -56,6 +56,8 @@ + {{if eq .ViewState.booking.Status "CANCELLED" }} diff --git a/web/layouts/solidarity_transport/ext/booking_proposal.html b/web/layouts/solidarity_transport/ext/booking_proposal.html index 57e3f4d..0d0d374 100644 --- a/web/layouts/solidarity_transport/ext/booking_proposal.html +++ b/web/layouts/solidarity_transport/ext/booking_proposal.html @@ -14,6 +14,7 @@ + diff --git a/web/layouts/solidarity_transport/overview.html b/web/layouts/solidarity_transport/overview.html index 1cc2768..3b2eef6 100644 --- a/web/layouts/solidarity_transport/overview.html +++ b/web/layouts/solidarity_transport/overview.html @@ -1,10 +1,10 @@ {{ define "content" }} - +{{$defaultTab := "solidarityService"}}

Transport solidaire