diff --git a/config.yaml b/config.yaml index 7e2c97d..bae16d7 100644 --- a/config.yaml +++ b/config.yaml @@ -84,19 +84,18 @@ views: fleet_update: files: - web/layouts/_partials/address_autocomplete.html - - web/layouts/agenda/_partials/address.html - web/layouts/vehicles_management/_partials/vehicle-type-select.html - web/layouts/vehicles_management/fleet-update.html booking_display: files: - web/layouts/vehicles_management/booking-display.html - delete_booking: - files: - - web/layouts/vehicles_management/delete-booking.html agenda: list: files: - web/layouts/agenda/home.html + history: + files: + - web/layouts/agenda/history.html display_event: files: - web/layouts/agenda/_partials/subscribers-table.html @@ -185,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 @@ -212,6 +215,7 @@ views: ko: files: - web/layouts/auth/onboarding-ko.html + icons: svg: coopgo:parcoursmob/monogram: @@ -289,4 +293,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 diff --git a/emails/layout.html b/emails/layout.html old mode 100644 new mode 100755 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..30c5edf --- /dev/null +++ b/web/layouts/administration/bookings_stats.html @@ -0,0 +1,37 @@ +{{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/events_stats.html b/web/layouts/administration/events_stats.html index 53bd498..97781e0 100644 --- a/web/layouts/administration/events_stats.html +++ b/web/layouts/administration/events_stats.html @@ -6,6 +6,12 @@

La liste des événements

+ + + - - + + + +
diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html index ecbad39..d5ceef9 100644 --- a/web/layouts/agenda/display-event.html +++ b/web/layouts/agenda/display-event.html @@ -98,12 +98,15 @@ + - {{template "subscribers_table" .}} + + + {{template "subscribers_table" .}} {{end}} 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 @@

+ + +
@@ -114,14 +121,6 @@
-
- - -
-
diff --git a/web/layouts/beneficiaries/display.html b/web/layouts/beneficiaries/display.html index 8b8584f..3be8ddf 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}}
@@ -145,10 +151,7 @@
-
-

Actions réalisées

-

Aucune action réalisée pour le moment

-
+ {{template "beneficiary_events" .}}
diff --git a/web/layouts/beneficiaries/update.html b/web/layouts/beneficiaries/update.html index eacda1c..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 @@
- -
- - -
-
@@ -162,13 +162,9 @@
- {{ $fieldName := "address" }} - {{if .ViewState.Data.address}} - {{$default := .ViewState.Data.address}} - {{ template "address" dict "FieldName" $fieldName "Default" $default}} - {{else}} - {{ template "address_autocomplete" dict "FieldName" $fieldName}} - {{end}} + {{ $fieldName := "address" }} + {{ template "address_autocomplete" (dict "FieldName" $fieldName "Address" .ViewState.Data.address) }} +
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 @@
diff --git a/web/layouts/vehicles/bookings-list.html b/web/layouts/vehicles/bookings-list.html index 4f2ace9..d6f9538 100644 --- a/web/layouts/vehicles/bookings-list.html +++ b/web/layouts/vehicles/bookings-list.html @@ -5,12 +5,12 @@

Réservations

- +
@@ -54,7 +54,7 @@ {{range .ViewState.bookings}} - + {{if .Data.administrator_unavailability}} Retiré @@ -76,15 +76,11 @@ {{end}} {{end}} - {{if not .bookings}} - - Disponible - - {{end}}
{{(index $.ViewState.vehicles_map .Vehicleid).Type}}
- + +
{{(index $.ViewState.vehicles_map .Vehicleid).Data.licence_plate}}
diff --git a/web/layouts/vehicles/search.html b/web/layouts/vehicles/search.html index 57b8446..42c2875 100644 --- a/web/layouts/vehicles/search.html +++ b/web/layouts/vehicles/search.html @@ -223,13 +223,11 @@ {{end}} -
- +
+
-
+
diff --git a/web/layouts/vehicles_management/_partials/bookings-list.html b/web/layouts/vehicles_management/_partials/bookings-list.html index 9aea540..122f9a0 100644 --- a/web/layouts/vehicles_management/_partials/bookings-list.html +++ b/web/layouts/vehicles_management/_partials/bookings-list.html @@ -39,10 +39,6 @@ Retiré - {{else if .Data.Deleted}} - - Annulé - {{else}} {{if eq .Status 1 }} diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html index 2d9715d..046414e 100644 --- a/web/layouts/vehicles_management/booking-display.html +++ b/web/layouts/vehicles_management/booking-display.html @@ -11,18 +11,17 @@ changeVehicle: false, selectedvehicle: '' }"> - {{if and (ne .ViewState.booking.Status -1) (not .ViewState.booking.Data.Deleted)}} - + +