Edit web/layout/vehicles/search.html - Add Documents demandés

config.yaml

@@ -43,6 +43,12 @@ views:
     list:
       files:
         - web/layouts/members/membersList.html
+  group:
+    settings:
+      files:
+        - web/layouts/administration/_partials/groups_admins.html
+        - web/layouts/administration/_partials/group_members.html
+        - web/layouts/group/settings.html
   vehicles:
     search: 
       files: 
@@ -83,21 +89,23 @@ views:
     booking_display: 
       files: 
         - web/layouts/vehicles_management/booking-display.html
-    delete_booking: 
-      files: 
-        - web/layouts/vehicles_management/delete-booking.html
   agenda: 
     list: 
       files: 
         - web/layouts/agenda/home.html
+    history: 
+      files: 
+        - web/layouts/agenda/history.html
     display_event: 
       files: 
         - web/layouts/agenda/_partials/subscribers-table.html
         - web/layouts/agenda/display-event.html
+        - web/layouts/agenda/_partials/event-files.html
     create_event: 
       files: 
         - web/layouts/_partials/address_autocomplete.html
         - web/layouts/agenda/create-event.html
+        - web/layouts/agenda/_partials/event-files.html
     delete_subscriber: 
       files: 
         - web/layouts/agenda/delete-subscriber.html
@@ -178,6 +186,10 @@ views:
     vehicles_list:
       files:
         - web/layouts/administration/vehicles_stats.html
+    bookings_list:
+      files:
+        - web/layouts/administration/_partials/bookings_list.html
+        - web/layouts/administration/bookings_stats.html
     settings: 
       files:
         - web/layouts/administration/_partials/groups_admins.html
@@ -205,12 +217,7 @@ views:
       ko: 
         files:
           - web/layouts/auth/onboarding-ko.html
-  group:
+
-    settings:
-      files:
-        - web/layouts/administration/_partials/groups_admins.html
-        - web/layouts/administration/_partials/group_members.html
-        - web/layouts/group/settings.html
 icons:
   svg:
     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>

web/layouts/administration/_partials/bookings_list.html

@@ -0,0 +1,115 @@
+{{define "bookings_list"}}
+<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 text-center">
+                                    Statut
+                                </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">
+                                    Numéro
+                                </th>
+                                <th scope="col" class="px-3 py-3.5 text-left text-sm font-semibold text-gray-900 sm:pl-6">
+                                    Gestionnaire véhicule
+                                </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">
+                                    Beneficiaire
+                                </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">
+                                    Commentaire
+                                </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.bookings}}
+                            <tr>
+                                <td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                    {{if .Data.administrator_unavailability}}
+                                    <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
+                                        Retiré
+                                    </span>
+                                    {{else}}
+                                        {{if eq .Status 1 }}
+                                        <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
+                                            A&nbsp;venir
+                                        </span>
+                                        {{end}}
+                                        {{if eq .Status 0 }}
+                                        <span class="p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
+                                            En&nbsp;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" >{{ (index $.ViewState.vehicles_map .Vehicleid).Type }}</div>
+                                </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).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" >{{ (index $.ViewState.admingroups (index (index $.ViewState.vehicles_map .Vehicleid).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.booked_by.group.name }}<br />({{ .Data.booked_by.user.display_name }})</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if .Data.administrator_unavailability}}
+                                    <div class="text-gray-900" ></div>
+                                    {{else}}
+                                    <div class="text-gray-900" >
+                                        <!-- <img class="h-6 w-6 rounded-co" src="/app/beneficiaries/{{.Driver}}/picture" alt=""> -->
+                                        {{$b := (index $.ViewState.beneficiaries_map .Driver)}}
+                                        {{$b.Data.first_name}} {{$b.Data.last_name}} <br />
+                                        {{$b.Data.file_number}}
+                                    </div>
+                                    {{end}}
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    {{if .Data.administrator_unavailability}}
+                                    <div class="text-gray-900" >Retiré du {{(timeFrom .Unavailablefrom).Format "02/01/2006"}} <br />
+                                        au {{(timeFrom .Unavailableto).Format "02/01/2006"}}</div>
+                                    {{else}}
+                                    <div class="text-gray-900" >Du {{(timeFrom .Startdate).Format "02/01/2006"}} <br />
+                                        au {{(timeFrom .Enddate).Format "02/01/2006"}}</div>
+                                    {{end}}
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <div class="text-gray-900" >{{ .Data.comment }}</div>
+                                </td>
+                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+                                    <a href="/app/vehicles-management/bookings/{{.ID}}"
+                                            class="text-co-blue hover:text-co-blue">Voir</a>
+                                </td>
+                            </tr>
+                            {{end}}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}

web/layouts/administration/bookings_stats.html

