fix the modify address

config.yaml

@@ -32,6 +32,7 @@ views:
     update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/beneficiaries/update.html
   members:
     display:
@@ -40,6 +41,15 @@ views:
     update:
       files:
         - web/layouts/members/update.html
+    list:
+      files:
+        - web/layouts/members/membersList.html
+  group:
+    settings:
+      files:
+        - web/layouts/administration/_partials/groups_admins.html
+        - web/layouts/administration/_partials/group_members.html
+        - web/layouts/group/settings.html
   vehicles:
     search: 
       files: 
@@ -75,6 +85,7 @@ views:
     fleet_update:
       files:
         - web/layouts/_partials/address_autocomplete.html
+        - web/layouts/agenda/_partials/address.html
         - web/layouts/vehicles_management/_partials/vehicle-type-select.html
         - web/layouts/vehicles_management/fleet-update.html
     booking_display: 
@@ -163,7 +174,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

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

web/layouts/administration/events_stats.html

@@ -0,0 +1,105 @@
+{{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}}

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/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>
@@ -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>
+          <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.groups}} organisations</p>
+          <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> -->
+  <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>

web/layouts/administration/vehicles_stats.html

@@ -0,0 +1,151 @@
+{{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 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é
+                                            </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}}
+                                        {{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>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <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>
+                                </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}}

web/layouts/beneficiaries/update.html

@@ -163,8 +163,12 @@
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
 
                         {{ $fieldName := "address" }} 
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.Data.address) }}
+                        {{if .ViewState.Data.address}}
-                    <!-- will dolater : tags, groups, ... -->
+                        {{$default := .ViewState.Data.address}}
+                        {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                        {{else}}
+                        {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                        {{end}}
 
                 </div>
             </div>

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>
@@ -60,6 +58,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>

web/layouts/members/membersList.html

@@ -0,0 +1,154 @@
+{{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 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,
+            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>
+                        </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>
+                                
+                                <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>
+                            <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>
+                                <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}}

web/layouts/vehicles/bookings-list.html

@@ -1,7 +1,19 @@
 {{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">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">
     <div class="mt-8 flex flex-col">
@@ -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>

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

web/layouts/vehicles_management/fleet-display.html

@@ -1,4 +1,5 @@
 {{define "content"}}
+
 <div x-data="{dialog: false}">
     <main class="py-10">
         <div class="max-w-3xl mx-auto px-4 sm:px-6 md:flex md:items-center md:justify-between md:space-x-5 lg:max-w-7xl lg:px-8">
@@ -13,11 +14,12 @@
                     <h1 class="text-2xl font-bold text-gray-900">{{.ViewState.vehicle.Data.name}}</h1>
                 </div>
             </div>
+            {{ if eq (index .ViewState.vehicle.Administrators 0) .Group.ID }}
             <div class="mt-6 flex flex-col-reverse justify-stretch space-y-4 space-y-reverse sm:flex-row-reverse sm:justify-end sm:space-x-reverse sm:space-y-0 sm:space-x-3 md:mt-0 md:flex-row md:space-x-3">
+                <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.ID}}/update" class="inline-flex"><button type="button"
+                    class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a> {{end}}
                 <button type="button" @click="dialog = !dialog"
                     class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer de la flotte</button>
-                <!-- <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.ID}}/update" class="inline-flex"><button type="button"
-                        class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Modifier</button></a> -->
             </div>
         </div>
         <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">

web/layouts/vehicles_management/fleet-update.html

@@ -1,5 +1,6 @@
 {{define "content"}}
 
+{{ if eq (index .ViewState.vehicle.Administrators 0) .Group.ID }}
 
 <div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
     <h1 class="text-2xl font-semibold text-gray-900">Modifier un véhicule</h1>
@@ -78,13 +79,17 @@
                 </div>
                 <div class="mt-5 md:mt-0 md:col-span-2">
                     {{ $fieldName := "address" }} 
-                    {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.vehicle.Data.address) }}
+                    {{if .ViewState.vehicle.Data.address}}
-
+                    {{$default := .ViewState.vehicle.Data.address}}
+                    {{ template "address" dict "FieldName" $fieldName  "Default" $default}}
+                    {{else}}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName}}
+                    {{end}}
                     <div class="mt-5">
                         <label for="informations" class="block text-sm font-medium text-gray-700">Informations pratiques pour le bénéficiaire</label>
                         <div class="mt-1">
-                            <textarea rows="4" name="informations" id="informations"
+                            <textarea rows="4" name="informations" id="informations" value="{{.ViewState.vehicle.Data.informations}}"
-                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
+                                class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">{{ if .ViewState.vehicle.Data.informations}} {{.ViewState.vehicle.Data.informations}} {{end}}</textarea>
                         </div>
                     </div>
                 </div>
@@ -103,4 +108,29 @@
         </div>
     </form>
 </div>
+
+{{else}}
+ <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
+        
+ <div class="fixed inset-0 z-10 overflow-y-auto">
+ <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
+
+     <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
+     <div>
+         <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
+         {{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
+         </div>
+         <div class="mt-3 text-center sm:mt-5">
+             <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Vous n'avez pas le droit de modifier ce véhicule</h3>
+         </div>
+     </div>
+     <div class="flex justify-center  items-center mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense ">
+        <!-- class="flex justify-center items-center py-2 px-3 border-t dark:border-gray-600 -->
+         <a href="/app/vehicles-management/fleet/{{.ViewState.vehicle.ID}}" class="rounded-2xl mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
+         <!-- <button type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmation</button> -->
+     </div>
+     </div>
+ </div>
+ </div>
+{{end}}
 {{end}}