From 296ca9808f33eed9adbf61c6f40c33d1335082a6 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Tue, 8 Nov 2022 17:17:41 +0100
Subject: [PATCH 1/5] add file groupe

---
 config.yaml                                 |  12 +
 web/layouts/group_module/create_group.html  |  86 +++++++
 web/layouts/group_module/display_group.html | 254 ++++++++++++++++++++
 web/layouts/group_module/home.html          |  60 +++++
 4 files changed, 412 insertions(+)
 create mode 100644 web/layouts/group_module/create_group.html
 create mode 100644 web/layouts/group_module/display_group.html
 create mode 100644 web/layouts/group_module/home.html

diff --git a/config.yaml b/config.yaml
index 1a9c750..9d89d12 100644
--- a/config.yaml
+++ b/config.yaml
@@ -101,6 +101,18 @@ views:
     request:
       files:
         - web/layouts/support/support.html
+  group_module:
+    home:
+      files:
+        - web/layouts/group_module/home.html
+    create_group:
+      files:
+        - web/layouts/group_module/create_group.html
+  
+    display_group:
+      files:
+        - web/layouts/group_module/display_group.html
+
   administration:
     home:
       files:
diff --git a/web/layouts/group_module/create_group.html b/web/layouts/group_module/create_group.html
new file mode 100644
index 0000000..4936a2a
--- /dev/null
+++ b/web/layouts/group_module/create_group.html
@@ -0,0 +1,86 @@
+{{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">Groups > Créer un group</h1>
+</div>
+
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8" x-data="{
+        fields: {
+            name: null,
+            type: null,
+        },
+        rules: {
+            name: ['required'],
+            type: ['required'],
+        },
+        formValidation: {
+            valid: false,
+            fields: {
+                name: {valid: null},
+                type: {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">Nouveau groupe</h3>
+                    <p class="mt-1 text-sm text-gray-500">Informations de base sur le groupe à créer</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-5">
+                            <label for="name" class="block text-sm font-medium text-gray-700">Nom de groupe</label>
+                            <input type="text" name="name" id="name"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.name" @blur="validateField('name')"
+                                :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+                        <div class="col-span-3">
+                            <label for="type" class="block text-sm font-medium text-gray-700">Type de groupe</label>
+                            <select id="type" name="type" 
+                                x-model="fields.type" @blur="validateField('type')"
+                                class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm rounded-2xl"
+                                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                <option value="" selected></option>
+                                {{range .ViewState.group_types}}
+                                <option value="{{.}}">{{.}}</option>
+                                {{end}}
+                            </select>
+                        </div>
+                    </div>
+                </div>
+               
+            </div>
+            
+        </div>
+        <div class="flex justify-end">
+            <a href="/app/group_module/">
+                <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">Créer le groupe</button>
+        </div>
+    </form>
+   
+</div>
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/group_module/display_group.html b/web/layouts/group_module/display_group.html
new file mode 100644
index 0000000..462f844
--- /dev/null
+++ b/web/layouts/group_module/display_group.html
@@ -0,0 +1,254 @@
+{{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">Gestion du groupe</h1>
+
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            <p class="mt-2 text-sm text-gray-700"></p>
+        </div>
+    </div>
+    <!-- ****************************** -->
+    <div 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">Info du groupe</h2>
+                <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                    <div>
+                        <div class="mt-5 border-gray-200">
+                            <dl class="sm:divide-y sm:divide-gray-200">
+                                <div class="sm:pb-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                    <dt class="text-sm font-medium text-gray-500">Nom</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.name}}</dd>
+                                </div>
+                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                    <dt class="text-sm font-medium text-gray-500">Type</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.type}}</dd>
+                                </div>
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        
+   
+    <!-- *********************************** -->
+
+
+<div class="lg:col-start-2 lg:col-span-2" x-data="{
+    state: {{.ViewState.list.JSONWithLimits 0 10}},
+    current: 0,
+    nb_pages() {
+        let nbEl = this.state.count 
+        return Math.ceil(nbEl/10)
+    },
+    async paginate(page) {
+        let start = (page-1)*10
+        if(start < 0|| start > this.state.count) {
+            return
+        }
+        let resp = await fetch('/api/cache/' + this.state.cache_id + '?limits.min=' + start + '&limits.max=' + (start+10))
+        let data = await resp.json()
+        this.state.beneficiaries = data
+        this.current=page-1
+        this.state.group = data
+    }
+}">
+<div >
+<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 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="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.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>
+
+                    <!-- 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>
+
+</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 bénéficiaire</h2>
+            <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+                <form method="GET" >
+                <div x-data="{
+                    text: '{{if .ViewState.search}}{{.ViewState.search.beneficiary.Data.first_name}} {{.ViewState.search.beneficiary.Data.last_name}}{{end}}',
+                    beneficiariesListOpen: false,
+                    beneficiaries: {{json .ViewState.beneficiaries}},
+                    filteredBeneficiaries: (text) => {
+                        if(text=='') return beneficiaries
+                        return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
+                    },
+                    fields: {
+                        beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
+                    },
+                    selectbeneficiary(beneficiary) {
+                        console.log(beneficiary)
+                        this.fields.beneficiaryid = beneficiary.id 
+                        this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
+                        this.beneficiariesListOpen = false
+                    }
+                }">
+                    <input type="hidden" name="beneficiaryid" x-model="fields.beneficiaryid">
+                    <label for="combobox" class="block text-sm font-medium text-gray-700">Bénéficiaire</label>
+                    <div class="relative mt-1 mb-4">
+                      <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
+                      
+                      <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
+                        <!-- Heroicon name: solid/selector -->
+                        <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                          <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
+                        </svg>
+                      </button>
+                  
+                      <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
+                        <!--
+                          Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
+                  
+                          Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
+                        -->
+                        <template x-for="beneficiary in beneficiaries">
+                            <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
+                            <!-- Selected: "font-semibold" -->
+                            <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
+                    
+                            <!--
+                                Checkmark, only display for selected option.
+                    
+                                Active: "text-white", Not Active: "text-indigo-600"
+                            -->
+                            <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
+                                <!-- Heroicon name: solid/check -->
+                                <!-- <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="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
+                                </svg> -->
+                            </span>
+                            </li>
+                        </template>
+                  
+                        <!-- More items... -->
+                      </ul>
+                    </div>
+                  </div>
+                  <!-- <a href="/app/group_module/groups/{{.ViewState.group.ID}}"> -->
+                    <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>
+                <!-- </a> -->
+                </form>
+            </div>
+        </div>
+        
+    </div>
+</div>
+</div>
+
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/group_module/home.html b/web/layouts/group_module/home.html
new file mode 100644
index 0000000..6d29350
--- /dev/null
+++ b/web/layouts/group_module/home.html
@@ -0,0 +1,60 @@
+
+ {{define "content"}}
+ <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 groupes</h2>
+  
+    <div class="sm:flex sm:items-center">
+      <div class="sm:flex-auto">
+        <p class="mt-2 text-sm text-gray-700"></p>
+      </div>
+      <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+        <a href="/app/group_module/groups">
+          <button type="button"
+            class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
+            {{$.IconSet.Icon "hero:outline/plus-circle" "h-5 w-5 mr-3"}}
+            Ajouter un groupe
+          </button>
+        </a>
+      </div>
+    </div>
+  
+    <div class="bg-white shadow overflow-hidden sm:rounded-3xl mt-4">
+      <ul role="list" class="divide-y divide-gray-200">
+        {{range .ViewState.groups}}
+        <li>
+          <a href="/app/group_module/groups/{{.ID}}" class="block hover:bg-gray-50">
+            <div class="px-4 py-4 flex items-center sm:px-6">
+              <div class="min-w-0 flex-1 sm:flex sm:items-center sm:justify-between">
+                <div class="truncate">
+                  <div class="flex text-sm">
+                    <p class="font-medium text-lg text-co-blue truncate">{{.Data.name}}</p>
+                    <p class="ml-1 flex-shrink-0 font-normal text-gray-500"></p>
+                  </div>
+                  <div class="mt-2 flex">
+                    <div class="flex items-center text-sm text-gray-500">
+                      {{$.IconSet.Icon "hero:outline/user-group" "flex-shrink-0 mr-1.5 h-5 w-5"}}
+                      <p>
+                        {{ len .Members }} bénéficiaires
+                      </p>
+                    </div>
+                  </div>
+                </div>
+                <div class="mt-4 flex-shrink-0 sm:mt-0 sm:ml-5">
+                  <div class="flex overflow-hidden -space-x-1">
+                    <!-- <img class="inline-block h-6 w-6 rounded-full ring-2 ring-white"
+                      src="http://localhost:9000/app/beneficiaries/e7616eac-4a87-4396-a505-23e0421b9c4c/picture"
+                      alt="Dries Vincent"> -->
+                  </div>
+                </div>
+              </div>
+              <div class="ml-5 flex-shrink-0">
+                {{$.IconSet.Icon "hero:solid/chevron-right" "h-5 w-5 text-gray-400"}}
+              </div>
+            </div>
+          </a>
+        </li>
+        {{end}}
+      </ul>
+    </div>
+  </div>
+{{end}}
\ No newline at end of file

From 8a20ab2502bff7ba5339c1ccbf8416dd2d36a9e0 Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Tue, 8 Nov 2022 17:26:17 +0100
Subject: [PATCH 2/5] fix  config

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

diff --git a/config.yaml b/config.yaml
index 9d89d12..55815e1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -159,6 +159,7 @@ icons:
     coopgo:parcoursmob/monogram: <svg xmlns="http://www.w3.org/2000/svg" class="%s" viewBox="0 0 61.85 33.58"><defs><style>.cls-1{fill:#ff1300;}.cls-2{fill:#243887;}</style></defs><g id="Calque_2" data-name="Calque 2"><g id="Calque_1-2" data-name="Calque 1"><path class="cls-1" d="M44.978,0C31.337,0,28.1,6.824,27.875,15.505H39.536V9.434a.727.727,0,0,1,1.123-.607L52.6,16.453,40.659,24.08a.729.729,0,0,1-1.123-.608v-6.1H27.865c.075,8.427,1.527,16.213,17.113,16.213,14.867,0,16.872-7.764,16.872-17.032C61.85,7.91,59.894,0,44.978,0Z"/><polygon class="cls-1" points="41.412 21.385 49.133 16.453 41.412 11.521 41.412 21.385"/><path class="cls-2" d="M14.175,11.4l-.019,4.151H26.311a14.781,14.781,0,0,0,.819-5.141C27.046,3.767,22.545,0,14.764,0H1.052A1.147,1.147,0,0,0,0,1.24V31.87a1.149,1.149,0,0,0,1.094,1.239H11.525a1.145,1.145,0,0,0,1.051-1.239V10.41h.758C13.88,10.41,14.175,10.756,14.175,11.4Z"/><path class="cls-2" d="M14.148,17.3l-.015,3.514H18.97A7.521,7.521,0,0,0,25.458,17.3Z"/></g></g></svg>
     hero:outline/briefcase: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z" /></svg>
     hero:outline/support: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M7.5 8.25h9m-9 3H12m-9.75 1.51c0 1.6 1.123 2.994 2.707 3.227 1.129.166 2.27.293 3.423.379.35.026.67.21.865.501L12 21l2.755-4.133a1.14 1.14 0 01.865-.501 48.172 48.172 0 003.423-.379c1.584-.233 2.707-1.626 2.707-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0012 3c-2.392 0-4.744.175-7.043.513C3.373 3.746 2.25 5.14 2.25 6.741v6.018z" /></svg>
+    hero:outline/group_module: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6"><path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 003.741-.479 3 3 0 00-4.682-2.72m.94 3.198l.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0112 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 016 18.719m12 0a5.971 5.971 0 00-.941-3.197m0 0A5.995 5.995 0 0012 12.75a5.995 5.995 0 00-5.058 2.772m0 0a3 3 0 00-4.681 2.72 8.986 8.986 0 003.74.477m.94-3.197a5.971 5.971 0 00-.94 3.197M15 6.75a3 3 0 11-6 0 3 3 0 016 0zm6 3a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-13.5 0a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0z" /></svg>
     hero:outline/calendar: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z" /></svg>
     hero:outline/chevron-right: <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="%s"><path stroke-linecap="round" stroke-linejoin="round" d="M8.25 4.5l7.5 7.5-7.5 7.5" /></svg>
     hero:outline/cog: <svg xmlns="http://www.w3.org/2000/svg" class="%s" fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="2"><path stroke-linecap="round" stroke-linejoin="round" d="M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z" /><path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" /></svg>

From 2055ef5e7cdd14514fc9fbf5c5300dd0391e786e Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Tue, 8 Nov 2022 17:55:21 +0100
Subject: [PATCH 3/5] clean the files

---
 web/layouts/group_module/display_group.html | 31 +++++----------------
 web/layouts/group_module/home.html          |  3 --
 2 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/web/layouts/group_module/display_group.html b/web/layouts/group_module/display_group.html
index 462f844..c1edbde 100644
--- a/web/layouts/group_module/display_group.html
+++ b/web/layouts/group_module/display_group.html
@@ -80,15 +80,10 @@
                         <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>
@@ -202,47 +197,35 @@
                       <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
                       
                       <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
-                        <!-- Heroicon name: solid/selector -->
+                     
                         <svg class="h-5 w-5 text-gray-400" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
                           <path fill-rule="evenodd" d="M10 3a1 1 0 01.707.293l3 3a1 1 0 01-1.414 1.414L10 5.414 7.707 7.707a1 1 0 01-1.414-1.414l3-3A1 1 0 0110 3zm-3.707 9.293a1 1 0 011.414 0L10 14.586l2.293-2.293a1 1 0 011.414 1.414l-3 3a1 1 0 01-1.414 0l-3-3a1 1 0 010-1.414z" clip-rule="evenodd" />
                         </svg>
                       </button>
                   
                       <ul x-show="beneficiariesListOpen" class="absolute z-10 mt-1 max-h-60 w-full overflow-auto rounded-xl bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm" id="options" role="listbox">
-                        <!--
-                          Combobox option, manage highlight styles based on mouseenter/mouseleave and keyboard navigation.
-                  
-                          Active: "text-white bg-indigo-600", Not Active: "text-gray-900"
-                        -->
+                      
                         <template x-for="beneficiary in beneficiaries">
                             <li @click="selectbeneficiary(beneficiary)" class="relative cursor-default hover:bg-gray-100 select-none py-2 pl-3 pr-9 text-gray-900" id="option-0" role="option" tabindex="-1">
-                            <!-- Selected: "font-semibold" -->
+                          
                             <span class="truncate" x-text="beneficiary.data.first_name"></span> <span class="truncate" x-text="beneficiary.data.last_name"></span>
                     
-                            <!--
-                                Checkmark, only display for selected option.
-                    
-                                Active: "text-white", Not Active: "text-indigo-600"
-                            -->
                             <span class="absolute inset-y-0 right-0 flex items-center pr-4 text-co-blue">
-                                <!-- Heroicon name: solid/check -->
-                                <!-- <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="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clip-rule="evenodd" />
-                                </svg> -->
+                            
                             </span>
                             </li>
                         </template>
                   
-                        <!-- More items... -->
+                     
                       </ul>
                     </div>
                   </div>
-                  <!-- <a href="/app/group_module/groups/{{.ViewState.group.ID}}"> -->
+                
                     <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>
-                <!-- </a> -->
+               
                 </form>
             </div>
         </div>
diff --git a/web/layouts/group_module/home.html b/web/layouts/group_module/home.html
index 6d29350..e2781cb 100644
--- a/web/layouts/group_module/home.html
+++ b/web/layouts/group_module/home.html
@@ -41,9 +41,6 @@
                 </div>
                 <div class="mt-4 flex-shrink-0 sm:mt-0 sm:ml-5">
                   <div class="flex overflow-hidden -space-x-1">
-                    <!-- <img class="inline-block h-6 w-6 rounded-full ring-2 ring-white"
-                      src="http://localhost:9000/app/beneficiaries/e7616eac-4a87-4396-a505-23e0421b9c4c/picture"
-                      alt="Dries Vincent"> -->
                   </div>
                 </div>
               </div>

From 9aaa51a81f6e225d777dbd8c22d8fe8075ffe29e Mon Sep 17 00:00:00 2001
From: soukainna <soukaina1lafdili@gmail.com>
Date: Thu, 10 Nov 2022 16:44:48 +0100
Subject: [PATCH 4/5] add the description and the address part

---
 config.yaml                                 |  1 +
 web/layouts/group_module/create_group.html  | 27 +++++++++++++++++++++
 web/layouts/group_module/display_group.html | 11 +++++++++
 3 files changed, 39 insertions(+)

diff --git a/config.yaml b/config.yaml
index 55815e1..e7449ef 100644
--- a/config.yaml
+++ b/config.yaml
@@ -107,6 +107,7 @@ views:
         - web/layouts/group_module/home.html
     create_group:
       files:
+        - web/layouts/_partials/address_autocomplete.html
         - web/layouts/group_module/create_group.html
   
     display_group:
diff --git a/web/layouts/group_module/create_group.html b/web/layouts/group_module/create_group.html
index 4936a2a..58a55a6 100644
--- a/web/layouts/group_module/create_group.html
+++ b/web/layouts/group_module/create_group.html
@@ -9,6 +9,7 @@
         fields: {
             name: null,
             type: null,
+            description: null,
         },
         rules: {
             name: ['required'],
@@ -19,6 +20,7 @@
             fields: {
                 name: {valid: null},
                 type: {valid: null},
+                description: {valid: null},
             }
         },
         isFormValid: true,
@@ -66,12 +68,37 @@
                                 {{end}}
                             </select>
                         </div>
+                        <div class="col-span-6">
+                            <label for="description" class="block text-sm font-medium text-gray-700">Description</label>
+                            <div class="mt-1">
+                                <textarea rows="4" name="description" id="descrpition" 
+                                    x-model="fields.description" @blur="validateField('description')"
+                                    :class="formValidation.fields.description.valid == false ? 'border-co-red border-2' : 'border-gray-300'"
+                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
+                            </div>
+                        </div>
                     </div>
                 </div>
                
             </div>
             
         </div>
+        <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
+            <div class="md:grid md:grid-cols-3 md:gap-6">
+                <div class="md:col-span-1">
+                    <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
+                    <p class="mt-1 text-sm text-gray-500">Paramètres liés au groupe, utiles pour exploiter les fonctionnalités de PARCOURSMOB</p>
+                </div>
+                <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
+
+                    {{ $fieldName := "address" }}
+                    {{ template "address_autocomplete" dict "FieldName" $fieldName }}
+
+                    <!-- will dolater : tags, groups, ... -->
+
+                </div>
+            </div>
+        </div>
         <div class="flex justify-end">
             <a href="/app/group_module/">
                 <button type="button"
diff --git a/web/layouts/group_module/display_group.html b/web/layouts/group_module/display_group.html
index c1edbde..50f2844 100644
--- a/web/layouts/group_module/display_group.html
+++ b/web/layouts/group_module/display_group.html
@@ -26,6 +26,17 @@
                                     <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
                                         {{.ViewState.group.Data.type}}</dd>
                                 </div>
+                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                    <dt class="text-sm font-medium text-gray-500">Adresse</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.address.properties.label}}</dd>
+                                </div>
+                                <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
+                                    <dt class="text-sm font-medium text-gray-500">Description</dt>
+                                    <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
+                                        {{.ViewState.group.Data.description}}</dd>
+                                </div>
+                             
                             </dl>
                         </div>
                     </div>

From 0f35c8950f134fa56f1215a2079178fe11b1e712 Mon Sep 17 00:00:00 2001
From: Arnaud Delcasse <arnaud.delcasse@coopgo.fr>
Date: Mon, 5 Dec 2022 17:24:24 +0100
Subject: [PATCH 5/5] Improve bookings and agenda

---
 config.yaml                                   |  2 +
 web/layouts/administration/home.html          |  2 +-
 .../agenda/_partials/subscribers-table.html   | 43 +++++++++++
 web/layouts/agenda/display-event.html         | 73 +++++++++++-------
 .../_partials/beneficiary-organizations.html  | 10 +++
 web/layouts/beneficiaries/display.html        | 21 +++---
 .../_partials/beneficiaries-widget.html       |  4 +-
 web/layouts/vehicles/bookings-list.html       | 42 +++++++++--
 .../vehicles_management/booking-display.html  | 42 +++++++++--
 web/public/css/main.css                       | 75 +++++--------------
 10 files changed, 209 insertions(+), 105 deletions(-)
 create mode 100644 web/layouts/agenda/_partials/subscribers-table.html
 create mode 100644 web/layouts/beneficiaries/_partials/beneficiary-organizations.html

diff --git a/config.yaml b/config.yaml
index e7449ef..3f4b4e1 100644
--- a/config.yaml
+++ b/config.yaml
@@ -27,6 +27,7 @@ views:
         - web/layouts/beneficiaries/_partials/beneficiary-journeys.html
         - web/layouts/beneficiaries/_partials/beneficiary-events.html
         - web/layouts/beneficiaries/_partials/beneficiary-files.html
+        - web/layouts/beneficiaries/_partials/beneficiary-organizations.html
         - web/layouts/beneficiaries/display.html
     update:
       files:
@@ -79,6 +80,7 @@ views:
         - web/layouts/agenda/home.html
     display_event: 
       files: 
+        - web/layouts/agenda/_partials/subscribers-table.html
         - web/layouts/agenda/display-event.html
     create_event: 
       files: 
diff --git a/web/layouts/administration/home.html b/web/layouts/administration/home.html
index 372307d..723af8a 100644
--- a/web/layouts/administration/home.html
+++ b/web/layouts/administration/home.html
@@ -43,7 +43,7 @@
         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>
-          <p class="text-gray-500">1 membres</p>
+          <p class="text-gray-500">{{len .ViewState.accounts}} membres</p>
         </div>
       </div>
     </li>
diff --git a/web/layouts/agenda/_partials/subscribers-table.html b/web/layouts/agenda/_partials/subscribers-table.html
new file mode 100644
index 0000000..9eb12ed
--- /dev/null
+++ b/web/layouts/agenda/_partials/subscribers-table.html
@@ -0,0 +1,43 @@
+{{define "subscribers_table"}}
+<table class="min-w-full divide-y divide-gray-300 border-t border-gray-200">
+    <thead class="bg-gray-50">
+        <tr>
+            <th scope="col"
+                class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 ">
+                Bénéficiaire
+            </th>
+            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                Prescripteur
+            </th>
+            <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                Date d'inscription
+            </th>
+            <th scope="col" class="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.event.Subscriptions}}
+        <tr>
+            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                <a href="/app/beneficiaries/{{.Subscriber}}" class="flex">
+                    <img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture" alt=" "> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}
+                </a>
+            </td>
+            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                <div class="flex"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Data.subscribed_by.user.id}}/picture" alt=" "> {{.Data.subscribed_by.user.display_name}}</div>
+                {{.Data.subscribed_by.group.name}}
+            </td>
+            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                {{(timeFormat .CreatedAt "02/01/2006")}}
+            </td>
+            <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                <!-- <a href=""
+                        class="text-co-blue hover:text-co-blue">Voir</a> -->
+            </td>
+        </tr>
+        {{end}}
+    </tbody>
+</table>
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html
index fcc31a7..787d596 100644
--- a/web/layouts/agenda/display-event.html
+++ b/web/layouts/agenda/display-event.html
@@ -65,30 +65,48 @@
                     </div>
                 </div>
             </section>
+            {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
+            <section aria-labelledby="subscribers-table"></section>
+                <div class="bg-white shadow sm:rounded-lg">
+                    <div class="px-4 py-5 sm:px-6">
+                        <h2 id="event-information-title" class="text-lg leading-6 font-medium text-gray-900">Tous les inscrits</h2>
+                    </div>
+                    {{template "subscribers_table" .}}
+                </div>
+            </section>
+            {{end}}
         </div>
         <section aria-labelledby="subscribers-title" class="lg:col-start-3 lg:col-span-1">
-            <div class="bg-white px-4 py-5 shadow sm:rounded-lg sm:px-6">
+            <div class="bg-white px-4 py-5 shadow sm:rounded-lg sm:px-6"  x-data="{
+                text: '',
+                error: false,
+                beneficiariesListOpen: false,
+                beneficiaries: {{json .ViewState.beneficiaries}},
+                filteredBeneficiaries: (text) => {
+                    if(text=='') return beneficiaries
+                    return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
+                },
+                fields: {
+                    beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
+                },
+                selectbeneficiary(beneficiary) {
+                    console.log(beneficiary)
+                    this.fields.beneficiaryid = beneficiary.id 
+                    this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
+                    this.beneficiariesListOpen = false
+                },
+                submit(event) {
+                    if(!this.fields.beneficiaryid) {
+                        this.error = true
+                        event.preventDefault()
+                    }
+                    return this.formValidation.valid
+                }
+            }">
                 <h2 id="subscribers-title" class="text-lg font-medium text-gray-900">Inscrire un bénéficiaire</h2>
                 {{if gt .ViewState.event.RemainingSubscriptions 0}}
-                <form class="mt-4" action="/app/agenda/{{.ViewState.event.ID}}/subscribe" method="POST">
-                    <div class="relative mt-1 mb-4"  x-data="{
-                        text: '',
-                        beneficiariesListOpen: false,
-                        beneficiaries: {{json .ViewState.beneficiaries}},
-                        filteredBeneficiaries: (text) => {
-                            if(text=='') return beneficiaries
-                            return this.beneficiaries.filter(b => b['data']['first_name'].includes(text) || b['data']['last_name'].includes(text))
-                        },
-                        fields: {
-                            beneficiaryid: {{if .ViewState.search}}'{{.ViewState.search.beneficiary.ID}}'{{else}}null{{end}},
-                        },
-                        selectbeneficiary(beneficiary) {
-                            console.log(beneficiary)
-                            this.fields.beneficiaryid = beneficiary.id 
-                            this.text = beneficiary.data.first_name + ' ' + beneficiary.data.last_name
-                            this.beneficiariesListOpen = false
-                        }
-                    }">
+                <form class="mt-4" action="/app/agenda/{{.ViewState.event.ID}}/subscribe" method="POST"  @submit="submit">
+                    <div class="relative mt-1 mb-4">
                         <input @focus="beneficiariesListOpen = true" x-model="text" id="combobox" type="text" class="w-full rounded-2xl border border-gray-300 bg-white py-2 pl-3 pr-12 shadow-sm focus:border-co-blue focus:outline-none focus:ring-1 focus:ring-co-blue sm:text-sm" role="combobox" aria-controls="options" aria-expanded="false">
                         
                         <button @click="beneficiariesListOpen = ! beneficiariesListOpen" type="button" class="absolute inset-y-0 right-0 flex items-center rounded-r-2xl px-2 focus:outline-none">
