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

Compare commits

base: coopgo-apps:1f951da1fa72ab150794fd495b82b85263e7724a
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:2747ce67fa54daf2745eeba1d0e88020d675c977
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. "1f951da1fa72ab150794fd495b82b85263e7724a" and "2747ce67fa54daf2745eeba1d0e88020d675c977" have entirely different histories.
1f951da1fa ... 2747ce67fa

2 changed files with 12 additions and 37 deletions
Show Stats Expand all files Collapse all files

45
web/layouts/vehicles_management/booking-display.html
View File

@ -9,13 +9,7 @@
<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"
x-data="{ x-data="{
changeVehicle: false, changeVehicle: false,
selectedvehicle: '', selectedvehicle: ''
submitSelectedvehicle(event) {
if(this.selectedvehicle == '') {
event.preventDefault()
}
return true
}
}"> }">
{{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}} {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
<button type="button" @click="changeVehicle = ! changeVehicle" <button type="button" @click="changeVehicle = ! changeVehicle"
@ -40,7 +34,7 @@
<div class="text-center"> <div class="text-center">
<h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Changer de véhicule</h3> <h3 class="text-lg font-medium leading-6 text-gray-900" id="modal-title">Changer de véhicule</h3>
</div> </div>
<form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/change-vehicle" class="mt-4" @submit="submitSelectedvehicle"> <form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/change-vehicle" class="mt-4">
<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 }}
@ -84,44 +78,29 @@
<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">
{{.ViewState.beneficiary.Data.phone_number}}</dd> {{.ViewState.beneficiary.Data.phone_number}}</dd>
</div> </div>
{{if .ViewState.beneficiary.Data.birthdate}} {{if .ViewState.Data.birthdate}}
<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">Date de naissance</dt> <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{(timeFrom <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{(timeFrom
.ViewState.beneficiary.Data.birthdate).Format .ViewState.Data.birthdate).Format
"02/01/2006"}}</dd> "02/01/2006"}}</dd>
</div> </div>
{{end}} {{end}}
{{if and .ViewState.beneficiary.Data.gender (ne .ViewState.Data.gender "0")}} {{if and .ViewState.Data.gender (ne .ViewState.Data.gender "0")}}
<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">Date de naissance</dt> <dt class="text-sm font-medium text-gray-500">Date de naissance</dt>
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{genderISO5218 <dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">{{genderISO5218
.ViewState.beneficiary.Data.gender}}</dd> .ViewState.Data.gender}}</dd>
</div> </div>
{{end}} {{end}}
{{if .ViewState.beneficiary.Data.address}} {{if .ViewState.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">
<dt class="text-sm font-medium text-gray-500">Adresse</dt> <dt class="text-sm font-medium text-gray-500">Adresse</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">
{{.ViewState.beneficiary.Data.address.properties.label}} {{.ViewState.Data.address.properties.label}}
</dd> </dd>
</div> </div>
{{end}} {{end}}
{{if .ViewState.beneficiary.Data.file_number}}
<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">Numéro de dossier (CAF / Pole emploi)</dt>
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2">
{{.ViewState.beneficiary.Data.file_number}}
</dd>
</div>
{{end}}
<div>
<a href="/app/beneficiaries/{{.ViewState.beneficiary.ID}}">
<button type="button"
class="w-full items-center px-4 py-2 border border-transparent shadow-sm text-xs font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue hover:text-white focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Fiche bénéficiaire</button>
</a>
</div>
</dl> </dl>
</div> </div>
</div> </div>
@ -204,7 +183,7 @@
x-data="{ updateOpen: false }"> x-data="{ updateOpen: false }">
<div class="w-full inline-flex" x-show="!updateOpen"> <div class="w-full inline-flex" x-show="!updateOpen">
<div class="flex-1">{{(timeFrom .ViewState.booking.Startdate).Format "02/01/2006"}}</div> <div class="flex-1">{{(timeFrom .ViewState.booking.Startdate).Format "02/01/2006"}}</div>
{{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}} {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
<a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a> <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
{{end}} {{end}}
</div> </div>
@ -226,7 +205,7 @@
x-data="{ updateOpen: false }"> x-data="{ updateOpen: false }">
<div class="w-full inline-flex" x-show="!updateOpen"> <div class="w-full inline-flex" x-show="!updateOpen">
<div class="flex-1">{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006"}}</div> <div class="flex-1">{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006"}}</div>
{{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}} {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
<a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a> <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
{{end}} {{end}}
</div> </div>
@ -248,7 +227,7 @@
x-data="{ updateOpen: false }"> x-data="{ updateOpen: false }">
<div class="w-full inline-flex" x-show="!updateOpen"> <div class="w-full inline-flex" x-show="!updateOpen">
<div class="flex-1">{{(timeFrom .ViewState.booking.Unavailablefrom).Format "02/01/2006"}}</div> <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailablefrom).Format "02/01/2006"}}</div>
{{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}} {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
<a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a> <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
{{end}} {{end}}
</div> </div>
@ -270,7 +249,7 @@
x-data="{ updateOpen: false }"> x-data="{ updateOpen: false }">
<div class="w-full inline-flex" x-show="!updateOpen"> <div class="w-full inline-flex" x-show="!updateOpen">
<div class="flex-1">{{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</div> <div class="flex-1">{{(timeFrom .ViewState.booking.Unavailableto).Format "02/01/2006"}}</div>
{{if (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}} {{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
<a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a> <a href="#" class="text-co-blue hover:text-co-blue ml-5" @click="updateOpen = ! updateOpen">Modifier</a>
{{end}} {{end}}
</div> </div>

4
web/layouts/vehicles_management/fleet-display.html
View File

@ -104,10 +104,6 @@
<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é
</span> </span>
{{else if or .Deleted .Data.Deleted}}
<span class="p-1 bg-co-red text-white text-xs font-bold rounded-xl" >
Annulé
</span>
{{else}} {{else}}
{{if eq .Status 1 }} {{if eq .Status 1 }}
<span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" > <span class="p-1 bg-co-blue text-white text-xs font-bold rounded-xl" >