From 702cbf67f186e3905c50ae34281304d79cb071e7 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Tue, 2 Dec 2025 08:30:56 +0100 Subject: [PATCH] add times to vehicle reservation --- web/layouts/vehicles/booking-display.html | 8 +- web/layouts/vehicles/search.html | 65 ++--- .../_partials/bookings-list.html | 7 +- .../vehicles_management/booking-display.html | 36 ++- web/public/css/main.css | 222 ------------------ 5 files changed, 67 insertions(+), 271 deletions(-) diff --git a/web/layouts/vehicles/booking-display.html b/web/layouts/vehicles/booking-display.html index b7b4372..096e14b 100644 --- a/web/layouts/vehicles/booking-display.html +++ b/web/layouts/vehicles/booking-display.html @@ -132,14 +132,14 @@ {{end}}
-
Date de récupération
+
Date et heure de prise en charge
{{(timeFrom .ViewState.booking.Startdate).Format - "02/01/2006"}}
+ "02/01/2006 à 15:04"}}
-
Date de retour
+
Date et heure de restitution
{{(timeFrom .ViewState.booking.Enddate).Format - "02/01/2006"}}
+ "02/01/2006 à 15:04"}}

Documents

diff --git a/web/layouts/vehicles/search.html b/web/layouts/vehicles/search.html index 6b1d3e2..6c33862 100644 --- a/web/layouts/vehicles/search.html +++ b/web/layouts/vehicles/search.html @@ -21,9 +21,8 @@

Chercher un véhicule

-
- -
+ }" @submit="if(!beneficiarySelected) { $event.preventDefault(); alert('Veuillez sélectionner un bénéficiaire'); }"> + +
- +
@@ -89,20 +91,36 @@ {{ template "address_autocomplete" dict "FieldName" $fieldName }} -->
- +
-
- +
-
- + +
+
+
+ +
+ +
+
+
+ +
+ +
+
{{if .ViewState.searched}}
-

Documents demandés

- - - {{range .ViewState.search.mandatory_documents}} - - - - {{end}} - -
- {{index $.ViewState.search.file_types_map .}} -
-
-

Véhicules disponibles

@@ -169,7 +173,6 @@ Véhicule - Numéro Gestionnaire Lieu @@ -180,7 +183,7 @@ {{range .ViewState.search.vehicles}} - +
{{.Data.name}}
{{.Type}} @@ -188,10 +191,12 @@ {{ if .Data.automatic}} (boite auto){{ end }} {{end}}
+ {{if .Data.licence_plate}} +
{{.Data.licence_plate}}
+ {{end}} - {{.Data.licence_plate}} {{(index $.ViewState.search.admingroups (index .Administrators 0)).Data.name}} - {{if .Data.address}}{{.Data.address.properties.label}}{{end}} + {{if .Data.address}}{{.Data.address.properties.label}}{{end}} + {{range $.ViewState.search.mandatory_documents}} {{$type := .}}
{{end}} - + {{if .Data.administrator_unavailability}}
Retiré du {{(timeFrom .Unavailablefrom).Format "02/01/2006"}} au {{(timeFrom .Unavailableto).Format "02/01/2006"}}
{{else}} -
Du {{(timeFrom .Startdate).Format "02/01/2006"}} au {{(timeFrom .Enddate).Format "02/01/2006"}}
+
+
Du {{(timeFrom .Startdate).Format "02/01/2006 à 15:04"}}
+
au {{(timeFrom .Enddate).Format "02/01/2006 à 15:04"}}
+
{{end}} diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html index 29b7560..4b15d35 100644 --- a/web/layouts/vehicles_management/booking-display.html +++ b/web/layouts/vehicles_management/booking-display.html @@ -39,6 +39,11 @@

Changer de véhicule

+ {{if eq (len .ViewState.alternative_vehicles) 0}} +
+

Aucun véhicule disponible pour les dates de cette réservation.