@@ -113,6 +131,7 @@
                         </ul>
                         <input type="hidden" name="subscriber" x-model="fields.beneficiaryid">
                       </div>
+                      <p class="text-co-red text-xs mb-4" x-show="error">Vous devez sélectionner un bénéficiaire</p>
                       <button type="submit"
                             class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
                             Inscrire le bénéficiaire
@@ -122,17 +141,21 @@
                 <p class="p-12 text-gray-500 text-center text-md">Il n'y a plus de place disponible</p>
                 {{end}}
                 {{if .ViewState.subscribers}}
-                <h2 id="subscribers-title" class="text-lg font-medium text-gray-900 mt-10">Inscrits</h2>
+                {{if ne (index .ViewState.event.Owners 0) .Group.ID}}
+                <h2 id="subscribers-title" class="text-lg font-medium text-gray-900 mt-10">Bénéficiaires {{.Group.Data.name}} inscrits</h2>
                 <div class="mt-2">
-                    {{range .ViewState.subscribers}}
                     <ul class="p-1">
-                        <a href="/app/beneficiaries/{{.ID}}">
-                        <li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.ID}}/picture"> {{.Data.first_name}} {{.Data.last_name}}</li>
+                        {{range .ViewState.event.Subscriptions}}
+                        {{if eq $.Group.ID .Data.subscribed_by.group.id}}
+                        <a href="/app/beneficiaries/{{.Subscriber}}">
+                        <li class="inline-flex text-sm p-2"><img class="h-6 w-6 rounded-co mr-2" src="/app/beneficiaries/{{.Subscriber}}/picture"> {{ (index $.ViewState.subscribers .Subscriber).Data.first_name }} {{ (index $.ViewState.subscribers .Subscriber).Data.last_name }}</li>
                         </a>