@@ -0,0 +1,37 @@
+{{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">Historique des réservations de véhicules</h1>
+
+
+    <div class="sm:flex sm:items-center">
+        <div class="sm:flex-auto">
+            
+        </div>
+        <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+            <a href="/exports/fleets/bookings">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    Export
+                </button>
+            </a>
+            <a href="/app/administration/stats/vehicles">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    {{$.IconSet.Icon "hero:outline/document-arrow-left" "h-5 w-5 mr-3"}}
+                    Liste des véhicules
+                </button>
+            </a>
+            <!-- <a href="/api/cache/{{.ViewState.cacheid}}/export">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
+                    Exporter
+                </button>
+            </a> -->
+        </div>
+    </div>
+</div>
+
+{{template "bookings_list" .}}
+
+{{end}}

web/layouts/administration/events_stats.html

@@ -6,6 +6,12 @@
             <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="/exports/agenda/subscriptions">
+                <button type="button"
+                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    Export
+                </button>
+            </a>
             <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">

web/layouts/administration/vehicles_stats.html

@@ -2,14 +2,18 @@
 <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>
+            <h1 class="text-2xl font-semibold text-gray-900">Liste des véhicules</h1>
         </div>
         <div class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
             <a href="/app/administration/">
-                <button type="button"
+                <a href="/app/administration/stats/bookings">
-                    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">
+                    <button type="button"
-                   Retour
+                        class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
-                </button>
+                        {{$.IconSet.Icon "hero:outline/document-arrow-left" "h-5 w-5 mr-3"}}
+                        Liste des réservations
+                    </button>
+                </a>
+                
             </a>
         </div>
     </div>

web/layouts/agenda/_partials/event-files.html

@@ -0,0 +1,134 @@
+{{define "event_files"}}
+<div class="px-4 py-6 sm:px-6"
+x-data="{
+    fields: {
+        name: null,
+        type: null,
+        file: null,
+    },
+    rules: {
+        name: ['required'],
+        type: ['required'],
+        file: ['required'],
+    },
+    formValidation: {
+        valid: false,
+        fields: {
+            name: {valid: null},
+            type: {valid: null},
+            file: {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
+    }
+}">
+    {{if eq (len .ViewState.documents) 0}}
+    <p class="p-12 text-gray-500 text-center text-md">Aucun document</p>
+    {{end}}
+    
+    {{if gt (len .ViewState.documents) 0}}
+    
+    <div class="-mx-4 mb-10 ring-1 ring-gray-300 sm:-mx-6 md:mx-0 md:rounded-lg">
+        <table class="min-w-full divide-y divide-gray-300">
+          <thead>
+            <tr>
+              <th scope="col" class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">Type</th>
+              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Nom du document</th>
+              <th scope="col" class="hidden px-3 py-3.5 text-left text-sm font-semibold text-gray-900 lg:table-cell">Ajouté le</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>
+            {{range .ViewState.documents}}
+            <tr>
+              <td class="relative py-4 pl-4 sm:pl-6 pr-3 text-sm">
+                <div class="font-medium text-gray-900">
+                    <span class="bg-co-blue text-xs text-white rounded-xl p-1 mr-2">{{index $.ViewState.file_types_map .Metadata.Type}}</span>
+                </div>
+              </td>
+              <td class="px-3 py-3.5 text-sm text-gray-900 lg:table-cell">{{.Metadata.Name}}</td>
+              <td class="px-3 py-3.5 text-sm text-gray-500 lg:table-cell">{{.LastModified.Format "02/01/2006"}}</td>
+              <td class="relative py-3.5 pl-3 pr-4 sm:pr-6 text-right text-sm font-medium">
+                <a href="/app/agenda/{{$.ViewState.event.ID}}/documents/{{.FileName}}" target="_blank">
+                <button type="button" class="inline-flex items-center rounded-md border border-gray-300 bg-white px-3 py-2 text-sm font-medium leading-4 text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-30">Voir<span class="sr-only"> le document</span></button>
+                </a>
+              </td>
+            </tr>
+            {{end}}
+    
+    
+            <!-- More plans... -->
+          </tbody>
+        </table>
+      </div>
+    
+    {{end}}
+    {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
+    <h3 class="text-lg">Ajouter un document</h3>
+    <form method="POST" action="/app/agenda/{{.ViewState.event.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
+        <div class="md:grid md:grid-cols-6 p-2">
+          <div class="sm:col-span-2">
+            <label for="type" class="block text-sm font-medium text-gray-700">Type</label>
+            <select id="type" name="type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
+                x-model="fields.type" @blur="validateField('type')"
+                :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                <option value="" selected>Sélectionner un type</option>
+                {{range .ViewState.events_file_types}}
+                <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
+                {{end}}
+            </select>
+          </div>
+              <div class="sm:col-span-4">
+                <label for="name" class="block text-sm font-medium text-gray-700">Nom</label>
+                      <input type="text" name="name" id="name"
+                          placeholder="Nom du fichier"
+                          class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl"
+                          x-model="fields.name" @blur="validateField('name')"
+                          :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
+              </div>
+              <div class="sm:col-span-6 mt-4">
+                <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
+                <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
+                x-on:drop="console.log('toto')"
+                :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                  <div class="space-y-1 text-center">
+                    {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
+                    <div class="flex text-sm text-gray-600">
+                      <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
+                        <span>Sélectionnez un fichier </span>
+                        <input id="file-upload" name="file-upload" type="file" class="sr-only"
+                        x-model="fields.file" @blur="validateField('file')">
+                      </label>
+                      <!-- <p class="pl-1">ou glissez-déposez</p>  -->
+
+                        
+                    </div>
+                    <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
+                    <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
+                  </div>
+                </div>
+              </div>
+        </div>
+        <button type="submit"
+            class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 my-4 mt-8 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
+            Ajouter le document
+        </button>
+    </form>
+    {{end}}
+</div>
+{{end}}

web/layouts/agenda/create-event.html

@@ -4,8 +4,7 @@
     <h1 class="text-2xl font-semibold text-gray-900">Ajouter à l'agenda</h1>
 </div>
 
-<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8"
+<div class="max-w-7xl mx-auto px-4 sm:px-6 md:px-8 mt-8" x-data="{
-    x-data="{
         fields: {
             name: null,
             type: null,
@@ -16,6 +15,9 @@
             starttime: null,
             endtime: null,
             max_subscribers: 0,
+            file_name: null,
+            file_type: null,
+            file: null,
         },
         rules: {
             name: ['required'],
@@ -25,7 +27,10 @@
             starttime: ['optional'],
             endtime: ['optional'],
             description: ['optional'],
-            max_subscribers: ['required', 'min:0']
+            max_subscribers: ['required', 'min:0'],
+            file_name: ['optional'],
+            file_type: ['optional'],
+            file: ['optional'],
         },
         formValidation: {
             valid: false,
@@ -39,6 +44,9 @@
                 endtime: {valid: null},
                 allday: {valid: null},
                 max_subscribers: {valid: null},
+                file_name: {valid: null},
+                file_type: {valid: null},
+                file: {valid: null},
             }
         },
         isFormValid: true,
@@ -62,12 +70,14 @@
             return this.formValidation.valid
         }
     }">
-    <form class="space-y-6" method="POST" @submit="submit">
+
+    <form id="eventForm" class="space-y-6" method="POST" @submit="submit">
         <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6">
             <div class="md:grid md:grid-cols-3 md:gap-6">
                 <div class="md:col-span-1">
                     <h3 class="text-lg font-medium leading-6 text-gray-900">Informations sur le dispositif</h3>
-                    <p class="mt-1 text-sm text-gray-500">Informations générales sur le dispositif d'accompagnement à ajouter à l'agenda</p>
+                    <p class="mt-1 text-sm text-gray-500">Informations générales sur le dispositif d'accompagnement à
+                        ajouter à l'agenda</p>
                 </div>
                 <div class="mt-5 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
@@ -80,8 +90,7 @@
                         </div>
                         <div class="sm:col-span-3">
                             <label for="type" class="block text-sm font-medium text-gray-700">Type de dispositif</label>
-                            <select id="type" name="type" 
+                            <select id="type" name="type" x-model="fields.type" @blur="validateField('type')"
-                                x-model="fields.type" @blur="validateField('type')"
                                 class="max-w-lg mt-1 block focus:ring-co-blue focus:border-co-blue w-full shadow-sm sm:max-w-xs sm:text-sm rounded-2xl"
                                 :class="formValidation.fields.type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 <option></option>
@@ -94,8 +103,8 @@
                         <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" 
+                                <textarea rows="4" name="description" id="descrpition" x-model="fields.description"
-                                    x-model="fields.description" @blur="validateField('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>
@@ -119,12 +128,14 @@
 
                         <div class="col-span-6">
 
-                            <button type="button" class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2" role="switch" aria-checked="false"
+                            <button type="button"
-                                :class="fields.allday ? 'bg-co-blue' : 'bg-gray-200'"
+                                class="relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2"
+                                role="switch" aria-checked="false" :class="fields.allday ? 'bg-co-blue' : 'bg-gray-200'"
                                 @click="fields.allday = ! fields.allday">
                                 <span class="sr-only">Use setting</span>
                                 <!-- Enabled: "translate-x-5", Not Enabled: "translate-x-0" -->
-                                <span aria-hidden="true" class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
+                                <span aria-hidden="true"
+                                    class="pointer-events-none inline-block h-5 w-5 transform rounded-full bg-white shadow ring-0 transition duration-200 ease-in-out"
                                     :class="fields.allday ? 'translate-x-5' : 'translate-x-0'"></span>
                             </button> <span class="text-md font-medium text-gray-700 ml-2">Toute la journée</span>
                             <input type="hidden" name="allday" x-model="fields.allday">
@@ -134,18 +145,20 @@
                         <div class="sm:col-span-6">
                             <div class="inline-flex w-full">
                                 <div class="flex-1">
-                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Date de début</label>
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Date de
+                                        début</label>
                                     <input type="date" name="startdate" id="startdate" placeholder="JJ/MM/AAAA"
-                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
+                                        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
-                                            x-model="fields.startdate" @blur="validateField('startdate')"
+                                        x-model="fields.startdate" @blur="validateField('startdate')"
-                                            :class="formValidation.fields.startdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                        :class="formValidation.fields.startdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 </div>
                                 <div class="flex-1">
-                                    <label for="enddate" class="block text-sm font-medium text-gray-700">Date de fin</label>
+                                    <label for="enddate" class="block text-sm font-medium text-gray-700">Date de
+                                        fin</label>
                                     <input type="date" name="enddate" id="enddate" placeholder="JJ/MM/AAAA"
-                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
+                                        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
-                                            x-model="fields.enddate" @blur="validateField('enddate')"
+                                        x-model="fields.enddate" @blur="validateField('enddate')"
-                                            :class="formValidation.fields.enddate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                        :class="formValidation.fields.enddate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 </div>
 
 
@@ -155,18 +168,20 @@
                         <div class="sm:col-span-6" x-show="!fields.allday">
                             <div class="inline-flex w-full">
                                 <div class="flex-1">
-                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Horaire de début</label>
+                                    <label for="startdate" class="block text-sm font-medium text-gray-700">Horaire de
+                                        début</label>
                                     <input type="time" name="starttime" id="starttime" placeholder="00:00"
-                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
+                                        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl"
-                                            x-model="fields.starttime" @blur="validateField('starttime')"
+                                        x-model="fields.starttime" @blur="validateField('starttime')"
-                                            :class="formValidation.fields.starttime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                        :class="formValidation.fields.starttime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 </div>
                                 <div class="flex-1">
-                                    <label for="endtime" class="block text-sm font-medium text-gray-700">Horaire de fin</label>
+                                    <label for="endtime" class="block text-sm font-medium text-gray-700">Horaire de
+                                        fin</label>
                                     <input type="time" name="endtime" id="endtime" placeholder="00:00"
-                                            class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
+                                        class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl"
-                                            x-model="fields.endtime" @blur="validateField('endtime')"
+                                        x-model="fields.endtime" @blur="validateField('endtime')"
-                                            :class="formValidation.fields.endtime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                                        :class="formValidation.fields.endtime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                                 </div>
 
 
@@ -184,12 +199,14 @@
             <div class="md:grid md:grid-cols-3 md:gap-6">
                 <div class="md:col-span-1">
                     <h3 class="text-lg font-medium leading-6 text-gray-900">Paramètres</h3>
-                    <p class="mt-1 text-sm text-gray-500">Paramètres du dispositift (nombre de places disponibles, etc...)</p>
+                    <p class="mt-1 text-sm text-gray-500">Paramètres du dispositif (nombre de places disponibles,
+                        etc...)</p>
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2 align-middle">
                     <div class="grid grid-cols-6 gap-6">
                         <div class="col-span-6 sm:col-span-3">
-                            <label for="max_subscribers" class="block text-sm font-medium text-gray-700">Places disponibles (0 = illimité)</label>
+                            <label for="max_subscribers" class="block text-sm font-medium text-gray-700">Places
+                                disponibles (0 = illimité)</label>
                             <input type="number" name="max_subscribers" id="max_subscribers"
                                 class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
                                 x-model="fields.max_subscribers" @blur="validateField('max_subscribers')"
@@ -199,8 +216,54 @@
                 </div>
             </div>
         </div>
-
+        <!-- <div class="bg-white shadow px-4 py-5 sm:rounded-lg sm:p-6 mt-8">
-
+            <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">Ajouter un document</h3>
+                    <p class="mt-1 text-sm text-gray-500">Téléchargez un document lié à cet événement</p>
+                </div>
+                    <div class="md:grid md:grid-cols-6 p-2">
+                      <div class="sm:col-span-2">
+                        <label for="file_type" class="block text-sm font-medium text-gray-700">Type</label>
+                        <select id="file_type" name="file_type" class="mt-1 block w-full rounded-l-2xl border-gray-300 py-2 pl-3 pr-10 text-base focus:border-indigo-500 focus:outline-none focus:ring-indigo-500 sm:text-sm"
+                            x-model="fields.file_type" @blur="validateField('file_type')"
+                            :class="formValidation.fields.file_type.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                            <option value="" selected>Sélectionner un type</option>
+                            {{range .ViewState.events_file_types}}
+                            <option value="{{.}}">{{index $.ViewState.file_types_map .}}</option>
+                            {{end}}
+                        </select>
+                      </div>
+                          <div class="sm:col-span-4">
+                            <label for="file_name" class="block text-sm font-medium text-gray-700">Nom</label>
+                                  <input type="text" name="file_name" id="file_name"
+                                      placeholder="Nom du fichier"
+                                      class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-r-2xl"
+                                      x-model="fields.file_name" @blur="validateField('file_name')"
+                                      :class="formValidation.fields.file_name.valid == false ? 'border-co-red border-2' : 'border-gray-300'" />
+                          </div>
+                          <div class="sm:col-span-6 mt-4">
+                            <label for="cover-photo" class="block text-sm font-medium text-gray-700">Téléchargement</label>
+                            <div class="mt-1 flex justify-center rounded-md border-2 border-dashed px-6 pt-5 pb-6"
+                            x-on:drop="console.log('toto')"
+                            :class="formValidation.fields.file.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                              <div class="space-y-1 text-center">
+                                {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}}
+                                <div class="flex text-sm text-gray-600">
+                                  <label for="file-upload" class="relative cursor-pointer rounded-md bg-white font-medium text-co-blue focus-within:outline-none focus-within:ring-2 focus-within:ring-co-blue focus-within:ring-offset-2 hover:text-co-blue">
+                                    <span>Sélectionnez un fichier </span>
+                                    <input id="file-upload" name="file-upload" type="file" class="sr-only"
+                                    x-model="fields.file" @blur="validateField('file')">
+                                  </label>                                      
+                                </div>
+                                <p class="text-xs text-gray-500">Jusqu'à 10MB</p>
+                                <p class="text-co-blue p-2" x-text="fields.file" x-if="fields.file"></p>
+                              </div>
+                            </div>
+                          </div>
+                    </div>
+            </div>
+        </div> -->
 
         <div class="flex justify-end">
             <p x-show="! isFormValid" class="px-4 py-2 text-sm text-co-red">Certains champs de sont pas valides.</p>

web/layouts/agenda/display-event.html

@@ -28,7 +28,8 @@
             <a href="/app/agenda/{{$event}}/delete" class="inline-flex"><button type="button"
                 class="w-full px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer</button></a>
 
-            </div>
+
+        </div>
             {{end}}
     {{end}}
    
@@ -84,18 +85,29 @@
                     </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="flex justify-between px-4 py-5 sm:px-6">
                         <h2 id="event-information-title" class="text-lg leading-6 font-medium text-gray-900">Tous les inscrits</h2>
+                        <a href="/exports/agenda/{{$event}}">
+                            <button type="button"
+                                    class="inline-flex items-center justify-center bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                                {{$.IconSet.Icon "hero:outline/document-arrow-down" "h-5 w-5 mr-3"}}
+                                Exporter
+                            </button>
+                        </a>
                         <a href="/app/agenda/{{.ViewState.event.ID}}/history">
+
                             <button type="submit"class="rounded-2xl border border-transparent bg-co-blue px-4 py-2 w-full text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
                                 Bénéficiaires désinscrits
                             </button>
                         </a>
                     </div>
-                    {{template "subscribers_table" .}}
+
+
+                        {{template "subscribers_table" .}}
                 </div>
             </section>
             {{end}}
@@ -194,5 +206,17 @@
             </div>
         </section>
     </div>
+    <div class="mt-8 max-w-3xl mx-auto grid grid-cols-1 gap-6 sm:px-6 lg:max-w-7xl lg:grid-flow-col-dense lg:grid-cols-3">
+        <div class="space-y-6 lg:col-start-1 lg:col-span-2">
+            <section aria-labelledby="event-documents">
+                <div class="bg-white mt-4 px-4 py-5 shadow sm:rounded-lg sm:px-6">
+                    <h2 id="documents-title" class="text-lg font-medium text-gray-900">Documents</h2>
+                    <div class="flex justify-between items-center">
+                        <div>{{template "event_files" .}}</div>
+                    </div>
+                </div>
+            </section>
+        </div>
+    </div>
 </main>
 {{ end }}

web/layouts/agenda/history.html

@@ -0,0 +1,105 @@
+{{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">Anciens dispositifs</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 class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
+        </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}}
+                                {{if eq .Deleted false}}
+                                <a href="/app/agenda/{{.ID}}">
+                                <tr>
+                                    <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
+
+                                        <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}}
+                                {{end}}
+                            </tbody>
+                        </thead>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{{end}}

