From 405038be3a2454acbd6fcfef277b4eaa69343093 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 4 Jan 2023 12:09:51 +0100
Subject: [PATCH 01/55] add depart and destination for members in the 
 groupscovoiturage

---
 config.yaml                              |   1 +
 web/layouts/journeys/display_groups.html | 148 +++++++++++++----------
 2 files changed, 83 insertions(+), 66 deletions(-)

diff --git a/config.yaml b/config.yaml
index 8121a11..3169bf2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -114,6 +114,7 @@ views:
       files:
         - web/layouts/journeys/display_groups.html
         - web/layouts/journeys/_partials/map.html
+        - web/layouts/_partials/address_autocomplete.html
   support:
     request:
       files:
diff --git a/web/layouts/journeys/display_groups.html b/web/layouts/journeys/display_groups.html
index 90c2641..a9ce09c 100644
--- a/web/layouts/journeys/display_groups.html
+++ b/web/layouts/journeys/display_groups.html
@@ -122,6 +122,87 @@
                        
                     </div>
                 </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-1">
+                <div class="space-y-6 lg:col-start-1 lg:col-span-1">
+                  
+                    <div class="bg-white shadow sm:rounded-2xl">
+                        <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Ajouter un passager</h2>
+                        <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                            <form method="GET" >
+                            <div x-data="{
+                                text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
+                                beneficiariesListOpen: false,
+                                beneficiaries: {{json .ViewState.beneficiaries}},
+                                filteredBeneficiaries: (text) => {
+                                    if(text=='') return beneficiaries
+                                    return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
+                                },
+                                fields: {
+                                    beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
+                                },
+                                selectbeneficiary(beneficiary) {
+                                    console.log(beneficiary)
+                                    this.fields.beneficiaryid = beneficiary.id 
+                                    this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
+                                    this.beneficiariesListOpen = false
+                                }
+                            }">
+                                <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
+                                <label for="combobox" class="block text-sm font-medium text-gray-700">Passager</label>
+                                <div class="relative mt-1 mb-4">
+                                  <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
+                                  
+                                  <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
+                                 
+                                    <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                      <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
+                                    </svg>
+                                  </button>
+                              
+                                  <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
+                                  
+                                    <template x-for="beneficiary in beneficiaries">
+                                        <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
+                                      
+                                        <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
+                                
+                                        <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
+                                        
+                                        </span>
+                                        </li>
+                                    </template>
+                              
+                                 
+                                  </ul>
+                                </div>
+                                <div class="space-y-6 lg:col-start-1 lg:col-span-1 ">
+            
+                                    {{ $departureField := "departure" }}
+                                    {{ $departureLabel := "Départ" }}
+                                    {{ $departure := .ViewState.departure }}
+                                    {{ template "address_autocomplete" dict "FieldName" $departureField "FieldLabel" $departureLabel "Address" $departure }}
+                
+                                    {{ $destinationField := "destination" }}
+                                    {{ $destinationLabel := "Destination" }}
+                                    {{ $destination := .ViewState.destination }}
+                                    {{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel "Address" $destination }}
+                                   
+                
+                                </div>
+                              </div>
+                            
+                                <button type="submit"
+                                    class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
+                                    Ajouter
+                                </button>
+                           
+                            </form>
+                        </div>
+                    </div>
+                    
+                </div>
             </div>
             
         </div>
@@ -272,72 +353,7 @@
     </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">
-    <div class="space-y-6 lg:col-start-1 lg:col-span-1">
-      
-        <div class="bg-white shadow sm:rounded-2xl">
-            <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Ajouter un passager</h2>
-            <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
-                <form method="GET" >
-                <div x-data="{
-                    text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
-                    beneficiariesListOpen: false,
-                    beneficiaries: {{json .ViewState.beneficiaries}},
-                    filteredBeneficiaries: (text) => {
-                        if(text=='') return beneficiaries
-                        return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
-                    },
-                    fields: {
-                        beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
-                    },
-                    selectbeneficiary(beneficiary) {
-                        console.log(beneficiary)
-                        this.fields.beneficiaryid = beneficiary.id 
-                        this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                        this.beneficiariesListOpen = false
-                    }
-                }">
-                    <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
-                    <label for="combobox" class="block text-sm font-medium text-gray-700">Passager</label>
-                    <div class="relative mt-1 mb-4">
-                      <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
-                      
-                      <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
-                     
-                        <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                          <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
-                        </svg>
-                      </button>
-                  
-                      <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
-                      
-                        <template x-for="beneficiary in beneficiaries">
-                            <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
-                          
-                            <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
-                    
-                            <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                            
-                            </span>
-                            </li>
-                        </template>
-                  
-                     
-                      </ul>
-                    </div>
-                  </div>
-                
-                    <button type="submit"
-                        class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-                        Ajouter
-                    </button>
-               
-                </form>
-            </div>
-        </div>
-        
-    </div>
-</div>
+<!--  -->
 
 </div>
 

From ac413680e05556b3bb8a62934f93b45126bca5e7 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 4 Jan 2023 16:08:08 +0100
Subject: [PATCH 02/55] fix config.yaml to stock address

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

diff --git a/config.yaml b/config.yaml
index 3169bf2..4fb3c52 100644
--- a/config.yaml
+++ b/config.yaml
@@ -112,9 +112,9 @@ views:
         - web/layouts/_partials/address_autocomplete.html
     display:
       files:
+        - web/layouts/_partials/address_autocomplete.html
         - web/layouts/journeys/display_groups.html
         - web/layouts/journeys/_partials/map.html
-        - web/layouts/_partials/address_autocomplete.html
   support:
     request:
       files:

From e5382917cdd7e2f245385038a319ff7e71864341 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Tue, 17 Jan 2023 15:09:41 +0100
Subject: [PATCH 03/55] modify some style and add the update file to delete
 passenger

---
 config.yaml                                |   3 +
 web/layouts/journeys/_partials/map.html    |  47 ++++--
 web/layouts/journeys/create_groups.html    |  58 +++----
 web/layouts/journeys/display_groups.html   | 172 ++++++++-------------
 web/layouts/journeys/group_management.html |  12 +-
 web/layouts/journeys/update_groups.html    |  32 ++++
 6 files changed, 152 insertions(+), 172 deletions(-)
 create mode 100644 web/layouts/journeys/update_groups.html

diff --git a/config.yaml b/config.yaml
index 4fb3c52..8f107ed 100644
--- a/config.yaml
+++ b/config.yaml
@@ -115,6 +115,9 @@ views:
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/journeys/display_groups.html
         - web/layouts/journeys/_partials/map.html
+    update:
+      files:
+        - web/layouts/journeys/update_groups.html
   support:
     request:
       files:
diff --git a/web/layouts/journeys/_partials/map.html b/web/layouts/journeys/_partials/map.html
index 61c0f49..3b8e1ae 100644
--- a/web/layouts/journeys/_partials/map.html
+++ b/web/layouts/journeys/_partials/map.html
@@ -25,6 +25,11 @@
 	<input id="ar" type="hidden" value="{{.ViewState.group.Data.arrive.geometry.coordinates}}">
 	<input id="des" type="hidden" value="{{.ViewState.group.Data.depart.geometry.coordinates}}">
 	<input id="arri" type="hidden" value="{{.ViewState.group.Data.arrive.geometry.coordinates}}">
+    {{range .ViewState.beneficiaries}}                   
+    {{if (index $.ViewState.groups .ID) }}
+    <input id="passager"  type="hidden"value="{{(index $.ViewState.groups .ID).Data.depart.geometry.coordinates}}">
+    {{end}}
+    {{end}}
 
 <div>
         <span id="polyline-info-content"></span>
@@ -100,7 +105,7 @@ function errorRoute() {
 		 var br = (wwr[0])
          destCoord = [r, br]
         map.setZoom(9);
-        //console.log("Ici : " [depCoord[0],depCoord[1]],[destCoord[0],destCoord[1]])
+       
         map.fitBounds([[depCoord[0],depCoord[1]],[destCoord[0],destCoord[1]]],{padding: 40});   
 }
 
