From 669d7e4e7bff08334bca5164d3792516be5878dd Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 5 May 2023 09:13:04 +0200
Subject: [PATCH 1/8] fix config file

---
 config.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config.yaml b/config.yaml
index aad114f..1b17b2e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -78,6 +78,7 @@ views:
     fleet_update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/vehicles_management/_partials/vehicle-type-select.html
         - web/layouts/vehicles_management/fleet-update.html
     booking_display: 

From 89af48389afcb0a9e278d76c1ad0e0328439cd12 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 5 May 2023 09:15:32 +0200
Subject: [PATCH 2/8] add modify button

---
 web/layouts/vehicles_management/fleet-display.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/layouts/vehicles_management/fleet-display.html b/web/layouts/vehicles_management/fleet-display.html
index 6373c3e..90918cf 100644
--- a/web/layouts/vehicles_management/fleet-display.html
+++ b/web/layouts/vehicles_management/fleet-display.html
@@ -14,10 +14,10 @@
                 </div>
             </div>
             <div 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">
+                <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.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>
                 <button type="button" @click="dialog = !dialog"
                     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">Retirer de la flotte</button>
-                <!-- <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.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> -->
             </div>
         </div>
         <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">

From 6c5c25a9925886716bf86f5666df01c242692c48 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 5 May 2023 09:18:28 +0200
Subject: [PATCH 3/8] add the update file

---
 .../vehicles_management/fleet-update.html     | 106 ------------------
 1 file changed, 106 deletions(-)