web/layouts/agenda/home.html

@@ -7,6 +7,13 @@
             <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/agenda/history">
+                <button type="button"
+                    class="inline-flex items-center justify-center mr-3 bg-white hover:bg-gray-50 border-gray-300 border px-4 py-2 text-gray-700 flex items-center text-sm rounded-2xl focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">
+                    {{$.IconSet.Icon "hero:outline/calendar" "h-5 w-5 mr-3"}}
+                    Historique
+                </button>
+            </a>
             <a href="/app/agenda/create-event">
                 <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-ci-blue focus:ring-offset-2 sm:w-auto">

web/layouts/beneficiaries/_partials/beneficiary-events.html

@@ -1,4 +1,63 @@
 {{define "beneficiary_events"}}
-<div class="px-4 py-6 sm:px-6">
+{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }}
+{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
+<div class="bg-white shadow sm:rounded-lg">
+    <div class="px-4 py-5 sm:px-6">
+        <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Actions réalisées</h2>
+    </div>
+    <div class="border-t border-gray-200">
+        {{ $eventCount := len .ViewState.event }}
+        <ul role="list" class="divide-y divide-gray-200 flex-1">
+            {{if eq $eventCount 0}}
+                <li class="py-2 px-4">
+                    <p class="py-5 mt-1 max-w-2xl text-sm text-gray-500">Aucun dispositif n'est prévu pour le moment.</p>
+                </li>
+            {{else}}
+                {{range .ViewState.event}}
+                {{if eq .Deleted false}}
+                    <li class="py-5 px-4 flex">
+                        <a href="{{.Db}}{{.ID}}" class="flex w-full">
+                            <div class="flex-1 ml-3">
+                                <div class="flex items-center">
+
+                                    {{if eq .Status 2}}
+                                        {{if eq .Icons "vehicle"}}
+                                            <span class="bg-co-green text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
+                                        {{else}}
+                                            <span class="bg-co-green text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
+                                        {{end}}
+                                    {{end}}
+
+                                    {{if eq .Status 1}}
+                                        {{if eq .Icons "vehicle"}}
+                                            <span class="bg-co-blue text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
+                                        {{else}}
+                                            <span class="bg-co-blue text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
+                                        {{end}}
+                                    {{end}}
+
+                                    {{if eq .Status 3}}
+                                        {{if eq .Icons "vehicle"}}
+                                            <span class="bg-gray-500 text-white rounded-full h-8 w-10 flex items-center justify-center">{{$carIcon}}</span>
+                                        {{else}}
+                                            <span class="bg-gray-500 text-white rounded-full h-8 w-10 flex items-center justify-center">{{$calendarIcon}}</span>
+                                        {{end}}
+                                    {{end}} 
+
+                                    {{if eq .Date .DateEnd}}
+                                        <p class="text-sm font-medium text-gray-500"> &ensp;le {{(timeFrom .Date).Format "02/01/2006"}}</p>
+                                    {{else}}
+                                        <p class="text-sm font-medium text-gray-500">&ensp;du {{(timeFrom .Date).Format "02/01/2006"}} au {{(timeFrom .DateEnd).Format "02/01/2006"}}</p>
+                                    {{end}}
+                                </div>
+                                <p class="mt-1 text-sm text-gray-900">{{.Type}} - {{.Name}}</p>
+                            </div>
+                        </a>
+                    </li>
+                {{end}}
+                {{end}}
+            {{end}}
+        </ul>
+    </div>
 </div>
 {{end}}

web/layouts/beneficiaries/_partials/beneficiary-files.html

@@ -81,7 +81,7 @@ x-data="{
     {{end}}
 
     <h3 class="text-lg">Ajouter un document</h3>
-    <form method="POST" action="/app/beneficiaries/e7616eac-4a87-4396-a505-23e0421b9c4c/documents"  @submit="submit"  enctype="multipart/form-data">
+    <form method="POST" action="/app/beneficiaries/{{.ViewState.beneficiary.ID}}/documents"  @submit="submit"  enctype="multipart/form-data">
         <div class="md:grid md:grid-cols-6 p-2">
             <div class="sm:col-span-2">
                 <label for="type" class="block text-sm font-medium text-gray-700">Type</label>

web/layouts/beneficiaries/create.html

@@ -20,7 +20,7 @@
             email: ['required', 'email'],
             phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
             birthdate: ['required'],
-            file_number: ['optional'],
+            file_number: ['required'],
         },
         formValidation: {
             valid: false,
@@ -100,6 +100,13 @@
                                 x-model="fields.birthdate" @blur="validateField('birthdate')"
                                 :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (CAF / Pole Emploi ...)</label>
+                            <input type="text" name="file_number" id="file_number" placeholder=""
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
+                                x-model="fields.file_number" @blur="validateField('file_number')"
+                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
                     </div>
                 </div>
             </div>
@@ -114,14 +121,6 @@
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
 
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (allocataire, ...)</label>
-                            <input type="text" name="file_number" id="file_number" placeholder=""
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-2xl"
-                                x-model="fields.file_number" @blur="validateField('file_number')"
-                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
                         <div class="col-span-6 sm:col-span-3">
                             <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                             <div class="sm:mt-0 sm:col-span-2">

web/layouts/beneficiaries/display.html

@@ -69,6 +69,12 @@
                                 <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.address.properties.label}}</dd>
                             </div>
                             {{end}}
