feat: extra properties dynamiques, filtrage meta_status et alertes retard

config.yaml

@@ -73,6 +73,10 @@ views:
     files:
       - web/layouts/layout.html
       - web/layouts/_partials/mainmenu.html
+  search:
+    results:
+      files:
+        - web/layouts/search/results.html
   dashboard:
     files:
       - web/layouts/dashboard/_partials/agenda-widget.html
@@ -91,6 +95,7 @@ views:
     display:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/_partials/profile_optional_fields_display.html
         - web/layouts/vehicles_management/_partials/vehicle-type-select.html
         - web/layouts/beneficiaries/_partials/beneficiary-vehicles.html
         - web/layouts/beneficiaries/_partials/beneficiary-notes.html
@@ -132,6 +137,9 @@ views:
         - web/layouts/vehicles/search.html
     booking_display:
       files:
+        - web/layouts/vehicles/_partials/booking_status_badge.html
+        - web/layouts/vehicles/_partials/booking_documents.html
+        - web/layouts/vehicles/_partials/booking_status_history.html
         - web/layouts/vehicles/booking-display.html
     bookings_list:
       files:
@@ -140,6 +148,8 @@ views:
   vehicles_management:
     overview:
       files:
+        - web/layouts/vehicles_management/_partials/booking_filters.html
+        - web/layouts/vehicles_management/_partials/vehicle_filters.html
         - web/layouts/vehicles_management/_partials/bookings-list.html
         - web/layouts/vehicles_management/_partials/vehicles-list.html
         - web/layouts/vehicles_management/overview.html
@@ -165,6 +175,9 @@ views:
         - web/layouts/vehicles_management/fleet-update.html
     booking_display:
       files:
+        - web/layouts/vehicles/_partials/booking_status_badge.html
+        - web/layouts/vehicles/_partials/booking_documents.html
+        - web/layouts/vehicles/_partials/booking_status_history.html
         - web/layouts/vehicles_management/booking-display.html
     delete_booking:
       files:
@@ -274,6 +287,7 @@ views:
     driver_display:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/_partials/profile_optional_fields_display.html
         - web/layouts/solidarity_transport/_partials/driver_availabilities.html
         - web/layouts/solidarity_transport/_partials/driver_history.html
         - web/layouts/solidarity_transport/_partials/driver_documents.html
@@ -322,6 +336,7 @@ views:
     driver_display:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/_partials/profile_optional_fields_display.html
         - web/layouts/organized_carpool/_partials/driver_availabilities.html
         - web/layouts/organized_carpool/_partials/driver_documents.html
         - web/layouts/organized_carpool/_partials/driver_wallet.html
@@ -432,6 +447,7 @@ icons:
     tabler-icons:bus: <svg xmlns="http://www.w3.org/2000/svg" class="icon icon-tabler icon-tabler-bus %s" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><circle cx="6" cy="17" r="2" /><circle cx="18" cy="17" r="2" /><path d="M4 17h-2v-11a1 1 0 0 1 1 -1h14a5 7 0 0 1 5 7v5h-2m-4 0h-8" /><polyline points="16 5 17.5 12 22 12" /><line x1="2" y1="10" x2="17" y2="10" /><line x1="7" y1="5" x2="7" y2="10" /><line x1="12" y1="5" x2="12" y2="10" /></svg>
     tabler-icons:train: <svg  xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"  fill="none"  stroke="currentColor"  stroke-width="2"  stroke-linecap="round"  stroke-linejoin="round"  class="icon icon-tabler icons-tabler-outline icon-tabler-train %s"><path stroke="none" d="M0 0h24v24H0z" fill="none"/><path d="M21 13c0 -3.87 -3.37 -7 -10 -7h-8" /><path d="M3 15h16a2 2 0 0 0 2 -2" /><path d="M3 6v5h17.5" /><path d="M3 11v4" /><path d="M8 11v-5" /><path d="M13 11v-4.5" /><path d="M3 19h18" /></svg>
     hero:outline/map-pin: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M15 10.5a3 3 0 11-6 0 3 3 0 016 0z" /><path stroke-linecap="round" stroke-linejoin="round" d="M19.5 10.5c0 7.142-7.5 11.25-7.5 11.25s-7.5-4.108-7.5-11.25a7.5 7.5 0 1115 0z" /></svg>
+    hero:outline/exclamation-triangle: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126ZM12 15.75h.007v.008H12v-.008Z" /></svg>
     hero:outline/flag: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M3 3v1.5M3 21v-6m0 0l2.77-.693a9 9 0 016.208.682l.108.054a9 9 0 006.086.71l3.114-.732a48.524 48.524 0 01-.005-10.499l-3.11.732a9 9 0 01-6.085-.711l-.108-.054a9 9 0 00-6.208-.682L3 4.5M3 15V4.5" /></svg>
 
 emails:

emails/layout.html

@@ -3,12 +3,13 @@
     <head>
         <style>
             @font-face {
-                font-family: "Bitter";
+                font-family: "Poppins";
                 font-style: normal;
-                src: url("https://coopgo.fr/fonts/Bitter-Regular.woff") format("woff"); }
+                font-weight: 400;
+                src: url("https://coopgo.fr/fonts/Poppins-Regular.woff2") format("woff2"); }
 
             html {
-                font-family: Bitter, serif;
+                font-family: Poppins, sans-serif;
             }
 
             .bg-co-blue {

web/assets/css/main.css

@@ -16,14 +16,32 @@
     src: url("https://coopgo.fr/fonts/manometer.woff2") format("woff2"), url("/fonts/manometer.woff") format("woff"); }
   
 @font-face {
-    font-family: "Bitter";
+    font-family: "Poppins";
     font-style: normal;
-    src: url("https://coopgo.fr/fonts/Bitter-Regular.woff") format("woff"); }
+    font-weight: 400;
+    src: url("/public/fonts/Poppins-Regular.woff2") format("woff2"); }
 
+@font-face {
+    font-family: "Poppins";
+    font-style: normal;
+    font-weight: 500;
+    src: url("/public/fonts/Poppins-Medium.woff2") format("woff2"); }
+
+@font-face {
+    font-family: "Poppins";
+    font-style: normal;
+    font-weight: 600;
+    src: url("/public/fonts/Poppins-SemiBold.woff2") format("woff2"); }
+
+@font-face {
+    font-family: "Poppins";
+    font-style: normal;
+    font-weight: 700;
+    src: url("/public/fonts/Poppins-Bold.woff2") format("woff2"); }
 
 @layer base {
     html {
-        font-family: Bitter, serif; 
+        font-family: Poppins, sans-serif;
     }
     input {
       padding: 2px;

web/layouts/_partials/profile_optional_fields_display.html

@@ -0,0 +1,64 @@
+{{define "profile_optional_fields_display"}}
+{{if .other_properties}}
+{{range .fields}}
+{{$fieldName := .name}}
+{{$fieldLabel := .label}}
+{{if eq .type "multicheckbox"}}
+    {{$hasValues := false}}
+    {{range .options}}
+        {{$optionKey := printf "%s___%s" $fieldName .value}}
+        {{if index $.other_properties $optionKey}}{{$hasValues = true}}{{end}}
+    {{end}}
+    {{if $hasValues}}
+    <div class="sm:col-span-2">
+        <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
+        <dd class="mt-1 text-sm text-gray-900">
+            <div class="flex flex-wrap gap-2">
+                {{range .options}}
+                {{$optionKey := printf "%s___%s" $fieldName .value}}
+                {{if index $.other_properties $optionKey}}
+                <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-200 text-gray-800">
+                    {{.label}}
+                </span>
+                {{end}}
+                {{end}}
+            </div>
+        </dd>
+    </div>
+    {{end}}
+{{else if eq .type "select"}}
+    {{$fieldValue := index $.other_properties $fieldName}}
+    {{if and $fieldValue (ne $fieldValue "0") (ne $fieldValue "")}}
+    <div class="sm:col-span-1">
+        <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
+        <dd class="mt-1 text-sm text-gray-900">
+            {{if eq $fieldName "gender"}}
+                {{genderISO5218 $fieldValue}}
+            {{else}}
+                {{range .options}}
+                    {{if eq .value $fieldValue}}{{.label}}{{end}}
+                {{end}}
+            {{end}}
+        </dd>
+    </div>
+    {{end}}
+{{else if eq .type "date"}}
+    {{$fieldValue := index $.other_properties $fieldName}}
+    {{if $fieldValue}}
+    <div class="sm:col-span-1">
+        <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
+        <dd class="mt-1 text-sm text-gray-900">{{ (timeFrom $fieldValue).Format "02/01/2006" }}</dd>
+    </div>
+    {{end}}
+{{else}}
+    {{$fieldValue := index $.other_properties $fieldName}}
+    {{if $fieldValue}}
+    <div class="sm:col-span-1">
+        <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
+        <dd class="mt-1 text-sm text-gray-900">{{$fieldValue}}</dd>
+    </div>
+    {{end}}
+{{end}}
+{{end}}
+{{end}}
+{{end}}

web/layouts/administration/bookings_stats.html

@@ -26,8 +26,11 @@
     </div>
 </div>
 
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4">
         {{template "vehicle_booking_filters" .}}
-
         {{template "bookings_list" .}}
+    </div>
+</div>
 
 {{end}}

web/layouts/beneficiaries/display.html

@@ -89,36 +89,7 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.file_number}}</dd>
                             </div>
                             {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.status}}