@@ -115,10 +120,8 @@ function errorRoute() {
         if (rideDuration != null && rideDistance != null) {
             document.getElementById("polyline-info-content").innerHTML = "Durée : " + (Math.round(((rideDuration / 60) + Number.EPSILON) * 100) / 100) + " min<br/>Distance : " + rideDistance + " km";
         }
-        // $("#polyline-str").val(polylineString);
-        // $("#ride-duration").val(rideDuration);
-        // $("#ride-distance").val(rideDistance);
-        console.log("rideDuration :", rideDuration, ", rideDistance ",rideDistance)
+       
+        // console.log("rideDuration :", rideDuration, ", rideDistance ",rideDistance)
         if(polylineCoord != null && polylineCoord.length > 0 ){
         
             drawPolylineOnMap(polylineCoord)
@@ -130,10 +133,9 @@ function createPolyline() {
 
     destination = [r, br]
 
-    console.log("origin : ", origin)
 
     if(origin != null && destination != null && origin != "" && destination != ""){
-        console.log("Get polyline infos")
+       
         var hash_locs = [];
         hash_locs.push({
             'lat' : (origin[1]),
@@ -156,17 +158,15 @@ function createPolyline() {
             success : retrievePolylineInfo,
             error: routeNotOptimized(body),
         });
-        console.log("JSON.stringify(body)",JSON.stringify(body))
+      
     }
 }
             var depCoord = []
             var destCoord = []
+            var other = []
             var a, b
             depCoord = [a, b]
-            console.log("yeeesss: ", a)
-            //////////////////////////////
-            
-        //mapboxgl.accessToken = 'pk.eyJ1Ijoic291a2FpbmFsYWZkaWxpIiwiYSI6ImNsYjB1djUxNjAwaWQzdm82dnJ5OXJrZzcifQ.0i8xkskwRps3W1PFwApL_Q';
+           
         const map = new maplibregl.Map({
             container: 'map', 
             style: 'https://api.maptiler.com/maps/streets/style.json?key=get_your_own_OpIi9ZULNHzrESv6T2vL', 
@@ -175,9 +175,24 @@ function createPolyline() {
         });
         map.addControl(new maplibregl.NavigationControl(), 'bottom-right');
         var markers = []
+        var pass = []
 
+        //////////////////Code to add position in the map///////////////
+        var ii = document.querySelectorAll("#passager")
+        for (var i = 0; i < ii.length; i++){
+            var v = ii[i].value
+            var val = ii[i].value.split(' ')
+            const wl = val[0].split('[')
+            const wwl = val[1].split(']')
+            al = (wl[1]);
+            bl = (wwl[0])
+            other = [al, bl]
+            {var marker = new maplibregl.Marker()
+            .setLngLat([al, bl])//position of passager
+            .addTo(map);
+            pass.push(marker)}
+        }
 
-		//destination
 		 var i = document.getElementById('de').value
 		var words = i.split(' ');
 		 const w = words[0].split('[')
@@ -185,8 +200,6 @@ function createPolyline() {
 		 a = (w[1]);
 		 b = (ww[0])
          depCoord = [a, b]
-         console.log("yeeesss: ", depCoord[0])
-		 console.log(b)
 		//arrive
 		var ar = document.getElementById('ar').value
 		var wordsr = ar.split(' ');
@@ -195,7 +208,7 @@ function createPolyline() {
 		 var r = (wr[1]);
 		 var br = (wwr[0])
          destCoord = [r, br]
-		 console.log(br)
+		
 		 /////
 		{var marker = new maplibregl.Marker();
 		marker.setLngLat([a, b])//starting position
@@ -205,7 +218,7 @@ function createPolyline() {
         center: [a, b]
        
     });
-    console.log("again: ", a , b)
+   
     markers.push(marker)
   createPolyline()
 }
diff --git a/web/layouts/journeys/create_groups.html b/web/layouts/journeys/create_groups.html
index 433ead7..c8eb5b8 100644
--- a/web/layouts/journeys/create_groups.html
+++ b/web/layouts/journeys/create_groups.html
@@ -63,7 +63,7 @@
                         </div>
                         <div class="col-span-5">
                             <label for="name" class="block text-sm font-medium text-gray-700">Nombre maximum de personne</label>
-                            <input type="text" name="number" id="number"
+                            <input type="number" name="number" id="number"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                 x-model="fields.number" @blur="validateField('number')"
                                 :class="formValidation.fields.number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
@@ -157,53 +157,31 @@
                     <p class="mt-1 text-sm text-gray-500">Informations liés a la planification de groupe, veuillez cocher la solution qui vous convient </p>
                 </div>
             
-        <div class="mt-5 md:mt-0 md:col-span-2">
-            <!-- <div class="flex items-start">
-                <div class="flex items-center h-5">
-                    <input id="ponctuelleuelle" name="ponctuelleuelle" type="checkbox"
-                        class="focus:ring-co-blue h-4 w-4 text-co-blue border-gray-300 rounded">
-                </div>
-                <div class="ml-3 text-sm">
-                    <label for="ponctuelleuelle" class=" text-lg font-medium leading-6 text-gray-900">ponctuelleuelle</label>
-                   
-                </div>
-            </div> -->
-            <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
+    <div class="mt-5 md:mt-0 md:col-span-2">
             <div x-data="{selectedListID: ''}" x-init="$watch('selectedListID', value => console.log(value))">
             <input type="radio" value="recurrent" x-model="selectedListID">&nbsp Recurrent &nbsp&nbsp
             <input type="radio"  value="ponctuelle" x-model="selectedListID">&nbsp Ponctuelle
-            <!-- <p>value: <span x-text="selectedListID" name="selectedListID"></span></p> -->
+   
+        <input id="t" :name="selectedListID" type="hidden" :value="selectedListID">
 
-           
-<!-- <div x-data="{lists: [{id: 'ponctuelle', name: 'ponctuelle'}, {id: 'recurrent', name: 'recurrent'}], selectedListID: ''}">
-    <template x-for="list in lists" :key="list.id">
-      <div>
-        <input x-model="selectedListID" type="radio" :value="list.id.toString()" :id="list.name" >
-        <label :for="list.name" x-text="list.name"></label>
-      </div>
-    </template> -->
-    <input id="t" :name="selectedListID" type="hidden" :value="selectedListID">
+        <div class="sm:col-span-6"  x-show="selectedListID == 'ponctuelle'" >
+            <div class="py-4 grid grid-cols-2">
+                <div class="lg:col-span-1">
+                    <label for="departdate" class="block text-sm font-medium text-gray-700">le</label>
+                    <div class="mt-1">
+                        <input type="date" id="departdate" name="departdate"
+                            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" class="sr-only">
+                    </div>
 
-    <!-- <p name="selectedListID">Selected value: <code x-text="selectedListID" ></code></p> -->
-    <!-- ******************************* -->
-    <div class="sm:col-span-6"  x-show="selectedListID == 'ponctuelle'" >
-        <div class="py-4 grid grid-cols-2">
-            <div class="lg:col-span-1">
-                <label for="departdate" class="block text-sm font-medium text-gray-700">le</label>
-                <div class="mt-1">
-                    <input type="date" id="departdate" name="departdate"
-                        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" class="sr-only">
                 </div>
-
-            </div>
-            <div class="lg:col-span-1">
-                <label for="departtime" class="block text-sm font-medium text-gray-700">A</label>
-                <div class="mt-1">
-                    <input type="time" id="departtime" name="departtime"
-                        class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
+                <div class="lg:col-span-1">
+                    <label for="departtime" class="block text-sm font-medium text-gray-700">A</label>
+                    <div class="mt-1">
+                        <input type="time" id="departtime" name="departtime"
+                            class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-r-2xl border-l-0">
+                    </div>
                 </div>
             </div>
-         </div>
     </div>
     <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
     <div x-show="selectedListID == 'recurrent'">
diff --git a/web/layouts/journeys/display_groups.html b/web/layouts/journeys/display_groups.html
index a9ce09c..1a786df 100644
--- a/web/layouts/journeys/display_groups.html
+++ b/web/layouts/journeys/display_groups.html
@@ -1,5 +1,6 @@
 {{define "content"}}
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+<div x-data="{dialog: false, 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">Gestion du groupe</h1>
     <div class="sm:flex sm:items-center">
         <div class="sm:flex-auto">
@@ -124,12 +125,15 @@
                 </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-1">
                 <div class="space-y-6 lg:col-start-1 lg:col-span-1">
                   
                     <div class="bg-white shadow sm:rounded-2xl">
                         <h2 id="timeline-title" class="text-lg font-medium text-gray-900 p-4 sm:px-6">Ajouter un passager</h2>
+                      
                         <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                            {{if gt .ViewState.group.Data.number .ViewState.number}}
                             <form method="GET" >
                             <div x-data="{
                                 text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
@@ -197,39 +201,24 @@
                                     class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
                                     Ajouter
                                 </button>
-                           
+                                {{else}}
+                                <p>Vous avez atteint le nombre maximum de passagers</p>
+                                {{end}}
                             </form>
                         </div>
+                     
                     </div>
                     
                 </div>
+                
             </div>
             
         </div>
       
    
     <!-- *********************************** -->
-
-   
-    <div class="lg:col-start-2 lg:col-span-2" x-data="{
-        state: {{.ViewState.list.JSONWithLimits 0 10}},
-        current: 0,
-        nb_pages() {
-            let nbEl = this.state.count 
-            return Math.ceil(nbEl/10)
-        },
-        async paginate(page) {
-            let start = (page-1)*10
-            if(start < 0|| start > this.state.count) {
-                return
-            }
-            let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
-            let data = await resp.json()
-            this.state.beneficiaries = data
-            this.current=page-1
-            this.state.group = data
-        }
-    }">
+  
+    <div class="lg:col-start-2 lg:col-span-2">
     <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-2 mb-4">
         <div class="sm:flex sm:items-center">
             <div class="sm:flex-auto">
@@ -237,7 +226,6 @@
             </div>
         </div>
     </div>
-    <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
     
     <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8 mt-2">
     <!--  -->
@@ -253,107 +241,83 @@
                                 Nom du bénéficiaire
                             </th>
                             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-                                Téléphone
+                                Départ
                             </th>
                             <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-                                Email
+                                Déstination
+                            </th>
+                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                            
                             </th>
                         </tr>
                     </thead>
                     <tbody class="divide-y divide-gray-200 bg-white">
-                        <template x-for="beneficiary in state.beneficiaries">
+                        {{range .ViewState.beneficiaries}}
+                        
+                        {{if (index $.ViewState.groups .ID) }}
                             <tr>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="flex items-center">
-                                        <div class="ml-4">
-                                            <div class="font-medium text-gray-900"><span
-                                                    x-text="beneficiary.data.first_name"></span> <span
-                                                    x-text="beneficiary.data.last_name"></span></div>
+                                        <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>
+                                        <a :href="'/app/beneficiaries/' + `{{.ID}}`">
+                                            <div class="flex items-center">
+                                                
+                                                <div class="ml-4">
+                                                    <div class="text-co-blue hover:text-co-blue"><span
+                                                            >{{.Data.first_name}}</span> <span
+                                                            >{{.Data.last_name}}</span></div>
+                                                </div>
+                                            </div></a>
+                                </td>
+                               
+                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                  
+                                    {{if (index $.ViewState.groups .ID).Data.depart}}
+                                    <div class="text-gray-900" >{{(index $.ViewState.groups .ID).Data.depart.properties.label}}</div>
+                                    {{else}}
+                                    <div class="text-gray-900" >...</div>
+                                    {{end}}
+                                    
                                 </td>
                                 <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                    <div class="text-gray-900" x-text="beneficiary.data.phone_number"></div>
-                                </td>
-                                <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
-                                    x-text="beneficiary.data.email">
+                                    {{if (index $.ViewState.groups .ID).Data.arrive}}
+                                    <div class="text-gray-900" >{{(index $.ViewState.groups .ID).Data.arrive.properties.label}}</div>
+                                    {{else}}
+                                    <div class="text-gray-900" >...</div>
+                                    {{end}}
+                                  
                                 </td>
+                                
                                 <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
-                                    <template x-for="tag in beneficiary.data.tags">
-                                        <span
-                                            class="inline-flex rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-800"
-                                            x-text="tag"></span>
-                                    </template>
-                                </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/' + beneficiary.id"
-                                        class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
-                                                x-text="beneficiary.data.first_name"></span> <span
-                                                x-text="beneficiary.data.last_name"></span></a>
+                             
+                                   <a  :href="'/app/journeys/groups_covoiturage/create/{{(index $.ViewState.groups .ID).ID}}/{{(index $.ViewState.groups .ID).Groupid}}/{{(index $.ViewState.groups .ID).Memberid}}'">
+                                    <div class="flex items-center">
+                                                
+                                        <div class="ml-4">
+                                            <div class="text-co-blue hover:text-co-blue"><span
+                                                    >retirer</span> </div>
+                                        </div>
+                                   </a>
                                 </td>
                             </tr>
-                        </template>
-
-                    </tbody>
-                </table>
-                
-                <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
-                    <div class="flex-1 flex justify-between sm:hidden">
-                    <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
-                    @click="paginate(current)"> Previous </a>
-                    <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
-                    @click="paginate(current+2)"> Next </a>
-                    </div>
-                    <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
-                    <div>
-                        <p class="text-sm text-gray-700">
-                        Résultats
-                        <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
-                        à
-                        <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
-                        sur
-                        <span class="font-medium" x-text="state.count"></span>
-                        </p>
-                    </div>
-                    <div>
-                        <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
-                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
-                            @click="paginate(current)">
-                            <span class="sr-only">Previous</span>
-                            <!-- Heroicon name: solid/chevron-left -->
-                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                            <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
-                            </svg>
-                        </a>
-                        <template x-for="i in nb_pages">
-                            <a href="#" @click="paginate(i)"
-                            class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
-                            :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
-                            x-text="i"></a>
-                        </template>
-                        <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
-                        <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
-                            @click="paginate(current+2)">
-                            <span class="sr-only">Next</span>
-                            <!-- Heroicon name: solid/chevron-right -->
-                            <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
-                            <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
-                            </svg>
-                        </a>
-                        </nav>
-                    </div>
-                    </div>
+                     {{end}}
+                     
+                     {{end}}
+                        </tbody>
+                    </table>
                 </div>
             </div>
+        
         </div>
-      
-    </div>
-    </div>
+        </div>
+        </div>
+
     </div>
 
-</div>
-<!--  -->
+    </div>
 
 </div>
 
diff --git a/web/layouts/journeys/group_management.html b/web/layouts/journeys/group_management.html
index b316645..205a158 100644
--- a/web/layouts/journeys/group_management.html
+++ b/web/layouts/journeys/group_management.html
@@ -62,16 +62,7 @@
                             
                                     </div>
                                     <div class="ml-4">
-                                     
-                                        <!-- <div class="font-medium text-gray-900"> <span
-                                                x-text="beneficiary.data.name"></span> </div> -->
-                                                <!-- <div class="flex items-center font-medium text-gray-700 text-xl">
-                                                  {{$.IconSet.Icon "hero:outline/user-group" "flex-shrink-0 mr-1.5 h-5 w-5"}}
-                                                  <p>
-                                                    <span
-                                                x-text="beneficiary.data.name"></span>
-                                                  </p>
-                                                </div> -->
+                                  
                                                 <div class="truncate">
                                                   <div class="flex text-sm">
                                                     <p class="font-medium text-lg text-co-blue truncate" x-text="beneficiary.data.name"></p>
@@ -99,7 +90,6 @@
                         </tr>
                     </template>
 
-                    <!-- More people... -->
                 </tbody>
             </table>
             <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
diff --git a/web/layouts/journeys/update_groups.html b/web/layouts/journeys/update_groups.html
new file mode 100644
index 0000000..53c96d7
--- /dev/null
+++ b/web/layouts/journeys/update_groups.html
@@ -0,0 +1,32 @@
+{{define "content"}}
+<div>
+        <form method="POST">
+
+            <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">Confirmation de retrait</h3>
+                        <div class="mt-2">
+                            <p class="text-sm text-gray-500">Vous etes sur de retirer ce passager </p>
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
+                    <a href="/app/journeys/groups_covoiturage/create/{{.ViewState.groupid}}" class="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>
+        </form>
+
+ </div>
+{{end}}
\ No newline at end of file

From 3345eb156030c6d62e5d2cbc55fff0efaa0a10a8 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 18 Jan 2023 14:17:28 +0100
Subject: [PATCH 04/55] fix url page profileMember

---
 web/layouts/administration/_partials/groups_admins.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/layouts/administration/_partials/groups_admins.html b/web/layouts/administration/_partials/groups_admins.html
index 2debd04..469ae40 100644
--- a/web/layouts/administration/_partials/groups_admins.html
+++ b/web/layouts/administration/_partials/groups_admins.html
@@ -11,7 +11,7 @@
         <img class="h-10 w-10 rounded-co" src="/app/beneficiaries/{{.ID}}/picture" alt="">
       </div>
       <div class="flex-1 min-w-0">
-        <a href="/app/profile/{{.ID}}" class="focus:outline-none">
+        <a href="/app/members/{{.ID}}" class="focus:outline-none">
           <span class="absolute inset-0" aria-hidden="true"></span>
           <p class="text-sm font-medium text-gray-900">{{.Data.first_name}} {{.Data.last_name}}</p>
           <p class="text-sm text-gray-500 truncate">{{.Data.email}}</p>

From 5dde4beee7f45e1961547c40d14af25fc1763684 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Thu, 26 Jan 2023 15:24:16 +0100
Subject: [PATCH 05/55] =?UTF-8?q?add=20button=20'supprimer=20le=20b=C3=A9n?=
 =?UTF-8?q?=C3=A9ficiaire'=20on=20agenda=20subscribers-table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/layouts/agenda/_partials/subscribers-table.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
index 9eb12ed..a7b3fd5 100644
--- a/web/layouts/agenda/_partials/subscribers-table.html
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -19,6 +19,7 @@
     </thead>
     <tbody class="divide-y divide-gray-200 bg-white">
         {{range .ViewState.event.Subscriptions}}
+        
         <tr>
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
                 <a href="/app/beneficiaries/{{.Subscriber}}" class="flex">
@@ -36,6 +37,13 @@
                 <!-- <a href=""
                         class="text-co-blue hover:text-co-blue">Voir</a> -->
             </td>
+
+            <!-- ajout du bouton supprimer -->
+            <td>
+                <button action="" method=""  @submit="submit"type="submit"
+                class="rounded-2xl border border-transparent bg-co-red px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">Supprimer le bénéficiaire</button>
+            </td>
+            <!-- fin -->
         </tr>
         {{end}}
     </tbody>

From 7959a34b261abcb9487b05e05595f02f7107a0a9 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 27 Jan 2023 15:53:10 +0100
Subject: [PATCH 06/55] =?UTF-8?q?change=20color=20of=20the=20'Supprimer=20?=
 =?UTF-8?q?le=20b=C3=A9n=C3=A9ficiaire'=20in=20blue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/layouts/agenda/_partials/subscribers-table.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
index a7b3fd5..b7d7d38 100644
--- a/web/layouts/agenda/_partials/subscribers-table.html
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -41,7 +41,7 @@
             <!-- ajout du bouton supprimer -->
             <td>
                 <button action="" method=""  @submit="submit"type="submit"
-                class="rounded-2xl border border-transparent bg-co-red px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">Supprimer le bénéficiaire</button>
+                class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">Supprimer le bénéficiaire</button>
             </td>
             <!-- fin -->
         </tr>

From 79aff422282e52ae50187a15c25a15587d787cc8 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 1 Feb 2023 09:55:18 +0100
Subject: [PATCH 07/55] add template to update and delete event

---
 config.yaml                                   |   8 +
 web/layouts/agenda/_partials/address.html     |  67 +++++
 .../agenda/_partials/subscribers-table.html   |  17 +-
 web/layouts/agenda/delete-event.html          |  32 +++
 web/layouts/agenda/display-event.html         |  19 ++
 web/layouts/agenda/home.html                  |   2 +
 web/layouts/agenda/updateEvent.html           | 231 ++++++++++++++++++
 7 files changed, 372 insertions(+), 4 deletions(-)
 create mode 100644 web/layouts/agenda/_partials/address.html
 create mode 100644 web/layouts/agenda/delete-event.html
 create mode 100644 web/layouts/agenda/updateEvent.html

diff --git a/config.yaml b/config.yaml
index 9344cc3..06de35b 100644
--- a/config.yaml
+++ b/config.yaml
@@ -92,6 +92,14 @@ views:
       files: 
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/agenda/create-event.html
+    update:
+      files:
+        - web/layouts/agenda/_partials/address.html
+        - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/updateEvent.html
+    delete:
+      files:
+        - web/layouts/agenda/delete-event.html
   directory: 
     home: 
       files: 
diff --git a/web/layouts/agenda/_partials/address.html b/web/layouts/agenda/_partials/address.html
new file mode 100644
index 0000000..06fc040
--- /dev/null
+++ b/web/layouts/agenda/_partials/address.html
@@ -0,0 +1,67 @@
+{{ define "address" }}
+
+
+<div class="col-span-6 relative" x-data="{
+    input: {{if .Adress}}'{{.Address.Properties.label}}'{{else}}`{{ .Default.properties.label}}`{{end}},
+    def: `{{ .Default}}`,
+    address: {{if .Address}}JSON.stringify({{printf "%s" .Address.MarshalJSON}}){{else}}null{{end}},
+    addressObject: {{if .Address}}{{printf "%s" .Address.MarshalJSON}}{{else}}null{{end}},
+    responselength: 0,
+    async autocomplete() {
+        if(this.input == null || this.input == '') {
+            this.responselength = 0
+            return []
+        }
+        if(this.addressObject != null && this.input == this.addressObject.properties.label) {
+            this.responselength = 0
+           
+            return []
+        }
+
+        if(this.input == `{{ .Default.properties.label}}`) {
+            this.responselength = 0
+            this.address = this.def
+            this.input = `{{ .Default.properties.label}}`
+            result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
+            json = await result.json()
+
+            bb = json['features'][0]
+            console.log(bb)
+            this.address = JSON.stringify(bb)
+            this.addressObject = bb
+            this.input = bb.properties.label
+                return [bb]
+        }
+        
+            result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input)
+            json = await result.json()
+
+        this.responselength = json['features'].length
+        return json['features']
+    },
+    select(a) {
+        this.address = JSON.stringify(a)
+        this.addressObject = a
+        this.input = a.properties.label
+        
+    }
+}">
+    <input type="hidden" name="{{ .FieldName }}" x-model="address" >
+    <label for="address" class="block text-sm font-medium text-gray-700">{{ if .FieldLabel }}{{.FieldLabel}}{{else}}Adresse{{end}}</label>
+    <input type="text"  
+        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm border-gray-300 rounded-2xl"
+      x-model="input">
+
+    <ul x-show="responselength > 0"
+    class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base ring-1 ring-black ring-opacity-5 overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">
+        <template x-for="item in autocomplete">
+            <a href="#">
+                <li class="text-gray-900 hover:bg-gray-200 cursor-default select-none relative py-2 pl-3 pr-9" 
+                    @click="select(item)">
+                    <span class="font-normal block truncate" x-text="item.properties.label" ></span>
+                </li>
+            </a>
+        </template>
+    </ul>
+</div>
+{{ end }}
\ No newline at end of file
diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
index 9eb12ed..bda5b2b 100644
--- a/web/layouts/agenda/_partials/subscribers-table.html
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -17,8 +17,10 @@
             </th>
         </tr>
     </thead>
+    {{$groupId := .ViewState.event.ID}}
     <tbody class="divide-y divide-gray-200 bg-white">
         {{range .ViewState.event.Subscriptions}}
+        
         <tr>
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
                 <a href="/app/beneficiaries/{{.Subscriber}}" class="flex">
@@ -32,10 +34,17 @@
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                 {{(timeFormat .CreatedAt "02/01/2006")}}
             </td>
-            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                <!-- <a href=""
-                        class="text-co-blue hover:text-co-blue">Voir</a> -->
-            </td>
+            <!-- <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                             
+                    <a  :href="'/app/agenda/delete/{{$groupId}}/{{.Subscriber}}'">
+                     <div class="flex items-center">
+                                 
+                         <div class="ml-4">
+                             <div class="text-co-blue hover:text-co-blue"><span
+                                     >retirer</span> </div>
+                         </div>
+                    </a>
+            </td> -->
         </tr>
         {{end}}
     </tbody>
diff --git a/web/layouts/agenda/delete-event.html b/web/layouts/agenda/delete-event.html
new file mode 100644
index 0000000..af7d15f
--- /dev/null
+++ b/web/layouts/agenda/delete-event.html
@@ -0,0 +1,32 @@
+{{define "content"}}
+<div>
+        <form method="POST">
+
+            <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">Confirmation de retrait</h3>
+                        <div class="mt-2">
+                            <p class="text-sm text-gray-500">Vous etes sur de retirer cet événement</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
+                    <a href="/app/agenda/{{.ViewState.event.ID}}" class="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>
+        </form>
+
+ </div>
+{{end}}
diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index 787d596..2a632f9 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -12,7 +12,26 @@
                     {{end}}
                 </p>
             </div>
+            {{$gr := .Group.ID}}
+            {{$event := .ViewState.event.ID}}
         </div>
+        {{range .ViewState.event.Owners}}
+        {{$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">
+        {{if eq $gr $id}}
+            <a href="/app/agenda/{{$event}}/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>
+             
+        
+            <a href="/app/agenda/{{$event}}/delete" 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-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer</button></a>
+             
+            </div>
+            {{end}}
+    {{end}}
+   
     </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">
diff --git a/web/layouts/agenda/home.html b/web/layouts/agenda/home.html
index 9a5882a..06769e1 100644
--- a/web/layouts/agenda/home.html
+++ b/web/layouts/agenda/home.html
@@ -50,6 +50,7 @@
                             </tr>
                             <tbody class="divide-y divide-gray-200 bg-white">
                                 {{range .ViewState.events}}
+                                {{if eq .Deleted false}}
                                 <a href="/app/agenda/{{.ID}}">
                                 <tr>
                                     <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
@@ -99,6 +100,7 @@
                                 </tr>
                                 </a>
                                 {{end}}
+                                {{end}}
                             </tbody>
                         </thead>
                     </table>
diff --git a/web/layouts/agenda/updateEvent.html b/web/layouts/agenda/updateEvent.html
new file mode 100644
index 0000000..4533761
--- /dev/null
+++ b/web/layouts/agenda/updateEvent.html
@@ -0,0 +1,231 @@
+{{ 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 votre agenda</h1>
+</div>
+{{$sdate := (timeFrom .ViewState.event.Startdate).Format ("2006-01-02")}}
+{{$edate := (timeFrom .ViewState.event.Enddate).Format ("2006-01-02")}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
+        fields: {
+            name: '{{.ViewState.event.Name}}',
+            type:'{{.ViewState.event.Type}}',
+            description: '{{.ViewState.event.Description}}',
+            allday: {{.ViewState.event.Allday}},
+            startdate:'{{$sdate}}',
+            enddate: '{{$edate}}',
+            starttime: '{{.ViewState.event.Starttime}}',
+            endtime: '{{.ViewState.event.Endtime}}',
+            max_subscribers: '{{.ViewState.event.MaxSubscribers}}',
+        },
+        rules: {
+            name: ['required'],
+            type: ['required'],
+            startdate: ['required'],
+            enddate: ['required'],
+            starttime: ['optional'],
+            endtime: ['optional'],
+            description: ['optional'],
+            max_subscribers: ['required', 'min:0']
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+                type: {valid: null},
+                description: {valid: null},
+                startdate: {valid: null},
+                enddate: {valid: null},
+                starttime: {valid: null},
+                endtime: {valid: null},
+                allday: {valid: null},
+                max_subscribers: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+
+            if(!Iodine.assertAfterOrEqual(new Date(this.fields.enddate), new Date(this.fields.startdate))) {
+                this.formValidation.fields.enddate.valid = false
+                this.formValidation.valid = false
+            }
+        },
+        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">Informations sur le dispositif</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations générales sur le dispositif d'accompagnement à ajouter à l'agenda</p>
+                </div>
+                <div class="mt-5 md:mt-0 md:col-span-2">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
+                            <input type="text" name="name" id="name" value="{{.ViewState.event.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="sm:col-span-3">
+                            <label for="type" class="block text-sm font-medium text-gray-700">Type de dispositif</label>
+                          
+                            <select id="type" name="type" value="{{.ViewState.event.Type}}"
+                                x-model="fields.type" @blur="validateField('type')"
+                                class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm rounded-2xl"
+                                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                <option></option>
+                                <option value="Permis accéléré">Permis accéléré</option>
+                                <option value="Auto-école sociale (classique)">Auto-école sociale (classique)</option>
+                                <option value="Information collective">Information collective</option>
+                                <option value="Autres">Autres</option>
+                            </select>
+                            
+                        </div>
+                        <div class="col-span-6">
+                            <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
+                            <div class="mt-1">
+                                
+                                <textarea rows="4" name="description" id="descrpition" value="{{.ViewState.event.Description}}"
+                                    x-model="fields.description" @blur="validateField('description')"
+                                    :class="formValidation.fields.description.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
+                                    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>
+                    
+                        {{ $fieldName := "address" }} 
+                        {{if .ViewState.event.Data.address}}
+                        {{$default := .ViewState.event.Data.address}}
+                        {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                        {{else}}
+                        {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                        
+                        
+                    {{end}}
+                    </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-
+                    ray-900">Planification</h3>
+                    <p class="mt-1 text-sm text-gray-500">Dates et horaires de l'événement</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2 align-middle">
+                    <div class="grid grid-cols-6 gap-6">
+
+                        <div class="col-span-6">
+
+                            <button type="button" class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2" role="switch" aria-checked="false"
+                                :class="fields.allday ? 'bg-co-blue' : 'bg-gray-200'"
+                                @click="fields.allday = ! fields.allday">
+                                <span class="sr-only">Use setting</span>
+                                <!-- Enabled: "translate-x-5", Not Enabled: "translate-x-0" -->
+                                <span aria-hidden="true" class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
+                                    :class="fields.allday ? 'translate-x-5' : 'translate-x-0'"></span>
+                            </button> <span class="text-md font-medium text-gray-700 ml-2">Toute la journée</span>
+                            <input type="hidden" name="allday" x-model="fields.allday">
+
+                        </div>
+
+                        <div class="sm:col-span-6">
+                            <div class="inline-flex w-full">
+                                <div class="flex-1">
+                                    
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Date de début</label>
+                                    <input  name="startdate" id="startdate" type="date" value="{{$sdate}}"
+                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
+                                            x-model="fields.startdate" @blur="validateField('startdate')"
+                                            :class="formValidation.fields.startdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                </div>
+                                <div class="flex-1">
+                                    <label for="enddate" class="block text-sm font-medium text-gray-700">Date de fin</label>
+                                    <input  name="enddate" id="enddate" type="date" value="{{$edate}}"
+                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
+                                            x-model="fields.enddate" @blur="validateField('enddate')"
+                                            :class="formValidation.fields.enddate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                </div>
+
+
+                            </div>
+                        </div>
+
+                        <div class="sm:col-span-6" x-show="!fields.allday">
+                            <div class="inline-flex w-full">
+                                <div class="flex-1">
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Horaire de début</label>
+                                    <input type="time" name="starttime" id="starttime" placeholder="00:00" 
+                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
+                                            x-model="fields.starttime" @blur="validateField('starttime')"
+                                            :class="formValidation.fields.starttime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                </div>
+                                <div class="flex-1">
+                                    <label for="endtime" class="block text-sm font-medium text-gray-700">Horaire de fin</label>
+                                    <input type="time" name="endtime" id="endtime" placeholder="00:00" 
+                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
+                                            x-model="fields.endtime" @blur="validateField('endtime')"
+                                            :class="formValidation.fields.endtime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                </div>
+                                
+                                
+                            </div>
+                        </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">Paramètres</h3>
+                    <p class="mt-1 text-sm text-gray-500">Paramètres du dispositift (nombre de places disponibles, etc...)</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2 align-middle">
+                    <div class="grid grid-cols-6 gap-6">
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="max_subscribers" class="block text-sm font-medium text-gray-700">Places disponibles (0 = illimité)</label>
+                            <input type="number" value="{{.ViewState.event.MaxSubscribers}}" name="max_subscribers" id="max_subscribers"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.max_subscribers" @blur="validateField('max_subscribers')"
+                                :class="formValidation.fields.max_subscribers.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </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/agenda/{{.ViewState.event.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</button>
+        </div>
+    </form>
+</div>
+
+{{end}}
\ No newline at end of file

From 2ddf2e6673f727be6600bfca033f0c684c770ffc Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 1 Feb 2023 10:47:48 +0100
Subject: [PATCH 08/55] add url to redirect form action

---
 config.yaml                                         | 3 +++
 web/layouts/agenda/_partials/subscribers-table.html | 6 ++++--
 web/layouts/agenda/delete-subscriber.html           | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 web/layouts/agenda/delete-subscriber.html

diff --git a/config.yaml b/config.yaml
index 9344cc3..e8174f6 100644
--- a/config.yaml
+++ b/config.yaml
@@ -92,6 +92,9 @@ views:
       files: 
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/agenda/create-event.html
+    delete_subscriber: 
+      files: 
+        - web/layouts/agenda/delete-subscriber.html
   directory: 
     home: 
       files: 
diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
index b7d7d38..daa932d 100644
--- a/web/layouts/agenda/_partials/subscribers-table.html
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -17,9 +17,9 @@
             </th>
         </tr>
     </thead>
+    {{$evid := .ViewState.event.ID}}
     <tbody class="divide-y divide-gray-200 bg-white">
         {{range .ViewState.event.Subscriptions}}
-        
         <tr>
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
                 <a href="/app/beneficiaries/{{.Subscriber}}" class="flex">
@@ -40,8 +40,10 @@
 
             <!-- ajout du bouton supprimer -->
             <td>
-                <button action="" method=""  @submit="submit"type="submit"
+                <form class="mt-4" action="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" method="POST"  @submit="submit">
+                <button  type="submit"
                 class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">Supprimer le bénéficiaire</button>
+            </form>
             </td>
             <!-- fin -->
         </tr>
diff --git a/web/layouts/agenda/delete-subscriber.html b/web/layouts/agenda/delete-subscriber.html
new file mode 100644
index 0000000..142fc0c
--- /dev/null
+++ b/web/layouts/agenda/delete-subscriber.html
@@ -0,0 +1,3 @@
+{{ define "content" }}
+<h1>hello</h1>
+{{end}}
\ No newline at end of file

From 6c4a99c1a7c6979ebd27ffcd8bed1ba0aaa1d174 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 1 Feb 2023 11:51:00 +0100
Subject: [PATCH 09/55] add modale

---
 .../agenda/_partials/subscribers-table.html   |  6 ++--
 web/layouts/agenda/delete-subscriber.html     | 33 +++++++++++++++++--
 2 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
index daa932d..6851357 100644
--- a/web/layouts/agenda/_partials/subscribers-table.html
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -40,10 +40,12 @@
 
             <!-- ajout du bouton supprimer -->
             <td>
-                <form class="mt-4" action="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" method="POST"  @submit="submit">
+                <!-- <form class="mt-4" action="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" method="POST"  @submit="submit">
                 <button  type="submit"
                 class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">Supprimer le bénéficiaire</button>
-            </form>
+            </form> -->
+            <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" 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">Supprimer le bénéficiaire</button></a>
             </td>
             <!-- fin -->
         </tr>
diff --git a/web/layouts/agenda/delete-subscriber.html b/web/layouts/agenda/delete-subscriber.html
index 142fc0c..3451827 100644
--- a/web/layouts/agenda/delete-subscriber.html
+++ b/web/layouts/agenda/delete-subscriber.html
@@ -1,3 +1,32 @@
-{{ define "content" }}
-<h1>hello</h1>
+{{define "content"}}
+<div>
+        <form method="POST" action="/app/agenda/{{.ViewState.eventid}}">
+
+            <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">Confirmation de retrait</h3>
+                        <div class="mt-2">
+                            <p class="text-sm text-gray-500">Vous etes sur de retirer ce bénéficiaire</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
+                    <a href="/app/agenda/{{.ViewState.eventid}}" class="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>
+        </form>
+
+ </div>
 {{end}}
\ No newline at end of file

From 6ac44006d3cb91663862fd392f093a8fb608e869 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 1 Feb 2023 16:03:04 +0100
Subject: [PATCH 10/55] add delete file

---
 web/layouts/agenda/delete-subscriber.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/layouts/agenda/delete-subscriber.html b/web/layouts/agenda/delete-subscriber.html
index 3451827..bcd5d91 100644
--- a/web/layouts/agenda/delete-subscriber.html
+++ b/web/layouts/agenda/delete-subscriber.html
@@ -1,6 +1,6 @@
 {{define "content"}}
 <div>
-        <form method="POST" action="/app/agenda/{{.ViewState.eventid}}">
+        <form method="POST" >
 
             <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
         

From 811e040cd8e9d574b196402d6c2cb6da95b36552 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Wed, 1 Feb 2023 18:16:24 +0100
Subject: [PATCH 11/55] add 'motif' text-area in delete-subscriber

---
 web/layouts/agenda/delete-subscriber.html | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/web/layouts/agenda/delete-subscriber.html b/web/layouts/agenda/delete-subscriber.html
index bcd5d91..d73f8b7 100644
--- a/web/layouts/agenda/delete-subscriber.html
+++ b/web/layouts/agenda/delete-subscriber.html
@@ -15,7 +15,14 @@
                     <div class="mt-3 text-center sm:mt-5">
                         <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Confirmation de retrait</h3>
                         <div class="mt-2">
-                            <p class="text-sm text-gray-500">Vous etes sur de retirer ce bénéficiaire</p>
+                            <p class="text-sm text-gray-500">Voulez-vous vraiment retirer ce bénéficiaire ?</p>
+                        </div>
+                        <div class="col-span-6">
+                            <label for="motif" class="block text-sm font-medium text-gray-700">Motif</label>
+                            <div class="mt-1">
+                                <textarea rows="4" name="motif" id="motif" 
+                                    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>

From f74c0eaf06254011af9a6d3b5388157144d81100 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 3 Feb 2023 10:06:11 +0100
Subject: [PATCH 12/55] modification about delete-subscriber template

---
 web/layouts/agenda/delete-subscriber.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/layouts/agenda/delete-subscriber.html b/web/layouts/agenda/delete-subscriber.html
index d73f8b7..c1e850a 100644
--- a/web/layouts/agenda/delete-subscriber.html
+++ b/web/layouts/agenda/delete-subscriber.html
@@ -20,7 +20,7 @@
                         <div class="col-span-6">
                             <label for="motif" class="block text-sm font-medium text-gray-700">Motif</label>
                             <div class="mt-1">
-                                <textarea rows="4" name="motif" id="motif" 
+                                <textarea rows="4" name="motif" id="motif"
                                     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>

From 759e8f810ac5d3309c364d80bdabd162788c63ef Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 3 Feb 2023 16:12:47 +0100
Subject: [PATCH 13/55] add condition to display modify button

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

diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index 2a632f9..61e0ed7 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -17,10 +17,10 @@
         </div>
         {{range .ViewState.event.Owners}}
         {{$id := .}}
-        
+        {{if eq $gr $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">
-        {{if eq $gr $id}}
+       
             <a href="/app/agenda/{{$event}}/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>
              

From 3dce51620fc53c5564ac7ed1e2218dc6176db539 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Wed, 8 Feb 2023 09:36:48 +0100
Subject: [PATCH 14/55] add 'History' page

---
 config.yaml                           |  3 ++
 web/layouts/agenda/display-event.html |  1 +
 web/layouts/agenda/history-event.html | 51 +++++++++++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 web/layouts/agenda/history-event.html

diff --git a/config.yaml b/config.yaml
index e8174f6..0a0ded8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -95,6 +95,9 @@ views:
     delete_subscriber: 
       files: 
         - web/layouts/agenda/delete-subscriber.html
+    history_event:
+      files:
+        - web/layouts/agenda/history-event.html
   directory: 
     home: 
       files: 
diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index 787d596..9cad872 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -70,6 +70,7 @@
                 <div class="bg-white shadow sm:rounded-lg">
                     <div class="px-4 py-5 sm:px-6">
                         <h2 id="event-information-title" class="text-lg leading-6 font-medium text-gray-900">Tous les inscrits</h2>
+                        <a href="/app/agenda/{{.ViewState.event.ID}}/history" class="mt-1 max-w-2xl text-sm text-gray-500">Historique</a>
                     </div>
                     {{template "subscribers_table" .}}
                 </div>
diff --git a/web/layouts/agenda/history-event.html b/web/layouts/agenda/history-event.html
new file mode 100644
index 0000000..b6cc468
--- /dev/null
+++ b/web/layouts/agenda/history-event.html
@@ -0,0 +1,51 @@
+{{define "content"}}
+<table class="min-w-full divide-y divide-gray-300 border-t border-gray-200">
+    <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 ">
+                Bénéficiaire
+            </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">
+                Date d'inscription
+            </th>
+            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                Supprimé par
+            </th>
+            <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                <span class="sr-only">Date de supression</span>
+            </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>
+    {{$evid := .ViewState.event.ID}}
+    <tbody class="divide-y divide-gray-200 bg-white">
+        {{range .ViewState.event.Subscriptions}}
+        <tr>
+            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                <a href="/app/beneficiaries/{{.Subscriber}}" class="flex">
+                    <img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture" alt=" "> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}
+                </a>
+            </td>
+            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                <div class="flex"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Data.subscribed_by.user.id}}/picture" alt=" "> {{.Data.subscribed_by.user.display_name}}</div>
+                {{.Data.subscribed_by.group.name}}
+            </td>
+            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                {{(timeFormat .CreatedAt "02/01/2006")}}
+            </td>
+            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                <!-- <a href=""
+                        class="text-co-blue hover:text-co-blue">Voir</a> -->
+            </td>
+
+        </tr>
+        {{end}}
+    </tbody>
+</table>
+{{end}}
\ No newline at end of file

From b004cf847a7d46e6188f8f0ec4f346a65689a610 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 13 Feb 2023 10:29:50 +0100
Subject: [PATCH 15/55] make the subscriber_by clickable

---
 web/layouts/agenda/_partials/subscribers-table.html | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
index bda5b2b..9c182f5 100644
--- a/web/layouts/agenda/_partials/subscribers-table.html
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -28,23 +28,12 @@
                 </a>
             </td>
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                <div class="flex"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Data.subscribed_by.user.id}}/picture" alt=" "> {{.Data.subscribed_by.user.display_name}}</div>
+                <a href="/app/members/{{.Data.subscribed_by.user.id}}" class="flex"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Data.subscribed_by.user.id}}/picture" alt=" "> {{.Data.subscribed_by.user.display_name}}</a>
                 {{.Data.subscribed_by.group.name}}
             </td>
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                 {{(timeFormat .CreatedAt "02/01/2006")}}
             </td>
-            <!-- <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                             
-                    <a  :href="'/app/agenda/delete/{{$groupId}}/{{.Subscriber}}'">
-                     <div class="flex items-center">
-                                 
-                         <div class="ml-4">
-                             <div class="text-co-blue hover:text-co-blue"><span
-                                     >retirer</span> </div>
-                         </div>
-                    </a>
-            </td> -->
         </tr>
         {{end}}
     </tbody>

From 39d4713ebfeaa586a33ba85df36589581102115f Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 15 Feb 2023 11:32:27 +0100
Subject: [PATCH 16/55] add the member page and not the beneficaire page

---
 web/layouts/agenda/_partials/subscribers-table.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
index 9c182f5..35e81d5 100644
--- a/web/layouts/agenda/_partials/subscribers-table.html
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -28,6 +28,7 @@
                 </a>
             </td>
             <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                <!-- add the member page and not the beneficiare page -->
                 <a href="/app/members/{{.Data.subscribed_by.user.id}}" class="flex"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Data.subscribed_by.user.id}}/picture" alt=" "> {{.Data.subscribed_by.user.display_name}}</a>
                 {{.Data.subscribed_by.group.name}}
             </td>

From 41c1e109241b81d7eb1cc9722f4ef52e8877b001 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Wed, 15 Feb 2023 14:26:56 +0100
Subject: [PATCH 17/55] edit template 'history-event'

---
 .../agenda/_partials/subscribers-table.html   |   6 +-
 web/layouts/agenda/display-event.html         |   8 +-
 web/layouts/agenda/history-event.html         | 121 +++++++++++-------
 3 files changed, 80 insertions(+), 55 deletions(-)

diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
index 6851357..470dfc2 100644
--- a/web/layouts/agenda/_partials/subscribers-table.html
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -40,12 +40,8 @@
 
             <!-- ajout du bouton supprimer -->
             <td>
-                <!-- <form class="mt-4" action="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" method="POST"  @submit="submit">
-                <button  type="submit"
-                class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">Supprimer le bénéficiaire</button>
-            </form> -->
             <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" 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">Supprimer le bénéficiaire</button></a>
+                class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">Retirer</button></a>
             </td>
             <!-- fin -->
         </tr>
diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index 9cad872..f809dc8 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -68,9 +68,13 @@
             {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
             <section aria-labelledby="subscribers-table"></section>
                 <div class="bg-white shadow sm:rounded-lg">
-                    <div class="px-4 py-5 sm:px-6">
+                    <div class="flex justify-between px-4 py-5 sm:px-6">
                         <h2 id="event-information-title" class="text-lg leading-6 font-medium text-gray-900">Tous les inscrits</h2>
-                        <a href="/app/agenda/{{.ViewState.event.ID}}/history" class="mt-1 max-w-2xl text-sm text-gray-500">Historique</a>
+                        <a href="/app/agenda/{{.ViewState.event.ID}}/history">
+                            <button type="submit"class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
+                                Historique
+                            </button>
+                        </a>
                     </div>
                     {{template "subscribers_table" .}}
                 </div>
diff --git a/web/layouts/agenda/history-event.html b/web/layouts/agenda/history-event.html
index b6cc468..775bbca 100644
--- a/web/layouts/agenda/history-event.html
+++ b/web/layouts/agenda/history-event.html
@@ -1,51 +1,76 @@
 {{define "content"}}
-<table class="min-w-full divide-y divide-gray-300 border-t border-gray-200">
-    <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 ">
-                Bénéficiaire
-            </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">
-                Date d'inscription
-            </th>
-            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                Supprimé par
-            </th>
-            <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
-                <span class="sr-only">Date de supression</span>
-            </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>
-    {{$evid := .ViewState.event.ID}}
-    <tbody class="divide-y divide-gray-200 bg-white">
-        {{range .ViewState.event.Subscriptions}}
-        <tr>
-            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
-                <a href="/app/beneficiaries/{{.Subscriber}}" class="flex">
-                    <img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture" alt=" "> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}
-                </a>
-            </td>
-            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                <div class="flex"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Data.subscribed_by.user.id}}/picture" alt=" "> {{.Data.subscribed_by.user.display_name}}</div>
-                {{.Data.subscribed_by.group.name}}
-            </td>
-            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                {{(timeFormat .CreatedAt "02/01/2006")}}
-            </td>
-            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                <!-- <a href=""
-                        class="text-co-blue hover:text-co-blue">Voir</a> -->
-            </td>
+<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">
+        <div class="flex items-center space-x-5">
+            <div>
+                <h1 class="text-2xl font-bold text-gray-900">Historique de l'évènement {{.ViewState.event.Name}}</h1>
+                <p class="text-m font-medium text-gray-500">
+                    {{if eq .ViewState.event.Startdate .ViewState.event.Enddate}}
+                    Le {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}}
+                    {{else}}
+                    Du {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}} au {{(timeFrom
+                    .ViewState.event.Enddate).Format "02/01/2006"}}
+                    {{end}}
+                </p>
+                <a href="/app/agenda/{{.ViewState.event.ID}}" class="mt-1 max-w-2xl text-sm text-gray-500">Retour</a>
+            </div>
+        </div>
+    </div>
+
+    <table class="mt-4 min-w-full divide-y divide-gray-300 border-t border-gray-200">
+        <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 ">
+                    Bénéficiaire
+                </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">
+                    Supprimé par
+                </th>
+                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                    Date de suppression
+                </th>
+                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                    Motif
+                </th>
+            </tr>
+        </thead>
+        <tbody class="divide-y divide-gray-200 bg-white">
+            {{range .ViewState.event.DeletedSubscription}}
+            <tr>
+                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                    <a href="/app/beneficiaries/{{.Subscriber}}" class="flex">
+                        <img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture" alt=" ">
+                        {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index
+                        $.ViewState.subscribers .Subscriber).Data.last_name }}
+                    </a>
+                </td>
+                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                    <div class="flex"><img class="h-6 w-6 rounded-co mr-2"
+                            src="/app/beneficiaries/{{.Data.subscribed_by.user.id}}/picture" alt=" ">
+                        {{.Data.subscribed_by.user.display_name}}</div>
+                    {{.Data.subscribed_by.group.name}}
+                </td>
+                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                    <div class="flex"><img class="h-6 w-6 rounded-co mr-2"
+                            src="/app/beneficiaries/{{.Data.unsubscribed_by.user.id}}/picture" alt=" ">
+                        {{.Data.unsubscribed_by.user.display_name}}</div>
+                    {{.Data.unsubscribed_by.group.name}}
+                </td>
+                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                    {{(timeFormat .CreatedAt "02/01/2006")}}
+                </td>
+                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                    <div class="flex">{{.Data.motif}}</div>
+                </td>
+            </tr>
+            {{end}}
+        </tbody>
+    </table>
+</main>
+
 
