From 54c2ce3367c494d9a29faff2dfcb889e5f83877c Mon Sep 17 00:00:00 2001
From: Arnaud Delcasse <arnaud.delcasse@mobicoop.org>
Date: Tue, 9 Sep 2025 08:29:00 +0200
Subject: [PATCH] solidarity transport search from beneficiary + exclude driver
 from returned list

---
 .../_partials/beneficiary-solidarity-transport.html            | 3 +++
 .../journeys/_partials/journeys-solidarity-transport.html      | 2 +-
 web/layouts/journeys/search.html                               | 3 +++
 web/layouts/solidarity_transport/booking_display.html          | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html b/web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html
index e2911e2..3dca1ca 100644
--- a/web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html
+++ b/web/layouts/beneficiaries/_partials/beneficiary-solidarity-transport.html
@@ -3,5 +3,8 @@
   <p class="text-center text-lg">Trajets réalisés : {{ .ViewState.solidarity_transport_stats.count }}</p>
   <p class="text-center text-lg">Kilomètres réalisés : {{ .ViewState.solidarity_transport_stats.km}} km</p>
 
+  <a href="/app/journeys/?passengerid={{.ViewState.beneficiary.ID}}" class="inline-flex">
+    <button type="button" class="m-10 w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Chercher un trajet</button>
+  </a>
 </div>
 {{end}}
diff --git a/web/layouts/journeys/_partials/journeys-solidarity-transport.html b/web/layouts/journeys/_partials/journeys-solidarity-transport.html
index 8113579..6e05511 100644
--- a/web/layouts/journeys/_partials/journeys-solidarity-transport.html
+++ b/web/layouts/journeys/_partials/journeys-solidarity-transport.html
@@ -53,7 +53,7 @@
       </td>
       <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
         <a class="text-co-blue hover:text-co-blue" 
-          href="/app/solidarity-transport/drivers/{{$driver.ID}}/journeys/{{.Id}}">
+		href="/app/solidarity-transport/drivers/{{$driver.ID}}/journeys/{{.Id}}{{if ne $.ViewState.passengerid ""}}?passengerid={{$.ViewState.passengerid}}{{end}}">
           Organiser
         </a>
       </td>
diff --git a/web/layouts/journeys/search.html b/web/layouts/journeys/search.html
index 5930aed..6d38837 100644
--- a/web/layouts/journeys/search.html
+++ b/web/layouts/journeys/search.html
@@ -33,6 +33,9 @@
                         {{ $destination := .ViewState.destination }}
                         {{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel "Address" $destination }}
                         
+			{{if ne .ViewState.passengerid "" }}
+			<input type="hidden" value="{{.ViewState.passengerid}}" name="passengerid" />
+			{{end}}
 
                         <div class="py-4 grid grid-cols-2">
                             <div class="lg:col-span-1">
diff --git a/web/layouts/solidarity_transport/booking_display.html b/web/layouts/solidarity_transport/booking_display.html
index 7fc72c6..47f4fea 100644
--- a/web/layouts/solidarity_transport/booking_display.html
+++ b/web/layouts/solidarity_transport/booking_display.html
@@ -57,7 +57,7 @@
   <!-- <button type="button"
        class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
   {{if eq .ViewState.booking.Status "CANCELLED" }}
-    <a href="/app/journeys/?departure={{json .ViewState.booking.Journey.PassengerPickup}}&destination={{ json .ViewState.booking.Journey.PassengerDrop }}&departuredate={{ .ViewState.booking.Journey.PassengerPickupDate.Format "2006-01-02"}}&departuretime={{ .ViewState.booking.Journey.PassengerPickupDate.Format "15:04"}}" class="inline-flex"><button type="button"
+  <a href="/app/journeys/?departure={{json .ViewState.booking.Journey.PassengerPickup}}&destination={{ json .ViewState.booking.Journey.PassengerDrop }}&departuredate={{ .ViewState.booking.Journey.PassengerPickupDate.Format "2006-01-02"}}&departuretime={{ (timeFrom .ViewState.booking.Journey.PassengerPickupDate).Format "15:04"}}&passengerid={{.ViewState.booking.PassengerId}}&solidarity_transport_exclude_driver={{.ViewState.booking.DriverId}}" class="inline-flex"><button type="button"
      class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm bg-white text-gray-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Solliciter un autre conducteur</button></a>
   {{end}}
   {{if eq .ViewState.booking.Status "WAITING_CONFIRMATION" }}