+                        {{end}}
+                        {{end}}
                     </ul>
-                    {{end}}
                 </div>
                 {{end}}
+                {{end}}
             </div>
         </section>
     </div>
diff --git a/web/layouts/beneficiaries/_partials/beneficiary-organizations.html b/web/layouts/beneficiaries/_partials/beneficiary-organizations.html
new file mode 100644
index 0000000..467035c
--- /dev/null
+++ b/web/layouts/beneficiaries/_partials/beneficiary-organizations.html
@@ -0,0 +1,10 @@
+{{define "beneficiary_organizations"}}
+<div class="px-4 py-6 sm:px-6">
+    <h3 class="text-lg">Organisations gestionnaires du bénéficiaire</h3>
+    <ul class="my-8">
+        {{range .ViewState.organizations}}
+        <li class="text-sm ml-8">{{.Data.name}}</li>
+        {{end}}
+    </ul>
+</div>
+{{end}}
\ No newline at end of file
diff --git a/web/layouts/beneficiaries/display.html b/web/layouts/beneficiaries/display.html
index 6829e5a..8b8584f 100644
--- a/web/layouts/beneficiaries/display.html
+++ b/web/layouts/beneficiaries/display.html
@@ -89,11 +89,11 @@
                                     class="block w-full pl-3 pr-10 py-2 text-base border-gray-300 focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 sm:text-sm rounded-md">
                                     <!-- <option value="notes">Notes</option> -->
 
