modify some style and add the update file to delete passenger

config.yaml

@@ -32,7 +32,13 @@ views:
       files:
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/beneficiaries/update.html
-  
+  conseillers:
+    display:
+      files:
+        - web/layouts/conseillers/display.html
+    update:
+      files:
+        - web/layouts/conseillers/update.html
   vehicles:
     search: 
       files: 
@@ -106,8 +112,12 @@ 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
+    update:
+      files:
+        - web/layouts/journeys/update_groups.html
   support:
     request:
       files:

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="#" class="focus:outline-none">
+        <a href="/app/profile/{{.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>

web/layouts/administration/create_group.html

@@ -122,6 +122,28 @@
                                     </p>
                                 </div>
                             </div>
+                            <div class="flex items-start">
+                                <div class="flex items-center h-5">
+                                    <input id="support" name="modules.support" 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="modules.support" class="font-medium text-gray-700">Support</label>
+                                    <p class="text-gray-500">Contacter notre support en cas de problème.
+                                    </p>
+                                </div>
+                            </div>
+                            <div class="flex items-start">
+                                <div class="flex items-center h-5">
+                                    <input id="group_module" name="modules.group_module" 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="modules.group_module" class="font-medium text-gray-700">Groupes/Communautés</label>
+                                    <p class="text-gray-500">Créer des groupes pour ses bénéficiaires.
+                                    </p>
+                                </div>
+                            </div>
                         </div>
                     </fieldset>
                 </div>

web/layouts/administration/display_group.html

@@ -119,6 +119,28 @@
                                 </p>
                             </div>
                         </div>
+                        <div class="flex items-start">
+                            <div class="flex items-center h-5">
+                                <input id="support" name="modules.support" type="checkbox" disabled {{if .ViewState.group.Data.modules.support}} checked{{end}}
+                                    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="modules.support" class="font-medium text-gray-700">Support</label>
+                                <p class="text-gray-500">Contacter notre support en cas de problème.
+                                </p>
+                            </div>
+                        </div>
+                        <div class="flex items-start">
+                            <div class="flex items-center h-5">
+                                <input id="group_module" name="modules.group_module" type="checkbox" disabled {{if .ViewState.group.Data.modules.group_module}} checked{{end}}
+                                    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="modules.group_module" class="font-medium text-gray-700">Groupes/Communautés</label>
+                                <p class="text-gray-500">Créer des groupes pour ses bénéficiaires.
+                                </p>
+                            </div>
+                        </div>
                         <div class="flex items-start">
                             <div class="flex items-center h-5">
                                 <input id="events" name="modules.events" type="checkbox" disabled {{if .ViewState.group.Data.modules.administration}} checked{{end}}

web/layouts/conseillers/display.html

@@ -0,0 +1,70 @@
+{{define "content"}}
+<main class="py-10">
+    <!-- Page header -->
+    <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 class="flex-shrink-0">
+                <div class="relative">
+                    <img class="h-16 w-16 rounded-co" src="/app/beneficiaries/{{.ViewState.admins.ID}}/picture" alt="">
+                    <span class="absolute inset-0 shadow-inner rounded-full" aria-hidden="true"></span>
+                </div>
+            </div>
+            <div>
+                <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.admins.Data.first_name}}
+                    {{.ViewState.admins.Data.last_name}}</h1>
+            </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">
+        <!-- <button type="button"
+            class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Supprimer</button> -->
+        <a href="/app/profile/{{.ViewState.admins.ID}}/update" class="inline-flex"><button type="button"
+                class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a>
+    </div>
+    </div>
+
+    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
+        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
+            <section aria-labelledby="admins-information-title">
+                <div class="bg-white shadow sm:rounded-lg">
+                    <div class="px-4 py-5 sm:px-6">
+                        <h2 id="admins-information-title" class="text-lg leading-6 font-medium text-gray-900">
+                            Informations personnelles</h2>
+                        <p class="mt-1 max-w-2xl text-sm text-gray-500">Informations générales sur le conseiller.</p>
+                    </div>
+                    <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                       
+                        <dl class="grid grid-cols-1 gap-x-4 gap-y-8 sm:grid-cols-2">
+                            {{if .ViewState.admins.Data.email}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Email</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.email}}</dd>
+                            </div>
+                            {{end}}
+                            {{if .ViewState.admins.Data.phone_number}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Télephone</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.phone_number}}
+                               </dd>
+                            </div>
+                            {{end}}
+                            
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Nom</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.first_name}}</dd>
+                            </div>
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Prénon</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.admins.Data.last_name}}
+                               </dd>
+                            </div>
+                            
+                        </dl>
+                    </div>
+                </div>
+            </section>
+        </div>
+
+    </div>
+</main>
+{{end}}

