feat: extra properties dynamiques, filtrage meta_status et alertes retard
This commit is contained in:
Arnaud Delcasse
@@ -11,6 +11,28 @@
|
||||
changeVehicle: false,
|
||||
changeStatus: false,
|
||||
selectedvehicle: '',
|
||||
selectedStatus: '{{.ViewState.booking.ManualStatus}}',
|
||||
statusOptions: {{json .ViewState.status_options}},
|
||||
extraPropertiesDefs: {{json .ViewState.booking_extra_properties}},
|
||||
bookingExtraProperties: {{if .ViewState.booking.Data.extra_properties}}{{json .ViewState.booking.Data.extra_properties}}{{else}}{}{{end}},
|
||||
getRequestedProperties() {
|
||||
if (!this.statusOptions || !this.extraPropertiesDefs) return [];
|
||||
let current = this.statusOptions.find(s => s.name === this.selectedStatus);
|
||||
if (!current || !current.requested_properties) return [];
|
||||
return current.requested_properties.map(rp => {
|
||||
let ref = (typeof rp === 'string') ? { name: rp } : rp;
|
||||
let def = this.extraPropertiesDefs.find(d => d.name === ref.name);
|
||||
if (!def) return null;
|
||||
return { ...def, required: !!ref.required };
|
||||
}).filter(d => d);
|
||||
},
|
||||
getDefaultValue(prop) {
|
||||
if (prop.target === 'enddate') return '{{(timeFrom .ViewState.booking.Enddate).Format "2006-01-02T15:04"}}';
|
||||
if (prop.target === 'startdate') return '{{(timeFrom .ViewState.booking.Startdate).Format "2006-01-02T15:04"}}';
|
||||
if (prop.target === 'unavailableto') return '{{(timeFrom .ViewState.booking.Unavailableto).Format "2006-01-02"}}';
|
||||
if (prop.target === 'unavailablefrom') return '{{(timeFrom .ViewState.booking.Unavailablefrom).Format "2006-01-02"}}';
|
||||
return this.bookingExtraProperties[prop.name] || '';
|
||||
},
|
||||
submitSelectedvehicle(event) {
|
||||
if(this.selectedvehicle == '') {
|
||||
event.preventDefault()
|
||||
@@ -19,23 +41,24 @@
|
||||
}
|
||||
}">
|
||||
{{if and (ne .ViewState.booking.Status -1) (not .ViewState.booking.Deleted)}}
|
||||
{{if eq .ViewState.status_management "manual"}}
|
||||
<button type="button" @click="changeStatus = ! changeStatus"
|
||||
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 le statut
|
||||
</button>
|
||||
{{end}}
|
||||
<button type="button" @click="changeVehicle = ! changeVehicle"
|
||||
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
|
||||
</button>
|
||||
<a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/delete">
|
||||
{{if eq .ViewState.status_management "manual"}}
|
||||
<button type="button" @click="changeStatus = ! changeStatus"
|
||||
class="inline-flex items-center justify-center rounded-2xl border border-transparent bg-co-blue px-4 py-2 text-sm font-medium text-white shadow-sm focus:outline-none focus:ring-2 focus:ring-co-blue focus:ring-offset-2 sm:w-auto">
|
||||
Changer de statut
|
||||
</button>
|
||||
{{else}}
|
||||
<a href="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/delete">
|
||||
<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>
|
||||
{{end}}
|
||||
{{end}}
|
||||
|
||||
<div class="relative z-10" aria-labelledby="modal-title" role="dialog" aria-modal="true" x-show="changeVehicle">
|
||||
<div class="fixed inset-0 bg-gray-900 bg-opacity-30 transition-opacity"></div>
|
||||
@@ -83,7 +106,8 @@
|
||||
</div>
|
||||
<form method="POST" action="/app/vehicles-management/bookings/{{.ViewState.booking.ID}}/status" class="mt-4 space-y-4">
|
||||
<div>
|
||||
<select name="new_status" class="block w-full rounded-2xl border-gray-300 py-2 pl-3 pr-10 text-sm focus:border-co-blue focus:outline-none focus:ring-co-blue">
|
||||
<label for="new_status" class="block text-sm font-medium text-gray-700 mb-1">Nouveau statut</label>
|
||||
<select id="new_status" name="new_status" x-model="selectedStatus" class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-10 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
|
||||
{{$currentStatus := .ViewState.booking.ManualStatus}}
|
||||
{{range .ViewState.status_options}}
|
||||
<option value="{{index . "name"}}" {{if eq (index . "name") $currentStatus}}selected{{end}}>{{index . "label"}}</option>
|
||||
@@ -91,9 +115,43 @@
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<textarea name="comment" rows="3" placeholder="Commentaire (optionnel)"
|
||||
class="block w-full rounded-2xl border-gray-300 text-sm focus:border-co-blue focus:outline-none focus:ring-co-blue"></textarea>
|
||||
<label for="status_comment" class="block text-sm font-medium text-gray-700 mb-1">Commentaire</label>
|
||||
<textarea id="status_comment" name="comment" rows="3" placeholder="Optionnel"
|
||||
class="block w-full rounded-2xl border-gray-300 bg-gray-50 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue"></textarea>
|
||||
</div>
|
||||
<div x-show="getRequestedProperties().length > 0" class="border-t border-gray-200"></div>
|
||||
<template x-for="prop in getRequestedProperties()" :key="prop.name">
|
||||
<div>
|
||||
<label :for="'prop_' + prop.name" class="block text-sm font-medium text-gray-700 mb-1">
|
||||
<span x-text="prop.label"></span>
|
||||
<span x-show="prop.required" class="text-red-500"> *</span>
|
||||
</label>
|
||||
<template x-if="prop.type === 'text'">
|
||||
<input type="text" :id="'prop_' + prop.name" :name="'prop_' + prop.name" :value="getDefaultValue(prop)" :required="prop.required"
|
||||
class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-3 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
|
||||
</template>
|
||||
<template x-if="prop.type === 'number'">
|
||||
<input type="number" :id="'prop_' + prop.name" :name="'prop_' + prop.name" :value="getDefaultValue(prop)" :required="prop.required"
|
||||
class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-3 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
|
||||
</template>
|
||||
<template x-if="prop.type === 'date'">
|
||||
<input type="date" :id="'prop_' + prop.name" :name="'prop_' + prop.name" :value="getDefaultValue(prop)" :required="prop.required"
|
||||
class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-3 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
|
||||
</template>
|
||||
<template x-if="prop.type === 'datetime-local'">
|
||||
<input type="datetime-local" :id="'prop_' + prop.name" :name="'prop_' + prop.name" :value="getDefaultValue(prop)" :required="prop.required"
|
||||
class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-3 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
|
||||
</template>
|
||||
<template x-if="prop.type === 'select' && prop.options">
|
||||
<select :id="'prop_' + prop.name" :name="'prop_' + prop.name" :required="prop.required"
|
||||
class="block w-full rounded-2xl border-gray-300 bg-gray-50 py-2 pl-3 pr-10 text-sm shadow-sm focus:border-co-blue focus:bg-white focus:outline-none focus:ring-co-blue">
|
||||
<template x-for="opt in prop.options" :key="opt.value">
|
||||
<option :value="opt.value" :selected="opt.value === getDefaultValue(prop)" x-text="opt.label"></option>
|
||||
</template>
|
||||
</select>
|
||||
</template>
|
||||
</div>
|
||||
</template>
|
||||
<div class="mt-5 sm:mt-6">
|
||||
<button type="submit" class="inline-flex w-full justify-center rounded-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:text-sm">Valider</button>
|
||||
</div>
|
||||
@@ -175,6 +233,42 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{{if .ViewState.booking_extra_properties}}
|
||||
<div class="bg-white shadow sm:rounded-2xl"
|
||||
x-data="{
|
||||
extraPropertiesDefs: {{json .ViewState.booking_extra_properties}},
|
||||
storedProps: {{if .ViewState.booking.Data.extra_properties}}{{json .ViewState.booking.Data.extra_properties}}{{else}}{}{{end}},
|
||||
computedProps: {{if .ViewState.computed_extra_properties}}{{json .ViewState.computed_extra_properties}}{{else}}{}{{end}},
|
||||
displayProps() {
|
||||
return this.extraPropertiesDefs.filter(prop => !prop.target);
|
||||
},
|
||||
getValue(prop) {
|
||||
if (prop.type === 'computed') return this.computedProps[prop.name] || '';
|
||||
let v = this.storedProps[prop.name];
|
||||
if (prop.type === 'date' && v) {
|
||||
let d = new Date(v);
|
||||
if (!isNaN(d)) return d.toLocaleDateString('fr-FR');
|
||||
}
|
||||
return v || '';
|
||||
},
|
||||
hasAnyValue() {
|
||||
return this.displayProps().some(prop => this.getValue(prop) !== '');
|
||||
}
|
||||
}"
|
||||
x-show="hasAnyValue()">
|
||||
<h2 class="text-lg font-medium text-gray-900 p-4 sm:px-6">Informations complémentaires</h2>
|
||||
<div class="border-t border-gray-200 px-4 py-5 sm:px-6">
|
||||
<dl class="sm:divide-y sm:divide-gray-200">
|
||||
<template x-for="prop in displayProps()" :key="prop.name">
|
||||
<div x-show="getValue(prop) !== ''" class="py-4 sm:py-5 sm:grid sm:grid-cols-3 sm:gap-4">
|
||||
<dt class="text-sm font-medium text-gray-500" x-text="prop.label"></dt>
|
||||
<dd class="mt-1 text-sm text-gray-900 sm:mt-0 sm:col-span-2" x-text="getValue(prop)"></dd>
|
||||
</div>
|
||||
</template>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="lg:col-start-2 lg:col-span-2">
|
||||
<div class="bg-white shadow sm:rounded-2xl sm:px-6">
|
||||
@@ -199,6 +293,23 @@
|
||||
{{template "booking_status_badge" .}}
|
||||
</h3>
|
||||
<p class="mt-1 text-sm text-gray-500">Informations utiles sur la réservation.</p>
|
||||
{{if eq .ViewState.status_management "manual"}}
|
||||
{{range .ViewState.status_options}}
|
||||
{{if eq (index . "name") $.ViewState.booking.ManualStatus}}
|
||||
{{if and (eq (index . "meta_status") "open") (isPast $.ViewState.booking.Startdate)}}
|
||||
<div class="mt-3 flex items-center gap-2 rounded-lg bg-red-50 px-3 py-2 text-red-700 border border-red-200">
|
||||
{{$.IconSet.Icon "hero:outline/exclamation-triangle" "h-6 w-6 flex-shrink-0"}}
|
||||
<span class="text-sm font-medium">Retard : la date de début de réservation est dépassée</span>
|
||||
</div>
|
||||
{{else if and (eq (index . "meta_status") "active") (isPast $.ViewState.booking.Enddate)}}
|
||||
<div class="mt-3 flex items-center gap-2 rounded-lg bg-red-50 px-3 py-2 text-red-700 border border-red-200">
|
||||
{{$.IconSet.Icon "hero:outline/exclamation-triangle" "h-6 w-6 flex-shrink-0"}}
|
||||
<span class="text-sm font-medium">Retard : la date de fin de réservation est dépassée</span>
|
||||
</div>
|
||||
{{end}}
|
||||
{{end}}
|
||||
{{end}}
|
||||
{{end}}
|
||||
{{end}}
|
||||
</div>
|
||||
<div class="ml-4 mt-4 flex-shrink-0">
|
||||
|
||||
Reference in New Issue
Block a user