From 764b301dbb4444624108464170d5b28abfcf7fb2 Mon Sep 17 00:00:00 2001
From: Arnaud Delcasse <arnaud.delcasse@mobicoop.org>
Date: Tue, 3 Feb 2026 08:44:51 +0100
Subject: [PATCH] Add useful informations on solidarity transport journeys

---
 .../_partials/journeys-solidarity-transport.html | 16 +++++++++++++++-
 .../solidarity_transport/booking_display.html    | 11 +++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/web/layouts/journeys/_partials/journeys-solidarity-transport.html b/web/layouts/journeys/_partials/journeys-solidarity-transport.html
index 6e05511..fa2fb76 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
       </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Dernier trajet (-{{.ViewState.last_trip_days}}j)
+      </th>
       <th scope="col"
           class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
           Commentaire
@@ -38,11 +42,21 @@
   <tbody class="divide-y divide-gray-200 bg-white">
     {{ range .ViewState.driver_journeys }}
     {{ $driver := (index $.ViewState.solidarity_drivers .DriverId)}}
+    {{ $lastTrip := (index $.ViewState.driver_last_trips .DriverId)}}
 
     <tr>
       <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
       <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDistance }} km</td>
       <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .PassengerDistance }} km</td>
+      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{if $lastTrip.IsZero}}
+        <span class="text-gray-400">-</span>
+        {{else if eq ($lastTrip.Format "2006-01-02") ($.ViewState.departuredatetime.Format "2006-01-02")}}
+        <span class="text-red-600 font-semibold">{{ $lastTrip.Format "02/01/2006" }}</span>
+        {{else}}
+        {{ $lastTrip.Format "02/01/2006" }}
+        {{end}}
+      </td>
       <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">{{if $driver.Data.other_properties}}{{ $driver.Data.other_properties.comment }}{{end}}</td>
       <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
         {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID) }}
@@ -52,7 +66,7 @@
         {{end}}
       </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" 
+        <a class="text-co-blue hover:text-co-blue"
 		href="/app/solidarity-transport/drivers/{{$driver.ID}}/journeys/{{.Id}}{{if ne $.ViewState.passengerid ""}}?passengerid={{$.ViewState.passengerid}}{{end}}">
           Organiser
         </a>
diff --git a/web/layouts/solidarity_transport/booking_display.html b/web/layouts/solidarity_transport/booking_display.html
index 8248aa7..a94c1e1 100644
--- a/web/layouts/solidarity_transport/booking_display.html
+++ b/web/layouts/solidarity_transport/booking_display.html
@@ -128,6 +128,7 @@
                         <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Lieu de départ</th>
                         <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Distance conducteur</th>
                         <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Distance passager</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Dernier trajet (-{{$.ViewState.last_trip_days}}j)</th>
                         <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Prix passager</th>
                         <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Indemnité conducteur</th>
                         <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Commentaire</th>
@@ -142,6 +143,7 @@
                       {{$driver := index $.ViewState.replacement_drivers_map $journey.DriverId}}
                       {{$pricing := index $.ViewState.replacement_pricing $journey.Id}}
                       {{$location := index $.ViewState.replacement_locations $journey.Id}}
+                      {{$lastTrip := index $.ViewState.driver_last_trips $journey.DriverId}}
                       <tr>
                         <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">
                           {{$driver.Data.first_name}} {{$driver.Data.last_name}}
@@ -155,6 +157,15 @@
                         <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
                           {{$journey.PassengerDistance}} km
                         </td>
+                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                          {{if $lastTrip.IsZero}}
+                          <span class="text-gray-400">-</span>
+                          {{else if eq ($lastTrip.Format "2006-01-02") ($.ViewState.booking.Journey.PassengerPickupDate.Format "2006-01-02")}}
+                          <span class="text-red-600 font-semibold">{{ $lastTrip.Format "02/01/2006" }}</span>
+                          {{else}}
+                          {{ $lastTrip.Format "02/01/2006" }}
+                          {{end}}
+                        </td>
                         <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
                           {{if $pricing}}
                           {{printf "%.2f" $pricing.passenger.amount}} {{$pricing.passenger.currency}}