-        </tr>
-        {{end}}
-    </tbody>
-</table>
 {{end}}
\ No newline at end of file

From 09b0458f627d0040b39a7258e57c64b96d8bd0b9 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Thu, 16 Feb 2023 09:05:36 +0100
Subject: [PATCH 18/55] edit display-event and history-event template

---
 web/layouts/agenda/display-event.html | 9 +++++++--
 web/layouts/agenda/history-event.html | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index f809dc8..16f1f64 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -72,7 +72,7 @@
                         <h2 id="event-information-title" class="text-lg leading-6 font-medium text-gray-900">Tous les inscrits</h2>
                         <a href="/app/agenda/{{.ViewState.event.ID}}/history">
                             <button type="submit"class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-                                Historique
+                                Bénéficiaires désinscrits
                             </button>
                         </a>
                     </div>
@@ -150,11 +150,16 @@
                 <h2 id="subscribers-title" class="text-lg font-medium text-gray-900 mt-10">Bénéficiaires {{.Group.Data.name}} inscrits</h2>
                 <div class="mt-2">
                     <ul class="p-1">
+                        {{$evid := .ViewState.event.ID}}
                         {{range .ViewState.event.Subscriptions}}
                         {{if eq $.Group.ID .Data.subscribed_by.group.id}}
                         <a href="/app/beneficiaries/{{.Subscriber}}">