+                            {{ template "profile_optional_fields_display" dict "other_properties" .ViewState.beneficiary.Data.other_properties "fields" $.ViewState.profile_optional_fields }}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Statut</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.status}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.situation}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Situation sociale</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.situation}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.subscription_reason}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Motif d'inscription</dt>
-                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.subscription_reason}}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.last_subscription_date}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Dernière adhésion</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{ (timeFrom .ViewState.beneficiary.Data.other_properties.last_subscription_date).Format "02/01/2006" }}</dd>
-                            </div>
-                            {{end}}
-                            {{if and .ViewState.beneficiary.Data.other_properties .ViewState.beneficiary.Data.other_properties.comment}}
-                            <div class="sm:col-span-1">
-                                <dt class="text-sm font-medium text-gray-500">Commentaire</dt>
-                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.other_properties.comment}}</dd>
-                            </div>
-                            {{end}}
                         </dl>
                     </div>
                 </div>

web/layouts/beneficiaries/update.html

@@ -7,15 +7,15 @@
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
     x-data="{
         fields: {
-            first_name: '{{ .ViewState.beneficiary.Data.first_name }}',
+            first_name: null,
-            last_name: '{{ .ViewState.beneficiary.Data.last_name }}',
+            last_name: null,
-            email: '{{ .ViewState.beneficiary.Data.email }}',
+            email: null,
-            phone_number: '{{ .ViewState.beneficiary.Data.phone_number }}',
+            phone_number: null,
-            birthdate: {{if .ViewState.beneficiary.Data.birthdate}}'{{ (timeFrom .ViewState.beneficiary.Data.birthdate).Format "2006-01-02" }}'{{else}}null{{end}},
+            birthdate: null,
-            file_number: '{{ .ViewState.beneficiary.Data.file_number }}',
+            file_number: null,
-            gender: {{.ViewState.beneficiary.Data.gender}}
+            gender: 0
         },
-        other_properties: {{if .ViewState.beneficiary.Data.other_properties}}{{ json .ViewState.beneficiary.Data.other_properties }}{{else}}{}{{end}},
+        other_properties: {},
         other_properties_serialized: null,
         rules: {
             first_name: ['required'],
@@ -37,6 +37,19 @@
             }
         },
         isFormValid: true,
+        init() {
+            const data = window.__PARCOURSMOB_DATA__ || {};
+            this.fields.first_name = data.first_name || '';
+            this.fields.last_name = data.last_name || '';
+            this.fields.email = data.email || '';
+            this.fields.phone_number = data.phone_number || '';
+            this.fields.file_number = data.file_number || '';
+            this.fields.gender = data.gender || 0;
+            if (data.birthdate) {
+                this.fields.birthdate = String(data.birthdate).substring(0, 10);
+            }
+            this.other_properties = data.other_properties || {};
+        },
         validate() {
             this.formValidation = Iodine.assert(this.fields, this.rules)
         },

web/layouts/layout.html

@@ -80,7 +80,7 @@
       </button>
       <div class="flex-1 px-4 flex justify-between">
         <div class="flex-1 flex">
-          <form class="w-full flex md:ml-0" action="/app/beneficiaries/" method="GET">
+          <form class="w-full flex md:ml-0" action="/app/search" method="GET">
             <label for="search-field" class="sr-only">Search</label>
             <div class="relative w-full text-gray-400 focus-within:text-gray-600">
               <div class="absolute inset-y-0 left-0 flex items-center pointer-events-none">
@@ -89,7 +89,7 @@
               </div>
               <input id="search-field"
                 class="block w-full h-full pl-8 pr-3 py-2 border-transparent text-gray-900 placeholder-gray-500 focus:outline-none focus:placeholder-gray-400 focus:ring-0 focus:border-transparent sm:text-sm"
-                placeholder="Chercher un bénéficiaire" type="search" name="search">
+                placeholder="Rechercher..." type="search" name="q">
             </div>
           </form>
         </div>
@@ -173,6 +173,7 @@
       </div>
     </div>
 
+    {{if .DynamicData}}<script id="dynamic-data">window.__PARCOURSMOB_DATA__ = {{ json .DynamicData }};</script>{{end}}
     <main>
       <div class="py-6">
         {{ template "content" . }}

web/layouts/organized_carpool/_partials/driver_availabilities.html

@@ -8,51 +8,46 @@
   <div class="px-4 py-5 sm:px-6">
     <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Trajets</h2>
   </div>
-  <div class="border-t border-gray-200 px-4">
+  <div class="border-t border-gray-200 px-4 py-4 space-y-3">
-    <div class="">
       {{ range .ViewState.trips }}
       {{$departure := index .Features 0}}
       {{$destination := index .Features 1}}
-      <div class="my-10">
+      {{$schedules := .ExtraMembers.properties.schedules}}
-      <div class="flex flex-row my-2">
+      {{$firstSchedule := index $schedules 0}}
-        {{range .ExtraMembers.properties.schedules}}
+      <div class="border border-gray-200 rounded-2xl p-4">
-        <span class="p-1 text-xs mr-2 bg-co-blue text-white rounded-lg">
+        <div class="flex items-center justify-between mb-3">
-        {{ if eq .day "SUN"}}Dimanche
+          <div class="flex gap-2">
-        {{ else if eq .day "MON"}}Lundi
+            {{range $schedules}}
-        {{ else if eq .day "TUE"}}Mardi
+            <span class="inline-flex items-center justify-center w-8 h-8 text-[10px] font-bold bg-co-blue text-white rounded-full leading-none">{{ if eq .day "MON"}}Lu{{ else if eq .day "TUE"}}Ma{{ else if eq .day "WED"}}Me{{ else if eq .day "THU"}}Je{{ else if eq .day "FRI"}}Ve{{ else if eq .day "SAT"}}Sa{{ else if eq .day "SUN"}}Di{{ end }}</span>
-        {{ else if eq .day "WED"}}Mercredi
-        {{ else if eq .day "THU"}}Jeudi
-        {{ else if eq .day "FRI"}}Vendredi
-        {{ else if eq .day "SAT"}}Samedi
-        {{ end }}
-        {{.time_of_day}}
-
-        </span>
             {{end}}
           </div>
-      <div class="flex flex-row">
+          <span class="text-sm font-bold text-gray-900">{{$firstSchedule.time_of_day}}</span>
-        <div class="flex-1 text-sm">
-          {{$departure.Properties.label}}
         </div>
-        <div>
+        <div class="relative ml-2">
-          {{$.IconSet.Icon "hero:outline/chevron-right" "h-5 w-5 mr-3"}}
+          <div class="absolute left-[5px] top-[10px] bottom-[10px] w-0.5 bg-co-blue"></div>
+          <div class="relative flex items-center gap-3 mb-2">
+            <div class="w-3 h-3 rounded-full bg-co-blue shrink-0 z-10"></div>
+            <p class="text-sm text-gray-900 truncate" title="{{$departure.Properties.label}}">{{$departure.Properties.label}}</p>
           </div>
-        <div class="flex-1 text-sm text-right">
+          <div class="relative flex items-center gap-3">
-          {{$destination.Properties.label}}
+            <div class="w-3 h-3 rounded-full border-2 border-co-blue bg-white shrink-0 z-10"></div>
+            <p class="text-sm text-gray-500 truncate" title="{{$destination.Properties.label}}">{{$destination.Properties.label}}</p>
           </div>
         </div>
-      <div>
+        <div class="mt-3 flex justify-end">
-        <div class="flex-none text-sm text-right"><a class="text-co-blue" href="/app/organized-carpool/drivers/{{$.ViewState.driver.ID}}/trips/{{.ExtraMembers.id}}/delete">Supprimer</a></div>
+          <a class="text-xs text-gray-400 hover:text-co-red transition-colors" href="/app/organized-carpool/drivers/{{$.ViewState.driver.ID}}/trips/{{.ExtraMembers.id}}/delete">Supprimer</a>
         </div>
       </div>
       {{ end }}
   </div>
+    <div class="px-4 py-4 text-center">
       <button type="button" @click="availabilitiesdialog = !availabilitiesdialog"
-      class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue my-4 px-4 py-2 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">
+        class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2">
         {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
         Ajouter un trajet
       </button>
     </div>
+  </div>
   <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true"
        x-show="availabilitiesdialog">
     <div class="fixed inset-0 bg-gray-900 opacity-30 transition-opacity"></div>

web/layouts/organized_carpool/driver_display.html

@@ -91,6 +91,7 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.address_destination.properties.label}}</dd>
                             </div>
                             {{end}}
+                            {{ template "profile_optional_fields_display" dict "other_properties" .ViewState.driver.Data.other_properties "fields" $.ViewState.profile_optional_fields }}
                         </dl>
                     </div>
                 </div>

web/layouts/search/results.html