web/layouts/conseillers/update.html

@@ -0,0 +1,131 @@
+{{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 vos informations</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+    x-data="{
+        fields: {
+            first_name: '{{ .ViewState.Data.first_name }}',
+            last_name: '{{ .ViewState.Data.last_name }}',
+            email: '{{ .ViewState.Data.email }}',
+            phone_number: '{{ .ViewState.Data.phone_number }}',
+            gender: {{.ViewState.Data.gender}}
+        },
+        rules: {
+            first_name: ['required'],
+            last_name: ['required'],
+            email: ['required', 'email'],
+            phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                first_name: {valid: null},
+                last_name: {valid: null},
+                email: {valid: null},
+                phone_number: {valid: null},
+            }
+        },
+        isFormValid: true,
+        validate() {
+            this.formValidation = Iodine.assert(this.fields, this.rules)
+        },
+        validateField(field) {
+            this.formValidation.fields[field] = Iodine.assert(this.fields[field], this.rules[field])
+        },
+        submit(event) {
+            this.validate()
+            if(!this.formValidation.valid) {
+                this.isFormValid = false
+                event.preventDefault()
+            }
+            return this.formValidation.valid
+        }
+    }">
+    <form class="space-y-6" method="POST" @submit="submit">
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations obligatoires</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations personnelles sur le conseiller obligatoires
+                        pour créer son profil dans PARCOURSMOB</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="first_name" class="block text-sm font-medium text-gray-700">Prénom</label>
+                            <input type="text" value="{{.ViewState.Data.first_name}}" name="first_name" id="first_name" autocomplete="given-name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                 @blur="validateField('first_name')" 
+                                :class="formValidation.fields.first_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="last_name" class="block text-sm font-medium text-gray-700">Nom</label>
+                            <input type="text" name="last_name" id="last_name" value="{{.ViewState.Data.last_name}}" autocomplete="family-name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                               @blur="validateField('last_name')"
+                                :class="formValidation.fields.last_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="email" class="block text-sm font-medium text-gray-700">Email</label>
+                            <input type="text" name="email" id="email" autocomplete="email" value="{{.ViewState.Data.email}}"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                 @blur="validateField('email')"
+                                :class="formValidation.fields.email.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="phone_number" class="block text-sm font-medium text-gray-700">Numéro de
+                                téléphone</label>
+                            <input type="text" name="phone_number" id="phone_number" autocomplete="phone" placeholder="+33612345678"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="fields.phone_number" @blur="validateField('phone_number')"
+                                :class="formValidation.fields.phone_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Informations optionnelles</h3>
+                    <p class="mt-1 text-sm text-gray-500">Autres informations de profil optionnelles</p>
+                </div>
+                <div class="mt-5 space-y-6 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="gender" class="block text-sm font-medium text-gray-700">Genre</label>
+                            <div class="sm:mt-0 sm:col-span-2">
+                                <select id="gender" name="gender" autocomplete="gender" x-model="gender"
+                                    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 border-gray-300 rounded-2xl">
+                                    <option value="0">Inconnu</option>
+                                    <option value="1" :selected="fields.gender == '1'">Masculin</option>
+                                    <option value="2" :selected="fields.gender == '2'">Féminin</option>
+                                    <option value="9" :selected="fields.gender == '9'">Sans objet</option>
+                                </select>
+                            </div>
+                        </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/profile/{{.ViewState.ID}}">
+                <button type="button"
+                    class="bg-white py-2 px-4 border border-gray-300 rounded-2xl shadow-sm text-sm font-medium text-gray-700 hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+            </a>
+            <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}}

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);
+        // console.log("rideDuration :", rideDuration, ", rideDistance ",rideDistance)
-        // $("#ride-distance").val(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()
 }

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'">
@@ -158,34 +158,12 @@
                 </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 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> -->
    