-                                    <option value="journeys">Déplacements</option>
+                                    <!-- <option value="journeys">Déplacements</option>
 
                                     <option value="vehicles">Véhicules</option>
 
-                                    <option value="events">Dispositifs</option>
+                                    <option value="events">Dispositifs</option> -->
 
                                     <option value="documents">Documents</option>
                                 </select>
@@ -107,7 +107,7 @@
                                             :class="tab == 'notes' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                             Notes </a> -->
 
-                                        <a href="#" @click="tab = 'journeys'"
+                                        <!-- <a href="#" @click="tab = 'journeys'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                             :class="tab == 'journeys' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
                                             Déplacements </a>
@@ -120,22 +120,25 @@
                                         <a href="#" @click="tab = 'events'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
                                             :class="tab == 'events' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Dispositifs </a>
+                                            Dispositifs </a> -->
 
                                         <a href="#" @click="tab = 'documents'"
+                                        class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
+                                        :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                        Documents </a>
+
+                                        <a href="#" @click="tab = 'organizations'"
                                             class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm"
-                                            :class="tab == 'documents' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
-                                            Documents </a>
+                                            :class="tab == 'organizations' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'">
+                                            Gestionnaires </a>
                                     </nav>
                                 </div>
                             </div>
                         </div>
 
-                        <div x-show="tab == 'journeys'">{{template "beneficiary_journeys" .}}</div>
-                        <div x-show="tab == 'vehicles'">{{template "beneficiary_vehicles" .}}</div>
-                        <div x-show="tab == 'events'">{{template "beneficiary_events" .}}</div>
                         <div x-show="tab == 'documents'">{{template "beneficiary_files" .}}</div>
                         <div x-show="tab == 'notes'">{{template "beneficiary_notes" .}}</div>
