web/layouts/administration/bookings_stats.html

@@ -8,7 +8,7 @@
             
         </div>
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-            <a href="/exports/fleets/bookings">
+            <a href="/app/administration/stats/bookings/export">
                 <button type="button"
                     class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
                     Export
@@ -34,4 +34,4 @@
 
 {{template "bookings_list" .}}
 
-{{end}}
+{{end}}

web/layouts/beneficiaries/_partials/beneficiary-wallet.html

@@ -4,7 +4,7 @@
     walletdialog: false
   }">
   <div class="px-4 py-5 sm:px-6">
-    <p class="text-center text-lg">Solde : {{if .ViewState.beneficiary.Data.wallet}}{{ printf "%.2f" .ViewState.beneficiary.Data.wallet }}{{else}}0{{end}} €</p>
+    <p class="text-center text-lg">Solde : {{if .ViewState.beneficiary.Data.wallet}}{{ .ViewState.beneficiary.Data.wallet }}{{else}}0{{end}} €</p>
   <button  @click="walletdialog = !walletdialog" 
     class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
     Créditer le compte
@@ -26,7 +26,7 @@
             </div>
           <form method="POST" action="/app/wallets/{{.ViewState.beneficiary.ID}}/credit" class="my-4">
               <div class="my-8">
-                <input type="number" step="0.01" id="amount" name="amount" value="0"
+                <input type="number" id="amount" name="amount" value="0"
                        class="w-full shadow-sm focus:ring-co-blue focus:border-co-blue px-2 p-1 sm:text-sm border-gray-300 rounded-2xl">
               </div>
               <div class="mt-5 sm:mt-6">

web/layouts/beneficiaries/display.html

@@ -40,7 +40,6 @@
                     </div>
                     <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
                         <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
-                            {{if moduleAvailable "solidarity_transport"}}
                             <div class="sm:col-span-1">
                                 <dt class="text-sm font-medium text-gray-500">Profil validé</dt>
                                 <dd class="mt-1 text-sm text-gray-900">
@@ -51,7 +50,6 @@
                                   {{end}}
                                 </dd>
                             </div>
-                            {{end}}
                             {{if .ViewState.beneficiary.Data.email}}
                             <div class="sm:col-span-1">
                                 <dt class="text-sm font-medium text-gray-500">Email</dt>
@@ -177,13 +175,12 @@
                                         :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                         Documents </a>
 
-                                        {{if moduleAvailable "solidarity_transport"}}
                                         <a href="#" @click="tab = 'wallet'"
                                         class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                         :class="tab == 'wallet' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                         Compte mobilité </a>
                                         
-                                        <a href="#" @click="tab = 'solidarity_transport'"
+                                        {{if moduleAvailable "solidarity_transport"}}<a href="#" @click="tab = 'solidarity_transport'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                             :class="tab == 'solidarity_transport' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                             Transport solidaire </a>

web/layouts/dashboard/_partials/bookings-widget.html

@@ -1,9 +1,12 @@
 {{define "bookings_widget"}}
-<!--<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
+<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
     <div class="-ml-4 -mt-2 px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
         <div class="ml-4 mt-2">
             <h3 class="text-lg leading-6 font-medium text-gray-900">Prochaines réservations</h3>
         </div>
+        <!-- <div class="ml-4 mt-2 flex-shrink-0">
+          <button type="button" class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Voir</button>
+        </div> -->
     </div>
     <ul role="list" class="divide-y divide-gray-200 flex-1">
         {{range .}}
@@ -25,5 +28,5 @@
             Reservation des véhicules
         </button>
     </a>
-</div>-->
-{{end}}
+</div>
+{{end}}

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

@@ -1,14 +1,5 @@
 {{define "journeys_others"}}
-<!--KNOWLEDGE BASE-->
-<div class="p-10">
-  {{ range .ViewState.kb_data }}
-    <div class="m-4">
-      <h2 class="text-sm font-bold">{{.title}}</h2>
-      <p class="text-sm">{{.description}}</p>
-      <p class="text-sm text-co-blue"><a href="{{.url}}">Voir plus ...</a></p>
-    </div>
-  {{ end }}
-</div>
+
 <!--VEHICLES-->
 {{if moduleAvailable "vehicles"}}
 <div class="p-4 flex text-sm text-grey-900">
@@ -25,6 +16,7 @@
       <tr>
         <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 md:pl-0">Véhicule</th>
         <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Numéro</th>