+                            {{if .ViewState.beneficiary.Data.file_number}}
+                            <div class="sm:col-span-1">
+                                <dt class="text-sm font-medium text-gray-500">Numéro de dossier (CAF / Pole emploi)</dt>
+                                <dd class="mt-1 text-sm text-gray-900">{{.ViewState.beneficiary.Data.file_number}}</dd>
+                            </div>
+                            {{end}}
                         </dl>
                     </div>
                 </div>
@@ -145,10 +151,7 @@
         </div>
 
         <section aria-labelledby="timeline-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">
+        {{template "beneficiary_events" .}}
-                <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Actions réalisées</h2>
-                <p class="p-12 text-gray-500 text-center text-md">Aucune action réalisée pour le moment</p>
-            </div>
         </section>
     </div>
 </main>

web/layouts/beneficiaries/update.html

@@ -21,7 +21,7 @@
             email: ['required', 'email'],
             phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'],
             birthdate: ['required'],
-            file_number: ['optional'],
+            file_number: ['required'],
         },
         formValidation: {
             valid: false,
@@ -101,6 +101,15 @@
                                 x-model="fields.birthdate" @blur="validateField('birthdate')"
                                 :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
                         </div>
+
+                        <div class="col-span-6 sm:col-span-3">
+                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (CAF / Pole Emploi ...)</label>
+                            <input type="text" name="file_number" id="file_number"
+                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
+                                x-model="fields.file_number" @blur="validateField('file_number')"
+                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+                        </div>
+
                     </div>
                 </div>
             </div>
@@ -114,15 +123,6 @@
                 </div>
                 <div class="mt-5 space-y-6 md:mt-0 md:col-span-2">
                     <div class="grid grid-cols-6 gap-6">
-
-                        <div class="col-span-6 sm:col-span-3">
-                            <label for="file_number" class="block text-sm font-medium text-gray-700">Numéro de dossier (allocataire, ...)</label>
-                            <input type="text" name="file_number" id="file_number"
-                                class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
-                                x-model="fields.file_number" @blur="validateField('file_number')"
-                                :class="formValidation.fields.file_number.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
-                        </div>
-
                         <div class="col-span-6 sm:col-span-3">
                             <label for="gender" class="block text-sm font-medium text-gray-700">Genre</label>
                             <div class="sm:mt-0 sm:col-span-2">

web/layouts/dashboard/_partials/agenda-widget.html

@@ -10,6 +10,7 @@
     </div>
     <ul role="list" class="divide-y divide-gray-200 flex-1">
         {{range .}}
+        {{if eq .Deleted false}}
             <li class="py-2 px-4 flex">
                 <a href="/app/agenda/{{.ID}}" class="flex w-full">
                 <div class="ml-3">
@@ -18,6 +19,7 @@
             </a>
             </li>
         {{end}}
+        {{end}}
     </ul>
 
     <a href="/app/agenda/">

web/layouts/vehicles/bookings-list.html

@@ -5,12 +5,12 @@
             <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">
+            <!-- <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>
+            </a> -->
         </div>
     </div>
 </div>
@@ -54,7 +54,7 @@
                             
                             {{range .ViewState.bookings}}
                             <tr>
-                                <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
+                                <td class="flex-col py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
                                     {{if .Data.administrator_unavailability}}
                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                         Retiré
@@ -76,15 +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>
-                                </td>
+                                  </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).Data.licence_plate}}</div>
                                 </td>

