coopgo-apps
/
parcoursmob-default-theme
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: coopgo-apps:ad7f5b642e311cd8c9bf4f6bbcf5cc5fc0539547
Branches Tags
coopgo-apps:main
coopgo-apps:spie06
coopgo-apps:solidarity-transport-dev
coopgo-apps:diags
coopgo-apps:silvermobi
coopgo-apps:dev
coopgo-apps:AddDiagDate
coopgo-apps:addKilometersOnVehicle
coopgo-apps:showPiecesInReservation
coopgo-apps:addDocsInEvent
coopgo-apps:mika
coopgo-apps:deleteVehicleReservation
coopgo-apps:modifyVehicle
coopgo-apps:FixAddressBeneficiary
coopgo-apps:fixMultipleReservationV
coopgo-apps:addStatistiques
coopgo-apps:vehicleList
coopgo-apps:modifyAnEvent
coopgo-apps:deleteMembersInAnAgenda
coopgo-apps:addInfoInCovoiturage
coopgo-apps:themeCovoiturage
..
compare: coopgo-apps:e43e23353a81e3d85e72651715175bb8ad0f40e2
Branches Tags
coopgo-apps:spie06
coopgo-apps:main
coopgo-apps:solidarity-transport-dev
coopgo-apps:diags
coopgo-apps:silvermobi
coopgo-apps:dev
coopgo-apps:AddDiagDate
coopgo-apps:addKilometersOnVehicle
coopgo-apps:showPiecesInReservation
coopgo-apps:addDocsInEvent
coopgo-apps:mika
coopgo-apps:deleteVehicleReservation
coopgo-apps:modifyVehicle
coopgo-apps:FixAddressBeneficiary
coopgo-apps:fixMultipleReservationV
coopgo-apps:addStatistiques
coopgo-apps:vehicleList
coopgo-apps:modifyAnEvent
coopgo-apps:deleteMembersInAnAgenda
coopgo-apps:addInfoInCovoiturage
coopgo-apps:themeCovoiturage

No commits in common. "ad7f5b642e311cd8c9bf4f6bbcf5cc5fc0539547" and "e43e23353a81e3d85e72651715175bb8ad0f40e2" have entirely different histories.
ad7f5b642e ... e43e23353a

2 changed files with 1 additions and 56 deletions
Show Stats Expand all files Collapse all files

2
web/layouts/vehicles_management/_partials/bookings-list.html
View File

@ -34,7 +34,7 @@
<tbody class="divide-y divide-gray-200 bg-white"> <tbody class="divide-y divide-gray-200 bg-white">
{{range .ViewState.bookings}} {{range .ViewState.bookings}}
<tr> <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}} {{if .Data.administrator_unavailability}}
<span class="p-1 bg-black text-white text-xs font-bold rounded-xl" > <span class="p-1 bg-black text-white text-xs font-bold rounded-xl" >
Retiré Retiré

55
web/layouts/vehicles_management/_partials/vehicles-list.html
View File

@ -7,10 +7,6 @@
<table class="min-w-full divide-y divide-gray-300"> <table class="min-w-full divide-y divide-gray-300">
<thead class="bg-gray-50"> <thead class="bg-gray-50">
<tr> <tr>
<th scope="col"
class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
Statut Réservation
</th>
<th scope="col" <th scope="col"
class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6"> class="py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6">
Numéro (Immat / Bicycode) Numéro (Immat / Bicycode)
@ -32,57 +28,6 @@
<tbody class="divide-y divide-gray-200 bg-white"> <tbody class="divide-y divide-gray-200 bg-white">
{{range .ViewState.vehicles}} {{range .ViewState.vehicles}}
<tr> <tr>
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6 text-center">
<div class="flex flex-col px-6">
{{if not .Bookings}}
<span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
Disponible
</span>
{{else if len .Bookings | eq 1}}
{{range .Bookings}}
{{if .Data.administrator_unavailability}}
<span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
Retiré
</span>
{{else if eq .Status -1 }}
<span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
Disponible
</span>
{{end}}
{{end}}
{{else if gt (len .Bookings) 1}}
{{range .Bookings}}
{{if .Data.administrator_unavailability}}
<span class="mt-1 p-1 bg-black text-white text-xs font-bold rounded-xl" >
Retiré
</span>
{{else}}
{{if eq .Status 1 }}
<span class="mt-1 p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >
A venir
</span>
{{else if eq .Status 0 }}
<span class="mt-1 p-1 bg-co-green text-white text-xs font-bold rounded-xl" >
En cours
</span>
{{end}}
{{end}}
{{end}}
{{$allAvailable := true}}
{{range .Bookings}}
{{if ne .Status -1}}
{{ $allAvailable = false }}
{{ break }}
{{end}}
{{end}}
{{if $allAvailable}}
<span class="mt-1 p-1 bg-gray-500 text-white text-xs font-bold rounded-xl" >
Disponible
</span>
{{end}}
{{end}}
</div>
</td>
<td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6"> <td class="whitespace-nowrap py-4 pl-4 pr-3 text-sm sm:pl-6">
<div class="text-gray-900" >{{.Data.licence_plate}}</div> <div class="text-gray-900" >{{.Data.licence_plate}}</div>
</td> </td>