+                        <div x-show="tab == 'organizations'">{{template "beneficiary_organizations" .}}</div>
                     </div>
                 </div>
             </section>
diff --git a/web/layouts/dashboard/_partials/beneficiaries-widget.html b/web/layouts/dashboard/_partials/beneficiaries-widget.html
index dcf45cc..1505693 100644
--- a/web/layouts/dashboard/_partials/beneficiaries-widget.html
+++ b/web/layouts/dashboard/_partials/beneficiaries-widget.html
@@ -1,5 +1,5 @@
 {{define "beneficiaries_widget"}}
-<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200">
+<div class="col-span-1 bg-white rounded-2xl shadow divide-y divide-gray-200 flex flex-col">
     <div class="-ml-4 -mt-2 px-4 py-2 flex items-center justify-between flex-wrap sm:flex-nowrap">
         <div class="ml-4 mt-2">
             <h3 class="text-lg leading-6 font-medium text-gray-900">Bénéficiaires</h3>
@@ -9,7 +9,7 @@
           <button type="button" class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-sm font-medium rounded-md text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Voir</button>
         </div> -->
     </div>
-    <ul role="list" class="divide-y divide-gray-200">
+    <ul role="list" class="divide-y divide-gray-200 flex-1">
         {{range .latest}}
             <li class="py-2 px-4 flex">
                 <a href="/app/beneficiaries/{{.ID}}" class="flex w-full">