-                        <li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture"> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}</li>
+                        <li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture"> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}
                         </a>
+                        <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex">
+                            <button type="button"
+                            class="w-full ml-2 px-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">x</button></a>
+                        </li>
                         {{end}}
                         {{end}}
                     </ul>
diff --git a/web/layouts/agenda/history-event.html b/web/layouts/agenda/history-event.html
index 775bbca..13e51d4 100644
--- a/web/layouts/agenda/history-event.html
+++ b/web/layouts/agenda/history-event.html
@@ -4,7 +4,7 @@
         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">
         <div class="flex items-center space-x-5">
             <div>
-                <h1 class="text-2xl font-bold text-gray-900">Historique de l'évènement {{.ViewState.event.Name}}</h1>
+                <h1 class="text-2xl font-bold text-gray-900">Bénéficiaires désinscrits de l'évènement {{.ViewState.event.Name}}</h1>
                 <p class="text-m font-medium text-gray-500">
                     {{if eq .ViewState.event.Startdate .ViewState.event.Enddate}}
                     Le {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}}
@@ -28,7 +28,7 @@
                     Prescripteur
                 </th>
                 <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                    Supprimé par
+                    Désinscrit par
                 </th>
                 <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                     Date de suppression

From 46f1d44b11f357f773bc7dccfb7cbfd6cc54f6a3 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 17 Feb 2023 10:24:30 +0100
Subject: [PATCH 19/55] add delete button for different organization