+        <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Gestionnaire</th>
         <th scope="col" class="py-3.5 px-3 text-left text-sm font-semibold text-gray-900">Lieu</th>
       </tr>
     </thead>
@@ -33,6 +25,7 @@
       <tr>
         <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6 md:pl-0">{{.Data.name}}</td>
         <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{.Data.licence_plate}}</td>
+        <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">COOPGO</td>
         <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
       </tr>
       {{end}}

web/layouts/journeys/_partials/journeys-solidarity-transport.html

@@ -40,11 +40,11 @@
     {{ $driver := (index $.ViewState.solidarity_drivers .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 $driver.Data.other_properties}}{{ $driver.Data.other_properties.comment }}{{end}}</td>
-      <td class="py-4 pl-4 pr-3 text-sm sm:pl-6">
+      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">{{ $driver.Data.first_name }} {{ $driver.Data.last_name }}</td>
+      <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}}

web/layouts/solidarity_transport/_partials/bookings_history.html

@@ -30,10 +30,6 @@
           class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
           Statut
       </th>
-      <th scope="col"
-          class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-          Prix 
-      </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;
@@ -73,9 +69,6 @@
         <span class="p-1 text-xs bg-co-red text-white rounded-xl">Annulé</span>
         {{ end }}
       </td>
-      <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-        {{ .Journey.Price.Amount }} {{ .Journey.Price.Currency }}
-      </td>
       <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
         <a class="text-co-blue" href="/app/solidarity-transport/bookings/{{.Id}}">
           Voir

web/layouts/solidarity_transport/_partials/journey_preview.html

@@ -249,7 +249,7 @@
                             {{end}}
                             <div class="sm:col-span-1">
                                 <dt class="text-sm font-medium text-gray-500">Compte mobilié (solde)</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{if .passenger.Data.wallet}}{{ printf "%.2f" .passenger.Data.wallet }}{{else}}0{{end}} EUR</dd>
+                                <dd class="mt-1 text-sm text-gray-900">{{if .passenger.Data.wallet}}{{ .passenger.Data.wallet }}{{else}}0{{end}} EUR</dd>
                             </div>
                         </dl>
                     </div>

web/layouts/vehicles_management/booking-display.html

@@ -189,11 +189,11 @@
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{.ViewState.vehicle.Data.licence_plate}}</dd>
                                 </div>
-                                <!--<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Kilométrage</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{.ViewState.vehicle.Data.kilometers}} km</dd>
-                                </div>-->
+                                </div>
                                 <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
                                     <dt class="text-sm font-medium text-gray-500">Type</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">

web/public/css/main.css

@@ -454,6 +454,9 @@
   .mx-auto {
     margin-inline: auto;
   }
+  .-my-1 {
+    margin-block: calc(var(--spacing) * -1);
+  }
   .-my-1\.5 {
     margin-block: calc(var(--spacing) * -1.5);
   }
@@ -502,6 +505,9 @@
   .mt-10 {
     margin-top: calc(var(--spacing) * 10);
   }
+  .-mr-1 {
+    margin-right: calc(var(--spacing) * -1);
+  }
   .-mr-1\.5 {
     margin-right: calc(var(--spacing) * -1.5);
   }
@@ -697,15 +703,27 @@
   .max-h-screen {
     max-height: 100vh;
   }
+  .min-h-10 {
+    min-height: calc(var(--spacing) * 10);
+  }
+  .min-h-50 {
+    min-height: calc(var(--spacing) * 50);
+  }
   .min-h-full {
     min-height: 100%;
   }
   .min-h-screen {
     min-height: 100vh;
   }
+  .w-0 {
+    width: calc(var(--spacing) * 0);
+  }
   .w-0\.5 {
     width: calc(var(--spacing) * 0.5);
   }
+  .w-1 {
+    width: calc(var(--spacing) * 1);
+  }
   .w-1\/2 {
     width: calc(1/2 * 100%);
   }
@@ -742,6 +760,9 @@
   .w-48 {
     width: calc(var(--spacing) * 48);
   }
+  .w-50 {
+    width: calc(var(--spacing) * 50);
+  }
   .w-100 {
     width: calc(var(--spacing) * 100);
   }
@@ -1940,6 +1961,9 @@
   .py-12 {
     padding-block: calc(var(--spacing) * 12);
   }
+  .pt-1 {
+    padding-top: calc(var(--spacing) * 1);
+  }
   .pt-1\.5 {
     padding-top: calc(var(--spacing) * 1.5);
   }