Merge branch 'main' into spie06

This commit is contained in:
Arnaud Delcasse 2022-12-05 19:17:01 +01:00
commit aa97b97f22
2 changed files with 6 additions and 6 deletions

View File

@ -15,7 +15,7 @@
class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate"> 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"> <div class="flex-1 px-4 py-2 text-sm truncate">
<a href="#" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a> <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Bénéficiaires</a>
<p class="text-gray-500">{{len (index .ViewState.groups 0).Members}} bénéficiaires</p> <p class="text-gray-500">{{len .ViewState.beneficiaries }} bénéficiaires</p>
</div> </div>
</div> </div>
</li> </li>
@ -51,13 +51,13 @@
<li class="col-span-1 flex shadow-sm rounded-3xl"> <li class="col-span-1 flex shadow-sm rounded-3xl">
<div <div
class="flex-shrink-0 flex items-center justify-center w-16 bg-co-yellow text-white text-sm font-medium rounded-l-3xl"> class="flex-shrink-0 flex items-center justify-center w-16 bg-co-yellow text-white text-sm font-medium rounded-l-3xl">
{{.IconSet.Icon "hero:outline/shield-check" "h-6 w-6"}} {{.IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
</div> </div>
<div <div
class="flex-1 flex items-center justify-between border-t border-r border-b border-gray-200 bg-white rounded-r-3xl truncate"> 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"> <div class="flex-1 px-4 py-2 text-sm truncate">
<a href="#" class="text-gray-900 font-medium hover:text-gray-600">Accompagnement</a> <a href="#" class="text-gray-900 font-medium hover:text-gray-600">Véhicules</a>
<p class="text-gray-500">0 actions réalisées</p> <p class="text-gray-500">{{len .ViewState.bookings}} réservations de véhicules</p>
</div> </div>
</div> </div>
</li> </li>

View File

@ -35,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"> <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> <option value=""></option>
{{range .ViewState.alternative_vehicles }} {{range .ViewState.alternative_vehicles }}
<option value="{{.ID}}">{{.Data.name}}</option> <option value="{{.ID}}">{{.Data.name}} ({{.Type}})</option>
{{end}} {{end}}
</select> </select>
<div class="mt-5 sm:mt-6"> <div class="mt-5 sm:mt-6">
@ -161,7 +161,7 @@
<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4"> <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
<dt class="text-sm font-medium text-gray-500">Type</dt> <dt class="text-sm font-medium text-gray-500">Type</dt>
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2"> <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
Voiture</dd> {{.ViewState.vehicle.Type}}</dd>
</div> </div>
{{if .ViewState.vehicle.Data.address}} {{if .ViewState.vehicle.Data.address}}
<div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4"> <div class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">