agenda event export button

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

@@ -1,63 +1,4 @@
 {{define "beneficiary_events"}}
-{{ $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 class="px-4 py-6 sm:px-6">
 </div>
 {{end}}

web/layouts/beneficiaries/display.html

@@ -151,7 +151,10 @@
         </div>
 
         <section aria-labelledby="timeline-title" class="lg:col-start-3 lg:col-span-1">
-        {{template "beneficiary_events" .}}
+            <div class="bg-white px-4 py-5 shadow sm:rounded-lg sm:px-6">
+                <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/vehicles/bookings-list.html

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

@@ -1,39 +0,0 @@
-{{define "content"}}
-<div>
-        <form method="POST" >
-
-            <div class="fixed inset-0 bg-gray-500 bg-opacity-75 transition-opacity"></div>
-        
-            <div class="fixed inset-0 z-10 overflow-y-auto">
-            <div class="flex min-h-full items-end justify-center p-4 text-center sm:items-center sm:p-0">
-
-                <div class="relative transform overflow-hidden rounded-lg bg-white px-4 pt-5 pb-4 text-left shadow-xl transition-all sm:my-8 sm:w-full max-w-lg sm:p-6">
-                <div>
-                    <div class="mx-auto flex h-12 w-12 items-center justify-center rounded-co bg-co-blue text-white">
-                    {{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}}
-                    </div>
-                    <div class="mt-3 text-center sm:mt-5">
-                        <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Confirmation d'annulation</h3>
-                        <div class="mt-2">
-                            <p class="text-sm text-gray-500">Souhaitez-vous vraiment annuler cette réservaton ?</p>
-                        </div>
-                        <div class="col-span-6">
-                            <label for="motif" class="block text-sm font-medium text-gray-700">Motif</label>
-                            <div class="mt-1">
-                                <textarea rows="4" name="motif" id="motif"
-                                    class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"></textarea>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="mt-5 sm:mt-6 sm:grid sm:grid-flow-row-dense sm:grid-cols-2">
-                    <a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}" class="mt-3 inline-flex w-full justify-center rounded-l-2xl border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-1 sm:mt-0 sm:text-sm">Annuler</a>
-                    <button  type="submit" class="inline-flex w-full justify-center rounded-r-2xl border border-transparent bg-co-blue px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:col-start-2 sm:text-sm">Confirmation</button>
-                </div>
-                </div>
-            </div>
-            </div>
-        </form>
-
- </div>
-{{end}}