From 0c77e5054a6ccbf03b767c1521c67882b7c7f5bb Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Fri, 10 Mar 2023 13:20:03 +0100 Subject: [PATCH 01/15] small updates after merge --- config.yaml | 3 + web/layouts/agenda/history.html | 105 ++++++++++++++++++++++++++++++++ web/layouts/agenda/home.html | 7 +++ 3 files changed, 115 insertions(+) create mode 100644 web/layouts/agenda/history.html diff --git a/config.yaml b/config.yaml index aad114f..0102a64 100644 --- a/config.yaml +++ b/config.yaml @@ -87,6 +87,9 @@ views: list: files: - web/layouts/agenda/home.html + history: + files: + - web/layouts/agenda/history.html display_event: files: - web/layouts/agenda/_partials/subscribers-table.html diff --git a/web/layouts/agenda/history.html b/web/layouts/agenda/history.html new file mode 100644 index 0000000..55f84fe --- /dev/null +++ b/web/layouts/agenda/history.html @@ -0,0 +1,105 @@ +{{define "content"}} +
+

Anciens dispositifs

+ +
+
+

+
+
+
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + {{range .ViewState.events}} + {{if eq .Deleted false}} + + + + + + + + + + + + + + {{end}} + {{end}} + + +
+ Dispositif + + Structure + + Lieu + + Dates + + Places disponibles + + Bénéficiaires positionnés + + Actions +
+ +
{{.Name}}
+
{{.Type}}
+ 		+ +
+ {{range .Owners}} + {{if (index $.ViewState.groups .)}} + {{(index $.ViewState.groups .).Data.name}} + {{end}} + {{end}} +
+ 		+
{{if .Data.address}}{{.Data.address.properties.label}}{{end}}
+ 		+
+ {{if eq .Startdate .Enddate}} + Le {{(timeFrom .Startdate).Format "02/01/2006"}} + {{else}} + Du {{(timeFrom .Startdate).Format "02/01/2006"}}
Au {{(timeFrom .Enddate).Format "02/01/2006"}} + {{end}} +
+ 		+ {{if ne .RemainingSubscriptions 999}} +
{{.RemainingSubscriptions}}
+ {{end}} + 		+
+ {{range .Subscriptions}} + + {{end}} +
+ 		+ Voir +
+
+
+
+
+
+{{end}} \ No newline at end of file diff --git a/web/layouts/agenda/home.html b/web/layouts/agenda/home.html index 06769e1..8bf12f0 100644 --- a/web/layouts/agenda/home.html +++ b/web/layouts/agenda/home.html @@ -7,6 +7,13 @@

+ + +
- +
From 139b4c9c14f9b4339b114993b1a56136ca574e1b Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Fri, 10 Mar 2023 15:43:46 +0100 Subject: [PATCH 03/15] Add licence plate --- web/layouts/vehicles_management/booking-display.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html index 35cfc65..046414e 100644 --- a/web/layouts/vehicles_management/booking-display.html +++ b/web/layouts/vehicles_management/booking-display.html @@ -35,7 +35,7 @@
From 2248bd8425a100c64c2c87a6e3df07ec24f87be0 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Mon, 13 Mar 2023 16:22:44 +0100 Subject: [PATCH 04/15] add group management --- config.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index 0102a64..6d8b6cc 100644 --- a/config.yaml +++ b/config.yaml @@ -43,6 +43,10 @@ views: list: files: - web/layouts/members/membersList.html + group: + settings: + files: + - web/layouts/group/settings.html vehicles: search: files: @@ -283,4 +287,4 @@ emails: subject: PARCOURSMOB - Un bénéficiaire a été retiré d'un dispositif files: - emails/layout.html - - emails/onboarding/delete-subscriber.html \ No newline at end of file + - emails/onboarding/delete-subscriber.html From 2f49d003eed8fdaf1d1cbddbcfcd8e9b38590d7b Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Mon, 13 Mar 2023 16:31:03 +0100 Subject: [PATCH 05/15] small fix --- config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yaml b/config.yaml index 6d8b6cc..46c2133 100644 --- a/config.yaml +++ b/config.yaml @@ -46,6 +46,7 @@ views: group: settings: files: + - web/layouts/administration/_partials/groups_admins.html - web/layouts/group/settings.html vehicles: search: From 9f4d331959024b98bd53952f958587aef06f33aa Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Mon, 13 Mar 2023 16:58:13 +0100 Subject: [PATCH 06/15] small fix --- config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config.yaml b/config.yaml index 46c2133..81a3dae 100644 --- a/config.yaml +++ b/config.yaml @@ -47,6 +47,7 @@ views: settings: files: - web/layouts/administration/_partials/groups_admins.html + - web/layouts/administration/_partials/group_members.html - web/layouts/group/settings.html vehicles: search: From a11ed1c59595af65be3c2b6626b73eaaf0ad440b Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Wed, 15 Mar 2023 16:48:09 +0100 Subject: [PATCH 07/15] Fix document update issue --- web/layouts/beneficiaries/_partials/beneficiary-files.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/layouts/beneficiaries/_partials/beneficiary-files.html b/web/layouts/beneficiaries/_partials/beneficiary-files.html index b4a3de4..87e47d4 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-files.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-files.html @@ -81,7 +81,7 @@ x-data="{ {{end}}