-           
-<!-- <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">
 
-    <!-- <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">

web/layouts/journeys/display_groups.html

@@ -1,4 +1,5 @@
 {{define "content"}}
+<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">
@@ -122,162 +123,17 @@
                        
                     </div>
                 </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="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="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">
-                {{template "map" .}}
-            </div>
-        </div>
-    </div>
-    <!-- $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$ -->
-    
-    <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8 mt-2">
-    <!--  -->
-        <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 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
-                            </th>
-                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
-                                Email
-                            </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="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>
-                                    </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.email">
-                                </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>
-
-                    </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>
-
-</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">
+                            {{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}}',
@@ -325,18 +181,142 @@
                                  
                                   </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>
-               
+                                {{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">
+    <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">
+                {{template "map" .}}
+            </div>
+        </div>
+    </div>
+    
+    <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8 mt-2">
+    <!--  -->
+        <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 du bénéficiaire
+                            </th>
+                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                Départ
+                            </th>
+                            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900">
+                                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">
+                        {{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="h-10 w-10 flex-shrink-0">
+                                            <img class="h-10 w-10 rounded-co"
+                                                :src="'/app/beneficiaries/' + `{{.ID}}`+ '/picture'" alt="">
+                                        </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">
+                                    {{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">
+                             
+                                   <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>
+                     {{end}}
+                     
+                     {{end}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        
+        </div>
+        </div>
+        </div>
+
+    </div>
+
     </div>
 
 </div>

web/layouts/journeys/group_management.html

@@ -63,15 +63,6 @@
                                     </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">

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}}

web/layouts/layout.html

@@ -8,8 +8,6 @@
   <!-- <script defer type="text/javascript" src="/public/js/main.js" defer></script> -->
   <script src="https://cdn.jsdelivr.net/npm/@kingshott/iodine@8.1.0/dist/iodine.min.umd.js" defer></script>
   <script defer src="https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js" defer></script>
-  <script src="https://unpkg.com/maplibre-gl@2.4.0/dist/maplibre-gl.js"></script>
-  <link href="https://unpkg.com/maplibre-gl@2.4.0/dist/maplibre-gl.css" rel="stylesheet" />
 </head>
 
 <body class="h-full" x-data="{ offCanvasMenu: false }">
@@ -133,12 +131,12 @@
           <div class="ml-3 relative" x-data="{ profileMenuOpen: false }">
             <div>
               <!-- <button @click="profileMenuOpen = ! profileMenuOpen" type="button" -->
-              <button type="button"
+              <button  @click="profileMenuOpen = ! profileMenuOpen" type="button"
                 class="max-w-xs bg-white flex items-center text-sm rounded-co focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue"
                 id="user-menu-button" aria-expanded="false" aria-haspopup="true">
                 <span class="sr-only">Open user menu</span>
                 <img class="h-8 w-8 rounded-co"
-                  src="http://localhost:9000/app/beneficiaries/e7616eac-4a87-4396-a505-23e0421b9c4c/picture"
+                  src="/app/beneficiaries/{{.UserID}}/picture"
                   alt="Menu utilisateur">
               </button>
             </div>
@@ -153,14 +151,14 @@
               x-transition:leave-start="transform opacity-100 scale-100"
               x-transition:leave-end="transform opacity-0 scale-95">
               <!-- Active: "bg-gray-100", Not Active: "" -->
-              <a href="/app/profile" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <a href="/app/profile/{{.UserID}}" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
                 id="user-menu-item-0">Votre profil</a>
 
-              <a href="/app/settings/" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <a href="/app/profile/{{.UserID}}/update" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
                 id="user-menu-item-1">Paramètres</a>
 
-              <a href="/app/disconnect" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
+              <!-- <a href="/app/disconnect" class="block px-4 py-2 text-sm text-gray-700" role="menuitem" tabindex="-1"
-                id="user-menu-item-2">Se déconnecter</a>
+                id="user-menu-item-2">Se déconnecter</a> -->
             </div>
           </div>
         </div>