solidarity-transport-dev

web/layouts/journeys/_partials/journeys-all.html

@@ -28,7 +28,7 @@
     </div>
     <div class="p-4 pb-8 flex">
         {{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")) }}
         <!--<span class="ml-2 px-2 py-1 text-sm text-gray-500 whitespace-nowrap">
         {{.AgencyName}} 
         </span>-->

web/layouts/journeys/_partials/journeys-public-transit-motis.html

@@ -39,7 +39,7 @@
             </li>
             {{end}}
             {{end}}
-            {{if eq .Mode "BUS"}}
+            {{if or (eq .Mode "BUS") (eq .Mode "COACH")}}
             <li>
                 <div class="relative py-4">
                     <span class="absolute top-4 left-4 -ml-px h-full w-0.5 bg-gray-200" aria-hidden="true"></span>

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
       </th>
+      <th scope="col"
+          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+          Profil validé
+      </th>
       <th scope="col"
           class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
           &nbsp;
@@ -33,7 +37,6 @@
   </thead>
   <tbody class="divide-y divide-gray-200 bg-white">
     {{ range .ViewState.driver_journeys }}
-    {{if lt .DriverDistance 250}}
     {{ $driver := (index $.ViewState.solidarity_drivers .DriverId)}}
 
     <tr>
@@ -41,6 +44,13 @@
       <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .DriverDistance }} km</td>
       <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ .PassengerDistance }} km</td>
       <td class="whitespace-nowrap 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="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+        {{if solidarityDriverValidatedProfile $driver (solidarityDocuments $driver.ID) }}
+        <span class="p-1 px-2 text-xs bg-co-green rounded-2xl">Oui</span>
+        {{else}}
+        <span class="p-1 px-2 text-xs bg-co-red text-white rounded-2xl">Non</span>
+        {{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" 
           href="/app/solidarity-transport/drivers/{{$driver.ID}}/journeys/{{.Id}}">
@@ -48,7 +58,6 @@
         </a>
       </td>
     </tr>
-    {{end}}
     {{ end }}
   </tbody>
 </table>