From 7220c4e3505c8e4a3f7d3d162f85c86999e4f840 Mon Sep 17 00:00:00 2001
From: Arnaud Delcasse <arnaud.delcasse@coopgo.fr>
Date: Tue, 17 Jan 2023 08:26:46 +0100
Subject: [PATCH] Add Vehicles states in admin

---
 config.yaml                                   |  6 ++--
 web/layouts/administration/home.html          |  2 +-
 web/layouts/layout.html                       |  8 ++---
 .../{conseillers => members}/display.html     |  4 ++-
 .../{conseillers => members}/update.html      |  2 +-
 web/layouts/vehicles/bookings-list.html       | 31 +++++++++++++++++--
 6 files changed, 41 insertions(+), 12 deletions(-)
 rename web/layouts/{conseillers => members}/display.html (95%)
 rename web/layouts/{conseillers => members}/update.html (99%)

diff --git a/config.yaml b/config.yaml
index dd9f1b3..9344cc3 100644
--- a/config.yaml
+++ b/config.yaml
@@ -33,13 +33,13 @@ views:
       files:
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/beneficiaries/update.html
-  conseillers:
+  members:
     display:
       files:
-        - web/layouts/conseillers/display.html
+        - web/layouts/members/display.html
     update:
       files:
-        - web/layouts/conseillers/update.html
+        - web/layouts/members/update.html
   vehicles:
     search: 
       files: 
diff --git a/web/layouts/administration/home.html b/web/layouts/administration/home.html
index 7e17eb8..8c47e1f 100644
--- a/web/layouts/administration/home.html
+++ b/web/layouts/administration/home.html
@@ -56,7 +56,7 @@
       <div
         class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate">
         <div class="flex-1 px-4 py-2 text-sm truncate">
-          <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Véhicules</a>
+          <a href="/app/administration/stats/vehicles" class="text-gray-900 font-medium hover:text-gray-600">Véhicules</a>
           <p class="text-gray-500">{{len .ViewState.bookings}} réservations de véhicules</p>
         </div>
       </div>
diff --git a/web/layouts/layout.html b/web/layouts/layout.html
index 9e8f2f0..126af02 100644
--- a/web/layouts/layout.html
+++ b/web/layouts/layout.html
@@ -151,14 +151,14 @@
               x-transition:leave-start="transform opacity-100 scale-100"
               x-transition:leave-end="transform opacity-0 scale-95">
               <!-- Active: "bg-gray-100", Not Active: "" -->
-              <a href="/app/profile/{{.UserID}}" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <a href="/app/members/{{.UserID}}" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
                 id="user-menu-item-0">Votre profil</a>
 
-              <a href="/app/profile/{{.UserID}}/update" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <a href="/app/members/{{.UserID}}/update" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
                 id="user-menu-item-1">Paramètres</a>
 
-              <!-- <a href="/app/disconnect" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
-                id="user-menu-item-2">Se déconnecter</a> -->
+              <a href="/auth/disconnect" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+                id="user-menu-item-2">Se déconnecter</a>
             </div>
           </div>
         </div>
diff --git a/web/layouts/conseillers/display.html b/web/layouts/members/display.html
similarity index 95%
rename from web/layouts/conseillers/display.html
rename to web/layouts/members/display.html
index eb72713..2d8d487 100644
--- a/web/layouts/conseillers/display.html
+++ b/web/layouts/members/display.html
@@ -18,8 +18,10 @@
         class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
         <!-- <button type="button"
             class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
-        <a href="/app/profile/{{.ViewState.admins.ID}}/update" class="inline-flex"><button type="button"
+            {{if eq .UserID .ViewState.admins.ID}}
+            <a href="/app/members/{{.ViewState.admins.ID}}/update" class="inline-flex"><button type="button"
                 class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
+            {{end}}
     </div>
     </div>
 
diff --git a/web/layouts/conseillers/update.html b/web/layouts/members/update.html
similarity index 99%
rename from web/layouts/conseillers/update.html
rename to web/layouts/members/update.html
index 82afce3..b7b28b0 100644
--- a/web/layouts/conseillers/update.html
+++ b/web/layouts/members/update.html
@@ -119,7 +119,7 @@
 
         <div class="flex justify-end">
             <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>
-            <a href="/app/profile/{{.ViewState.ID}}">
+            <a href="/app/members/{{.ViewState.ID}}">
                 <button type="button"
                     class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
             </a>
diff --git a/web/layouts/vehicles/bookings-list.html b/web/layouts/vehicles/bookings-list.html
index a8e6726..8d6a14d 100644
--- a/web/layouts/vehicles/bookings-list.html
+++ b/web/layouts/vehicles/bookings-list.html
@@ -21,6 +21,12 @@
                                 <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Véhicule
                                 </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Prescripteur
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Gestionnaire
+                                </th>
                                 <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Beneficiaire
                                 </th>
@@ -60,11 +66,32 @@
                                     {{end}}
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >Voiture</div>
+                                    <div class="text-gray-900" >{{(index $.ViewState.vehicles_map .Vehicleid).Type}}</div>
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >{{.Vehicle.Data.name}}</div>
+                                    <div class="text-gray-900" >{{(index $.ViewState.vehicles_map .Vehicleid).Data.licence_plate}}</div>
                                 </td>
+                                
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                {{if .Data.booked_by}}
+                                {{if .Data.booked_by.user}}
+                                <a href="/app/members/{{.Data.booked_by.user.id}}" class="flex inline">
+                                    <img class="h-5 w-5 rounded-co mr-1"
+                                        src="/app/members/{{.Data.booked_by.user.id}}/picture" alt="">
+                                    {{.Data.booked_by.user.display_name}} 
+                                </a>
+                                {{end}}
+                                {{if .Data.booked_by.group}}
+                                ({{.Data.booked_by.group.name}})
+                                {{end}}
+                                {{end}}
+                                </td>
+
+
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{ (index $.ViewState.groups_map (index (index $.ViewState.vehicles_map .Vehicleid).Administrators 0)).Data.name }}
+                                </td>
+
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     {{if not .Data.administrator_unavailability}}
                                     <div class="text-gray-900" ><img class="h-6 w-6 rounded-co"