@@ -0,0 +1,144 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <h1 class="text-2xl font-semibold text-gray-900">Résultats pour « {{.ViewState.query}} »</h1>
+
+    {{if moduleAvailable "beneficiaries"}}
+    <div class="mt-8">
+        <h2 class="text-lg font-medium text-gray-900">
+            Bénéficiaires
+            <span class="ml-2 inline-flex items-center justify-center w-6 h-6 rounded-full bg-co-blue text-xs font-medium text-white">{{len .ViewState.beneficiaries}}</span>
+        </h2>
+        {{if .ViewState.beneficiaries}}
+        <div class="mt-4 overflow-hidden shadow md:rounded-lg">
+            <table class="min-w-full divide-y divide-gray-300">
+                <thead class="bg-gray-50">
+                    <tr>
+                        <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Nom</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Téléphone</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Adresse</th>
+                        <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6"><span class="sr-only">Voir</span></th>
+                    </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-200 bg-white">
+                    {{range .ViewState.beneficiaries}}
+                    <tr>
+                        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                            <div class="flex items-center">
+                                <div class="h-10 w-10 flex-shrink-0">
+                                    <img class="h-10 w-10 rounded-co" src="/app/beneficiaries/{{.ID}}/picture" alt="">
+                                </div>
+                                <div class="ml-4">
+                                    <div class="font-medium text-gray-900">{{.Data.first_name}} {{.Data.last_name}}</div>
+                                    <div class="text-gray-500">{{.Data.email}}</div>
+                                </div>
+                            </div>
+                        </td>
+                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{.Data.phone_number}}</td>
+                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
+                        <td class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                            <a href="/app/beneficiaries/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
+                        </td>
+                    </tr>
+                    {{end}}
+                </tbody>
+            </table>
+        </div>
+        {{else}}
+        <p class="mt-2 text-sm text-gray-500">Aucun résultat</p>
+        {{end}}
+    </div>
+    {{end}}
+
+    {{if moduleAvailable "solidarity_transport"}}
+    <div class="mt-8">
+        <h2 class="text-lg font-medium text-gray-900">
+            Conducteurs solidaires
+            <span class="ml-2 inline-flex items-center justify-center w-6 h-6 rounded-full bg-co-blue text-xs font-medium text-white">{{len .ViewState.solidarity_drivers}}</span>
+        </h2>
+        {{if .ViewState.solidarity_drivers}}
+        <div class="mt-4 overflow-hidden shadow md:rounded-lg">
+            <table class="min-w-full divide-y divide-gray-300">
+                <thead class="bg-gray-50">
+                    <tr>
+                        <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Nom</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Adresse</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Téléphone</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Profil validé</th>
+                        <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6"><span class="sr-only">Voir</span></th>
+                    </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-200 bg-white">
+                    {{range .ViewState.solidarity_drivers}}
+                    <tr>
+                        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">{{.Data.first_name}} {{.Data.last_name}}</td>
+                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
+                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{.Data.phone_number}}</td>
+                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                            {{if solidarityDriverValidatedProfile . (solidarityDocuments .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="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                            <a href="/app/solidarity-transport/drivers/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
+                        </td>
+                    </tr>
+                    {{end}}
+                </tbody>
+            </table>
+        </div>
+        {{else}}
+        <p class="mt-2 text-sm text-gray-500">Aucun résultat</p>
+        {{end}}
+    </div>
+    {{end}}
+
+    {{if moduleAvailable "organized_carpool"}}
+    <div class="mt-8">
+        <h2 class="text-lg font-medium text-gray-900">
+            Conducteurs covoiturage
+            <span class="ml-2 inline-flex items-center justify-center w-6 h-6 rounded-full bg-co-blue text-xs font-medium text-white">{{len .ViewState.organized_carpool_drivers}}</span>
+        </h2>
+        {{if .ViewState.organized_carpool_drivers}}
+        <div class="mt-4 overflow-hidden shadow md:rounded-lg">
+            <table class="min-w-full divide-y divide-gray-300">
+                <thead class="bg-gray-50">
+                    <tr>
+                        <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Nom</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Adresse départ</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Adresse destination</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Téléphone</th>
+                        <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">Profil validé</th>
+                        <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6"><span class="sr-only">Voir</span></th>
+                    </tr>
+                </thead>
+                <tbody class="divide-y divide-gray-200 bg-white">
+                    {{range .ViewState.organized_carpool_drivers}}
+                    <tr>
+                        <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm font-medium text-gray-900 sm:pl-6">{{.Data.first_name}} {{.Data.last_name}}</td>
+                        <td class="px-3 py-4 text-sm text-gray-500">{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</td>
+                        <td class="px-3 py-4 text-sm text-gray-500">{{if .Data.address_destination}}{{.Data.address_destination.properties.label}}{{end}}</td>
+                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">{{.Data.phone_number}}</td>
+                        <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                            {{if carpoolDriverValidatedProfile . (carpoolDocuments .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="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                            <a href="/app/organized-carpool/drivers/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
+                        </td>
+                    </tr>
+                    {{end}}
+                </tbody>
+            </table>
+        </div>
+        {{else}}
+        <p class="mt-2 text-sm text-gray-500">Aucun résultat</p>
+        {{end}}
+    </div>
+    {{end}}
+</div>
+{{end}}

web/layouts/solidarity_transport/_partials/driver_availabilities.html

@@ -7,28 +7,25 @@
   <div class="px-4 py-5 sm:px-6">
     <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Disponibilités</h2>
   </div>
-  <div class="border-t border-gray-200 px-4">
+  <div class="border-t border-gray-200 px-4 py-4 space-y-3">
-    <div class="py-4">
       {{ range .ViewState.availabilities }}
-      <div class="flex flex-row">
+      <div class="border border-gray-200 rounded-2xl p-3">
-        <div class="flex-none">
+        <div class="flex items-center gap-2.5">
-        {{ if eq .Day 0}}Dimanche
+          <span class="inline-flex items-center justify-center w-9 h-9 text-[10px] font-bold bg-co-blue text-white rounded-full leading-none shrink-0">{{ if eq .Day 0}}Di{{ else if eq .Day 1}}Lu{{ else if eq .Day 2}}Ma{{ else if eq .Day 3}}Me{{ else if eq .Day 4}}Je{{ else if eq .Day 5}}Ve{{ else if eq .Day 6}}Sa{{ end }}</span>
-        {{ else if eq .Day 1}}Lundi
+          <div class="min-w-0">
-        {{ else if eq .Day 2}}Mardi
+            <p class="text-xs font-semibold text-gray-900">{{ if eq .Day 0}}Dimanche{{ else if eq .Day 1}}Lundi{{ else if eq .Day 2}}Mardi{{ else if eq .Day 3}}Mercredi{{ else if eq .Day 4}}Jeudi{{ else if eq .Day 5}}Vendredi{{ else if eq .Day 6}}Samedi{{ end }} <span class="font-normal text-gray-500">{{.StartTime}} — {{.EndTime}}</span></p>
-        {{ else if eq .Day 3}}Mercredi
+            {{if .Address}}<p class="text-[11px] text-gray-400 leading-tight mt-0.5" title="{{.Address.Properties.label}}">{{.Address.Properties.label}}</p>{{end}}
-        {{ else if eq .Day 4}}Jeudi
+          </div>
-        {{ else if eq .Day 5}}Vendredi
+        </div>
-        {{ else if eq .Day 6}}Samedi
+        <div class="mt-1.5 flex justify-end">
-        {{ end }}
+          <a class="text-[10px] text-gray-400 hover:text-co-red transition-colors" href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/availabilities/{{.ID}}/delete">Supprimer</a>
-        {{.StartTime}} - {{ .EndTime }}
         </div>
-        <div class="flex-auto">&nbsp;</div>
-        <div class="flex-none text-sm"><a class="text-co-blue" href="/app/solidarity-transport/drivers/{{$.ViewState.driver.ID}}/availabilities/{{.Id}}/delete">Supprimer</a></div>
       </div>
       {{ end }}
   </div>
+  <div class="px-4 py-4 text-center">
     <button type="button" @click="availabilitiesdialog = !availabilitiesdialog"
-      class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue my-4 px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-ci-blue focus:ring-offset-2 sm:w-auto">
+      class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2">
       {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
       Ajouter une disponibilité
     </button>

web/layouts/solidarity_transport/driver_display.html

@@ -89,59 +89,7 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.driver.Data.file_number}}</dd>
                             </div>
                             {{end}}
-                            {{range .ViewState.profile_optional_fields}}
+                            {{ template "profile_optional_fields_display" dict "other_properties" .ViewState.driver.Data.other_properties "fields" $.ViewState.profile_optional_fields }}
-                            {{$fieldName := .name}}
-                            {{$fieldLabel := .label}}
-                            {{$fieldType := .type}}
-                            {{if eq .type "multicheckbox"}}
-                                {{$hasValues := false}}
-                                {{range .options}}
-                                    {{$optionKey := printf "%s___%s" $fieldName .value}}
-                                    {{if index $.ViewState.driver.Data.other_properties $optionKey}}{{$hasValues = true}}{{end}}
-                                {{end}}
-                                {{if $hasValues}}
-                                <div class="sm:col-span-2">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">
-                                        <div class="flex flex-wrap gap-2">
-                                            {{range .options}}
-                                            {{$optionKey := printf "%s___%s" $fieldName .value}}
-                                            {{if index $.ViewState.driver.Data.other_properties $optionKey}}
-                                            <span class="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-gray-200 text-gray-800">
-                                                {{.label}}
-                                            </span>
-                                            {{end}}
-                                            {{end}}
-                                        </div>
-                                    </dd>
-                                </div>
-                                {{end}}
-                            {{else if eq .type "select"}}
-                                {{$fieldValue := index $.ViewState.driver.Data.other_properties $fieldName}}
-                                {{if and $fieldValue (ne $fieldValue "0") (ne $fieldValue "")}}
-                                <div class="sm:col-span-1">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">
-                                        {{if eq $fieldName "gender"}}
-                                            {{genderISO5218 $fieldValue}}
-                                        {{else}}
-                                            {{range .options}}
-                                                {{if eq .value $fieldValue}}{{.label}}{{end}}
-                                            {{end}}
-                                        {{end}}
-                                    </dd>
-                                </div>
-                                {{end}}
-                            {{else}}
-                                {{$fieldValue := index $.ViewState.driver.Data.other_properties $fieldName}}
-                                {{if $fieldValue}}
-                                <div class="sm:col-span-1">
-                                    <dt class="text-sm font-medium text-gray-500">{{$fieldLabel}}</dt>
-                                    <dd class="mt-1 text-sm text-gray-900">{{$fieldValue}}</dd>
-                                </div>
-                                {{end}}
-                            {{end}}
-                            {{end}}
                         </dl>
                     </div>
                 </div>

web/layouts/vehicles/_partials/booking_documents.html

@@ -0,0 +1,51 @@
+{{define "booking_documents"}}
+<div>
+    <p class="text-sm font-medium text-gray-500 my-4">Documents</p>
+    {{if eq (len .ViewState.documents) 0}}
+    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
+    {{end}}
+
+
+    {{if gt (len .ViewState.documents) 0}}
+
+    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
+        <table class="min-w-full divide-y divide-gray-300 table-fixed">
+        <thead>
+            <tr>
+            <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
+            <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
+            <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajout&eacute; le</th>
+            <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                <span class="sr-only">Actions</span>
+            </th>
+            </tr>
+        </thead>
+        <tbody>
+            {{range .ViewState.documents}}
+            <tr>
+            <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
+                <div class="font-medium text-gray-900">
+                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
+                </div>
+            </td>
+            <td class="px-3 py-3.5 text-sm text-gray-900 table-cell max-w-10 overflow-hidden">
+                <p class=" overflow-hidden">{{.Metadata.Name}}</p>
+            </td>
+            <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
+            <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
+                <a href="/app/vehicles/bookings/{{$.ViewState.booking.ID}}/documents/{{.FileName}}" target="_blank">
+                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
+                </a>
+            </td>
+            </tr>
+            {{end}}
+
+
+            <!-- More plans... -->
+        </tbody>
+        </table>
+    </div>
+
+    {{end}}
+</div>
+{{end}}

web/layouts/vehicles/_partials/booking_status_badge.html

@@ -0,0 +1,16 @@
+{{define "booking_status_badge"}}
+{{if eq .ViewState.status_management "manual"}}
+    {{$currentStatus := .ViewState.booking.ManualStatus}}
+    {{range .ViewState.status_options}}
+        {{if eq (index . "name") $currentStatus}}
+            {{if eq (index . "meta_status") "open"}}
+            <span class="ml-2 p-1 px-3 text-xs bg-co-blue text-white rounded-2xl align-middle">{{index . "label"}}</span>
+            {{else if eq (index . "meta_status") "active"}}
+            <span class="ml-2 p-1 px-3 text-xs bg-co-green text-white rounded-2xl align-middle">{{index . "label"}}</span>
+            {{else if eq (index . "meta_status") "closed"}}
+            <span class="ml-2 p-1 px-3 text-xs bg-co-red text-white rounded-2xl align-middle">{{index . "label"}}</span>
+            {{end}}
+        {{end}}
+    {{end}}
+{{end}}
+{{end}}

web/layouts/vehicles/_partials/booking_status_history.html

@@ -0,0 +1,43 @@
+{{define "booking_status_history"}}
+{{if eq .ViewState.status_management "manual"}}
+{{if .ViewState.booking.StatusHistory}}
+<div class="py-4 sm:py-5">
+    <p class="text-sm font-medium text-gray-500 mb-4">Historique des statuts</p>
+    <div class="flow-root">
+        <ul role="list" class="-mb-8">
+            {{range .ViewState.booking.StatusHistory}}
+            <li>
+                <div class="relative pb-8">
+                    <div class="relative flex space-x-3">
+                        <div>
+                            <span class="h-8 w-8 rounded-full bg-gray-200 flex items-center justify-center ring-8 ring-white">
+                                <svg class="h-4 w-4 text-gray-500" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                                    <path stroke-linecap="round" stroke-linejoin="round" d="M7.5 21L3 16.5m0 0L7.5 12M3 16.5h13.5m0-13.5L21 7.5m0 0L16.5 12M21 7.5H7.5" />
+                                </svg>
+                            </span>
+                        </div>
+                        <div class="flex min-w-0 flex-1 justify-between space-x-4 pt-1.5">
+                            <div>
+                                <p class="text-sm text-gray-500">
+                                    {{if .FromStatus}}{{$from := .FromStatus}}{{range $.ViewState.status_options}}{{if eq (index . "name") $from}}{{index . "label"}}{{end}}{{end}} &rarr; {{end}}{{$to := .ToStatus}}{{range $.ViewState.status_options}}{{if eq (index . "name") $to}}{{index . "label"}}{{end}}{{end}}
+                                    par <a href="/app/members/{{.UserID}}" class="font-medium text-co-blue hover:underline">{{.UserName}}</a>
+                                    ({{.GroupName}})
+                                </p>
+                                {{if .Comment}}
+                                <p class="mt-1 text-xs text-gray-400">{{.Comment}}</p>
+                                {{end}}
+                            </div>
+                            <div class="whitespace-nowrap text-right text-sm text-gray-500">
+                                {{.Date.Format "02/01/2006 15:04"}}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </li>
+            {{end}}
+        </ul>
+    </div>
+</div>
+{{end}}
+{{end}}
+{{end}}

web/layouts/vehicles/booking-display.html

@@ -72,7 +72,10 @@
                 <div class="bg-white px-4 py-5 border-b border-gray-200 sm:px-6">
                     <div class="-ml-4 -mt-4 flex justify-between items-center flex-wrap sm:flex-nowrap">
                         <div class="ml-4 mt-4">
-                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation</h3>
+                            <h3 class="text-lg leading-6 font-medium text-gray-900">
+                                Réservation
+                                {{template "booking_status_badge" .}}
+                            </h3>
                             <p class="mt-1 text-sm text-gray-500">Informations utiles sur la réservation.</p>
                         </div>
                         <div class="ml-4 mt-4 flex-shrink-0">
@@ -101,9 +104,7 @@
                                     <dt class="text-sm font-medium text-gray-500">Réservé par</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{if .ViewState.booking.Data.booked_by.user}}
-                                            <a href="/app/members/{{.ViewState.booking.Data.booked_by.user.id}}" class="flex inline">
+                                            <a href="/app/members/{{.ViewState.booking.Data.booked_by.user.id}}" class="text-co-blue hover:underline">
-                                                <img class="h-5 w-5 rounded-co mr-1"
-                                                    src="/app/members/{{.ViewState.booking.Data.booked_by.user.id}}/picture" alt="">
                                                 {{.ViewState.booking.Data.booked_by.user.display_name}}
                                             </a>
                                         {{end}}
@@ -141,55 +142,8 @@
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{(timeFrom .ViewState.booking.Enddate).Format
                                         "02/01/2006 à 15:04"}}</dd>
                                 </div>
-                                <div>
+                                {{template "booking_documents" .}}
-                                    <p class="text-sm font-medium text-gray-500 my-4">Documents</p>
+                                {{template "booking_status_history" .}}
-                                    {{if eq (len .ViewState.documents) 0}}
-                                    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-                                    {{end}}
-
-
-                                    {{if gt (len .ViewState.documents) 0}}
-                                    
-                                    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-                                        <table class="min-w-full divide-y divide-gray-300 table-fixed">
-                                        <thead>
-                                            <tr>
-                                            <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-                                            <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-                                            <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</th>
-                                            <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                                                <span class="sr-only">Actions</span>
-                                            </th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            {{range .ViewState.documents}}
-                                            <tr>
-                                            <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                                                <div class="font-medium text-gray-900">
-                                                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                                                </div>
-                                            </td>
-                                            <td class="px-3 py-3.5 text-sm text-gray-900 table-cell max-w-10 overflow-hidden">
-                                                <p class=" overflow-hidden">{{.Metadata.Name}}</p>
-                                            </td>
-                                            <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-                                            <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                                                <a href="/app/vehicles/bookings/{{$.ViewState.booking.ID}}/documents/{{.FileName}}" target="_blank">
-                                                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
-                                                </a>
-                                            </td>
-                                            </tr>
-                                            {{end}}
-                                    
-                                    
-                                            <!-- More plans... -->
-                                        </tbody>
-                                        </table>
-                                    </div>
-                                    
-                                    {{end}}
-                                </div>
                             </dl>
                         </div>
                     </div>

web/layouts/vehicles/bookings-list.html

@@ -63,6 +63,19 @@
                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                         Retiré
                                     </span>
+                                    {{else if eq $.ViewState.status_management "manual"}}
+                                        {{$manualStatus := .ManualStatus}}
+                                        {{range $.ViewState.status_options}}
+                                            {{if eq (index . "name") $manualStatus}}
+                                                {{if eq (index . "meta_status") "open"}}
+                                                <span class="p-1 px-2 text-xs bg-co-blue text-white font-bold rounded-xl">{{index . "label"}}</span>
+                                                {{else if eq (index . "meta_status") "active"}}
+                                                <span class="p-1 px-2 text-xs bg-co-green text-white font-bold rounded-xl">{{index . "label"}}</span>
+                                                {{else if eq (index . "meta_status") "closed"}}
+                                                <span class="p-1 px-2 text-xs bg-co-red text-white font-bold rounded-xl">{{index . "label"}}</span>
+                                                {{end}}
+                                            {{end}}
+                                        {{end}}
                                     {{else}}
                                         {{if eq .Status 1 }}
                                         <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >

web/layouts/vehicles/search.html

@@ -89,11 +89,13 @@
 
                         <!-- {{ $fieldName := "address" }}
                         {{ template "address_autocomplete" dict "FieldName" $fieldName }} -->
-                        <div class="py-4 grid grid-cols-2">
+                        <div class="py-4 grid grid-cols-2"
+                          x-data="{ defaultDurationDays: {{.ViewState.default_booking_duration_days}} }">
                             <div class="lg:col-span-1">
                                 <label for="startdate" class="block text-sm font-medium text-gray-700">Du <span class="text-red-600">*</span></label>
                                 <div class="mt-1">
                                     <input type="date" id="startdate" name="startdate" value="{{if .ViewState.search}}{{(timeFrom .ViewState.search.startdate).Format "2006-01-02"}}{{end}}" required
+                                        @change="if ($event.target.value && !document.getElementById('enddate').value) { const d = new Date($event.target.value); d.setDate(d.getDate() + defaultDurationDays); document.getElementById('enddate').value = d.toISOString().split('T')[0]; }"
                                         class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-l-2xl border-r-1">
                                 </div>
                             </div>

web/layouts/vehicles_management/_partials/booking_filters.html

@@ -1,9 +1,14 @@
 {{ define "vehicle_booking_filters" }}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+<div class="px-4 sm:px-6 md:px-8">
 <form>
 
+<input type="hidden" name="tab" value="bookings" />
+{{if .ViewState.filters.v_type}}<input type="hidden" name="v_type" value="{{.ViewState.filters.v_type}}" />{{end}}
+{{if .ViewState.filters.v_status}}<input type="hidden" name="v_status" value="{{.ViewState.filters.v_status}}" />{{end}}
+
 <div class="flex flex-row justify-end flex-wrap">
 
+{{if not .ViewState.hide_date_filters}}
 <div class="m-4">
 <div>
   <label for="vehicles_date_start" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Dates (début / fin)</label>
@@ -13,16 +18,46 @@
   </div>
 </div>
 </div>
+{{end}}
+
+{{if .ViewState.vehicle_types}}
+<div class="m-4">
+<label for="vehicles_vehicle_type" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Type de véhicule</label>
+<div class="mt-2 grid grid-cols-1">
+<select id="vehicles_vehicle_type" name="vehicle_type" class="col-start-1 row-start-1 w-full appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
+    <option></option>
+    {{range .ViewState.vehicle_types}}
+    <option value="{{.}}"{{if eq $.ViewState.filters.vehicle_type .}} selected{{end}}>{{.}}</option>
+    {{end}}
+  </select>
+  <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
+    <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
+  </svg>
+</div>
+</div>
+{{end}}
 
 <div class="m-4">
 <label for="vehicles_status" class="block text-sm/6 font-medium text-gray-900 dark:text-white">Statut</label>
 <div class="mt-2 grid grid-cols-1">
 <select id="vehicles_status" name="status" class="col-start-1 row-start-1 w-full appearance-none rounded-md bg-white py-1.5 pr-8 pl-3 text-base text-gray-900 outline-1 -outline-offset-1 outline-gray-300 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-indigo-600 sm:text-sm/6 dark:bg-white/5 dark:text-white dark:outline-white/10 dark:*:bg-gray-800 dark:focus-visible:outline-co-blue" onchange="this.form.submit()">
-    <option></option>
+    <option value="">Tous</option>
+    {{if eq .ViewState.status_management "manual"}}
+    <optgroup label="Par catégorie">
+      <option value="meta:open,active"{{if eq $.ViewState.filters.status "meta:open,active"}} selected{{end}}>Actifs ({{$first := true}}{{range $.ViewState.status_options}}{{$ms := index . "meta_status"}}{{if or (eq $ms "open") (eq $ms "active")}}{{if not $first}}, {{end}}{{$first = false}}{{index . "label"}}{{end}}{{end}})</option>
+      <option value="meta:closed"{{if eq $.ViewState.filters.status "meta:closed"}} selected{{end}}>Clôturés ({{$first := true}}{{range $.ViewState.status_options}}{{$ms := index . "meta_status"}}{{if eq $ms "closed"}}{{if not $first}}, {{end}}{{$first = false}}{{index . "label"}}{{end}}{{end}})</option>
+    </optgroup>
+    <optgroup label="Par statut">
+    {{range .ViewState.status_options}}
+      <option value="{{index . "name"}}"{{if eq $.ViewState.filters.status (index . "name")}} selected{{end}}>{{index . "label"}}</option>
+    {{end}}
+    </optgroup>
+    {{else}}
     <option value="FORTHCOMING"{{if eq .ViewState.filters.status "FORTHCOMING"}} selected{{end}}>A venir</option>
     <option value="ONGOING"{{if eq .ViewState.filters.status "ONGOING"}} selected{{end}}>En cours</option>
     <option value="TERMINATED"{{if eq .ViewState.filters.status "TERMINATED"}} selected{{end}}>Terminé</option>
     <option value="CANCELLED"{{if eq .ViewState.filters.status "CANCELLED"}} selected{{end}}>Annulé</option>
+    {{end}}
   </select>
   <svg viewBox="0 0 16 16" fill="currentColor" data-slot="icon" aria-hidden="true" class="pointer-events-none col-start-1 row-start-1 mr-2 size-5 self-center justify-self-end text-gray-500 sm:size-4 dark:text-gray-400">
     <path d="M4.22 6.22a.75.75 0 0 1 1.06 0L8 8.94l2.72-2.72a.75.75 0 1 1 1.06 1.06l-3.25 3.25a.75.75 0 0 1-1.06 0L4.22 7.28a.75.75 0 0 1 0-1.06Z" clip-rule="evenodd" fill-rule="evenodd" />
@@ -30,10 +65,6 @@
 </div>
 </div>
 
-<div class="m-4">
-
-</div>
-
 </div>
 
 </form>

web/layouts/vehicles_management/_partials/bookings-list.html

@@ -1,30 +1,24 @@
 {{define "bookings_list"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-    <div class="mt-8 flex flex-col">
-        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
-            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
-                    <table class="min-w-full divide-y divide-gray-300">
     <thead class="bg-gray-50">
         <tr>
             <th scope="col"
-                                    class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 text-center">
+                class="py-3.5 pl-4 pr-3 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Statut
             </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+            <th scope="col" class="px-3 py-3.5 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Type
             </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+            <th scope="col" class="px-3 py-3.5 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Numéro (Immat / Bicycode)
             </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+            <th scope="col" class="px-3 py-3.5 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Beneficiaire
             </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+            <th scope="col" class="px-3 py-3.5 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Dates
             </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+            <th scope="col" class="px-3 py-3.5 text-center text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Commentaire
             </th>
             <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
                 <span class="sr-only">Actions</span>
@@ -39,6 +33,19 @@
                 <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                     Retiré
                 </span>
+                {{else if and (eq $.ViewState.status_management "manual") (not .Deleted)}}
+                    {{$manualStatus := .ManualStatus}}
+                    {{range $.ViewState.status_options}}
+                        {{if eq (index . "name") $manualStatus}}
+                            {{if eq (index . "meta_status") "open"}}
+                            <span class="p-1 px-2 text-xs bg-co-blue text-white font-bold rounded-xl">{{index . "label"}}</span>
+                            {{else if eq (index . "meta_status") "active"}}
+                            <span class="p-1 px-2 text-xs bg-co-green text-white font-bold rounded-xl">{{index . "label"}}</span>
+                            {{else if eq (index . "meta_status") "closed"}}
+                            <span class="p-1 px-2 text-xs bg-co-red text-white font-bold rounded-xl">{{index . "label"}}</span>
+                            {{end}}
+                        {{end}}
+                    {{end}}
                 {{else if .Deleted}}
                 <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                     Annulé
@@ -72,7 +79,6 @@
                 <div class="text-gray-900" ></div>
                 {{else}}
                 <div class="text-gray-900" >
-                                        <!--<img class="h-6 w-6 rounded-co" src="/app/beneficiaries/{{.Driver}}/picture" alt="">-->
                     {{ (index $.ViewState.drivers_map .Driver).Data.first_name }}
                     {{ (index $.ViewState.drivers_map .Driver).Data.last_name }}
                 </div>
@@ -88,8 +94,25 @@
                 </div>
                 {{end}}
             </td>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+            <td class="py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
-                                    <div class="text-gray-900" >{{ .Data.comment }}</div>
+                {{if and (eq $.ViewState.status_management "manual") (not .Data.administrator_unavailability) (not .Deleted)}}
+                    {{$manualStatus := .ManualStatus}}
+                    {{$startdate := .Startdate}}
+                    {{$enddate := .Enddate}}
+                    {{range $.ViewState.status_options}}
+                        {{if eq (index . "name") $manualStatus}}
+                            {{if and (eq (index . "meta_status") "open") (isPast $startdate)}}
+                            <span class="text-red-600" title="Retard : la date de début de réservation est dépassée">
+                                {{$.IconSet.Icon "hero:outline/exclamation-triangle" "h-6 w-6 inline-block"}}
+                            </span>
+                            {{else if and (eq (index . "meta_status") "active") (isPast $enddate)}}
+                            <span class="text-red-600" title="Retard : la date de fin de réservation est dépassée">
+                                {{$.IconSet.Icon "hero:outline/exclamation-triangle" "h-6 w-6 inline-block"}}
+                            </span>
+                            {{end}}
+                        {{end}}
+                    {{end}}
+                {{end}}
             </td>
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                 <a href="/app/vehicles-management/bookings/{{.ID}}"
@@ -99,9 +122,4 @@
         {{end}}
     </tbody>
 </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 {{end}}

web/layouts/vehicles_management/_partials/vehicles-list.html

@@ -1,27 +1,22 @@
 {{define "vehicles_list"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+<table class="min-w-full divide-y divide-gray-300 border-gray-300 border-t-1">
-    <div class="mt-8 flex flex-col">
-        <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
-            <div class="inline-block min-w-full py-2 align-middle md:px-6 lg:px-8">
-                <div class="overflow-hidden shadow md:rounded-lg">
-                    <table class="min-w-full divide-y divide-gray-300">
     <thead class="bg-gray-50">
         <tr>
             <th scope="col"
-                                    class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                class="py-3.5 pl-4 pr-3 text-center text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Statut Réservation
+                Disponibilité
             </th>
             <th scope="col"
-                                    class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                class="py-3.5 pl-4 pr-3 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Numéro (Immat / Bicycode)
             </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+            <th scope="col" class="px-3 py-3.5 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Type
             </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+            <th scope="col" class="px-3 py-3.5 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Modèle
             </th>
-                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+            <th scope="col" class="px-3 py-3.5 text-center text-sm font-semibold text-gray-900 sm:pl-6">
                 Lieu
             </th>
             <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
@@ -35,56 +30,37 @@
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
                 <div class="flex flex-col px-6">
                 {{if not .Bookings}}
-                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
-                                        Disponible
-                                    </span>
-                                    {{else if len .Bookings | eq 1}}
-                                        {{range .Bookings}}
-                                            {{if  .Data.administrator_unavailability}}
-                                                <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
-                                                    Retiré
-                                                </span>
-                                            {{else if eq .Status -1 }}
-                                                <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
-                                                    Disponible
-                                                </span>
-                                            {{else if eq .Status 1 }}
-                                                <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
-                                                    A venir
-                                                </span>
-                                            {{else if eq .Status 0 }}
                 <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl">
-                                                    En cours
+                    Disponible
-                                                </span>
-                                            {{end}}
-                                        {{end}}
-                                    {{else if gt (len .Bookings) 1}} 
-                                        {{range .Bookings}}
-                                            {{if .Data.administrator_unavailability}}
-                                            <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
-                                                Retiré
                 </span>
                 {{else}}
-                                                {{if eq .Status 1 }}
+                    {{$hasActive := false}}
-                                                <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                    {{$hasUpcoming := false}}
-                                                    A venir
+                    {{$hasRetired := false}}
-                                                </span>
-                                                {{else if eq .Status 0 }}
-                                                <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
-                                                    En cours
-                                                </span>
-                                                {{end}}
-                                            {{end}}
-                                        {{end}}
-                                        {{$allAvailable := true}}
                     {{range .Bookings}}
-                                                {{if ne .Status -1}}
+                        {{if .Data.administrator_unavailability}}
-                                                    {{ $allAvailable = false }}
+                            {{$hasRetired = true}}
-                                                    {{break}}
+                        {{else if eq .Status 0}}
+                            {{$hasActive = true}}
+                        {{else if eq .Status 1}}
+                            {{$hasUpcoming = true}}
                         {{end}}
                     {{end}}
-                                            {{if $allAvailable}}
+                    {{if $hasRetired}}
-                                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                    <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl">
+                        Retiré
+                    </span>
+                    {{end}}
+                    {{if $hasActive}}
+                    <span class="mt-1 p-1 bg-co-red text-white text-xs font-bold rounded-xl">
+                        En prêt
+                    </span>
+                    {{else if $hasUpcoming}}
+                    <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl">
+                        Réservé
+                    </span>
+                    {{else if not $hasRetired}}
+                    <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl">
                         Disponible
                     </span>
                     {{end}}
@@ -116,9 +92,4 @@
         {{end}}
     </tbody>
 </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 {{end}}

web/layouts/vehicles_management/booking-display.html

@@ -9,7 +9,30 @@
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none"
             x-data="{
                 changeVehicle: false,
+                changeStatus: false,
                 selectedvehicle: '',
+                selectedStatus: '{{.ViewState.booking.ManualStatus}}',
+                statusOptions: {{json .ViewState.status_options}},
+                extraPropertiesDefs: {{json .ViewState.booking_extra_properties}},
+                bookingExtraProperties: {{if .ViewState.booking.Data.extra_properties}}{{json .ViewState.booking.Data.extra_properties}}{{else}}{}{{end}},
+                getRequestedProperties() {
+                    if (!this.statusOptions || !this.extraPropertiesDefs) return [];
+                    let current = this.statusOptions.find(s => s.name === this.selectedStatus);
+                    if (!current || !current.requested_properties) return [];
+                    return current.requested_properties.map(rp => {
+                        let ref = (typeof rp === 'string') ? { name: rp } : rp;
+                        let def = this.extraPropertiesDefs.find(d => d.name === ref.name);
+                        if (!def) return null;
+                        return { ...def, required: !!ref.required };
+                    }).filter(d => d);
+                },
+                getDefaultValue(prop) {
+                    if (prop.target === 'enddate') return '{{(timeFrom .ViewState.booking.Enddate).Format "2006-01-02T15:04"}}';
+                    if (prop.target === 'startdate') return '{{(timeFrom .ViewState.booking.Startdate).Format "2006-01-02T15:04"}}';
+                    if (prop.target === 'unavailableto') return '{{(timeFrom .ViewState.booking.Unavailableto).Format "2006-01-02"}}';
+                    if (prop.target === 'unavailablefrom') return '{{(timeFrom .ViewState.booking.Unavailablefrom).Format "2006-01-02"}}';
+                    return this.bookingExtraProperties[prop.name] || '';
+                },
                 submitSelectedvehicle(event) {
                     if(this.selectedvehicle == '') {
                         event.preventDefault()
@@ -22,6 +45,12 @@
                 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">
                 Changer de véhicule
             </button>
+            {{if eq .ViewState.status_management "manual"}}
+            <button type="button" @click="changeStatus = ! changeStatus"
+                class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 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">
+                Changer de statut
+            </button>
+            {{else}}
             <a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/delete">
                 <button type="button"
                     class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-red px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2 sm:w-auto">
@@ -29,6 +58,7 @@
                 </button>
             </a>
             {{end}}
+            {{end}}
 
             <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true" x-show="changeVehicle">
                 <div class="fixed inset-0 bg-gray-900 bg-opacity-30 transition-opacity"></div>
@@ -63,6 +93,77 @@
                     </div>
                 </div>
             </div>
+
+            {{if eq .ViewState.status_management "manual"}}
+            <div class="relative z-10" role="dialog" aria-modal="true" x-show="changeStatus">
+                <div class="fixed inset-0 bg-gray-900 bg-opacity-30 transition-opacity"></div>
+
+                <div class="fixed inset-0 z-10 overflow-y-auto">
+                    <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+                        <div class="relative transform overflow-hidden rounded-3xl bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
+                            <div class="text-center">
+                                <h3 class="text-lg font-medium leading-6 text-gray-900">Changer le statut</h3>
+                            </div>
+                            <form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/status" class="mt-4 space-y-4">
+                                <div>
+                                    <label for="new_status" class="block text-sm font-medium text-gray-700 mb-1">Nouveau statut</label>
+                                    <select id="new_status" name="new_status" x-model="selectedStatus" class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-10 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
+                                        {{$currentStatus := .ViewState.booking.ManualStatus}}
+                                        {{range .ViewState.status_options}}
+                                        <option value="{{index . "name"}}" {{if eq (index . "name") $currentStatus}}selected{{end}}>{{index . "label"}}</option>
+                                        {{end}}
+                                    </select>
+                                </div>
+                                <div>
+                                    <label for="status_comment" class="block text-sm font-medium text-gray-700 mb-1">Commentaire</label>
+                                    <textarea id="status_comment" name="comment" rows="3" placeholder="Optionnel"
+                                        class="block w-full rounded-2xl border-gray-300 bg-gray-50 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue"></textarea>
+                                </div>
+                                <div x-show="getRequestedProperties().length > 0" class="border-t border-gray-200"></div>
+                                <template x-for="prop in getRequestedProperties()" :key="prop.name">
+                                    <div>
+                                        <label :for="'prop_' + prop.name" class="block text-sm font-medium text-gray-700 mb-1">
+                                            <span x-text="prop.label"></span>
+                                            <span x-show="prop.required" class="text-red-500"> *</span>
+                                        </label>
+                                        <template x-if="prop.type === 'text'">
+                                            <input type="text" :id="'prop_' + prop.name" :name="'prop_' + prop.name" :value="getDefaultValue(prop)" :required="prop.required"
+                                                class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-3 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
+                                        </template>
+                                        <template x-if="prop.type === 'number'">
+                                            <input type="number" :id="'prop_' + prop.name" :name="'prop_' + prop.name" :value="getDefaultValue(prop)" :required="prop.required"
+                                                class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-3 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
+                                        </template>
+                                        <template x-if="prop.type === 'date'">
+                                            <input type="date" :id="'prop_' + prop.name" :name="'prop_' + prop.name" :value="getDefaultValue(prop)" :required="prop.required"
+                                                class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-3 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
+                                        </template>
+                                        <template x-if="prop.type === 'datetime-local'">
+                                            <input type="datetime-local" :id="'prop_' + prop.name" :name="'prop_' + prop.name" :value="getDefaultValue(prop)" :required="prop.required"
+                                                class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-3 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
+                                        </template>
+                                        <template x-if="prop.type === 'select' && prop.options">
+                                            <select :id="'prop_' + prop.name" :name="'prop_' + prop.name" :required="prop.required"
+                                                class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-10 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
+                                                <template x-for="opt in prop.options" :key="opt.value">
+                                                    <option :value="opt.value" :selected="opt.value === getDefaultValue(prop)" x-text="opt.label"></option>
+                                                </template>
+                                            </select>
+                                        </template>
+                                    </div>
+                                </template>
+                                <div class="mt-5 sm:mt-6">
+                                    <button type="submit" class="inline-flex w-full justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:text-sm">Valider</button>
+                                </div>
+                            </form>
+                            <div class="mt-5 sm:mt-6">
+                                <button @click="changeStatus=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            {{end}}
         </div>
     </div>
     <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
@@ -132,6 +233,42 @@
                     </div>
                 </div>
             </div>
+            {{if .ViewState.booking_extra_properties}}
+            <div class="bg-white shadow sm:rounded-2xl"
+                x-data="{
+                    extraPropertiesDefs: {{json .ViewState.booking_extra_properties}},
+                    storedProps: {{if .ViewState.booking.Data.extra_properties}}{{json .ViewState.booking.Data.extra_properties}}{{else}}{}{{end}},
+                    computedProps: {{if .ViewState.computed_extra_properties}}{{json .ViewState.computed_extra_properties}}{{else}}{}{{end}},
+                    displayProps() {
+                        return this.extraPropertiesDefs.filter(prop => !prop.target);
+                    },
+                    getValue(prop) {
+                        if (prop.type === 'computed') return this.computedProps[prop.name] || '';
+                        let v = this.storedProps[prop.name];
+                        if (prop.type === 'date' && v) {
+                            let d = new Date(v);
+                            if (!isNaN(d)) return d.toLocaleDateString('fr-FR');
+                        }
+                        return v || '';
+                    },
+                    hasAnyValue() {
+                        return this.displayProps().some(prop => this.getValue(prop) !== '');
+                    }
+                }"
+                x-show="hasAnyValue()">
+                <h2 class="text-lg font-medium text-gray-900 p-4 sm:px-6">Informations complémentaires</h2>
+                <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                    <dl class="sm:divide-y sm:divide-gray-200">
+                        <template x-for="prop in displayProps()" :key="prop.name">
+                            <div x-show="getValue(prop) !== ''" class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                <dt class="text-sm font-medium text-gray-500" x-text="prop.label"></dt>
+                                <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2" x-text="getValue(prop)"></dd>
+                            </div>
+                        </template>
+                    </dl>
+                </div>
+            </div>
+            {{end}}
         </div>
         <div class="lg:col-start-2 lg:col-span-2">
             <div class="bg-white  shadow sm:rounded-2xl sm:px-6">
@@ -151,8 +288,28 @@
                             <p class="mt-1 text-sm text-gray-500">Motif : {{.ViewState.booking.Data.motif}}</p>
                             {{end}}
                             {{else}}
-                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation</h3>
+                            <h3 class="text-lg leading-6 font-medium text-gray-900">
+                                Réservation
+                                {{template "booking_status_badge" .}}
+                            </h3>
                             <p class="mt-1 text-sm text-gray-500">Informations utiles sur la réservation.</p>
+                            {{if eq .ViewState.status_management "manual"}}
+                            {{range .ViewState.status_options}}
+                                {{if eq (index . "name") $.ViewState.booking.ManualStatus}}
+                                    {{if and (eq (index . "meta_status") "open") (isPast $.ViewState.booking.Startdate)}}
+                                    <div class="mt-3 flex items-center gap-2 rounded-lg bg-red-50 px-3 py-2 text-red-700 border border-red-200">
+                                        {{$.IconSet.Icon "hero:outline/exclamation-triangle" "h-6 w-6 flex-shrink-0"}}
+                                        <span class="text-sm font-medium">Retard : la date de début de réservation est dépassée</span>
+                                    </div>
+                                    {{else if and (eq (index . "meta_status") "active") (isPast $.ViewState.booking.Enddate)}}
+                                    <div class="mt-3 flex items-center gap-2 rounded-lg bg-red-50 px-3 py-2 text-red-700 border border-red-200">
+                                        {{$.IconSet.Icon "hero:outline/exclamation-triangle" "h-6 w-6 flex-shrink-0"}}
+                                        <span class="text-sm font-medium">Retard : la date de fin de réservation est dépassée</span>
+                                    </div>
+                                    {{end}}
+                                {{end}}
+                            {{end}}
+                            {{end}}
                             {{end}}
                         </div>
                         <div class="ml-4 mt-4 flex-shrink-0">
@@ -181,9 +338,7 @@
                                     <dt class="text-sm font-medium text-gray-500">Prescripteur</dt>
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{if .ViewState.booking.Data.booked_by.user}}
-                                            <a href="/app/members/{{.ViewState.booking.Data.booked_by.user.id}}" class="flex inline">
+                                            <a href="/app/members/{{.ViewState.booking.Data.booked_by.user.id}}" class="text-co-blue hover:underline">
-                                                <img class="h-5 w-5 rounded-co mr-1"
-                                                    src="/app/members/{{.ViewState.booking.Data.booked_by.user.id}}/picture" alt="">
                                                 {{.ViewState.booking.Data.booked_by.user.display_name}}
                                             </a>
                                         {{end}}
@@ -308,55 +463,8 @@
                                         </button>
                                     </dd>
                                 </div>
-                                <div>
+                                {{template "booking_documents" .}}
-                                    <p class="text-sm font-medium text-gray-500 my-4">Documents</p>
+                                {{template "booking_status_history" .}}
-                                    {{if eq (len .ViewState.documents) 0}}
-                                    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
-                                    {{end}}
-
-
-                                    {{if gt (len .ViewState.documents) 0}}
-                                    
-                                    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
-                                        <table class="min-w-full divide-y divide-gray-300 table-fixed">
-                                        <thead>
-                                            <tr>
-                                            <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
-                                            <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
-                                            <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</th>
-                                            <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                                                <span class="sr-only">Actions</span>
-                                            </th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            {{range .ViewState.documents}}
-                                            <tr>
-                                            <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
-                                                <div class="font-medium text-gray-900">
-                                                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
-                                                </div>
-                                            </td>
-                                            <td class="px-3 py-3.5 text-sm text-gray-900 table-cell max-w-10 overflow-hidden">
-                                                <p class=" overflow-hidden">{{.Metadata.Name}}</p>
-                                            </td>
-                                            <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
-                                            <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
-                                                <a href="/app/vehicles/bookings/{{$.ViewState.booking.ID}}/documents/{{.FileName}}" target="_blank">
-                                                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
-                                                </a>
-                                            </td>
-                                            </tr>
-                                            {{end}}
-                                    
-                                    
-                                            <!-- More plans... -->
-                                        </tbody>
-                                        </table>
-                                    </div>
-                                    
-                                    {{end}}
-                                </div>
                             </dl>
                         </div>
                     </div>

web/layouts/vehicles_management/bookings-list.html

@@ -18,10 +18,11 @@
             </a>
         </div>
     </div>
+
+    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4">
+        {{template "vehicle_booking_filters" .}}
+        {{template "bookings_list" .}}
+    </div>
 </div>
 
-{{template "vehicle_booking_filters" .}}
-
-{{template "bookings_list" .}}
-
 {{end}}

web/layouts/vehicles_management/fleet-update.html

@@ -14,7 +14,7 @@
             informations: '{{ .ViewState.vehicle.Data.informations}}',
         },
         rules: {
-            licence_plate: ['required', 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'],
+            licence_plate: ['required'],
             name: ['required'],
         },
         formValidation: {

web/layouts/vehicles_management/overview.html

@@ -1,13 +1,39 @@
 {{define "content"}}
+{{$defaultTab := "bookings"}}
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <h1 class="text-2xl font-semibold text-gray-900">Gestion des véhicules et réservations</h1>
 
+    <div class="bg-white shadow sm:rounded-lg sm:overflow-hidden my-4" x-data="{
+        tab: '{{or .ViewState.tab $defaultTab}}',
+        to(event) {
+            this.tab = event.target.value
+        }
+    }">
+        <div class="divide-y divide-gray-200">
+            <div>
+                <div class="hidden sm:block">
+                    <div class="border-b border-gray-200 pl-4 flex justify-between items-center">
+                        <nav class="-mb-px flex space-x-8" aria-label="Tabs">
+                            <a href="#" @click="tab = 'bookings'"
+                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                :class="tab == 'bookings' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                Réservations </a>
 
-    <div class="sm:flex sm:items-center">
+                            <a href="#" @click="tab = 'vehicles'"
-        <div class="sm:flex-auto">
+                                class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-            <h2 class="text-xl font-semibold text-gray-600 pt-8">Réservations en cours et à venir</h2>
+                                :class="tab == 'vehicles' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-        </div>
+                                Véhicules </a>
-        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+                        </nav>
+
+                        <div class="pr-4 flex space-x-2">
+                            <div x-show="tab == 'bookings'" class="flex space-x-2">
+                                <a href="/exports/fleets/bookings/group_bookings.xlsx?status={{.ViewState.filters.status}}&date_start={{.ViewState.filters.date_start}}&date_end={{.ViewState.filters.date_end}}&vehicle_type={{.ViewState.filters.vehicle_type}}">
+                                    <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 text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                                        {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
+                                        Export
+                                    </button>
+                                </a>
                                 <a href="/app/vehicles-management/bookings/">
                                     <button type="button"
                                         class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 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">
@@ -16,19 +42,7 @@
                                     </button>
                                 </a>
                             </div>
-    </div>
+                            <div x-show="tab == 'vehicles'">
-</div>
-
-{{template "bookings_list" .}}
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8">
-    
-
-    <div class="sm:flex sm:items-center">
-        <div class="sm:flex-auto">
-            <h2 class="text-xl font-semibold text-gray-600 pt-8">Véhicules</h2>
-        </div>
-        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
                                 <a href="/app/vehicles-management/fleet/add">
                                     <button type="button"
                                         class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 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">
@@ -39,7 +53,22 @@
                             </div>
                         </div>
                     </div>
+                </div>
+            </div>
 
+            <div x-show="tab == 'bookings'">
+                {{template "vehicle_booking_filters" .}}
+                {{template "bookings_list" .}}
+            </div>
+
+            <div x-show="tab == 'vehicles'">
+                {{template "vehicle_filters" .}}
                 {{template "vehicles_list" .}}
+            </div>
+
+        </div>
+    </div>
+
+</div>
 
 {{end}}

web/public/css/main.css

@@ -6,16 +6,17 @@
       "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
     --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono",
       "Courier New", monospace;
+    --color-red-50: oklch(0.971 0.013 17.38);
+    --color-red-200: oklch(0.885 0.062 18.334);
     --color-red-500: oklch(0.637 0.237 25.331);
     --color-red-600: oklch(0.577 0.245 27.325);
     --color-red-700: oklch(0.505 0.213 27.518);
     --color-red-900: oklch(0.396 0.141 25.723);
     --color-orange-50: oklch(0.98 0.016 73.684);
     --color-orange-200: oklch(0.901 0.076 70.697);
+    --color-amber-500: oklch(0.769 0.188 70.08);
     --color-yellow-50: oklch(0.987 0.026 102.212);
-    --color-green-50: oklch(0.982 0.018 155.826);
     --color-green-100: oklch(0.962 0.044 156.743);
-    --color-green-200: oklch(0.925 0.084 155.995);
     --color-green-600: oklch(0.627 0.194 149.214);
     --color-green-800: oklch(0.448 0.119 151.328);
     --color-blue-50: oklch(0.97 0.014 254.604);
@@ -70,6 +71,7 @@
     --font-weight-extrabold: 800;
     --tracking-tight: -0.025em;
     --tracking-wide: 0.025em;
+    --leading-tight: 1.25;
     --radius-md: 0.375rem;
     --radius-lg: 0.5rem;
     --radius-xl: 0.75rem;
@@ -318,18 +320,27 @@
   .top-4 {
     top: calc(var(--spacing) * 4);
   }
+  .top-\[10px\] {
+    top: 10px;
+  }
   .right-0 {
     right: calc(var(--spacing) * 0);
   }
   .right-4 {
     right: calc(var(--spacing) * 4);
   }
+  .bottom-\[10px\] {
+    bottom: 10px;
+  }
   .left-0 {
     left: calc(var(--spacing) * 0);
   }
   .left-4 {
     left: calc(var(--spacing) * 4);
   }
+  .left-\[5px\] {
+    left: 5px;
+  }
   .isolate {
     isolation: isolate;
   }
@@ -498,18 +509,12 @@
   .-my-2 {
     margin-block: calc(var(--spacing) * -2);
   }
-  .my-2 {
-    margin-block: calc(var(--spacing) * 2);
-  }
   .my-4 {
     margin-block: calc(var(--spacing) * 4);
   }
   .my-8 {
     margin-block: calc(var(--spacing) * 8);
   }
-  .my-10 {
-    margin-block: calc(var(--spacing) * 10);
-  }
   .-mt-2 {
     margin-top: calc(var(--spacing) * -2);
   }
@@ -525,6 +530,9 @@
   .mt-1 {
     margin-top: calc(var(--spacing) * 1);
   }
+  .mt-1\.5 {
+    margin-top: calc(var(--spacing) * 1.5);
+  }
   .mt-2 {
     margin-top: calc(var(--spacing) * 2);
   }
@@ -736,6 +744,9 @@
   .h-8 {
     height: calc(var(--spacing) * 8);
   }
+  .h-9 {
+    height: calc(var(--spacing) * 9);
+  }
   .h-10 {
     height: calc(var(--spacing) * 10);
   }
@@ -814,6 +825,9 @@
   .w-8 {
     width: calc(var(--spacing) * 8);
   }
+  .w-9 {
+    width: calc(var(--spacing) * 9);
+  }
   .w-10 {
     width: calc(var(--spacing) * 10);
   }
@@ -919,6 +933,9 @@
   .shrink {
     flex-shrink: 1;
   }
+  .shrink-0 {
+    flex-shrink: 0;
+  }
   .flex-grow {
     flex-grow: 1;
   }
@@ -1332,6 +1349,9 @@
   .gap-2 {
     gap: calc(var(--spacing) * 2);
   }
+  .gap-2\.5 {
+    gap: calc(var(--spacing) * 2.5);
+  }
   .gap-3 {
     gap: calc(var(--spacing) * 3);
   }
@@ -1794,15 +1814,15 @@
   .border-gray-300 {
     border-color: var(--color-gray-300);
   }
-  .border-green-200 {
-    border-color: var(--color-green-200);
-  }
   .border-indigo-500 {
     border-color: var(--color-indigo-500);
   }
   .border-orange-200 {
     border-color: var(--color-orange-200);
   }
+  .border-red-200 {
+    border-color: var(--color-red-200);
+  }
   .border-transparent {
     border-color: transparent;
   }
@@ -1884,9 +1904,6 @@
   .bg-gray-900 {
     background-color: var(--color-gray-900);
   }
-  .bg-green-50 {
-    background-color: var(--color-green-50);
-  }
   .bg-green-100 {
     background-color: var(--color-green-100);
   }
@@ -1902,6 +1919,9 @@
   .bg-orange-50 {
     background-color: var(--color-orange-50);
   }
+  .bg-red-50 {
+    background-color: var(--color-red-50);
+  }
   .bg-red-500 {
     background-color: var(--color-red-500);
   }
@@ -1931,10 +1951,6 @@
     --tw-gradient-position: in oklab;
     background-image: conic-gradient(var(--tw-gradient-stops));
   }
-  .bg-gradient-to-r {
-    --tw-gradient-position: to right in oklab;
-    background-image: linear-gradient(var(--tw-gradient-stops));
-  }
   .bg-radial {
     --tw-gradient-position: in oklab;
     background-image: radial-gradient(var(--tw-gradient-stops));
@@ -1945,14 +1961,6 @@
   .via-none {
     --tw-gradient-via-stops: initial;
   }
-  .from-co-blue {
-    --tw-gradient-from: var(--color-co-blue);
-    --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
-  }
-  .to-blue-600 {
-    --tw-gradient-to: var(--color-blue-600);
-    --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position));
-  }
   .box-decoration-clone {
     -webkit-box-decoration-break: clone;
     box-decoration-break: clone;
@@ -2343,6 +2351,12 @@
     font-size: var(--text-sm);
     line-height: calc(var(--spacing) * 6);
   }
+  .text-\[10px\] {
+    font-size: 10px;
+  }
+  .text-\[11px\] {
+    font-size: 11px;
+  }
   .leading-4 {
     --tw-leading: calc(var(--spacing) * 4);
     line-height: calc(var(--spacing) * 4);
@@ -2359,6 +2373,10 @@
     --tw-leading: 1;
     line-height: 1;
   }
+  .leading-tight {
+    --tw-leading: var(--leading-tight);
+    line-height: var(--leading-tight);
+  }
   .font-bold {
     --tw-font-weight: var(--font-weight-bold);
     font-weight: var(--font-weight-bold);
@@ -2460,8 +2478,8 @@
   .\[color\:red\]\/50\! {
     color: color-mix(in oklab, red 50%, transparent) !important;
   }
-  .text-blue-100 {
+  .text-amber-500 {
-    color: var(--color-blue-100);
+    color: var(--color-amber-500);
   }
   .text-blue-800 {
     color: var(--color-blue-800);
@@ -2508,9 +2526,15 @@
   .text-indigo-600 {
     color: var(--color-indigo-600);
   }
+  .text-red-500 {
+    color: var(--color-red-500);
+  }
   .text-red-600 {
     color: var(--color-red-600);
   }
+  .text-red-700 {
+    color: var(--color-red-700);
+  }
   .text-white {
     color: var(--color-white);
   }
@@ -3191,6 +3215,13 @@
       }
     }
   }
+  .hover\:text-co-blue\/80 {
+    &:hover {
+      @media (hover: hover) {
+        color: color-mix(in oklab, var(--color-co-blue) 80%, transparent);
+      }
+    }
+  }
   .hover\:text-co-green {
     &:hover {
       @media (hover: hover) {
@@ -3205,6 +3236,13 @@
       }
     }
   }
+  .hover\:text-co-red {
+    &:hover {
+      @media (hover: hover) {
+        color: var(--color-co-red);
+      }
+    }
+  }
   .hover\:text-co-red\/80 {
     &:hover {
       @media (hover: hover) {
@@ -3240,13 +3278,6 @@
       }
     }
   }
-  .hover\:text-green-800 {
-    &:hover {
-      @media (hover: hover) {
-        color: var(--color-green-800);
-      }
-    }
-  }
   .hover\:text-inherit {
     &:hover {
       @media (hover: hover) {
@@ -3308,6 +3339,11 @@
       border-color: transparent;
     }
   }
+  .focus\:bg-white {
+    &:focus {
+      background-color: var(--color-white);
+    }
+  }
   .focus\:placeholder-gray-400 {
     &:focus {
       &::placeholder {
@@ -4071,13 +4107,32 @@
   src: url("https://coopgo.fr/fonts/manometer.woff2") format("woff2"), url("/fonts/manometer.woff") format("woff");
 }
 @font-face {
-  font-family: "Bitter";
+  font-family: "Poppins";
   font-style: normal;
-  src: url("https://coopgo.fr/fonts/Bitter-Regular.woff") format("woff");
+  font-weight: 400;
+  src: url("/public/fonts/Poppins-Regular.woff2") format("woff2");
+}
+@font-face {
+  font-family: "Poppins";
+  font-style: normal;
+  font-weight: 500;
+  src: url("/public/fonts/Poppins-Medium.woff2") format("woff2");
+}
+@font-face {
+  font-family: "Poppins";
+  font-style: normal;
+  font-weight: 600;
+  src: url("/public/fonts/Poppins-SemiBold.woff2") format("woff2");
+}
+@font-face {
+  font-family: "Poppins";
+  font-style: normal;
+  font-weight: 700;
+  src: url("/public/fonts/Poppins-Bold.woff2") format("woff2");
 }
 @layer base {
   html {
-    font-family: Bitter, serif;
+    font-family: Poppins, sans-serif;
   }
   input {
     padding: 2px;
@@ -4180,48 +4235,6 @@
   inherits: false;
   initial-value: 0;
 }
-@property --tw-gradient-position {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-gradient-from {
-  syntax: "<color>";
-  inherits: false;
-  initial-value: #0000;
-}
-@property --tw-gradient-via {
-  syntax: "<color>";
-  inherits: false;
-  initial-value: #0000;
-}
-@property --tw-gradient-to {
-  syntax: "<color>";
-  inherits: false;
-  initial-value: #0000;
-}
-@property --tw-gradient-stops {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-gradient-via-stops {
-  syntax: "*";
-  inherits: false;
-}
-@property --tw-gradient-from-position {
-  syntax: "<length-percentage>";
-  inherits: false;
-  initial-value: 0%;
-}
-@property --tw-gradient-via-position {
-  syntax: "<length-percentage>";
-  inherits: false;
-  initial-value: 50%;
-}
-@property --tw-gradient-to-position {
-  syntax: "<length-percentage>";
-  inherits: false;
-  initial-value: 100%;
-}
 @property --tw-leading {
   syntax: "*";
   inherits: false;