diff --git a/web/layouts/vehicles/bookings-list.html b/web/layouts/vehicles/bookings-list.html
index 5cc979c..a8e6726 100644
--- a/web/layouts/vehicles/bookings-list.html
+++ b/web/layouts/vehicles/bookings-list.html
@@ -11,13 +11,16 @@
                     <table class="min-w-full divide-y divide-gray-300">
                         <thead class="bg-gray-50">
                             <tr>
-                                <!-- <th scope="col"
+                                <th scope="col"
                                     class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Statut
-                                </th> -->
+                                </th>
                                 <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">
+                                    Véhicule
+                                </th>
                                 <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
                                     Beneficiaire
                                 </th>
@@ -33,21 +36,50 @@
                             
                             {{range .ViewState.bookings}}
                             <tr>
-                                <!-- <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
-                                    <div class="text-gray-900" >aa</div>
-                                </td> -->
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                    {{if .Data.administrator_unavailability}}
+                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                        Retiré
+                                    </span>
+                                    {{else}}
+                                        {{if eq .Status 1 }}
+                                        <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                            A venir
+                                        </span>
+                                        {{end}}
+                                        {{if eq .Status 0 }}
+                                        <span class="p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                            En cours
+                                        </span>
+                                        {{end}}
+                                        {{if eq .Status -1 }}
+                                        <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
+                                            Terminé
+                                        </span>
+                                        {{end}}
+                                    {{end}}
+                                </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >Voiture</div>
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{.Vehicle.Data.name}}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if not .Data.administrator_unavailability}}
                                     <div class="text-gray-900" ><img class="h-6 w-6 rounded-co"
                                         src="/app/beneficiaries/{{.Driver}}/picture" alt=""></div>
