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 @@
- Véhicules + Véhicules

{{len .ViewState.bookings}} réservations de véhicules

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"> - Votre profil - Paramètres - + Se déconnecter 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"> - + {{end}} 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 @@

Certains champs de sont pas valides.

- + 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 @@ Véhicule + + Prescripteur + + + Gestionnaire + Beneficiaire @@ -60,11 +66,32 @@ {{end}} -
Voiture
+
{{(index $.ViewState.vehicles_map .Vehicleid).Type}}
-
{{.Vehicle.Data.name}}
+
{{(index $.ViewState.vehicles_map .Vehicleid).Data.licence_plate}}
+ + + {{if .Data.booked_by}} + {{if .Data.booked_by.user}} + + + {{.Data.booked_by.user.display_name}} + + {{end}} + {{if .Data.booked_by.group}} + ({{.Data.booked_by.group.name}}) + {{end}} + {{end}} + + + + + {{ (index $.ViewState.groups_map (index (index $.ViewState.vehicles_map .Vehicleid).Administrators 0)).Data.name }} + + {{if not .Data.administrator_unavailability}}