Ajouter un document

-
+
@@ -132,4 +132,4 @@ x-data="{
-{{end}} \ No newline at end of file +{{end}} From 39e770bb0903f6020f313fed955a7c64716e716e Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Wed, 12 Apr 2023 10:52:29 +0200 Subject: [PATCH 08/15] Bookings list in admin --- config.yaml | 4 + .../_partials/bookings_list.html | 115 ++++++++++++++++++ .../administration/bookings_stats.html | 31 +++++ .../administration/vehicles_stats.html | 14 ++- web/layouts/beneficiaries/create.html | 17 ++- web/layouts/beneficiaries/display.html | 6 + web/layouts/beneficiaries/update.html | 20 +-- .../dashboard/_partials/agenda-widget.html | 2 + 8 files changed, 185 insertions(+), 24 deletions(-) create mode 100644 web/layouts/administration/_partials/bookings_list.html create mode 100644 web/layouts/administration/bookings_stats.html diff --git a/config.yaml b/config.yaml index 81a3dae..bae16d7 100644 --- a/config.yaml +++ b/config.yaml @@ -184,6 +184,10 @@ views: vehicles_list: files: - web/layouts/administration/vehicles_stats.html + bookings_list: + files: + - web/layouts/administration/_partials/bookings_list.html + - web/layouts/administration/bookings_stats.html settings: files: - web/layouts/administration/_partials/groups_admins.html diff --git a/web/layouts/administration/_partials/bookings_list.html b/web/layouts/administration/_partials/bookings_list.html new file mode 100644 index 0000000..9c5fd5e --- /dev/null +++ b/web/layouts/administration/_partials/bookings_list.html @@ -0,0 +1,115 @@ +{{define "bookings_list"}} +
+
+
+
+
+ + + + + + + + + + + + + + + + {{range .ViewState.bookings}} + + + + + + + + + + + + {{end}} + +
+ Statut + + Type + + Numéro + + Gestionnaire véhicule + + Prescripteur + + Beneficiaire + + Dates + + Commentaire + + Actions +
+ {{if .Data.administrator_unavailability}} + + Retiré + + {{else}} + {{if eq .Status 1 }} + + A venir + + {{end}} + {{if eq .Status 0 }} + + En cours + + {{end}} + {{if eq .Status -1 }} + + Terminé + + {{end}} + {{end}} + +
{{ (index $.ViewState.vehicles_map .Vehicleid).Type }}
+ 		+
{{ (index $.ViewState.vehicles_map .Vehicleid).Data.licence_plate }}
+ 		+
{{ (index $.ViewState.admingroups (index (index $.ViewState.vehicles_map .Vehicleid).Administrators 0)).Data.name }}
+ 		+
{{ .Data.booked_by.group.name }}
({{ .Data.booked_by.user.display_name }})
+ 		+ {{if .Data.administrator_unavailability}} +
+ {{else}} +
+ + {{$b := (index $.ViewState.beneficiaries_map .Driver)}} + {{$b.Data.first_name}} {{$b.Data.last_name}}
+ {{$b.Data.file_number}} +
+ {{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"}}
+ {{end}} + 		+
{{ .Data.comment }}
+ 		+ Voir +
+
+
+
+
+
+{{end}} \ No newline at end of file diff --git a/web/layouts/administration/bookings_stats.html b/web/layouts/administration/bookings_stats.html new file mode 100644 index 0000000..61d574b --- /dev/null +++ b/web/layouts/administration/bookings_stats.html @@ -0,0 +1,31 @@ +{{define "content"}} +
+

Historique des réservations de véhicules

+ + +
+
+ +
+
+ + + + +
+
+
+ +{{template "bookings_list" .}} + +{{end}} \ No newline at end of file diff --git a/web/layouts/administration/vehicles_stats.html b/web/layouts/administration/vehicles_stats.html index 06432c4..146cc62 100644 --- a/web/layouts/administration/vehicles_stats.html +++ b/web/layouts/administration/vehicles_stats.html @@ -2,14 +2,18 @@
-

La liste des voitures

+

Liste des véhicules

- + + + +
diff --git a/web/layouts/beneficiaries/create.html b/web/layouts/beneficiaries/create.html index 36ba876..a725af1 100644 --- a/web/layouts/beneficiaries/create.html +++ b/web/layouts/beneficiaries/create.html @@ -20,7 +20,7 @@ email: ['required', 'email'], phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'], birthdate: ['required'], - file_number: ['optional'], + file_number: ['required'], }, formValidation: { valid: false, @@ -100,6 +100,13 @@ x-model="fields.birthdate" @blur="validateField('birthdate')" :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+
+ + +
@@ -114,14 +121,6 @@
-
- - -
-
diff --git a/web/layouts/beneficiaries/display.html b/web/layouts/beneficiaries/display.html index 8b8584f..40dbc4b 100644 --- a/web/layouts/beneficiaries/display.html +++ b/web/layouts/beneficiaries/display.html @@ -69,6 +69,12 @@
{{.ViewState.beneficiary.Data.address.properties.label}}
{{end}} + {{if .ViewState.beneficiary.Data.file_number}} +
+
Numéro de dossier (CAF / Pole emploi)
+
{{.ViewState.beneficiary.Data.file_number}}
+
+ {{end}}
diff --git a/web/layouts/beneficiaries/update.html b/web/layouts/beneficiaries/update.html index da1b4c9..a938274 100644 --- a/web/layouts/beneficiaries/update.html +++ b/web/layouts/beneficiaries/update.html @@ -21,7 +21,7 @@ email: ['required', 'email'], phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'], birthdate: ['required'], - file_number: ['optional'], + file_number: ['required'], }, formValidation: { valid: false, @@ -101,6 +101,15 @@ x-model="fields.birthdate" @blur="validateField('birthdate')" :class="formValidation.fields.birthdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+ +
+ + +
+ @@ -114,15 +123,6 @@
- -
- - -
-
diff --git a/web/layouts/dashboard/_partials/agenda-widget.html b/web/layouts/dashboard/_partials/agenda-widget.html index c63ce4b..d121b2f 100644 --- a/web/layouts/dashboard/_partials/agenda-widget.html +++ b/web/layouts/dashboard/_partials/agenda-widget.html @@ -10,6 +10,7 @@
From d6de19d8e238fec2f03957abdfa7b49a463d4a3c Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Wed, 12 Apr 2023 22:21:25 +0200 Subject: [PATCH 09/15] Add exports --- web/layouts/administration/bookings_stats.html | 6 ++++++ web/layouts/administration/events_stats.html | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/web/layouts/administration/bookings_stats.html b/web/layouts/administration/bookings_stats.html index 61d574b..30c5edf 100644 --- a/web/layouts/administration/bookings_stats.html +++ b/web/layouts/administration/bookings_stats.html @@ -8,6 +8,12 @@
+ + +
+ + + - -
+ + +
{{end}} {{end}} @@ -89,13 +90,23 @@

Tous les inscrits

+ + + +
- {{template "subscribers_table" .}} + + + {{template "subscribers_table" .}}
{{end}} From 31f86b1782150d46fa36e4f55332f9326f5cbec4 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Tue, 30 Jan 2024 12:20:09 +0100 Subject: [PATCH 11/15] Updates feedbacks Mobilis06 and FDN --- .../vehicles_management/booking-display.html | 45 ++++++++++++++----- .../vehicles_management/fleet-display.html | 4 ++ 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html index b12b2b6..de7ffbb 100644 --- a/web/layouts/vehicles_management/booking-display.html +++ b/web/layouts/vehicles_management/booking-display.html @@ -9,7 +9,13 @@
{{if and (ne .ViewState.booking.Status -1) (not (or .ViewState.booking.Deleted .ViewState.booking.Data.Deleted))}}
-
+