+                                    {{end}}
                                 </td>
                                 <!-- <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <div class="text-gray-900" >aa</div>
                                 </td> -->
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if not .Data.administrator_unavailability}}
                                     <div class="text-gray-900" >Du {{(timeFrom .Startdate).Format "02/01/2006"}} au {{(timeFrom .Enddate).Format "02/01/2006"}}</div>
+                                    {{else}}
+                                    <div class="text-gray-900" >Du {{(timeFrom .Unavailablefrom).Format "02/01/2006"}} au {{(timeFrom .Unavailableto).Format "02/01/2006"}}</div>
+                                    {{end}}
                                 </td>
                                 <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
                                     <a href="/app/vehicles/bookings/{{.ID}}"
diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html
index d9fadcd..0db6d57 100644
--- a/web/layouts/vehicles_management/booking-display.html
+++ b/web/layouts/vehicles_management/booking-display.html
@@ -6,18 +6,50 @@
         <div class="sm:flex-auto">
             <p class="mt-2 text-sm text-gray-700"></p>
         </div>
-        <!-- <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
-            <button type="button"
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none"
+            x-data="{
+                changeVehicle: false,
+                selectedvehicle: ''
+            }">
+            <button type="button" @click="changeVehicle = ! changeVehicle"
                 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">
                 Changer de véhicule
             </button>
-            <a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/delete">
+        <!-- <a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/delete">
                 <button type="button"
                     class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-red px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-red focus:ring-offset-2 sm:w-auto">
                     Annuler
                 </button>