+
+ {{else}} +
-
-
Date de retour
+
Date et heure de restitution
-
{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006"}}
+
{{(timeFrom .ViewState.booking.Enddate).Format "02/01/2006 à 15:04"}}
{{if (not .ViewState.booking.Deleted)}} Modifier {{end}}
-
-
+ +
+
- diff --git a/web/public/css/main.css b/web/public/css/main.css index df7ecf6..960d886 100644 --- a/web/public/css/main.css +++ b/web/public/css/main.css @@ -6,20 +6,14 @@ "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; --font-mono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - --color-red-50: oklch(0.971 0.013 17.38); - --color-red-100: oklch(0.936 0.032 17.717); --color-red-500: oklch(0.637 0.237 25.331); --color-red-600: oklch(0.577 0.245 27.325); --color-red-700: oklch(0.505 0.213 27.518); - --color-red-800: oklch(0.444 0.177 26.899); --color-red-900: oklch(0.396 0.141 25.723); --color-orange-50: oklch(0.98 0.016 73.684); --color-orange-200: oklch(0.901 0.076 70.697); --color-yellow-50: oklch(0.987 0.026 102.212); - --color-yellow-100: oklch(0.973 0.071 103.193); - --color-yellow-800: oklch(0.476 0.114 61.907); --color-green-100: oklch(0.962 0.044 156.743); - --color-green-500: oklch(0.723 0.219 149.579); --color-green-600: oklch(0.627 0.194 149.214); --color-green-800: oklch(0.448 0.119 151.328); --color-blue-50: oklch(0.97 0.014 254.604); @@ -32,13 +26,6 @@ --color-indigo-50: oklch(0.962 0.018 272.314); --color-indigo-500: oklch(0.585 0.233 277.117); --color-indigo-600: oklch(0.511 0.262 276.966); - --color-purple-50: oklch(0.977 0.014 308.299); - --color-purple-100: oklch(0.946 0.033 307.174); - --color-purple-200: oklch(0.902 0.063 306.703); - --color-purple-500: oklch(0.627 0.265 303.9); - --color-purple-600: oklch(0.558 0.288 302.321); - --color-purple-700: oklch(0.496 0.265 301.924); - --color-purple-800: oklch(0.438 0.218 303.724); --color-gray-50: oklch(0.985 0.002 247.839); --color-gray-100: oklch(0.967 0.003 264.542); --color-gray-200: oklch(0.928 0.006 264.531); @@ -353,15 +340,9 @@ .z-10 { z-index: 10; } - .z-20 { - z-index: 20; - } .z-40 { z-index: 40; } - .z-50 { - z-index: 50; - } .z-auto { z-index: auto; } @@ -380,9 +361,6 @@ .col-span-1 { grid-column: span 1 / span 1; } - .col-span-2 { - grid-column: span 2 / span 2; - } .col-span-3 { grid-column: span 3 / span 3; } @@ -509,18 +487,12 @@ .mx-auto { margin-inline: auto; } - .-my-1 { - margin-block: calc(var(--spacing) * -1); - } .-my-1\.5 { margin-block: calc(var(--spacing) * -1.5); } .-my-2 { margin-block: calc(var(--spacing) * -2); } - .my-1 { - margin-block: calc(var(--spacing) * 1); - } .my-2 { margin-block: calc(var(--spacing) * 2); } @@ -539,9 +511,6 @@ .-mt-4 { margin-top: calc(var(--spacing) * -4); } - .mt-0 { - margin-top: calc(var(--spacing) * 0); - } .mt-0\.5 { margin-top: calc(var(--spacing) * 0.5); } @@ -569,9 +538,6 @@ .mt-10 { margin-top: calc(var(--spacing) * 10); } - .-mr-1 { - margin-right: calc(var(--spacing) * -1); - } .-mr-1\.5 { margin-right: calc(var(--spacing) * -1.5); } @@ -611,9 +577,6 @@ .mb-4 { margin-bottom: calc(var(--spacing) * 4); } - .mb-6 { - margin-bottom: calc(var(--spacing) * 6); - } .mb-10 { margin-bottom: calc(var(--spacing) * 10); } @@ -768,15 +731,9 @@ .h-16 { height: calc(var(--spacing) * 16); } - .h-48 { - height: calc(var(--spacing) * 48); - } .h-50 { height: calc(var(--spacing) * 50); } - .h-\[600px\] { - height: 600px; - } .h-full { height: 100%; } @@ -786,9 +743,6 @@ .max-h-60 { max-height: calc(var(--spacing) * 60); } - .max-h-\[600px\] { - max-height: 600px; - } .max-h-none { max-height: none; } @@ -804,15 +758,9 @@ .min-h-screen { min-height: 100vh; } - .w-0 { - width: calc(var(--spacing) * 0); - } .w-0\.5 { width: calc(var(--spacing) * 0.5); } - .w-1 { - width: calc(var(--spacing) * 1); - } .w-1\/2 { width: calc(1/2 * 100%); } @@ -1196,9 +1144,6 @@ .grid-cols-7 { grid-template-columns: repeat(7, minmax(0, 1fr)); } - .grid-cols-12 { - grid-template-columns: repeat(12, minmax(0, 1fr)); - } .grid-cols-none { grid-template-columns: none; } @@ -1811,9 +1756,6 @@ .border-co-red { border-color: var(--color-co-red); } - .border-co-yellow { - border-color: var(--color-co-yellow); - } .border-gray-200 { border-color: var(--color-gray-200); } @@ -1826,12 +1768,6 @@ .border-orange-200 { border-color: var(--color-orange-200); } - .border-purple-200 { - border-color: var(--color-purple-200); - } - .border-purple-600 { - border-color: var(--color-purple-600); - } .border-transparent { border-color: transparent; } @@ -1862,9 +1798,6 @@ .bg-blue-100 { background-color: var(--color-blue-100); } - .bg-blue-500 { - background-color: var(--color-blue-500); - } .bg-blue-600 { background-color: var(--color-blue-600); } @@ -1910,9 +1843,6 @@ .bg-green-100 { background-color: var(--color-green-100); } - .bg-green-500 { - background-color: var(--color-green-500); - } .bg-green-600 { background-color: var(--color-green-600); } @@ -1925,21 +1855,6 @@ .bg-orange-50 { background-color: var(--color-orange-50); } - .bg-purple-50 { - background-color: var(--color-purple-50); - } - .bg-purple-100 { - background-color: var(--color-purple-100); - } - .bg-purple-500 { - background-color: var(--color-purple-500); - } - .bg-purple-600 { - background-color: var(--color-purple-600); - } - .bg-red-100 { - background-color: var(--color-red-100); - } .bg-red-500 { background-color: var(--color-red-500); } @@ -1958,9 +1873,6 @@ .bg-yellow-50 { background-color: var(--color-yellow-50); } - .bg-yellow-100 { - background-color: var(--color-yellow-100); - } .-bg-conic { --tw-gradient-position: in oklab; background-image: conic-gradient(var(--tw-gradient-stops)); @@ -1969,10 +1881,6 @@ --tw-gradient-position: in oklab; background-image: conic-gradient(var(--tw-gradient-stops)); } - .bg-gradient-to-r { - --tw-gradient-position: to right in oklab; - background-image: linear-gradient(var(--tw-gradient-stops)); - } .bg-radial { --tw-gradient-position: in oklab; background-image: radial-gradient(var(--tw-gradient-stops)); @@ -1983,14 +1891,6 @@ .via-none { --tw-gradient-via-stops: initial; } - .from-co-blue { - --tw-gradient-from: var(--color-co-blue); - --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position)); - } - .to-co-lightblue { - --tw-gradient-to: var(--color-co-lightblue); - --tw-gradient-stops: var(--tw-gradient-via-stops, var(--tw-gradient-position), var(--tw-gradient-from) var(--tw-gradient-from-position), var(--tw-gradient-to) var(--tw-gradient-to-position)); - } .box-decoration-clone { -webkit-box-decoration-break: clone; box-decoration-break: clone; @@ -2094,9 +1994,6 @@ .fill-none { fill: none; } - .stroke-gray-600 { - stroke: var(--color-gray-600); - } .stroke-gray-700 { stroke: var(--color-gray-700); } @@ -2199,9 +2096,6 @@ .px-6 { padding-inline: calc(var(--spacing) * 6); } - .py-0 { - padding-block: calc(var(--spacing) * 0); - } .py-0\.5 { padding-block: calc(var(--spacing) * 0.5); } @@ -2238,12 +2132,6 @@ .py-12 { padding-block: calc(var(--spacing) * 12); } - .pt-0 { - padding-top: calc(var(--spacing) * 0); - } - .pt-0\.5 { - padding-top: calc(var(--spacing) * 0.5); - } .pt-1 { padding-top: calc(var(--spacing) * 1); } @@ -2504,12 +2392,6 @@ .\[color\:red\]\/50\! { color: color-mix(in oklab, red 50%, transparent) !important; } - .text-black { - color: var(--color-black); - } - .text-blue-600 { - color: var(--color-blue-600); - } .text-blue-800 { color: var(--color-blue-800); } @@ -2528,9 +2410,6 @@ .text-co-red { color: var(--color-co-red); } - .text-co-yellow { - color: var(--color-co-yellow); - } .text-gray-400 { color: var(--color-gray-400); } @@ -2558,27 +2437,12 @@ .text-indigo-600 { color: var(--color-indigo-600); } - .text-purple-600 { - color: var(--color-purple-600); - } - .text-purple-800 { - color: var(--color-purple-800); - } .text-red-600 { color: var(--color-red-600); } - .text-red-700 { - color: var(--color-red-700); - } - .text-red-800 { - color: var(--color-red-800); - } .text-white { color: var(--color-white); } - .text-yellow-800 { - color: var(--color-yellow-800); - } .capitalize { text-transform: capitalize; } @@ -3218,20 +3082,6 @@ } } } - .hover\:bg-purple-700 { - &:hover { - @media (hover: hover) { - background-color: var(--color-purple-700); - } - } - } - .hover\:bg-red-50 { - &:hover { - @media (hover: hover) { - background-color: var(--color-red-50); - } - } - } .hover\:bg-red-700 { &:hover { @media (hover: hover) { @@ -3394,11 +3244,6 @@ --tw-ring-color: var(--color-indigo-500); } } - .focus\:ring-red-500 { - &:focus { - --tw-ring-color: var(--color-red-500); - } - } .focus\:ring-white { &:focus { --tw-ring-color: var(--color-white); @@ -3870,16 +3715,6 @@ display: none; } } - .md\:h-auto { - @media (width >= 48rem) { - height: auto; - } - } - .md\:w-1\/3 { - @media (width >= 48rem) { - width: calc(1/3 * 100%); - } - } .md\:w-64 { @media (width >= 48rem) { width: calc(var(--spacing) * 64); @@ -4018,16 +3853,6 @@ display: table-cell; } } - .lg\:w-1\/3 { - @media (width >= 64rem) { - width: calc(1/3 * 100%); - } - } - .lg\:w-2\/3 { - @media (width >= 64rem) { - width: calc(2/3 * 100%); - } - } .lg\:max-w-7xl { @media (width >= 64rem) { max-width: var(--container-7xl); @@ -4058,11 +3883,6 @@ grid-template-columns: repeat(4, minmax(0, 1fr)); } } - .lg\:flex-row { - @media (width >= 64rem) { - flex-direction: row; - } - } .lg\:px-8 { @media (width >= 64rem) { padding-inline: calc(var(--spacing) * 8); @@ -4246,48 +4066,6 @@ inherits: false; initial-value: 0; } -@property --tw-gradient-position { - syntax: "*"; - inherits: false; -} -@property --tw-gradient-from { - syntax: ""; - inherits: false; - initial-value: #0000; -} -@property --tw-gradient-via { - syntax: ""; - inherits: false; - initial-value: #0000; -} -@property --tw-gradient-to { - syntax: ""; - inherits: false; - initial-value: #0000; -} -@property --tw-gradient-stops { - syntax: "*"; - inherits: false; -} -@property --tw-gradient-via-stops { - syntax: "*"; - inherits: false; -} -@property --tw-gradient-from-position { - syntax: ""; - inherits: false; - initial-value: 0%; -} -@property --tw-gradient-via-position { - syntax: ""; - inherits: false; - initial-value: 50%; -} -@property --tw-gradient-to-position { - syntax: ""; - inherits: false; - initial-value: 100%; -} @property --tw-leading { syntax: "*"; inherits: false;