---
 web/layouts/agenda/display-event.html |  4 +-
 web/layouts/agenda/history-event.html | 56 ++++++++++++++++++++-------
 2 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index 16f1f64..0703772 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -157,8 +157,8 @@
                         <li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture"> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}
                         </a>
                         <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex">
-                            <button type="button"
-                            class="w-full ml-2 px-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">x</button></a>
+                            <button type="button" class="w-full ml-2 px-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">x</button></a>
+                            <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex font-bold text-co-red">x</a>
                         </li>
                         {{end}}
                         {{end}}
diff --git a/web/layouts/agenda/history-event.html b/web/layouts/agenda/history-event.html
index 13e51d4..9ff9e80 100644
--- a/web/layouts/agenda/history-event.html
+++ b/web/layouts/agenda/history-event.html
@@ -1,19 +1,25 @@
 {{define "content"}}
+{{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
 <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">
-        <div class="flex items-center space-x-5">
-            <div>
-                <h1 class="text-2xl font-bold text-gray-900">Bénéficiaires désinscrits de l'évènement {{.ViewState.event.Name}}</h1>
-                <p class="text-m font-medium text-gray-500">
-                    {{if eq .ViewState.event.Startdate .ViewState.event.Enddate}}
-                    Le {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}}
-                    {{else}}
-                    Du {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}} au {{(timeFrom
-                    .ViewState.event.Enddate).Format "02/01/2006"}}
-                    {{end}}
-                </p>
-                <a href="/app/agenda/{{.ViewState.event.ID}}" class="mt-1 max-w-2xl text-sm text-gray-500">Retour</a>
+    <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">
+        <div class="flex space-between">
+            <div class="flex items-center space-x-5">
+                <div>
+                    <h1 class="text-2xl font-bold text-gray-900">Bénéficiaires désinscrits de l'évènement {{.ViewState.event.Name}}</h1>
+                    <p class="text-m font-medium text-gray-500">
+                        {{if eq .ViewState.event.Startdate .ViewState.event.Enddate}}
+                        Le {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}}
+                        {{else}}
+                        Du {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}} au {{(timeFrom
+                        .ViewState.event.Enddate).Format "02/01/2006"}}
+                        {{end}}
+                    </p>
+                </div> 
+                <a href="/app/agenda/{{.ViewState.event.ID}}">
+                    <button type="submit"class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
+                        Retour                
+                    </button>
+                </a>
             </div>
         </div>
     </div>
@@ -71,6 +77,26 @@
         </tbody>
     </table>
 </main>
