Agenda improvements

themes/default/layouts/administration/_partials/groups_admins.html

@@ -4,34 +4,57 @@
   <h2 class="text-md font-medium text-gray-900">Administrateurs</h2>
   
   <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
-    
+
+    {{range .ViewState.admins}}
     <div class="relative rounded-lg  bg-white px-6 py-5 flex items-center space-x-3 focus-within:ring-2 focus-within:ring-offset-2 focus-within:ring-co-blue">
       <div class="flex-shrink-0">
-        <img class="h-10 w-10 rounded-co" src="http://localhost:9000/app/beneficiaries/e7616eac-4a87-4396-a505-23e0421b9c4c/picture" alt="">
+        <img class="h-10 w-10 rounded-co" src="/app/beneficiaries/{{.ID}}/picture" alt="">
       </div>
       <div class="flex-1 min-w-0">
         <a href="#" class="focus:outline-none">
           <span class="absolute inset-0" aria-hidden="true"></span>
-          <p class="text-sm font-medium text-gray-900">Arnaud Delcasse</p>
-          <p class="text-sm text-gray-500 truncate">arnaud.delcasse@coopgo.fr</p>
+          <p class="text-sm font-medium text-gray-900">{{.Data.first_name}} {{.Data.last_name}}</p>
+          <p class="text-sm text-gray-500 truncate">{{.Data.email}}</p>
         </a>
       </div>
     </div>
-  
-    <!-- More people... -->
+    {{end}}
   </div>
 </div>
-<div class="px-6 py-4">
-<h2 class="text-md font-medium text-gray-900">Ajouter</h2>
-  <div class="flex">
+
+<div class="px-2 py-4">
+  <form class="flex" method="POST" action="/app/administration/groups/{{.ViewState.group.ID}}/invite-admin">
     <div class="pr-2 flex-1">
-      <input type="text" name="name" id="name"
+      <input type="text" name="username" id="username"
       class="mt-1 border-gray-300 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm  rounded-2xl"
       placeholder="Email">
     </div>
-    <button class="px-1 py-1 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Ajouter</button>
+    <button class="px-1 py-1 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Ajouter administrateur</button>
     
-  </div>
+  </form>
   
 </div>
+
+<!-- <div class="border-t border-gray-200 px-4 py-5 sm:px-6">
+  
+  <h2 class="text-md font-medium text-gray-900">Membres de l'organisation</h2>
+  
+  <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+
+    {{range .ViewState.members}}
+    <div class="relative rounded-lg  bg-white px-6 py-5 flex items-center space-x-3 focus-within:ring-2 focus-within:ring-offset-2 focus-within:ring-co-blue">
+      <div class="flex-shrink-0">
+        <img class="h-10 w-10 rounded-co" src="/app/beneficiaries/{{.ID}}/picture" alt="">
+      </div>
+      <div class="flex-1 min-w-0">
+        <a href="#" class="focus:outline-none">
+          <span class="absolute inset-0" aria-hidden="true"></span>
+          <p class="text-sm font-medium text-gray-900">{{.Data.first_name}} {{.Data.last_name}}</p>
+          <p class="text-sm text-gray-500 truncate">{{.Data.email}}</p>
+        </a>
+      </div>
+    </div>
+    {{end}}
+  </div>
+</div> -->
 {{end}}

themes/default/layouts/dashboard/_partials/agenda-widget.html

@@ -0,0 +1,29 @@
+{{define "agenda_widget"}}
+<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">Prochains dispositifs</h3>
+        </div>
+        <!-- <div class="ml-4 mt-2 flex-shrink-0">
+          <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 flex-1">
+        {{range .}}
+            <li class="py-2 px-4 flex">
+                <a href="/app/agenda/{{.ID}}" class="flex w-full">
+                <div class="ml-3">
+                    <p class="text-sm font-medium text-gray-900">{{(timeFrom .Startdate).Format "02/01"}} - {{.Type}} - {{.Name}}</p>
+                </div>
+            </a>
+            </li>
+        {{end}}
+    </ul>
+
+    <a href="/app/agenda/">
+        <button class="w-full p-2 text-center bg-co-blue text-white rounded-b-2xl text-sm">
+            Agenda des dispositifs
+        </button>
+    </a>
+</div>
+{{end}}

themes/default/layouts/dashboard/dashboard.html

@@ -57,7 +57,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">53 membres</p>
+            <p class="text-gray-500">{{.ViewState.count_members}} membres</p>
           </div>
         </div>
       </li>
@@ -68,7 +68,8 @@
     <div class="py-4 grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3">
 
 
-        {{template "beneficiaries_widget" .ViewState.beneficiaries}}
+      {{template "beneficiaries_widget" .ViewState.beneficiaries}}
+      {{template "agenda_widget" .ViewState.events}}
 
 
     </div>

themes/default/layouts/layout.html

@@ -130,7 +130,8 @@
           <!-- Profile dropdown -->
           <div class="ml-3 relative" x-data="{ profileMenuOpen: false }">
             <div>
-              <button @click="profileMenuOpen = ! profileMenuOpen" type="button"
+              <!-- <button @click="profileMenuOpen = ! profileMenuOpen" type="button" -->
+              <button type="button"
                 class="max-w-xs bg-white flex items-center text-sm rounded-co focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue"
                 id="user-menu-button" aria-expanded="false" aria-haspopup="true">
                 <span class="sr-only">Open user menu</span>

themes/default/layouts/vehicles/booking-display.html

@@ -6,14 +6,14 @@
         <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 class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
             <a href="/app/vehicles-management/fleet/add">
                 <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>
+        </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">
@@ -80,8 +80,8 @@
                                 class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-co-blue bg-gray-100 hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">SMS</button>
                             <button type="button"
                                 class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-co-blue bg-gray-100 hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Email</button>
-                            <button type="button"
-                                class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-co-blue bg-gray-100 hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Imprimer</button>
+                            <!-- <button type="button"
+                                class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-co-blue bg-gray-100 hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Imprimer</button> -->
                         </div>
                     </div>
                 </div>

themes/default/layouts/vehicles_management/booking-display.html

@@ -6,7 +6,7 @@
         <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 class="mt-4 sm:mt-0 sm:ml-16 sm:flex-none">
             <button type="button"
                 class="inline-flex items-center justify-center px-4 py-2 border border-gray-300 shadow-sm text-sm font-medium rounded-2xl text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">
                 Changer de véhicule
@@ -17,7 +17,7 @@
                     Annuler
                 </button>
             </a>
-        </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">
@@ -85,8 +85,8 @@
                                 class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-co-blue bg-gray-100 hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">SMS</button>
                             <button type="button"
                                 class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-co-blue bg-gray-100 hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Email</button>
-                            <button type="button"
-                                class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-co-blue bg-gray-100 hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Imprimer</button>
+                            <!-- <button type="button"
+                                class="relative inline-flex items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-co-blue bg-gray-100 hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Imprimer</button> -->
                         </div>
                     </div>
                 </div>