web/layouts/vehicles/search.html

@@ -147,6 +147,20 @@
         <div class="lg:col-start-2 lg:col-span-2">
             {{if .ViewState.searched}}
             <div class="bg-white px-4 py-5 shadow sm:rounded-2xl sm:px-6">
+              <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Documents demandés</h2>
+              <table>
+                <tbody>
+                  {{range .ViewState.search.mandatory_documents}}
+                  <tr>
+                    <td class="whitespace-nowrap py-4 px-3 text-sm text-gray-500">
+                      {{index $.ViewState.search.file_types_map .}}
+                    </td>
+                  </tr>
+                  {{end}}
+                </tbody>
+              </table>
+            </div>            
+            <div class="bg-white mt-8 px-4 py-5 shadow sm:rounded-2xl sm:px-6">
                 <h2 id="timeline-title" class="text-lg font-medium text-gray-900">Véhicules disponibles</h2>
                 <div class="mt-8 flex flex-col">
                     <div class="-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8">

web/layouts/vehicles_management/_partials/bookings-list.html

@@ -39,10 +39,6 @@
                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                         Retiré
                                     </span>
-                                    {{else if .Data.Deleted}}
-                                    <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
-                                        Annulé
-                                    </span>
                                     {{else}}
                                         {{if eq .Status 1 }}
                                         <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >

web/layouts/vehicles_management/booking-display.html

@@ -11,18 +11,17 @@
                 changeVehicle: false,
                 selectedvehicle: ''
             }">
-            {{if and (ne .ViewState.booking.Status -1) (not .ViewState.booking.Data.Deleted)}}
             <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>
+            </a> -->
-            {{end}}
+
             <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>
 
@@ -36,7 +35,7 @@
                                 <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}} ({{.Type}})</option>
+                                    <option value="{{.ID}}">{{.Data.licence_plate}} - {{.Data.name}} ({{.Type}})</option>
                                     {{end}}
                                 </select>
                                 <div class="mt-5 sm:mt-6">
@@ -110,13 +109,8 @@
                 <div class="bg-white px-4 py-5 border-b border-gray-200 sm:px-6">
                     <div class="-ml-4 -mt-4 flex justify-between items-center flex-wrap sm:flex-nowrap">
                         <div class="ml-4 mt-4">
-                            {{if eq .ViewState.booking.Data.Deleted true}}
-                            <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation annulée le {{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</h3>
-                            <p class="mt-1 text-sm text-gray-500">Motif : {{.ViewState.booking.Data.motif}}</p>
-                            {{else}}
                             <h3 class="text-lg leading-6 font-medium text-gray-900">Réservation</h3>
                             <p class="mt-1 text-sm text-gray-500">Informations utiles sur la réservation.</p>
-                            {{end}}
                         </div>
                         <div class="ml-4 mt-4 flex-shrink-0">
                             <!-- <button type="button"
@@ -181,9 +175,7 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Startdate).Format "02/01/2006"}}</div>
-                                        {{if and (ne .ViewState.booking.Status -1) (not .ViewState.booking.Data.Deleted)}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
-                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -203,9 +195,7 @@
                                         x-data="{ updateOpen: false }">
                                         <div class="w-full inline-flex" x-show="!updateOpen">
                                             <div class="flex-1">{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006"}}</div>
-                                            {{if and (ne .ViewState.booking.Status -1) (not .ViewState.booking.Data.Deleted)}}
                                             <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
-                                            {{end}}
                                         </div>
                                         <form method="POST" class="inline-flex" x-show="updateOpen">
                                             <div class="flex-1">
@@ -225,9 +215,7 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailablefrom).Format "02/01/2006"}}</div>
-                                        {{if and (ne .ViewState.booking.Status -1) (not .ViewState.booking.Data.Deleted)}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
-                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">
@@ -247,9 +235,7 @@
                                     x-data="{ updateOpen: false }">
                                     <div class="w-full inline-flex" x-show="!updateOpen">
                                         <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</div>
-                                        {{if and (ne .ViewState.booking.Status -1) (not .ViewState.booking.Data.Deleted)}}
                                         <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
-                                        {{end}}
                                     </div>
                                     <form method="POST" class="inline-flex" x-show="updateOpen">
                                         <div class="flex-1">

web/layouts/vehicles_management/fleet-display.html

@@ -104,10 +104,6 @@
                                                     <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
                                                         Retiré
                                                     </span>
-                                                    {{else if .Data.Deleted}}
-                                                    <span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
-                                                        Annulé
-                                                    </span>
                                                     {{else}}
                                                         {{if eq .Status 1 }}
                                                         <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
@@ -169,19 +165,13 @@
                     <p class="p-12 text-gray-500 text-center text-md">Aucune réservation à venir</p>
                     {{end}}
                     <ul role="list" class="divide-y divide-gray-200">
-                        {{$noReservation := true}}
                         {{range .ViewState.vehicle.Bookings}}
                         <li class="py-4 flex">
                         <div class="ml-3">
-                            {{if eq .Status 1 }}
                             <a href="/app/vehicles-management/bookings/{{.ID}}" class="hover:bg-gray-200">
                                 <p class="text-sm font-medium text-gray-900">Du {{(timeFrom .Startdate).Format "02/01/2006"}} au {{(timeFrom .Enddate).Format "02/01/2006"}}</p>
                                 <p class="text-sm text-gray-500"></p>
                             </a>
-                            {{else if $noReservation}}
-                            {{$noReservation = false}}
-                            <p class="p-12 text-gray-500 text-center text-md">Aucune réservation à venir</p>
-                            {{end}}
                         </div>
                         </li>
                         {{end}}