+{{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 accès à cette page</h3>
+        </div>
+    </div>
+    <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-1">
+        <a href="/app/agenda/{{.ViewState.event.ID}}" class="mt-3 inline-flex w-full justify-center rounded-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>
+    </div>
+    </div>
+</div>
+</div>
+{{end}}
 {{end}}
\ No newline at end of file

From b7eb73a4bdea23322cdabb62965dba92a24f5d4f Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 17 Feb 2023 10:53:57 +0100
Subject: [PATCH 20/55] fix some err

---
 web/layouts/agenda/delete-event.html | 26 ++++++++++++++++++++++++++
 web/layouts/agenda/updateEvent.html  | 24 ++++++++++++++++++++++++
 web/layouts/members/update.html      | 23 +++++++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/web/layouts/agenda/delete-event.html b/web/layouts/agenda/delete-event.html
index af7d15f..a4148d1 100644
--- a/web/layouts/agenda/delete-event.html
+++ b/web/layouts/agenda/delete-event.html
@@ -1,4 +1,6 @@
 {{define "content"}}
+{{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
+
 <div>
         <form method="POST">
 
@@ -29,4 +31,28 @@
         </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 avez pas le droit de supprimer cet événement</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/agenda/{{.ViewState.event.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}}
diff --git a/web/layouts/agenda/updateEvent.html b/web/layouts/agenda/updateEvent.html
index 4533761..a8e2c7b 100644
--- a/web/layouts/agenda/updateEvent.html
+++ b/web/layouts/agenda/updateEvent.html
@@ -1,4 +1,5 @@
 {{ define "content" }}
+{{ if eq (index .ViewState.event.Owners 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 votre agenda</h1>
@@ -227,5 +228,28 @@
         </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 avez pas le droit de modifier cet événement</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/agenda/{{.ViewState.event.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
diff --git a/web/layouts/members/update.html b/web/layouts/members/update.html
index b7b28b0..bfe9db0 100644
--- a/web/layouts/members/update.html
+++ b/web/layouts/members/update.html
@@ -1,4 +1,5 @@
 {{define "content"}}
+{{if eq .UserID .ViewState.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 vos informations</h1>
@@ -128,4 +129,26 @@
         </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 avez pas le droit de modifier ce profile</h3>
+         </div>
+     </div>
+     <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
+         <a href="/app/members/{{.ViewState.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>
+     </div>
+     </div>
+ </div>
+ </div>
+{{end}}
 {{end}}
\ No newline at end of file

From 1189fef6c0363324528ec004e7235213361afa50 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 17 Feb 2023 11:45:58 +0100
Subject: [PATCH 21/55] edit delete button for different organization

---
 web/layouts/agenda/display-event.html | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index 0703772..ceb9412 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -153,13 +153,19 @@
                         {{$evid := .ViewState.event.ID}}
                         {{range .ViewState.event.Subscriptions}}
                         {{if eq $.Group.ID .Data.subscribed_by.group.id}}
-                        <a href="/app/beneficiaries/{{.Subscriber}}">
-                        <li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture"> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}
-                        </a>
-                        <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex">
-                            <button type="button" class="w-full ml-2 px-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">x</button></a>
-                            <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex font-bold text-co-red">x</a>
-                        </li>
+                        <div class="flex justify-between border">
+                            <div>
+                                <a href="/app/beneficiaries/{{.Subscriber}}">
+                                <li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture"> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}
+                                </a>
+                            </div>
+                            <div class="flex items-center">
+                                <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex">
+                                    <button type="button" class="w-full mr-2 px-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">Retirer</button></a>
+                                    <!-- <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex font-bold text-co-red">x</a> -->
+                                </li>
+                            </div>
+                        </div>
                         {{end}}
                         {{end}}
                     </ul>

From 77445af5fb91cd2a627098a49f689f3a595a7c45 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 17 Feb 2023 11:47:26 +0100
Subject: [PATCH 22/55] edit delete button for different organization

---
 web/layouts/agenda/display-event.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index ceb9412..69e8dae 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -161,7 +161,7 @@
                             </div>
                             <div class="flex items-center">
                                 <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex">
-                                    <button type="button" class="w-full mr-2 px-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">Retirer</button></a>
+                                    <button type="button" class="w-full mr-2 py-1 px-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-red">Retirer</button></a>
                                     <!-- <a href="/app/agenda/{{$evid}}/{{.Subscriber}}/delete" class="inline-flex font-bold text-co-red">x</a> -->
                                 </li>
                             </div>

From 494f1124fab566af613ac8f253c0ea2c159e6a1b Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 17 Feb 2023 15:28:07 +0100
Subject: [PATCH 23/55] edit template history-event

---
 web/layouts/agenda/history-event.html | 66 +++++++++++++--------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/web/layouts/agenda/history-event.html b/web/layouts/agenda/history-event.html
index 9ff9e80..823413f 100644
--- a/web/layouts/agenda/history-event.html
+++ b/web/layouts/agenda/history-event.html
@@ -2,25 +2,22 @@
 {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
 <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">
-        <div class="flex space-between">
-            <div class="flex items-center space-x-5">
-                <div>
-                    <h1 class="text-2xl font-bold text-gray-900">Bénéficiaires désinscrits de l'évènement {{.ViewState.event.Name}}</h1>
-                    <p class="text-m font-medium text-gray-500">
-                        {{if eq .ViewState.event.Startdate .ViewState.event.Enddate}}
-                        Le {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}}
-                        {{else}}
-                        Du {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}} au {{(timeFrom
-                        .ViewState.event.Enddate).Format "02/01/2006"}}
-                        {{end}}
-                    </p>
-                </div> 
-                <a href="/app/agenda/{{.ViewState.event.ID}}">
-                    <button type="submit"class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
-                        Retour                
-                    </button>
-                </a>
+        <div class="flex items-center space-x-5">
+            <div>
+                <h1 class="text-2xl font-bold text-gray-900">Bénéficiaires désinscrits de l'évènement {{.ViewState.event.Name}}</h1>
+                <p class="text-m font-medium text-gray-500"> 
+                    {{if eq .ViewState.event.Startdate .ViewState.event.Enddate}} 
+                    Le {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}} 
+                    {{else}}
+                    Du {{(timeFrom .ViewState.event.Startdate).Format "02/01/2006"}} au {{(timeFrom
+                    .ViewState.event.Enddate).Format "02/01/2006"}} 
+                    {{end}} 
+                </p>
             </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/agenda/{{.ViewState.event.ID}}" 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">Retour</button></a>
         </div>
     </div>
 
@@ -79,24 +76,27 @@
 </main>
 {{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 accès à cette page</h3>
+<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 accès à
+                        cette page</h3>
+                </div>
+            </div>
+            <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-1">
+                <a href="/app/agenda/{{.ViewState.event.ID}}"
+                    class="mt-3 inline-flex w-full justify-center rounded-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>
+            </div>
         </div>
     </div>
-    <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-1">
-        <a href="/app/agenda/{{.ViewState.event.ID}}" class="mt-3 inline-flex w-full justify-center rounded-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>
-    </div>
-    </div>
-</div>
 </div>
 {{end}}
 {{end}}
\ No newline at end of file

From 1a67ee50bb070d3a8eabf916d7dc9ec19f459ec6 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 17 Feb 2023 17:24:45 +0100
Subject: [PATCH 24/55] modify text

---
 web/layouts/agenda/delete-event.html | 2 +-
 web/layouts/agenda/updateEvent.html  | 2 +-
 web/layouts/members/update.html      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/layouts/agenda/delete-event.html b/web/layouts/agenda/delete-event.html
index a4148d1..57952bf 100644
--- a/web/layouts/agenda/delete-event.html
+++ b/web/layouts/agenda/delete-event.html
@@ -43,7 +43,7 @@
          {{.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 avez pas le droit de supprimer cet événement</h3>
+             <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Vous n'avez pas le droit de supprimer cet événement</h3>
          </div>
      </div>
      <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
diff --git a/web/layouts/agenda/updateEvent.html b/web/layouts/agenda/updateEvent.html
index a8e2c7b..976a58e 100644
--- a/web/layouts/agenda/updateEvent.html
+++ b/web/layouts/agenda/updateEvent.html
@@ -240,7 +240,7 @@
          {{.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 avez pas le droit de modifier cet événement</h3>
+             <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Vous n'avez pas le droit de modifier cet événement</h3>
          </div>
      </div>
      <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
diff --git a/web/layouts/members/update.html b/web/layouts/members/update.html
index bfe9db0..2349fe5 100644
--- a/web/layouts/members/update.html
+++ b/web/layouts/members/update.html
@@ -141,7 +141,7 @@
          {{.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 avez pas le droit de modifier ce profile</h3>
+             <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Vous n'avez pas le droit de modifier ce profil</h3>
          </div>
      </div>
      <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">

From 9ba34805076b43e0df8f67a5c10127eaec45ce1d Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 22 Feb 2023 11:04:49 +0100
Subject: [PATCH 25/55] fix config yaml

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

diff --git a/config.yaml b/config.yaml
index 9344cc3..eef86a0 100644
--- a/config.yaml
+++ b/config.yaml
@@ -40,6 +40,9 @@ views:
     update:
       files:
         - web/layouts/members/update.html
+    list:
+      files:
+        - web/layouts/members/membersList.html
   vehicles:
     search: 
       files: 
@@ -72,6 +75,9 @@ views:
       files:
         - web/layouts/vehicles_management/_partials/calendar.html
         - web/layouts/vehicles_management/fleet-display.html
+    unbooking_display:
+      files:
+        - web/layouts/vehicles_management/unbooking-display.html
     fleet_update:
       files:
         - web/layouts/_partials/address_autocomplete.html

From 70186d13574b261bd6f08edcfc69e5185237b60a Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 22 Feb 2023 11:05:36 +0100
Subject: [PATCH 26/55] add url to redirect sataistique page

---
 web/layouts/administration/home.html | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/web/layouts/administration/home.html b/web/layouts/administration/home.html
index 8c47e1f..1418344 100644
--- a/web/layouts/administration/home.html
+++ b/web/layouts/administration/home.html
@@ -14,7 +14,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">Bénéficiaires</a>
+          <a href="/app/beneficiaries/" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
           <p class="text-gray-500">{{len .ViewState.beneficiaries }} bénéficiaires</p>
         </div>
       </div>
@@ -23,13 +23,13 @@
     <li class="col-span-1 flex shadow-sm rounded-3xl">
       <div
         class="flex-shrink-0 flex items-center justify-center w-16 bg-co-green text-white text-sm font-medium rounded-l-3xl">
-        {{.IconSet.Icon "hero:outline/office-building" "h-6 w-6"}}
+        {{.IconSet.Icon "hero:outline/calendar" "h-6 w-6"}}
       </div>
       <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">Organisations</a>
-          <p class="text-gray-500">{{len .ViewState.groups}} organisations</p>
+          <a href="/app/agenda/" class="text-gray-900 font-medium hover:text-gray-600">Évenements</a>
+          <p class="text-gray-500">{{len .ViewState.events}} évenements</p>
         </div>
       </div>
     </li>
@@ -42,7 +42,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">Référents</a>
+          <a href="/app/members/" class="text-gray-900 font-medium hover:text-gray-600">Référents</a>
           <p class="text-gray-500">{{len .ViewState.accounts}} membres</p>
         </div>
       </div>
@@ -65,8 +65,11 @@
 </div>
 
 <div class="max-w-7xl mt-10 mx-auto px-4 sm:px-6 md:px-8">
-  <h2 class="text-xl font-semibold text-gray-500">Gestion des organisations</h2>
-
+  <!-- <h2 class="text-xl font-semibold text-gray-500">Gestion des organisations</h2> -->
+  <div class="flex-1 px-4 py-2 text-sm truncate">
+    <h2 class="text-xl font-semibold text-gray-500">Gestion des organisations</h2>
+    <p class="text-gray-500">( {{len .ViewState.groups}} organisations )</p>
+  </div>
   <div class="sm:flex sm:items-center">
     <div class="sm:flex-auto">
       <p class="mt-2 text-sm text-gray-700"></p>

From 1c29f0072084568d723ee34b9085897ab1080378 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 22 Feb 2023 11:05:54 +0100
Subject: [PATCH 27/55] add organisations

---
 web/layouts/members/display.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web/layouts/members/display.html b/web/layouts/members/display.html
index 2d8d487..19d125d 100644
--- a/web/layouts/members/display.html
+++ b/web/layouts/members/display.html
@@ -60,6 +60,13 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.last_name}}
                                </dd>
                             </div>
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Organisations</dt>
+                                {{range .ViewState.groups}}
+                                <dd class="mt-1 text-sm text-gray-900">{{.}} 
+                               </dd>
+                               {{end}}
+                            </div>
                             
                         </dl>
                     </div>

From 18f126e4eb09bf0d797886aa3bdc428da9bacdbb Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 22 Feb 2023 11:06:21 +0100
Subject: [PATCH 28/55] create members list

---
 web/layouts/members/membersList.html | 159 +++++++++++++++++++++++++++
 1 file changed, 159 insertions(+)
 create mode 100644 web/layouts/members/membersList.html

diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html
new file mode 100644
index 0000000..a339435
--- /dev/null
+++ b/web/layouts/members/membersList.html
@@ -0,0 +1,159 @@
+{{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">Les membres de l'organisation {{.Group.Data.name}}</h1>
+
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <p class="mt-2 text-sm text-gray-700"></p>
+        </div>
+    </div>
+</div>
+
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
+            state: {{.ViewState.list.JSONWithLimits 0 10}},
+            current: 0,
+            nb_pages() {
+                let nbEl = this.state.count 
+                return Math.ceil(nbEl/10)
+            },
+            async paginate(page) {
+                let start = (page-1)*10
+                if(start < 0|| start > this.state.count) {
+                    return
+                }
+                let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+                let data = await resp.json()
+                this.state.members = data
+                this.current=page-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 ring-1 ring-black ring-opacity-5 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">
+                                    Email
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                    Organisations
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only"></span>
+                                </th>
+                            </tr>
+                        </thead>
+                       
+                        <tbody class="divide-y divide-gray-200 bg-white">
+                           
+                          
+                            <template x-for="(member, i) in state.members"  > 
+                                
+                               
+                                   
+                                <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/members/' + member.id + '/picture'" alt="">
+                                            </div>
+                                            <div class="ml-4">
+                                                <div class="font-medium text-gray-900"><span
+                                                        x-text="member.data.first_name"></span> <span
+                                                        x-text="member.data.last_name"></span></div>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                        <div class="text-gray-900" x-text="member.data.phone_number"></div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
+                                        x-text="member.data.email">
+                                    </td>
+                                    <template x-for="(group, index) in state.groups" > 
+                                    <template  x-if="i === index">
+                                        <td  class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
+                                    x-text="group"   >
+                                </td>
+                                    </template></template>
+                                    
+                                    <td
+                                        class="relative whitespace-nowrap py-4 pl-3 pr-4 text-right text-sm font-medium sm:pr-6">
+                                        <a :href="'/app/members/' + member.id"
+                                            class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
+                                                    x-text="member.data.first_name"></span> <span
+                                                    x-text="member.data.last_name"></span></a>
+                                    </td>
+                                </tr>
+                                <!-- </template> -->
+                        </template>
+                            <!-- More people... -->
+                        </tbody>
+                   
+                    </table>
+                    <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                        <div class="flex-1 flex justify-between sm:hidden">
+                          <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                          @click="paginate(current)"> Previous </a>
+                          <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                          @click="paginate(current+2)"> Next </a>
+                        </div>
+                        <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                          <div>
+                            <p class="text-sm text-gray-700">
+                              Résultats
+                              <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                              à
+                              <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                              sur
+                              <span class="font-medium" x-text="state.count"></span>
+                            </p>
+                          </div>
+                          <div>
+                            <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                              <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                @click="paginate(current)">
+                                <span class="sr-only">Previous</span>
+                                <!-- Heroicon name: solid/chevron-left -->
+                                <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                  <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                </svg>
+                              </a>
+                              <template x-for="i in nb_pages">
+                                <a href="#" @click="paginate(i)"
+                                 class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                 :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                 x-text="i"></a>
+                              </template>
+                              <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                            <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                @click="paginate(current+2)">
+                                <span class="sr-only">Next</span>
+                                <!-- Heroicon name: solid/chevron-right -->
+                                <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                  <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                </svg>
+                              </a>
+                            </nav>
+                          </div>
+                        </div>
+                      </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+
+{{end}}
\ No newline at end of file

From bee362342c65ff8d20478c2bee2d5ca63030dc00 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Wed, 22 Feb 2023 11:57:21 +0100
Subject: [PATCH 29/55] sending mail to the prescripteur

---
 config.yaml                              | 7 ++++++-
 emails/onboarding/delete-subscriber.html | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 emails/onboarding/delete-subscriber.html

diff --git a/config.yaml b/config.yaml
index 0a0ded8..5be7b71 100644
--- a/config.yaml
+++ b/config.yaml
@@ -252,4 +252,9 @@ emails:
       files:
         - emails/layout.html
         - emails/onboarding/support_emailing.html
-      
+  delete_subscriber:
+    request:
+      subject: PARCOURSMOB - Un bénéficiaire a été retiré d'un dispositif
+      files:
+        - emails/layout.html
+        - emails/onboarding/delete-subscriber.html
\ No newline at end of file
diff --git a/emails/onboarding/delete-subscriber.html b/emails/onboarding/delete-subscriber.html
new file mode 100644
index 0000000..a3d587e
--- /dev/null
+++ b/emails/onboarding/delete-subscriber.html
@@ -0,0 +1,5 @@
+{{define "content"}}
+<p>Un bénéficiare a été retiré d'un événement sur PARCOURSMOB par <b>{{.user}}</b></p>
+<p>Pour le motif suivant : "{{.key}}"</p>
+<p>Voir l'événement {{.link}}</p>
+{{end}}
\ No newline at end of file

From 5ffb2bcf852a03e7a896f018463684b86b87c3d4 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Wed, 22 Feb 2023 12:23:10 +0100
Subject: [PATCH 30/55] add file unbloking

---
 .../unbooking-display.html                    | 61 +++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 web/layouts/vehicles_management/unbooking-display.html

diff --git a/web/layouts/vehicles_management/unbooking-display.html b/web/layouts/vehicles_management/unbooking-display.html
new file mode 100644
index 0000000..8b5de9d
--- /dev/null
+++ b/web/layouts/vehicles_management/unbooking-display.html
@@ -0,0 +1,61 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <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 ring-1 ring-black ring-opacity-5 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">
+                                    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">
+                                    Type
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left 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">
+                                    Lieu
+                                </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 class="divide-y divide-gray-200 bg-white">
+                            {{range .ViewState.vehicles}}
+                            <tr>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{.Data.licence_plate}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >
+                                        {{.Type}}
+                                        {{if eq .Type "Voiture"}}
+                                        {{ if .Data.automatic}} (boite auto){{ end }}
+                                        {{end}}
+                                    </div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{.Data.name}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <a href="/app/vehicles-management/fleet/{{.ID}}"
+                                            class="text-co-blue hover:text-co-blue">Voir</a>
+                                </td>
+                            </tr>
+                            {{end}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}
\ No newline at end of file

From a2f9184e22ada09bfcc39c3a55cd5e3b47e409b3 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Thu, 23 Feb 2023 09:52:02 +0100
Subject: [PATCH 31/55] fix profile err

---
 web/layouts/members/update.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/layouts/members/update.html b/web/layouts/members/update.html
index 2349fe5..13074f2 100644
--- a/web/layouts/members/update.html
+++ b/web/layouts/members/update.html
@@ -18,8 +18,9 @@
             first_name: ['required'],
             last_name: ['required'],
             email: ['required', 'email'],
-            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
+            phone_number: ['regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
         },
+       
         formValidation: {
             valid: false,
             fields: {

From e43e23353a81e3d85e72651715175bb8ad0f40e2 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Thu, 23 Feb 2023 12:34:25 +0100
Subject: [PATCH 32/55] edit mail for the prescipteur when a beneficiary is
 delete

---
 emails/onboarding/delete-subscriber.html | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/emails/onboarding/delete-subscriber.html b/emails/onboarding/delete-subscriber.html
index a3d587e..1fc64ce 100644
--- a/emails/onboarding/delete-subscriber.html
+++ b/emails/onboarding/delete-subscriber.html
@@ -1,5 +1,7 @@
 {{define "content"}}
-<p>Un bénéficiare a été retiré d'un événement sur PARCOURSMOB par <b>{{.user}}</b></p>
-<p>Pour le motif suivant : "{{.key}}"</p>
-<p>Voir l'événement {{.link}}</p>
+<p></p>
+<p>Un bénéficiaire a été retiré d'un événement sur PARCOURSMOB par <b>{{.user}}</b></p>
+<p>Pour le motif suivant : <b>{{.motif}}</b></p>
+<p>Pour voir le bénéficiaire, cliquez sur : <a href={{.subscriber}}>{{.subscriber}}</a></p>
+<p>Pour voir l'événement, cliquez sur : <a href={{.link}}>{{.link}}</a></p>
 {{end}}
\ No newline at end of file

From 70ad96a4e8970641091a911d6210c54b682ce96a Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Thu, 23 Feb 2023 16:46:38 +0100
Subject: [PATCH 33/55] add 'statut' on vehicles-list template

---
 .../_partials/vehicles-list.html              | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index f831521..715554a 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -1,4 +1,13 @@
 {{define "vehicles_list"}}
+{{range $.ViewState.bookings}}
+    {{.Vehicleid}}
+    <br>
+{{end}}
+<br>
+{{range $.ViewState.vehicles}}
+    {{.ID}}
+    <br>
+{{end}}
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
@@ -7,6 +16,10 @@
                     <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">
+                                    Statut
+                                </th>
                                 <th scope="col"
                                     class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Numéro (Immat / Bicycode)
@@ -28,6 +41,31 @@
                         <tbody class="divide-y divide-gray-200 bg-white">
                             {{range .ViewState.vehicles}}
                             <tr>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                    {{range $.ViewState.bookings}}
+                                            {{if .Data.administrator_unavailability}}
+                                            <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                                Retiré
+                                            </span>
+                                            {{else}}
+                                                {{if eq .Status 1 }}
+                                                <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                                    A venir
+                                                </span>
+                                                {{end}}
+                                                {{if eq .Status 0 }}
+                                                <span class="p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                                    En cours
+                                                </span>
+                                                {{end}}
+                                                {{if eq .Status -1 }}
+                                                <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
+                                                    Terminé
+                                                </span>
+                                                {{end}}
+                                            {{end}}
+                                    {{end}}
+                                </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >{{.Data.licence_plate}}</div>
                                 </td>

From 361447f188d3f971b48884b6cc83bb2ea864b4d3 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Thu, 23 Feb 2023 16:46:56 +0100
Subject: [PATCH 34/55] add 'statut' on vehicles-list template

---
 web/layouts/vehicles_management/_partials/vehicles-list.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index 715554a..21d8b70 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -1,5 +1,5 @@
 {{define "vehicles_list"}}
-{{range $.ViewState.bookings}}
+<!-- {{range $.ViewState.bookings}}
     {{.Vehicleid}}
     <br>
 {{end}}
@@ -7,7 +7,7 @@
 {{range $.ViewState.vehicles}}
     {{.ID}}
     <br>
-{{end}}
+{{end}} -->
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">

From c16e27fb25920b3a52a11c41d56dd73152a73630 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 24 Feb 2023 10:53:27 +0100
Subject: [PATCH 35/55] showing all statuts for vehicle

---
 .../_partials/bookings-list.html              |  2 +-
 .../_partials/vehicles-list.html              | 23 ++++++-------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/web/layouts/vehicles_management/_partials/bookings-list.html b/web/layouts/vehicles_management/_partials/bookings-list.html
index d2a4f98..122f9a0 100644
--- a/web/layouts/vehicles_management/_partials/bookings-list.html
+++ b/web/layouts/vehicles_management/_partials/bookings-list.html
@@ -34,7 +34,7 @@
                         <tbody class="divide-y divide-gray-200 bg-white">
                             {{range .ViewState.bookings}}
                             <tr>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                <td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
                                     {{if .Data.administrator_unavailability}}
                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                         Retiré
diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index 21d8b70..74ae482 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -1,13 +1,4 @@
 {{define "vehicles_list"}}
-<!-- {{range $.ViewState.bookings}}
-    {{.Vehicleid}}
-    <br>
-{{end}}
-<br>
-{{range $.ViewState.vehicles}}
-    {{.ID}}
-    <br>
-{{end}} -->
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">
@@ -41,26 +32,26 @@
                         <tbody class="divide-y divide-gray-200 bg-white">
                             {{range .ViewState.vehicles}}
                             <tr>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
-                                    {{range $.ViewState.bookings}}
+                                <td class="flex flex-col whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                    {{range .Bookings}}
                                             {{if .Data.administrator_unavailability}}
-                                            <span class="p-1 bg-black 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>
                                             {{else}}
                                                 {{if eq .Status 1 }}
-                                                <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                                <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
                                                     A venir
                                                 </span>
                                                 {{end}}
                                                 {{if eq .Status 0 }}
-                                                <span class="p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                                <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
                                                     En cours
                                                 </span>
                                                 {{end}}
                                                 {{if eq .Status -1 }}
-                                                <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
-                                                    Terminé
+                                                <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                    Disponible
                                                 </span>
                                                 {{end}}
                                             {{end}}

From 59950586ec0bf35f8d160ea7ac6c721f35e63397 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 24 Feb 2023 13:51:25 +0100
Subject: [PATCH 36/55] showing 1 statut for vehicles-list

---
 .../_partials/vehicles-list.html                   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index 74ae482..d24d315 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -33,7 +33,12 @@
                             {{range .ViewState.vehicles}}
                             <tr>
                                 <td class="flex flex-col whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
-                                    {{range .Bookings}}
+                                    {{if not .Bookings}}
+                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                        Disponible
+                                    </span>
+                                    {{else}}
+                                    {{range slice .Bookings 0 1}}
                                             {{if .Data.administrator_unavailability}}
                                             <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                                 Retiré
@@ -43,19 +48,18 @@
                                                 <span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
                                                     A venir
                                                 </span>
-                                                {{end}}
-                                                {{if eq .Status 0 }}
+                                                {{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}}
-                                                {{if eq .Status -1 }}
+                                                {{else}}
                                                 <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
                                                     Disponible
                                                 </span>
                                                 {{end}}
                                             {{end}}
                                     {{end}}
+                                    {{end}}
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >{{.Data.licence_plate}}</div>

From c450eecc3764e226c05ebbbcf5b0873bcd9b057e Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 24 Feb 2023 16:04:01 +0100
Subject: [PATCH 37/55] display all status for vehicles list - statut
 'Disponible' for a new vehicle

---
 web/layouts/vehicles_management/_partials/vehicles-list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index d24d315..e6d8071 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -38,7 +38,7 @@
                                         Disponible
                                     </span>
                                     {{else}}
-                                    {{range slice .Bookings 0 1}}
+                                    {{range .Bookings}}
                                             {{if .Data.administrator_unavailability}}
                                             <span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                                 Retiré

From bb70ed9136290ec64de7298f65df27c4b324c50a Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 24 Feb 2023 17:23:27 +0100
Subject: [PATCH 38/55] edit design in template vehicles-list

---
 .../vehicles_management/_partials/vehicles-list.html        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index e6d8071..2a89e71 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -9,7 +9,7 @@
                             <tr>
                                 <th scope="col"
                                     class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
-                                    Statut
+                                    Statut Réservation
                                 </th>
                                 <th scope="col"
                                     class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
@@ -32,7 +32,8 @@
                         <tbody class="divide-y divide-gray-200 bg-white">
                             {{range .ViewState.vehicles}}
                             <tr>
-                                <td class="flex flex-col whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                <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
@@ -60,6 +61,7 @@
                                             {{end}}
                                     {{end}}
                                     {{end}}
+                                    </div>
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >{{.Data.licence_plate}}</div>

From ea4eea03dada64a029bf8b109ab06c2c0c5a2243 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 24 Feb 2023 18:47:58 +0100
Subject: [PATCH 39/55] delete some logs

---
 web/layouts/members/membersList.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html
index a339435..fcb46d6 100644
--- a/web/layouts/members/membersList.html
+++ b/web/layouts/members/membersList.html
@@ -96,7 +96,6 @@
                                                     x-text="member.data.last_name"></span></a>
                                     </td>
                                 </tr>
-                                <!-- </template> -->
                         </template>
                             <!-- More people... -->
                         </tbody>
@@ -140,7 +139,6 @@
                             <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
                                 @click="paginate(current+2)">
                                 <span class="sr-only">Next</span>
-                                <!-- Heroicon name: solid/chevron-right -->
                                 <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
                                   <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
                                 </svg>

From 6ccb72e566340bcb5085c6a7e7b529076fa4cfc4 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 24 Feb 2023 18:49:13 +0100
Subject: [PATCH 40/55] drop my comment

---
 web/layouts/members/membersList.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html
index fcb46d6..e5b2c84 100644
--- a/web/layouts/members/membersList.html
+++ b/web/layouts/members/membersList.html
@@ -97,7 +97,6 @@
                                     </td>
                                 </tr>
                         </template>
-                            <!-- More people... -->
                         </tbody>
                    
                     </table>
@@ -124,7 +123,7 @@
                               <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
                                 @click="paginate(current)">
                                 <span class="sr-only">Previous</span>
-                                <!-- Heroicon name: solid/chevron-left -->
+                                
                                 <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
                                   <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
                                 </svg>
@@ -135,7 +134,6 @@
                                  :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
                                  x-text="i"></a>
                               </template>
-                              <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
                             <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
                                 @click="paginate(current+2)">
                                 <span class="sr-only">Next</span>

From 612f74202df8bf1ea8bb3cd739abbc58ac3e1872 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Fri, 24 Feb 2023 18:50:26 +0100
Subject: [PATCH 41/55] remove sup button

---
 web/layouts/members/display.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/layouts/members/display.html b/web/layouts/members/display.html
index 19d125d..8e4a2e9 100644
--- a/web/layouts/members/display.html
+++ b/web/layouts/members/display.html
@@ -16,8 +16,6 @@
         </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">
-        <!-- <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> -->
             {{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>

From 675974a9e75421e09a52b8ec7aa74b8bc74305c5 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 27 Feb 2023 14:09:30 +0100
Subject: [PATCH 42/55] add config stats

---
 config.yaml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/config.yaml b/config.yaml
index eef86a0..0899334 100644
--- a/config.yaml
+++ b/config.yaml
@@ -151,7 +151,15 @@ views:
         - web/layouts/administration/_partials/groups_admins.html
         - web/layouts/administration/_partials/group_members.html
         - web/layouts/administration/display_group.html
-  group:
+    beneficaires_list:
+      files:
+        - web/layouts/administration/beneficaires_stats.html
+    events_list:
+      files:
+        - web/layouts/administration/events_stats.html
+    vehicles_list:
+      files:
+        - web/layouts/administration/vehicles_stats.html
     settings: 
       files:
         - web/layouts/administration/_partials/groups_admins.html

From 274f6c16167c43ca8dd5477d22dcc647bf18c681 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 27 Feb 2023 14:09:57 +0100
Subject: [PATCH 43/55] add beneficaires stats

---
 .../administration/beneficaires_stats.html    | 156 ++++++++++++++++++
 1 file changed, 156 insertions(+)
 create mode 100644 web/layouts/administration/beneficaires_stats.html

diff --git a/web/layouts/administration/beneficaires_stats.html b/web/layouts/administration/beneficaires_stats.html
new file mode 100644
index 0000000..d4eaf9c
--- /dev/null
+++ b/web/layouts/administration/beneficaires_stats.html
@@ -0,0 +1,156 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">La liste des bénéficaires</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/">
+                <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">
+                   Retour
+                </button>
+            </a>
+        </div>
+    </div>
+</div>
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
+            state: {{.ViewState.JSONWithLimits 0 10}},
+            current: 0,
+            nb_pages() {
+                let nbEl = this.state.count 
+                return Math.ceil(nbEl/10)
+            },
+            async paginate(page) {
+                let start = (page-1)*10
+                if(start < 0|| start > this.state.count) {
+                    return
+                }
+                let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+                let data = await resp.json()
+                this.state.beneficiaries = data
+                this.current=page-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 ring-1 ring-black ring-opacity-5 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="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                    Labels
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Modifier</span>
+                                </th>
+                            </tr>
+                        </thead>
+                        <tbody class="divide-y divide-gray-200 bg-white">
+                            <template x-for="beneficiary in state.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/' + beneficiary.id + '/picture'" alt="">
+                                            </div>
+                                            <div class="ml-4">
+                                                <div class="font-medium text-gray-900"><span
+                                                        x-text="beneficiary.data.first_name"></span> <span
+                                                        x-text="beneficiary.data.last_name"></span></div>
+                                                <div class="text-gray-500" x-text="beneficiary.data.email"></div>
+                                            </div>
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                        <div class="text-gray-900" x-text="beneficiary.data.phone_number"></div>
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500"
+                                        x-text="beneficiary.data.address ? beneficiary.data.address.properties.label : ''">
+                                    </td>
+                                    <td class="whitespace-nowrap px-3 py-4 text-sm text-gray-500">
+                                        <template x-for="tag in beneficiary.data.tags">
+                                            <span
+                                                class="inline-flex rounded-full bg-green-100 px-2 text-xs font-semibold leading-5 text-green-800"
+                                                x-text="tag"></span>
+                                        </template>
+                                    </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/' + beneficiary.id"
+                                            class="text-co-blue hover:text-co-blue">Voir<span class="sr-only">, <span
+                                                    x-text="beneficiary.data.first_name"></span> <span
+                                                    x-text="beneficiary.data.last_name"></span></a>
+                                    </td>
+                                </tr>
+                            </template>
+
+                            <!-- More people... -->
+                        </tbody>
+                    </table>
+                    <div class="bg-white px-4 py-3 flex items-center justify-between border-t border-gray-200 sm:px-6">
+                        <div class="flex-1 flex justify-between sm:hidden">
+                          <a href="#" class="relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                          @click="paginate(current)"> Previous </a>
+                          <a href="#" class="ml-3 relative inline-flex items-center px-4 py-2 border border-gray-300 text-sm font-medium rounded-md text-gray-700 bg-white hover:bg-gray-50"
+                          @click="paginate(current+2)"> Next </a>
+                        </div>
+                        <div class="hidden sm:flex-1 sm:flex sm:items-center sm:justify-between">
+                          <div>
+                            <p class="text-sm text-gray-700">
+                              Résultats
+                              <span class="font-medium" x-text="Math.min((current * 10)+1, state.count)"></span>
+                              à
+                              <span class="font-medium" x-text="Math.min((current * 10)+10, state.count)"></span>
+                              sur
+                              <span class="font-medium" x-text="state.count"></span>
+                            </p>
+                          </div>
+                          <div>
+                            <nav class="relative z-0 inline-flex rounded-md shadow-sm -space-x-px" aria-label="Pagination">
+                              <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-l-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                @click="paginate(current)">
+                                <span class="sr-only">Previous</span>
+                                <!-- Heroicon name: solid/chevron-left -->
+                                <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                  <path fill-rule="evenodd" d="M12.707 5.293a1 1 0 010 1.414L9.414 10l3.293 3.293a1 1 0 01-1.414 1.414l-4-4a1 1 0 010-1.414l4-4a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                </svg>
+                              </a>
+                              <template x-for="i in nb_pages">
+                                <a href="#" @click="paginate(i)"
+                                 class="relative inline-flex items-center px-4 py-2 border text-sm font-medium"
+                                 :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'"
+                                 x-text="i"></a>
+                              </template>
+                              <!-- Current: "z-10 bg-indigo-50 border-indigo-500 text-indigo-600", Default: "bg-white border-gray-300 text-gray-500 hover:bg-gray-50" -->
+                            <a href="#" class="relative inline-flex items-center px-2 py-2 rounded-r-md border border-gray-300 bg-white text-sm font-medium text-gray-500 hover:bg-gray-50"
+                                @click="paginate(current+2)">
+                                <span class="sr-only">Next</span>
+                                <!-- Heroicon name: solid/chevron-right -->
+                                <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                                  <path fill-rule="evenodd" d="M7.293 14.707a1 1 0 010-1.414L10.586 10 7.293 6.707a1 1 0 011.414-1.414l4 4a1 1 0 010 1.414l-4 4a1 1 0 01-1.414 0z" clip-rule="evenodd" />
+                                </svg>
+                              </a>
+                            </nav>
+                          </div>
+                        </div>
+                      </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+{{end}}
\ No newline at end of file

From 33c182574cf4154636e520b8f597359c6a8c777d Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 27 Feb 2023 14:10:26 +0100
Subject: [PATCH 44/55] add events stats

---
 web/layouts/administration/events_stats.html  | 107 +++++++++++++++
 web/layouts/administration/home.html          |   4 +-
 .../administration/vehicles_stats.html        | 128 ++++++++++++++++++
 web/layouts/members/membersList.html          |  13 +-
 web/layouts/vehicles/bookings-list.html       |  19 ++-
 .../unbooking-display.html                    |  19 +++
 6 files changed, 283 insertions(+), 7 deletions(-)
 create mode 100644 web/layouts/administration/events_stats.html
 create mode 100644 web/layouts/administration/vehicles_stats.html

diff --git a/web/layouts/administration/events_stats.html b/web/layouts/administration/events_stats.html
new file mode 100644
index 0000000..eeeeaf2
--- /dev/null
+++ b/web/layouts/administration/events_stats.html
@@ -0,0 +1,107 @@
+{{define "content"}}
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">La liste des événements</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/">
+                <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">
+                   Retour
+                </button>
+            </a>
+        </div>
+    </div>
+</div>
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <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 ring-1 ring-black ring-opacity-5 md:rounded-lg">
+                    <table class="min-w-full divide-y divide-gray-300">
+                        <thead class="bg-gray-50">
+                            <tr>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Dispositif
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Structure
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Lieu
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left 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">
+                                    Places disponibles
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Bénéficiaires positionnés
+                                </th>
+                                <th scope="col" class="relative py-3.5 pl-3 pr-4 sm:pr-6">
+                                    <span class="sr-only">Actions</span>
+                                </th>
+                            </tr>
+                            <tbody class="divide-y divide-gray-200 bg-white">
+                                {{range .ViewState.events}}
+                                <a href="/app/agenda/{{.ID}}">
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+
+                                        <div class="font-medium text-gray-900">{{.Name}}</div>
+                                        <div class="text-gray-500">{{.Type}}</div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                
+                                        <div class="text-gray-900" >
+                                            {{range .Owners}}
+                                            {{if (index $.ViewState.groups .)}}
+                                                {{(index $.ViewState.groups .).Data.name}}
+                                            {{end}}
+                                            {{end}}
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="text-gray-900" >{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="text-gray-900" >
+                                            {{if eq .Startdate .Enddate}}
+                                            Le {{(timeFrom .Startdate).Format "02/01/2006"}}
+                                            {{else}}
+                                            Du {{(timeFrom .Startdate).Format "02/01/2006"}} <br />Au {{(timeFrom .Enddate).Format "02/01/2006"}}
+                                            {{end}}
+                                        </div>
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        {{if ne .RemainingSubscriptions 999}}
+                                        <div class="text-gray-900" >{{.RemainingSubscriptions}}</div>
+                                        {{end}}
+                                    </td>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <div class="flex -space-x-1 overflow-hidden" >
+                                            {{range .Subscriptions}}
+                                            <img class="inline-block h-6 w-6 rounded-co ring-2 ring-white" src="/app/beneficiaries/{{.Subscriber}}/picture" >
+                                            {{end}}
+                                        </div>
+                                    </td>
+
+
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                        <a href="/app/agenda/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
+                                    </td>
+                                </tr>
+                                </a>
+                                {{end}}
+                            </tbody>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/administration/home.html b/web/layouts/administration/home.html
index 1418344..f314c63 100644
--- a/web/layouts/administration/home.html
+++ b/web/layouts/administration/home.html
@@ -14,7 +14,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="/app/beneficiaries/" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
+          <a href="/app/administration/stats/beneficaires" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
           <p class="text-gray-500">{{len .ViewState.beneficiaries }} bénéficiaires</p>
         </div>
       </div>
@@ -28,7 +28,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="/app/agenda/" class="text-gray-900 font-medium hover:text-gray-600">Évenements</a>
+          <a href="/app/administration/stats/events" class="text-gray-900 font-medium hover:text-gray-600">Évenements</a>
           <p class="text-gray-500">{{len .ViewState.events}} évenements</p>
         </div>
       </div>
diff --git a/web/layouts/administration/vehicles_stats.html b/web/layouts/administration/vehicles_stats.html
new file mode 100644
index 0000000..57834fc
--- /dev/null
+++ b/web/layouts/administration/vehicles_stats.html
@@ -0,0 +1,128 @@
+{{define "content"}}
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">La liste des voitures</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/">
+                <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">
+                   Retour
+                </button>
+            </a>
+        </div>
+    </div>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
+    <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 ring-1 ring-black ring-opacity-5 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">
+                                    Statut Réservation
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Organisation
+                                </th>
+                                <th scope="col"
+                                    class="py-3.5 pl-4 pr-3 text-left 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">
+                                    Type
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left 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">
+                                    Lieu
+                                </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 class="divide-y divide-gray-200 bg-white">
+                            {{range .ViewState.vehicles}}
+                            <tr>
+                                <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}}
+                                    {{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-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
+                                                </span>
+                                                {{else}}
+                                                <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                    Disponible
+                                                </span>
+                                                {{end}}
+                                            {{end}}
+                                    {{end}}
+                                    {{end}}
+                                    </div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{range .Bookings}}
+                                    <div class="text-gray-900" >{{.Data.booked_by.group.name}}</div>
+                                  
+                                   
+                                    {{end}}
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{.Data.licence_plate}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >
+                                        {{.Type}}
+                                        {{if eq .Type "Voiture"}}
+                                        {{ if .Data.automatic}} (boite auto){{ end }}
+                                        {{end}}
+                                    </div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{.Data.name}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</div>
+                                </td>
+                               
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <a href="/app/vehicles-management/fleet/{{.ID}}"
+                                            class="text-co-blue hover:text-co-blue">Voir</a>
+                                </td>
+                            </tr>
+                            {{end}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+{{end}}
+
+<!-- ////////////////////////////////// -->
\ No newline at end of file
diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html
index e5b2c84..73e3fd0 100644
--- a/web/layouts/members/membersList.html
+++ b/web/layouts/members/membersList.html
@@ -1,15 +1,20 @@
 {{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">Les membres de l'organisation {{.Group.Data.name}}</h1>
-
     <div class="sm:flex sm:items-center">
         <div class="sm:flex-auto">
-            <p class="mt-2 text-sm text-gray-700"></p>
+            <h1 class="text-2xl font-semibold text-gray-900">La listes des référents</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/">
+                <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">
+                   Retour
+                </button>
+            </a>
         </div>
     </div>
 </div>
 
-
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8" x-data="{
             state: {{.ViewState.list.JSONWithLimits 0 10}},
             current: 0,
diff --git a/web/layouts/vehicles/bookings-list.html b/web/layouts/vehicles/bookings-list.html
index 4cb90c2..4f2ace9 100644
--- a/web/layouts/vehicles/bookings-list.html
+++ b/web/layouts/vehicles/bookings-list.html
@@ -1,6 +1,18 @@
 {{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éservations</h1>
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h1 class="text-2xl font-semibold text-gray-900">Réservations</h1>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/app/administration/stats/vehicles/available">
+                <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">
+                    Voitures disponibles
+                </button>
+            </a>
+        </div>
+    </div>
 </div>
 
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
@@ -64,6 +76,11 @@
                                         </span>
                                         {{end}}
                                     {{end}}
+                                    {{if not .bookings}}
+                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                       Disponible
+                                    </span>
+                                    {{end}}
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >{{(index $.ViewState.vehicles_map .Vehicleid).Type}}</div>
diff --git a/web/layouts/vehicles_management/unbooking-display.html b/web/layouts/vehicles_management/unbooking-display.html
index 8b5de9d..7552f9a 100644
--- a/web/layouts/vehicles_management/unbooking-display.html
+++ b/web/layouts/vehicles_management/unbooking-display.html
@@ -1,4 +1,23 @@
 {{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">Voitures disponibles</h1>
+    
+
+    <!-- <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <h2 class="text-xl font-semibold text-gray-600 pt-8">Réservations en cours et à venir</h2>
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <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">
+                    {{$.IconSet.Icon "hero:outline/table-cells" "h-5 w-5 mr-3"}}
+                    Historique
+                </button>
+            </a>
+        </div>
+    </div> -->
+</div>
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <div class="mt-8 flex flex-col">
         <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">

From e0fd3aa510a44b44a75f61c2b53022c5251e62b1 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 27 Feb 2023 14:14:08 +0100
Subject: [PATCH 45/55] fix events stats

---
 web/layouts/administration/events_stats.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/layouts/administration/events_stats.html b/web/layouts/administration/events_stats.html
index eeeeaf2..53bd498 100644
--- a/web/layouts/administration/events_stats.html
+++ b/web/layouts/administration/events_stats.html
@@ -88,8 +88,6 @@
                                             {{end}}
                                         </div>
                                     </td>
-
-
                                     <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                         <a href="/app/agenda/{{.ID}}" class="text-co-blue hover:text-co-blue">Voir</a>
                                     </td>

From afc403bded1966e3ec02385f3a316e7e2eb2138c Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 27 Feb 2023 14:15:02 +0100
Subject: [PATCH 46/55] add vehicles stats

---
 web/layouts/administration/vehicles_stats.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web/layouts/administration/vehicles_stats.html b/web/layouts/administration/vehicles_stats.html
index 57834fc..62705ca 100644
--- a/web/layouts/administration/vehicles_stats.html
+++ b/web/layouts/administration/vehicles_stats.html
@@ -124,5 +124,3 @@
 
 
 {{end}}
-
-<!-- ////////////////////////////////// -->
\ No newline at end of file

From fc60854e21b7c00771848e4cd8096b8e173e5ec6 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 27 Feb 2023 14:16:01 +0100
Subject: [PATCH 47/55] add members stats

---
 web/layouts/members/membersList.html | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html
index 73e3fd0..884a889 100644
--- a/web/layouts/members/membersList.html
+++ b/web/layouts/members/membersList.html
@@ -59,13 +59,8 @@
                             </tr>
                         </thead>
                        
-                        <tbody class="divide-y divide-gray-200 bg-white">
-                           
-                          
+                        <tbody class="divide-y divide-gray-200 bg-white"> 
                             <template x-for="(member, i) in state.members"  > 
-                                
-                               
-                                   
                                 <tr>
                                     <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                         <div class="flex items-center">
@@ -152,7 +147,6 @@
                       </div>
                 </div>
             </div>
-
         </div>
     </div>
 </div>

From 031ef7b92468265c0c82390b7f65a6e6701331d7 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 27 Feb 2023 14:55:23 +0100
Subject: [PATCH 48/55] put organisation info

---
 web/layouts/administration/vehicles_stats.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/web/layouts/administration/vehicles_stats.html b/web/layouts/administration/vehicles_stats.html
index 62705ca..9fb6909 100644
--- a/web/layouts/administration/vehicles_stats.html
+++ b/web/layouts/administration/vehicles_stats.html
@@ -84,11 +84,7 @@
                                     </div>
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    {{range .Bookings}}
-                                    <div class="text-gray-900" >{{.Data.booked_by.group.name}}</div>
-                                  
-                                   
-                                    {{end}}
+                                    <div class="text-gray-900" >{{(index $.ViewState.admingroups (index .Administrators 0)).Data.name}}</div>
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >{{.Data.licence_plate}}</div>

From 511baa6a8e2c6cc155fd68a25ff969d822e4efef Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 27 Feb 2023 15:10:49 +0100
Subject: [PATCH 49/55] modify config

---
 config.yaml                                   |  3 -
 .../unbooking-display.html                    | 80 -------------------
 2 files changed, 83 deletions(-)
 delete mode 100644 web/layouts/vehicles_management/unbooking-display.html

diff --git a/config.yaml b/config.yaml
index 0899334..1ee068d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -75,9 +75,6 @@ views:
       files:
         - web/layouts/vehicles_management/_partials/calendar.html
         - web/layouts/vehicles_management/fleet-display.html
-    unbooking_display:
-      files:
-        - web/layouts/vehicles_management/unbooking-display.html
     fleet_update:
       files:
         - web/layouts/_partials/address_autocomplete.html
diff --git a/web/layouts/vehicles_management/unbooking-display.html b/web/layouts/vehicles_management/unbooking-display.html
deleted file mode 100644
index 7552f9a..0000000
--- a/web/layouts/vehicles_management/unbooking-display.html
+++ /dev/null
@@ -1,80 +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">Voitures disponibles</h1>
-    
-
-    <!-- <div class="sm:flex sm:items-center">
-        <div class="sm:flex-auto">
-            <h2 class="text-xl font-semibold text-gray-600 pt-8">Réservations en cours et à venir</h2>
-        </div>
-        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-            <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">
-                    {{$.IconSet.Icon "hero:outline/table-cells" "h-5 w-5 mr-3"}}
-                    Historique
-                </button>
-            </a>
-        </div>
-    </div> -->
-</div>
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
-    <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 ring-1 ring-black ring-opacity-5 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">
-                                    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">
-                                    Type
-                                </th>
-                                <th scope="col" class="px-3 py-3.5 text-left 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">
-                                    Lieu
-                                </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 class="divide-y divide-gray-200 bg-white">
-                            {{range .ViewState.vehicles}}
-                            <tr>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >{{.Data.licence_plate}}</div>
-                                </td>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >
-                                        {{.Type}}
-                                        {{if eq .Type "Voiture"}}
-                                        {{ if .Data.automatic}} (boite auto){{ end }}
-                                        {{end}}
-                                    </div>
-                                </td>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >{{.Data.name}}</div>
-                                </td>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >{{if .Data.address}}{{.Data.address.properties.label}}{{end}}</div>
-                                </td>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <a href="/app/vehicles-management/fleet/{{.ID}}"
-                                            class="text-co-blue hover:text-co-blue">Voir</a>
-                                </td>
-                            </tr>
-                            {{end}}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-{{end}}
\ No newline at end of file

From 332d9dd509ce5d726922d91b6017e866e360ac6c Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 3 Mar 2023 11:39:37 +0100
Subject: [PATCH 50/55] =?UTF-8?q?add=20'Disponible'=20for=20'Statut=20R?=
 =?UTF-8?q?=C3=A9servation'=20for=20some=20case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vehicles_management/_partials/vehicles-list.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index 2a89e71..d213d2f 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -38,6 +38,14 @@
                                     <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 eq .Status -1 }}
+                                                <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                    Disponible
+                                                </span>
+                                                {{end}}
+                                            {{end}}
                                     {{else}}
                                     {{range .Bookings}}
                                             {{if .Data.administrator_unavailability}}
@@ -53,10 +61,6 @@
                                                 <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
                                                     En cours
                                                 </span>
-                                                {{else}}
-                                                <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
-                                                    Disponible
-                                                </span>
                                                 {{end}}
                                             {{end}}
                                     {{end}}

From 193bd8ef3aae609240eb4102eef525683a6c03c1 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 3 Mar 2023 13:16:26 +0100
Subject: [PATCH 51/55] =?UTF-8?q?add=20'Retir=C3=A9'=20in=20'Statut=20R?=
 =?UTF-8?q?=C3=A9servation'=20for=20some=20case?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vehicles_management/_partials/vehicles-list.html   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index d213d2f..fc4cb7e 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -39,13 +39,17 @@
                                         Disponible
                                     </span>
                                     {{else if len .Bookings | eq 1}}
-                                            {{range .Bookings}}
-                                                {{if eq .Status -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>
-                                                {{end}}
                                             {{end}}
+                                        {{end}}
                                     {{else}}
                                     {{range .Bookings}}
                                             {{if .Data.administrator_unavailability}}

From ad7f5b642e311cd8c9bf4f6bbcf5cc5fc0539547 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Fri, 3 Mar 2023 16:58:47 +0100
Subject: [PATCH 52/55] Sow status of vehicle in vehicles list

---
 .../_partials/vehicles-list.html               | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index fc4cb7e..1fdcff7 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -50,8 +50,8 @@
                                                 </span>
                                             {{end}}
                                         {{end}}
-                                    {{else}}
-                                    {{range .Bookings}}
+                                    {{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é
@@ -67,7 +67,19 @@
                                                 </span>
                                                 {{end}}
                                             {{end}}
-                                    {{end}}
+                                        {{end}}
+                                        {{$allAvailable := true}}
+                                            {{range .Bookings}}
+                                                {{if ne .Status -1}}
+                                                    {{ $allAvailable = false }}
+                                                    {{ break }}
+                                                {{end}}
+                                            {{end}}
+                                            {{if $allAvailable}}
+                                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                        Disponible
+                                                    </span>
+                                            {{end}}                                        
                                     {{end}}
                                     </div>
                                 </td>

From a36827a6ffa9955b24b3c9e16c01b07e78be06c2 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 6 Mar 2023 10:22:25 +0100
Subject: [PATCH 53/55] add vehicles status in stat

---
 .../administration/vehicles_stats.html        | 43 ++++++++++++++++---
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/web/layouts/administration/vehicles_stats.html b/web/layouts/administration/vehicles_stats.html
index 9fb6909..06432c4 100644
--- a/web/layouts/administration/vehicles_stats.html
+++ b/web/layouts/administration/vehicles_stats.html
@@ -51,6 +51,7 @@
                         </thead>
                         <tbody class="divide-y divide-gray-200 bg-white">
                             {{range .ViewState.vehicles}}
+
                             <tr>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
                                     <div class="flex flex-col px-6">
@@ -58,8 +59,28 @@
                                     <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
                                         Disponible
                                     </span>
-                                    {{else}}
-                                    {{range .Bookings}}
+                                    {{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
+                                                </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é
@@ -73,13 +94,21 @@
                                                 <span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
                                                     En cours
                                                 </span>
-                                                {{else}}
-                                                <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
-                                                    Disponible
-                                                </span>
                                                 {{end}}
                                             {{end}}
-                                    {{end}}
+                                        {{end}}
+                                        {{$allAvailable := true}}
+                                            {{range .Bookings}}
+                                                {{if ne .Status -1}}
+                                                    {{ $allAvailable = false }}
+                                                    {{break}}
+                                                {{end}}
+                                            {{end}}
+                                            {{if $allAvailable}}
+                                                    <span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
+                                                        Disponible
+                                                    </span>
+                                            {{end}}                                      
                                     {{end}}
                                     </div>
                                 </td>

From 0f4d0e1e5bf26c96f70a913f3dde758222df53c5 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Mon, 6 Mar 2023 10:49:24 +0100
Subject: [PATCH 54/55] fix the break err

---
 web/layouts/vehicles_management/_partials/vehicles-list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index 1fdcff7..ea1b2a0 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -72,7 +72,7 @@
                                             {{range .Bookings}}
                                                 {{if ne .Status -1}}
                                                     {{ $allAvailable = false }}
-                                                    {{ break }}
+                                                    {{break}}
                                                 {{end}}
                                             {{end}}
                                             {{if $allAvailable}}

From b89b8064c56ad4bd1a24f6e2258f7345d9998537 Mon Sep 17 00:00:00 2001
From: Nicolas Caron <nicolas.caron@coopgo.fr>
Date: Wed, 8 Mar 2023 10:09:49 +0100
Subject: [PATCH 55/55] edit vehicles-list to fix viewing status problems

---
 .../vehicles_management/_partials/vehicles-list.html      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/web/layouts/vehicles_management/_partials/vehicles-list.html b/web/layouts/vehicles_management/_partials/vehicles-list.html
index ea1b2a0..c6b9759 100644
--- a/web/layouts/vehicles_management/_partials/vehicles-list.html
+++ b/web/layouts/vehicles_management/_partials/vehicles-list.html
@@ -48,6 +48,14 @@
                                                 <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
+                                                </span>
                                             {{end}}
                                         {{end}}
                                     {{else if gt (len .Bookings) 1}}