diff --git a/web/layouts/vehicles_management/fleet-update.html b/web/layouts/vehicles_management/fleet-update.html
index 88b6770..e69de29 100644
--- a/web/layouts/vehicles_management/fleet-update.html
+++ b/web/layouts/vehicles_management/fleet-update.html
@@ -1,106 +0,0 @@
-{{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">Modifier un véhicule</h1>
-</div>
-
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8" x-data="{
-        fields: {
-            licence_plate: '{{ .ViewState.vehicle.Data.licence_plate }}',
-            name: '{{ .ViewState.vehicle.Data.name }}',
-        },
-        rules: {
-            licence_plate: ['required', 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'],
-            name: ['required'],
-        },
-        formValidation: {
-            valid: false,
-            fields: {
-                name: {valid: null},
-                licence_plate: {valid: null},
-            }
-        },
-        isFormValid: true,
-        validate() {
-            this.formValidation = Iodine.assert(this.fields, this.rules)
-        },
-        validateField(field) {
-            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
-        },
-        submit(event) {
-            this.validate()
-            if(!this.formValidation.valid) {
-                this.isFormValid = false
-                event.preventDefault()
-            }
-            return this.formValidation.valid
-        }
-    }">
-    <form class="space-y-6" method="POST" @submit="submit">
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Identité du véhicule</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations de base sur le véhicule</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    <div class="grid grid-cols-3 md:grid-cols-6 gap-6">
-                        <div class="col-span-5">
-                            <label for="name" class="block text-sm font-medium text-gray-700">Modèle (ou nom donné au
-                                véhicule)</label>
-                            <input type="text" name="name" id="name"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.name" @blur="validateField('name')"
-                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                        <div class="col-span-3">
-                            {{template "vehicle_type_select" .}}
-                        </div>
-                        <div class="col-span-3">
-                            <label for="licence_plate"
-                                class="block text-sm font-medium text-gray-700">Immatriculation</label>
-                            <input type="text" name="licence_plate" id="licence_plate" placeholder="XX-123-YY"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.licence_plate"
-                                @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')"
-                                :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
-            <div class="md:grid md:grid-cols-3 md:gap-6">
-                <div class="md:col-span-1">
-                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations pratiques</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations pratiques pour la réservation</p>
-                </div>
-                <div class="mt-5 md:mt-0 md:col-span-2">
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.vehicle.Data.address) }}
-
-                    <div class="mt-5">
-                        <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques pour le bénéficiaire</label>
-                        <div class="mt-1">
-                            <textarea rows="4" name="informations" id="informations"
-                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <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/vehicles-management/fleet/{{.ViewState.vehicle.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>
-            <button type="submit"
-                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Modifier
-                le véhicule</button>
-        </div>
-    </form>
-</div>
-{{end}}
\ No newline at end of file

From e5fc2bcfb58fbba46e789459af5bb229f8bd4ecc Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 5 May 2023 09:18:57 +0200
Subject: [PATCH 4/8] add the update file

---
 .../vehicles_management/fleet-update.html     | 110 ++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/web/layouts/vehicles_management/fleet-update.html b/web/layouts/vehicles_management/fleet-update.html
index e69de29..418cf9a 100644
--- a/web/layouts/vehicles_management/fleet-update.html
+++ b/web/layouts/vehicles_management/fleet-update.html
@@ -0,0 +1,110 @@
+{{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">Modifier un véhicule</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8" x-data="{
+        fields: {
+            licence_plate: '{{ .ViewState.vehicle.Data.licence_plate }}',
+            name: '{{ .ViewState.vehicle.Data.name }}',
+        },
+        rules: {
+            licence_plate: ['required', 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'],
+            name: ['required'],
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+                licence_plate: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+        },
+        validateField(field) {
+            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
+        },
+        submit(event) {
+            this.validate()
+            if(!this.formValidation.valid) {
+                this.isFormValid = false
+                event.preventDefault()
+            }
+            return this.formValidation.valid
+        }
+    }">
+    <form class="space-y-6" method="POST" @submit="submit">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Identité du véhicule</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations de base sur le véhicule</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-3 md:grid-cols-6 gap-6">
+                        <div class="col-span-5">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Modèle (ou nom donné au
+                                véhicule)</label>
+                            <input type="text" name="name" id="name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.name" @blur="validateField('name')"
+                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                        <div class="col-span-3">
+                            {{template "vehicle_type_select" .}}
+                        </div>
+                        <div class="col-span-3">
+                            <label for="licence_plate"
+                                class="block text-sm font-medium text-gray-700">Immatriculation</label>
+                            <input type="text" name="licence_plate" id="licence_plate" placeholder="XX-123-YY"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.licence_plate"
+                                @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')"
+                                :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations pratiques</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations pratiques pour la réservation</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    {{ $fieldName := "address" }} 
+                    {{if .ViewState.vehicle.Data.address}}
+                    {{$default := .ViewState.vehicle.Data.address}}
+                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                    {{else}}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                    {{end}}
+                    <div class="mt-5">
+                        <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques pour le bénéficiaire</label>
+                        <div class="mt-1">
+                            <textarea rows="4" name="informations" id="informations" value="{{.ViewState.vehicle.Data.informations}}"
+                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">{{ if .ViewState.vehicle.Data.informations}} {{.ViewState.vehicle.Data.informations}} {{end}}</textarea>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <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/vehicles-management/fleet/{{.ViewState.vehicle.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>
+            <button type="submit"
+                class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Modifier
+                le véhicule</button>
+        </div>
+    </form>
+</div>
+{{end}}
\ No newline at end of file

From e5dae2d18f2a572b554f057199bb63dc00c01443 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 5 May 2023 10:22:08 +0200
Subject: [PATCH 5/8] allow modify option just for owners

---
 web/layouts/vehicles_management/fleet-display.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/layouts/vehicles_management/fleet-display.html b/web/layouts/vehicles_management/fleet-display.html
index 90918cf..df57749 100644
--- a/web/layouts/vehicles_management/fleet-display.html
+++ b/web/layouts/vehicles_management/fleet-display.html
@@ -1,4 +1,5 @@
 {{define "content"}}
+
 <div x-data="{dialog: false}">
     <main class="py-10">
         <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
@@ -13,9 +14,10 @@
                     <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.vehicle.Data.name}}</h1>
                 </div>
             </div>
+            {{ if eq (index .ViewState.vehicle.Administrators 0) .Group.ID }}
             <div 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">
                 <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.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>
+                    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}}
                 <button type="button" @click="dialog = !dialog"
                     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">Retirer de la flotte</button>
             </div>