-            </a>
-        </div> -->
+            </a> -->
+
+            <div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true" x-show="changeVehicle">
+                <div class="fixed inset-0 bg-gray-900 bg-opacity-30 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-3xl bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full sm:max-w-sm sm:p-6">
+                            <div class="text-center">
+                                <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Changer de véhicule</h3>
+                            </div>
+                            <form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/change-vehicle" class="mt-4">
+                                <select x-model="selectedvehicle" id="vehicle" name="vehicle" class="mt-1 block w-full rounded-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-co-blue focus:outline-none focus:ring-co-blue sm:text-sm">
+                                    <option value=""></option>
+                                    {{range .ViewState.alternative_vehicles }}
+                                    <option value="{{.ID}}">{{.Data.name}}</option>
+                                    {{end}}
+                                </select>
+                                <div class="mt-5 sm:mt-6">
+                                    <button type="submit" class="inline-flex w-full justify-center rounded-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:text-sm">Changer de véhicule</button>
+                                </div>
+                            </form>
+                            <div class="mt-5 sm:mt-6">
+                                <button @click="changeVehicle=false" type="button" class="inline-flex w-full justify-center max-w-xs bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Annuler</button>
+                              </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">
diff --git a/web/public/css/main.css b/web/public/css/main.css
index dcdf68f..109e22f 100644
--- a/web/public/css/main.css
+++ b/web/public/css/main.css
@@ -834,14 +834,14 @@ html {
   grid-column: span 5 / span 5;
 }
 
-.m-2 {
-  margin: 0.5rem;
-}
-
 .m-4 {
   margin: 1rem;
 }
 
+.m-2 {
+  margin: 0.5rem;
+}
+
 .-mx-4 {
   margin-left: -1rem;
   margin-right: -1rem;
@@ -977,6 +977,10 @@ html {
   margin-bottom: 2.5rem;
 }
 
+.ml-8 {
+  margin-left: 2rem;
+}
+
 .-mt-2 {
   margin-top: -0.5rem;
 }
@@ -1224,16 +1228,6 @@ html {
   transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
 }
 
-.translate-y-4 {
-  --tw-translate-y: 1rem;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
-.translate-y-0 {
-  --tw-translate-y: 0px;
-  transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-}
-
 .scale-95 {
   --tw-scale-x: .95;
   --tw-scale-y: .95;
@@ -1675,16 +1669,16 @@ html {
   background-color: rgb(17 24 39 / var(--tw-bg-opacity));
 }
 
-.bg-gray-500 {
-  --tw-bg-opacity: 1;
-  background-color: rgb(107 114 128 / var(--tw-bg-opacity));
-}
-
 .bg-black {
   --tw-bg-opacity: 1;
   background-color: rgb(0 0 0 / var(--tw-bg-opacity));
 }
 
+.bg-gray-500 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(107 114 128 / var(--tw-bg-opacity));
+}
+
 .bg-opacity-75 {
   --tw-bg-opacity: 0.75;
 }
@@ -2047,11 +2041,6 @@ html {
   color: rgb(0 0 0 / var(--tw-text-opacity));
 }
 
-.text-green-600 {
-  --tw-text-opacity: 1;
-  color: rgb(22 163 74 / var(--tw-text-opacity));
-}
-
 .placeholder-gray-500::-moz-placeholder {
   --tw-placeholder-opacity: 1;
   color: rgb(107 114 128 / var(--tw-placeholder-opacity));
@@ -2306,11 +2295,6 @@ html {
   background-color: rgb(29 78 216 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-indigo-700:hover {
-  --tw-bg-opacity: 1;
-  background-color: rgb(67 56 202 / var(--tw-bg-opacity));
-}
-
 .hover\:bg-opacity-5:hover {
   --tw-bg-opacity: 0.05;
 }
@@ -2494,14 +2478,14 @@ html {
     grid-column: span 4 / span 4;
   }
 
-  .sm\:col-start-2 {
-    grid-column-start: 2;
-  }
-
   .sm\:col-start-1 {
     grid-column-start: 1;
   }
 
+  .sm\:col-start-2 {
+    grid-column-start: 2;
+  }
+
   .sm\:-mx-6 {
     margin-left: -1.5rem;
     margin-right: -1.5rem;
@@ -2573,10 +2557,6 @@ html {
     max-width: 24rem;
   }
 
-  .sm\:max-w-lg {
-    max-width: 32rem;
-  }
-
   .sm\:flex-auto {
     flex: 1 1 auto;
   }
@@ -2589,23 +2569,6 @@ html {
     flex: 1 1 0%;
   }
 
-  .sm\:translate-y-0 {
-    --tw-translate-y: 0px;
-    transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-  }
-
-  .sm\:scale-95 {
-    --tw-scale-x: .95;
-    --tw-scale-y: .95;
-    transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-  }
-
-  .sm\:scale-100 {
-    --tw-scale-x: 1;
-    --tw-scale-y: 1;
-    transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
-  }
-
   .sm\:grid-flow-row-dense {
     grid-auto-flow: row dense;
   }
@@ -2646,10 +2609,6 @@ html {
     gap: 1rem;
   }
 
-  .sm\:gap-3 {
-    gap: 0.75rem;
-  }
-
   .sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) {
     --tw-space-y-reverse: 0;
     margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse)));