From 5950599bdbf7b9a75f647df1f9480b2ab5cbc7e7 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 5 May 2023 10:22:42 +0200
Subject: [PATCH 6/8] allow modification for owners

---
 .../vehicles_management/fleet-update.html     | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/web/layouts/vehicles_management/fleet-update.html b/web/layouts/vehicles_management/fleet-update.html
index 418cf9a..e4fc82a 100644
--- a/web/layouts/vehicles_management/fleet-update.html
+++ b/web/layouts/vehicles_management/fleet-update.html
@@ -1,5 +1,6 @@
 {{define "content"}}
 
+{{ if eq (index .ViewState.vehicle.Administrators 0) .Group.ID }}
 
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <h1 class="text-2xl font-semibold text-gray-900">Modifier un véhicule</h1>
@@ -107,4 +108,29 @@
         </div>
     </form>
 </div>
+
+{{else}}
+ <div class="fixed inset-0 bg-gray-500 bg-opacity-75 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-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
+     <div>
+         <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
+         {{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
+         </div>
+         <div class="mt-3 text-center sm:mt-5">
+             <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Vous n'avez pas le droit de modifier ce véhicule</h3>
+         </div>
+     </div>
+     <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
+        <!-- class="flex justify-center items-center py-2 px-3 border-t dark:border-gray-600 -->
+         <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.ID}}" class="rounded-2xl mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
+         <!-- <button type="submit" class="inline-flex w-full justify-center rounded-r-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:col-start-2 sm:text-sm">Confirmation</button> -->
+     </div>
+     </div>
+ </div>
+ </div>
+{{end}}
 {{end}}
\ No newline at end of file

From 83ae4665f0f5e84ae8ee1b83ccb1f088f3ef36d6 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 5 May 2023 10:42:55 +0200
Subject: [PATCH 7/8] fix the group settings

---
 config.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/config.yaml b/config.yaml
index 1b17b2e..a144890 100644
--- a/config.yaml
+++ b/config.yaml
@@ -43,6 +43,12 @@ views:
     list:
       files:
         - web/layouts/members/membersList.html
+  group:
+    settings:
+      files:
+        - web/layouts/administration/_partials/groups_admins.html
+        - web/layouts/administration/_partials/group_members.html
+        - web/layouts/group/settings.html
   vehicles:
     search: 
       files: 

From eec5afdf39357d48968657129d3e6afe480ac50b Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Tue, 9 May 2023 12:13:14 +0200
Subject: [PATCH 8/8] fix the modify address

---
 config.yaml                           |  1 +
 web/layouts/beneficiaries/update.html | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/config.yaml b/config.yaml
index a144890..cddab5e 100644
--- a/config.yaml
+++ b/config.yaml
@@ -32,6 +32,7 @@ views:
     update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/beneficiaries/update.html
   members:
     display:
diff --git a/web/layouts/beneficiaries/update.html b/web/layouts/beneficiaries/update.html
index da1b4c9..eacda1c 100644
--- a/web/layouts/beneficiaries/update.html
+++ b/web/layouts/beneficiaries/update.html
@@ -162,9 +162,13 @@
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
 
-                    {{ $fieldName := "address" }}
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.Data.address) }}
-                    <!-- will dolater : tags, groups, ... -->
+                        {{ $fieldName := "address" }} 
+                        {{if .ViewState.Data.address}}
+                        {{$default := .ViewState.Data.address}}
+                        {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                        {{else}}
+                        {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                        {{end}}
 
                 </div>
             </div>