From 698ccfc9d65c6ac7d15d77428b63d2801f97c78f Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Wed, 2 Oct 2024 14:36:23 +0200 Subject: [PATCH 01/53] edit display-event.html --- themes | 1 + web/layouts/agenda/display-event.html | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 120000 themes diff --git a/themes b/themes new file mode 120000 index 0000000..bfa4097 --- /dev/null +++ b/themes @@ -0,0 +1 @@ +themes \ No newline at end of file diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html index d5ceef9..7250d61 100644 --- a/web/layouts/agenda/display-event.html +++ b/web/layouts/agenda/display-event.html @@ -203,6 +203,23 @@ {{end}} {{end}} +
+
+

Documents joints

+ +
+
+
    + {{range .ViewState.event.Documents}} +
  • + {{.Name}} +
  • + {{end}} +
+
From 10c4fb22d164bf7cd9f40fac3b84ff5146bcf060 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Wed, 2 Oct 2024 14:41:37 +0200 Subject: [PATCH 02/53] edit display-event.html --- web/layouts/agenda/display-event.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html index 7250d61..5da1324 100644 --- a/web/layouts/agenda/display-event.html +++ b/web/layouts/agenda/display-event.html @@ -208,7 +208,7 @@

Documents joints

From c8ab3f22efc8cdcab27c947a68421814dcdce08a Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 7 Oct 2024 17:57:51 +0200 Subject: [PATCH 03/53] edit display-event.html & add event-files.html --- config.yaml | 1 + themes | 1 - web/layouts/agenda/_partials/event-files.html | 115 ++++++++++++++++++ web/layouts/agenda/display-event.html | 17 +-- 4 files changed, 119 insertions(+), 15 deletions(-) delete mode 120000 themes create mode 100644 web/layouts/agenda/_partials/event-files.html diff --git a/config.yaml b/config.yaml index bae16d7..e8a84f0 100644 --- a/config.yaml +++ b/config.yaml @@ -100,6 +100,7 @@ views: files: - web/layouts/agenda/_partials/subscribers-table.html - web/layouts/agenda/display-event.html + - web/layouts/agenda/_partials/event-files.html create_event: files: - web/layouts/_partials/address_autocomplete.html diff --git a/themes b/themes deleted file mode 120000 index bfa4097..0000000 --- a/themes +++ /dev/null @@ -1 +0,0 @@ -themes \ No newline at end of file diff --git a/web/layouts/agenda/_partials/event-files.html b/web/layouts/agenda/_partials/event-files.html new file mode 100644 index 0000000..faf6585 --- /dev/null +++ b/web/layouts/agenda/_partials/event-files.html @@ -0,0 +1,115 @@ +{{define "event_files"}} +
+ {{if eq (len .ViewState.documents) 0}} +

Aucun document

+ {{end}} + + + {{if gt (len .ViewState.documents) 0}} + +
+ + + + + + + + + + {{range .ViewState.documents}} + + + + + + {{end}} + + + + +
+ Actions +
{{.Metadata.Name}}{{.LastModified.Format "02/01/2006"}} + + + +
+
+ + {{end}} + +

Ajouter un document

+
+
+
+ + +
+
+ +
+
+ {{.IconSet.Icon "hero:outline/folder-plus" "mx-auto h-12 w-12 text-gray-400"}} +
+ + + + +
+

Jusqu'à 10MB

+

+
+
+
+
+ +
+ +
+{{end}} diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html index 5da1324..c5de13c 100644 --- a/web/layouts/agenda/display-event.html +++ b/web/layouts/agenda/display-event.html @@ -204,22 +204,11 @@ {{end}}
+

Documents

-

Documents joints

- +
{{template "event_files" .}}
-
-
    - {{range .ViewState.event.Documents}} -
  • - {{.Name}} -
  • - {{end}} -
-
+
From 56f07009993667af32d1485201328bc121efcad9 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 14 Oct 2024 09:59:33 +0200 Subject: [PATCH 04/53] edit web/layouts/agenda/_partials/event-files.html --- web/layouts/agenda/_partials/event-files.html | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/web/layouts/agenda/_partials/event-files.html b/web/layouts/agenda/_partials/event-files.html index faf6585..e404b8c 100644 --- a/web/layouts/agenda/_partials/event-files.html +++ b/web/layouts/agenda/_partials/event-files.html @@ -3,16 +3,19 @@ x-data="{ fields: { name: null, + type: null, file: null, }, rules: { name: ['required'], + type: ['required'], file: ['required'], }, formValidation: { valid: false, fields: { name: {valid: null}, + type: {valid: null}, file: {valid: null}, } }, @@ -35,8 +38,7 @@ x-data="{ {{if eq (len .ViewState.documents) 0}}

Aucun document

{{end}} - - + {{if gt (len .ViewState.documents) 0}}
@@ -74,11 +76,22 @@ x-data="{

Ajouter un document

+
+ + +
From 5eccdcf89be6636ef0f8c1b9fb6a21cb562f13e3 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Tue, 15 Oct 2024 10:52:23 +0200 Subject: [PATCH 05/53] edit web/layouts/agenda/_partials/event-files.html & web/layouts/agenda/display-event.html --- config.yaml | 1 + web/layouts/agenda/_partials/event-files.html | 10 ++++++++-- web/layouts/agenda/create-event.html | 2 -- web/layouts/agenda/display-event.html | 19 +++++++++++++------ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/config.yaml b/config.yaml index e8a84f0..10175e1 100644 --- a/config.yaml +++ b/config.yaml @@ -105,6 +105,7 @@ views: files: - web/layouts/_partials/address_autocomplete.html - web/layouts/agenda/create-event.html + - web/layouts/agenda/_partials/event-files.html delete_subscriber: files: - web/layouts/agenda/delete-subscriber.html diff --git a/web/layouts/agenda/_partials/event-files.html b/web/layouts/agenda/_partials/event-files.html index e404b8c..ae759cb 100644 --- a/web/layouts/agenda/_partials/event-files.html +++ b/web/layouts/agenda/_partials/event-files.html @@ -45,6 +45,7 @@ x-data="{ + {{range .ViewState.documents}} + diff --git a/web/layouts/vehicles_management/_partials/vehicle-diags.html b/web/layouts/vehicles_management/_partials/vehicle-diags.html new file mode 100644 index 0000000..69d4d3a --- /dev/null +++ b/web/layouts/vehicles_management/_partials/vehicle-diags.html @@ -0,0 +1,49 @@ +{{define "vehicle_diags"}} +{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }} +{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}} +
+ +
+ {{ $diagCount := len .ViewState.diags }} +
    + {{if eq $diagCount 0}} +
  • +

    Aucun diagnostique effectué pour le moment.

    +
  • + {{else}} + {{range .ViewState.diags}} + {{ $diags := .ID }} + {{if eq .Deleted false}} +
  • +
    + {{.Name}} +
    + +
  • + {{end}} + {{if eq .Deleted true}} +
  • +
    +

    {{.Name}}

    +
    +
    +

    Ce diagnostique a été retiré

    +
    +
  • + {{end}} + {{end}} + {{end}} +
+
+
+{{end}} \ No newline at end of file diff --git a/web/layouts/vehicles_management/create-diag.html b/web/layouts/vehicles_management/create-diag.html new file mode 100644 index 0000000..bb347ea --- /dev/null +++ b/web/layouts/vehicles_management/create-diag.html @@ -0,0 +1,116 @@ +{{define "content"}} + +
+

Ajouter un diagnostique

+
+ +
+
+
+
+
+

Informations obligatoires

+

Informations obligatoires + pour créer un diagnostique dans PARCOURSMOB

+
+
+
+
+ + +
+
+
+
+
+ +
+
+
+

Schéma JSON

+

Schéma JSON pour le diagnostique

+
+
+
+
+ + +
+
+
+
+
+
+
+
+

Schéma UI

+

Schéma UI pour le diagnostique

+
+
+
+
+ + +
+
+
+
+
+
+

Certains champs de sont pas valides.

+ + + + +
+ +
+{{end}} \ No newline at end of file diff --git a/web/layouts/vehicles_management/fleet-display.html b/web/layouts/vehicles_management/fleet-display.html index 5c0e227..8c87fdc 100644 --- a/web/layouts/vehicles_management/fleet-display.html +++ b/web/layouts/vehicles_management/fleet-display.html @@ -183,6 +183,9 @@ {{end}} +
+ {{template "vehicle_diags" .}} +
From ef66fa987620484b3655af4875355cab702a842b Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 16 Dec 2024 12:38:28 +0100 Subject: [PATCH 20/53] Add BookingsCreateDiag --- config.yaml | 8 +- .../_partials/beneficiary-diags.html | 20 +-- web/layouts/beneficiaries/create-diag.html | 8 +- web/layouts/beneficiaries/display.html | 9 +- web/layouts/diags/display-diag.html | 12 +- web/layouts/diags/home.html | 11 +- .../_partials/booking-diags.html | 49 ++++++++ .../_partials/vehicle-diags.html | 6 +- .../vehicles_management/booking-display.html | 3 + .../create-booking-diag.html | 116 ++++++++++++++++++ ...ate-diag.html => create-vehicle-diag.html} | 8 +- 11 files changed, 218 insertions(+), 32 deletions(-) create mode 100644 web/layouts/vehicles_management/_partials/booking-diags.html create mode 100644 web/layouts/vehicles_management/create-booking-diag.html rename web/layouts/vehicles_management/{create-diag.html => create-vehicle-diag.html} (97%) diff --git a/config.yaml b/config.yaml index ebbd5d7..1e1083a 100644 --- a/config.yaml +++ b/config.yaml @@ -95,12 +95,16 @@ views: booking_display: files: - web/layouts/vehicles_management/booking-display.html + - web/layouts/vehicles_management/_partials/booking-diags.html delete_booking: files: - web/layouts/vehicles_management/delete-booking.html - create_diag: + create_vehicle_diag: files: - - web/layouts/vehicles_management/create-diag.html + - web/layouts/vehicles_management/create-vehicle-diag.html + create_booking_diag: + files: + - web/layouts/vehicles_management/create-booking-diag.html agenda: list: files: diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html index 13cf9d7..e80c560 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html @@ -3,14 +3,16 @@ {{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
{{ $diagCount := len .ViewState.diags }} @@ -37,7 +39,7 @@

{{.Name}}

-

Ce diagnostique a été retiré

+

Ce diagnostic a été retiré

{{end}} diff --git a/web/layouts/beneficiaries/create-diag.html b/web/layouts/beneficiaries/create-diag.html index 90d5c2e..175968a 100644 --- a/web/layouts/beneficiaries/create-diag.html +++ b/web/layouts/beneficiaries/create-diag.html @@ -1,7 +1,7 @@ {{define "content"}}
-

Ajouter un diagnostique

+

Ajouter un diagnostic

Informations obligatoires

Informations obligatoires - pour créer un diagnostique dans PARCOURSMOB

+ pour créer un diagnostic dans PARCOURSMOB

@@ -68,7 +68,7 @@

Schéma JSON

-

Schéma JSON pour le diagnostique

+

Schéma JSON pour le diagnostic

@@ -87,7 +87,7 @@

Schéma UI

-

Schéma UI pour le diagnostique

+

Schéma UI pour le diagnostic

diff --git a/web/layouts/beneficiaries/display.html b/web/layouts/beneficiaries/display.html index d6d55c6..141e8a4 100644 --- a/web/layouts/beneficiaries/display.html +++ b/web/layouts/beneficiaries/display.html @@ -137,6 +137,11 @@ class="whitespace-nowrap py-4 px-1 border-b-2 font-medium text-sm" :class="tab == 'organizations' ? 'border-co-blue text-co-blue' : 'border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300'"> Gestionnaires + + + Diagnostics
@@ -145,6 +150,7 @@
{{template "beneficiary_files" .}}
{{template "beneficiary_notes" .}}
{{template "beneficiary_organizations" .}}
+
{{template "beneficiary_diags" .}}
@@ -152,9 +158,6 @@
{{template "beneficiary_events" .}} -
- {{template "beneficiary_diags" .}} -
diff --git a/web/layouts/diags/display-diag.html b/web/layouts/diags/display-diag.html index 52ccf15..39bf8cf 100644 --- a/web/layouts/diags/display-diag.html +++ b/web/layouts/diags/display-diag.html @@ -22,20 +22,26 @@

Informations

-

Informations sur le diagnostique.

+

Informations sur le diagnostic.

{{if eq .ViewState.diag.Namespace "parcoursmob_beneficiaries"}}
Type
-
Diagnostique personnelle
+
Diagnostic personnelle
{{end}} {{if eq .ViewState.diag.Namespace "parcoursmob_vehicles"}}
Type
-
Diagnostique automobile
+
Diagnostic automobile
+
+ {{end}} + {{if eq .ViewState.diag.Namespace "parcoursmob_bookings"}} +
+
Type
+
Diagnostic véhicule réservé
{{end}} {{if .ViewState.diag.Json_schema}} diff --git a/web/layouts/diags/home.html b/web/layouts/diags/home.html index 57213fb..451c096 100644 --- a/web/layouts/diags/home.html +++ b/web/layouts/diags/home.html @@ -1,6 +1,6 @@ {{define "content"}}
-

Diagnostiques effectués

+

Diagnostics effectués

@@ -27,7 +27,7 @@
+ {{range .ViewState.diags}} - {{if eq .Deleted false}} + {{end}} - {{end}}
Type @@ -55,6 +56,11 @@ x-data="{
+
+ {{index $.ViewState.file_types_map .Metadata.Type}} +
+
{{.Metadata.Name}} {{.LastModified.Format "02/01/2006"}} @@ -72,7 +78,7 @@ x-data="{ {{end}} - + {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}

Ajouter un document

@@ -123,6 +129,6 @@ x-data="{ Ajouter le document - + {{end}}
{{end}} diff --git a/web/layouts/agenda/create-event.html b/web/layouts/agenda/create-event.html index c3af0c4..04b2ad9 100644 --- a/web/layouts/agenda/create-event.html +++ b/web/layouts/agenda/create-event.html @@ -200,8 +200,6 @@ - - + {{ if eq (index .ViewState.event.Owners 0) .Group.ID }}
@@ -203,13 +204,19 @@ {{end}} {{end}}
-
-

Documents

-
-
{{template "event_files" .}}
-
-
+
+
+
+
+

Documents

+
+
{{template "event_files" .}}
+
+
+
+
+
{{ end }} \ No newline at end of file From 1903cd27db9f03ae4cc26fffd0168449177280a6 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Tue, 22 Oct 2024 12:10:49 +0200 Subject: [PATCH 06/53] edit web/layouts/agenda/create-event.html --- web/layouts/agenda/create-event.html | 133 ++++++++++++++++++++------- 1 file changed, 99 insertions(+), 34 deletions(-) diff --git a/web/layouts/agenda/create-event.html b/web/layouts/agenda/create-event.html index 04b2ad9..7251b04 100644 --- a/web/layouts/agenda/create-event.html +++ b/web/layouts/agenda/create-event.html @@ -4,8 +4,7 @@

Ajouter à l'agenda

-
-
+ +

Informations sur le dispositif

-

Informations générales sur le dispositif d'accompagnement à ajouter à l'agenda

+

Informations générales sur le dispositif d'accompagnement à + ajouter à l'agenda

@@ -80,8 +90,7 @@
-
@@ -119,12 +128,14 @@
- Toute la journée @@ -134,42 +145,46 @@
- + + class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl" + x-model="fields.startdate" @blur="validateField('startdate')" + :class="formValidation.fields.startdate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
- + + class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl" + x-model="fields.enddate" @blur="validateField('enddate')" + :class="formValidation.fields.enddate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
- - + +
- + + class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-l-2xl" + x-model="fields.starttime" @blur="validateField('starttime')" + :class="formValidation.fields.starttime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
- + + class="mt-1 focus:ring-co-blue focus:border-co-blue block w-full shadow-sm sm:text-sm rounded-r-2xl" + x-model="fields.endtime" @blur="validateField('endtime')" + :class="formValidation.fields.endtime.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
- - + +
@@ -184,12 +199,14 @@

Paramètres

-

Paramètres du dispositift (nombre de places disponibles, etc...)

+

Paramètres du dispositif (nombre de places disponibles, + etc...)

- +
+

Certains champs de sont pas valides.

From d8369bad3d3e5ef89d4d49b4503f63f139b928f2 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 28 Oct 2024 14:38:00 +0100 Subject: [PATCH 07/53] =?UTF-8?q?Edit=20web/layout/vehicles/search.html=20?= =?UTF-8?q?-=20Add=20Documents=20demand=C3=A9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/layouts/vehicles/search.html | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web/layouts/vehicles/search.html b/web/layouts/vehicles/search.html index 42c2875..6b1d3e2 100644 --- a/web/layouts/vehicles/search.html +++ b/web/layouts/vehicles/search.html @@ -147,6 +147,20 @@
{{if .ViewState.searched}}
+

Documents demandés

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

Véhicules disponibles

From 3526ee87004531c23f956c498a157e2f841f4988 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Tue, 29 Oct 2024 12:09:50 +0100 Subject: [PATCH 08/53] add bookings on dashboard & kilometers on vehicles management --- config.yaml | 4 +++ .../dashboard/_partials/bookings-widget.html | 32 +++++++++++++++++++ web/layouts/dashboard/dashboard.html | 2 +- .../vehicles_management/booking-display.html | 9 ++++-- .../vehicles_management/fleet-add.html | 7 ++++ .../vehicles_management/fleet-display.html | 10 ++++-- .../vehicles_management/fleet-update.html | 9 ++++++ 7 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 web/layouts/dashboard/_partials/bookings-widget.html diff --git a/config.yaml b/config.yaml index 10175e1..0b95e1c 100644 --- a/config.yaml +++ b/config.yaml @@ -9,6 +9,7 @@ views: files: - web/layouts/dashboard/_partials/agenda-widget.html - web/layouts/dashboard/_partials/beneficiaries-widget.html + - web/layouts/dashboard/_partials/bookings-widget.html - web/layouts/dashboard/dashboard.html beneficiaries: list: @@ -89,6 +90,9 @@ views: booking_display: files: - web/layouts/vehicles_management/booking-display.html + delete_booking: + files: + - web/layouts/vehicles_management/delete-booking.html agenda: list: files: diff --git a/web/layouts/dashboard/_partials/bookings-widget.html b/web/layouts/dashboard/_partials/bookings-widget.html new file mode 100644 index 0000000..48044ad --- /dev/null +++ b/web/layouts/dashboard/_partials/bookings-widget.html @@ -0,0 +1,32 @@ +{{define "bookings_widget"}} + +{{end}} \ No newline at end of file diff --git a/web/layouts/dashboard/dashboard.html b/web/layouts/dashboard/dashboard.html index 10c1e7f..0b01f54 100644 --- a/web/layouts/dashboard/dashboard.html +++ b/web/layouts/dashboard/dashboard.html @@ -70,7 +70,7 @@ {{template "beneficiaries_widget" .ViewState.beneficiaries}} {{template "agenda_widget" .ViewState.events}} - + {{template "bookings_widget" .ViewState.fleets}}
diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html index 046414e..027a940 100644 --- a/web/layouts/vehicles_management/booking-display.html +++ b/web/layouts/vehicles_management/booking-display.html @@ -15,12 +15,12 @@ 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 - + +
+
Kilométrage
+
+ {{.ViewState.vehicle.Data.kilometers}} km
+
Type
diff --git a/web/layouts/vehicles_management/fleet-add.html b/web/layouts/vehicles_management/fleet-add.html index c14bdf5..317dbe4 100644 --- a/web/layouts/vehicles_management/fleet-add.html +++ b/web/layouts/vehicles_management/fleet-add.html @@ -94,6 +94,13 @@ @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')" :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+
+ + +
diff --git a/web/layouts/vehicles_management/fleet-display.html b/web/layouts/vehicles_management/fleet-display.html index 6373c3e..5c0e227 100644 --- a/web/layouts/vehicles_management/fleet-display.html +++ b/web/layouts/vehicles_management/fleet-display.html @@ -16,8 +16,8 @@
- +
@@ -54,6 +54,12 @@
{{.ViewState.vehicle.Data.licence_plate}}
{{end}} + {{if .ViewState.vehicle.Data.kilometers}} +
+
Kilométrage
+
{{.ViewState.vehicle.Data.kilometers}} km
+
+ {{end}} {{if .ViewState.vehicle.Data.address}}
Lieu
diff --git a/web/layouts/vehicles_management/fleet-update.html b/web/layouts/vehicles_management/fleet-update.html index 88b6770..5a0f96b 100644 --- a/web/layouts/vehicles_management/fleet-update.html +++ b/web/layouts/vehicles_management/fleet-update.html @@ -66,6 +66,15 @@ @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')" :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
+
+ + +
From c6f40f2aa20afb77b79fef167dec580853bda650 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Tue, 29 Oct 2024 14:07:08 +0100 Subject: [PATCH 09/53] fix some error on web/layouts/vehicles_management/fleet-update.html --- .../vehicles_management/fleet-update.html | 31 ++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/web/layouts/vehicles_management/fleet-update.html b/web/layouts/vehicles_management/fleet-update.html index 5a0f96b..bd340cb 100644 --- a/web/layouts/vehicles_management/fleet-update.html +++ b/web/layouts/vehicles_management/fleet-update.html @@ -9,6 +9,7 @@ fields: { licence_plate: '{{ .ViewState.vehicle.Data.licence_plate }}', name: '{{ .ViewState.vehicle.Data.name }}', + kilometers: '{{ .ViewState.vehicle.Data.kilometers }}', }, rules: { licence_plate: ['required', 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'], @@ -35,7 +36,12 @@ event.preventDefault() } return this.formValidation.valid + }, + + displayAutomatic(type) { + return type == 'Voiture' } + }">
@@ -55,7 +61,30 @@ :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
- {{template "vehicle_type_select" .}} +
+ + +
+ Automatique +
+
+ +
+
+ +

Ce véhicule a une boite automatique.

+
+
+
+
-
Prénon
+
Prénom
{{.ViewState.admins.Data.last_name}}
From fc0739ab5718c68bf062969e1bc097ef2753a9e9 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Tue, 19 Nov 2024 15:16:57 +0100 Subject: [PATCH 11/53] Add Quilljs for rich text input instead of simple textereas --- emails/onboarding/support_emailing.html | 4 ++-- web/layouts/agenda/create-event.html | 20 +++++++++++++---- web/layouts/agenda/display-event.html | 4 ++-- web/layouts/agenda/updateEvent.html | 18 ++++++++++++--- web/layouts/layout.html | 4 +++- web/layouts/support/support.html | 19 +++++++++++++--- .../vehicles_management/fleet-add.html | 22 ++++++++++++++----- .../vehicles_management/fleet-display.html | 4 ++-- .../vehicles_management/fleet-update.html | 20 ++++++++++++----- 9 files changed, 88 insertions(+), 27 deletions(-) diff --git a/emails/onboarding/support_emailing.html b/emails/onboarding/support_emailing.html index 40ea8c7..bf81792 100644 --- a/emails/onboarding/support_emailing.html +++ b/emails/onboarding/support_emailing.html @@ -1,4 +1,4 @@ {{define "content"}}

Vous avez reçu un commentaire sur PARCOURSMOB de la part de {{.user}}

-

{{.key}}

-{{end}} \ No newline at end of file +

{{unescapeHTML .key}}

+{{end}} diff --git a/web/layouts/agenda/create-event.html b/web/layouts/agenda/create-event.html index 7251b04..801f9ba 100644 --- a/web/layouts/agenda/create-event.html +++ b/web/layouts/agenda/create-event.html @@ -8,7 +8,7 @@ fields: { name: null, type: null, - description: null, + description: '', allday: false, startdate: null, enddate: null, @@ -50,6 +50,16 @@ } }, isFormValid: true, + init() { + let quill = new Quill(this.$refs.quill, { theme: 'snow' }) + + quill.root.innerHTML = this.fields.description + + quill.on('text-change', () => { + this.fields.description = quill.root.innerHTML + }) + + }, validate() { this.formValidation = Iodine.assert(this.fields, this.rules) @@ -103,10 +113,12 @@
- + class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl"> --> + +
>
@@ -277,4 +289,4 @@
-{{end}} \ No newline at end of file +{{end}} diff --git a/web/layouts/agenda/display-event.html b/web/layouts/agenda/display-event.html index 67c7856..70bd356 100644 --- a/web/layouts/agenda/display-event.html +++ b/web/layouts/agenda/display-event.html @@ -78,7 +78,7 @@ {{if .ViewState.event.Description}}
Description
-
{{.ViewState.event.Description}}
+
{{ unescapeHTML .ViewState.event.Description}}
{{end}} @@ -219,4 +219,4 @@
-{{ end }} \ No newline at end of file +{{ end }} diff --git a/web/layouts/agenda/updateEvent.html b/web/layouts/agenda/updateEvent.html index 976a58e..a4e9322 100644 --- a/web/layouts/agenda/updateEvent.html +++ b/web/layouts/agenda/updateEvent.html @@ -44,6 +44,16 @@ } }, isFormValid: true, + init() { + let quill = new Quill(this.$refs.quill, { theme: 'snow' }) + + quill.root.innerHTML = this.fields.description + + quill.on('text-change', () => { + this.fields.description = quill.root.innerHTML + }) + + }, validate() { this.formValidation = Iodine.assert(this.fields, this.rules) @@ -99,10 +109,12 @@
- +class="shadow-sm focus:ring-co-blue focus:border-co-blue block w-full sm:text-sm border-gray-300 rounded-2xl">--> + +
>
@@ -252,4 +264,4 @@ {{end}} -{{end}} \ No newline at end of file +{{end}} diff --git a/web/layouts/layout.html b/web/layouts/layout.html index 126af02..d8eabd1 100644 --- a/web/layouts/layout.html +++ b/web/layouts/layout.html @@ -5,9 +5,11 @@ PARCOURSMOB + + @@ -175,4 +177,4 @@ -{{end}} \ No newline at end of file +{{end}} diff --git a/web/layouts/support/support.html b/web/layouts/support/support.html index f976bf9..cc1e3a2 100644 --- a/web/layouts/support/support.html +++ b/web/layouts/support/support.html @@ -1,6 +1,17 @@ {{define "content"}} -
+

Demande de support technique

@@ -10,9 +21,11 @@

- + - +
+ +
-
+
@@ -118,8 +130,8 @@
- +
+
@@ -138,4 +150,4 @@
-{{end}} \ No newline at end of file +{{end}} diff --git a/web/layouts/vehicles_management/fleet-display.html b/web/layouts/vehicles_management/fleet-display.html index 5c0e227..aebf48f 100644 --- a/web/layouts/vehicles_management/fleet-display.html +++ b/web/layouts/vehicles_management/fleet-display.html @@ -69,7 +69,7 @@ {{if .ViewState.vehicle.Data.informations}}
Informations pratiques pour le bénéficiaire
-
{{.ViewState.vehicle.Data.informations}}
+
{{unescapeHTML .ViewState.vehicle.Data.informations}}
{{end}} @@ -240,4 +240,4 @@ -{{end}} \ No newline at end of file +{{end}} diff --git a/web/layouts/vehicles_management/fleet-update.html b/web/layouts/vehicles_management/fleet-update.html index bd340cb..24de4cf 100644 --- a/web/layouts/vehicles_management/fleet-update.html +++ b/web/layouts/vehicles_management/fleet-update.html @@ -10,6 +10,7 @@ licence_plate: '{{ .ViewState.vehicle.Data.licence_plate }}', name: '{{ .ViewState.vehicle.Data.name }}', kilometers: '{{ .ViewState.vehicle.Data.kilometers }}', + informations: '{{ .ViewState.vahicle.Data.informations}}', }, rules: { licence_plate: ['required', 'regexMatch:^[A-Z]{1,2}-[0-9]{1,3}-[A-Z]{1,2}$'], @@ -23,6 +24,15 @@ } }, isFormValid: true, + init() { + let quill = new Quill(this.$refs.quill, { theme: 'snow', modules: { toolbar: [[{ 'header': [1, 2, 3, 4, 5, 6, false] }], ['bold', 'italic', 'underline'], ['link', 'image']] } }) + + quill.root.innerHTML = this.fields.informations + + quill.on('text-change', () => { + this.fields.informations = quill.root.innerHTML + }) + }, validate() { this.formValidation = Iodine.assert(this.fields, this.rules) }, @@ -95,7 +105,7 @@ @blur="fields.licence_plate = fields.licence_plate.toUpperCase(); validateField('licence_plate')" :class="formValidation.fields.licence_plate.valid == false ? 'border-co-red border-2' : 'border-gray-300'"> -
+
@@ -121,8 +131,8 @@
- +
+
@@ -141,4 +151,4 @@ -{{end}} \ No newline at end of file +{{end}} From 1d86d44aa88b6fd0694d51154964066075fb1e6c Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Tue, 19 Nov 2024 15:55:12 +0100 Subject: [PATCH 12/53] Add beneficiaries information to bookings list --- .../vehicles_management/_partials/bookings-list.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/web/layouts/vehicles_management/_partials/bookings-list.html b/web/layouts/vehicles_management/_partials/bookings-list.html index 122f9a0..22d3edd 100644 --- a/web/layouts/vehicles_management/_partials/bookings-list.html +++ b/web/layouts/vehicles_management/_partials/bookings-list.html @@ -67,8 +67,11 @@ {{if .Data.administrator_unavailability}}
{{else}} -
+
+ + {{ (index $.ViewState.drivers_map .Driver).Data.first_name }} + {{ (index $.ViewState.drivers_map .Driver).Data.last_name }} +
{{end}}
@@ -94,4 +97,4 @@ -{{end}} \ No newline at end of file +{{end}} From bc948e0141661006a292141ef56c78e90c4051dd Mon Sep 17 00:00:00 2001 From: Nicolas CARON <106981664+Nickos0695@users.noreply.github.com> Date: Mon, 2 Dec 2024 08:58:53 +0100 Subject: [PATCH 13/53] Add diags --- config.yaml | 4 + .../_partials/beneficiary-diags.html | 37 ++++ web/layouts/beneficiaries/create-diag.html | 183 ++++++++++++++++++ web/layouts/beneficiaries/display.html | 3 + 4 files changed, 227 insertions(+) create mode 100644 web/layouts/beneficiaries/_partials/beneficiary-diags.html create mode 100644 web/layouts/beneficiaries/create-diag.html diff --git a/config.yaml b/config.yaml index 0b95e1c..8ba402a 100644 --- a/config.yaml +++ b/config.yaml @@ -29,7 +29,11 @@ views: - web/layouts/beneficiaries/_partials/beneficiary-events.html - web/layouts/beneficiaries/_partials/beneficiary-files.html - web/layouts/beneficiaries/_partials/beneficiary-organizations.html + - web/layouts/beneficiaries/_partials/beneficiary-diags.html - web/layouts/beneficiaries/display.html + create_diag: + files: + - web/layouts/beneficiaries/create-diag.html update: files: - web/layouts/_partials/address_autocomplete.html diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html new file mode 100644 index 0000000..56b765f --- /dev/null +++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html @@ -0,0 +1,37 @@ +{{define "beneficiary_diags"}} +{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }} +{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}} +
+
+

Dignostiques réalisées

+
+ + + +
+ {{ $diagCount := len .ViewState.diag }} +
    + {{if eq $diagCount 0}} +
  • +

    Aucun diagnostique effectué pour le moment.

    +
  • + {{else}} + {{range .ViewState.diag}} + {{if eq .Deleted false}} +
  • +
    +

    {{.Name}}

    +
    + +
  • + {{end}} + {{end}} + {{end}} +
+
+
+{{end}} \ No newline at end of file diff --git a/web/layouts/beneficiaries/create-diag.html b/web/layouts/beneficiaries/create-diag.html new file mode 100644 index 0000000..562cac4 --- /dev/null +++ b/web/layouts/beneficiaries/create-diag.html @@ -0,0 +1,183 @@ +{{define "content"}} + +
+

Ajouter un diagnostique

+
+ +
+
+
+
+
+

Informations obligatoires

+

Informations personnelles sur le bénéficiaire obligatoires + pour créer son profil dans PARCOURSMOB

+
+
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+ + +
+
+
+
+
+ +
+
+
+

Informations optionnelles

+

Autres informations de profil optionnelles

+
+
+
+ +
+ +
+ +
+
+ + + + +
+
+
+
+
+
+
+

Paramètres

+

Paramètres liés au bénéficiaire, utiles pour exploiter les fonctionnalités de PARCOURSMOB

+
+
+ + {{ $fieldName := "address" }} + {{ template "address_autocomplete" dict "FieldName" $fieldName }} + + + +
+
+
+ +
+

Certains champs de sont pas valides.

+ + + + +
+
+
+{{end}} \ No newline at end of file diff --git a/web/layouts/beneficiaries/display.html b/web/layouts/beneficiaries/display.html index 3be8ddf..d6d55c6 100644 --- a/web/layouts/beneficiaries/display.html +++ b/web/layouts/beneficiaries/display.html @@ -152,6 +152,9 @@
{{template "beneficiary_events" .}} +
+ {{template "beneficiary_diags" .}} +
From 395160db6ee027ef03322539936693882fce04a0 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Wed, 4 Dec 2024 14:12:51 +0100 Subject: [PATCH 14/53] Edit beneficiary-diags and create-diag template on beneficiaries --- .../_partials/beneficiary-diags.html | 18 +-- web/layouts/beneficiaries/create-diag.html | 149 +++++------------- 2 files changed, 50 insertions(+), 117 deletions(-) diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html index 56b765f..b636c39 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html @@ -4,23 +4,23 @@
- - -
- {{ $diagCount := len .ViewState.diag }} + {{ $diagCount := len .ViewState.diags }}
    {{if eq $diagCount 0}}
  • Aucun diagnostique effectué pour le moment.

  • {{else}} - {{range .ViewState.diag}} + {{range .ViewState.diags}} {{if eq .Deleted false}}
  • diff --git a/web/layouts/beneficiaries/create-diag.html b/web/layouts/beneficiaries/create-diag.html index 562cac4..90d5c2e 100644 --- a/web/layouts/beneficiaries/create-diag.html +++ b/web/layouts/beneficiaries/create-diag.html @@ -8,29 +8,22 @@ x-data="{ fields: { name: null, - last_name: null, - email: null, - phone_number: null, - birthdate: null, - file_number: null + namespace: 'parcoursmob_beneficiaries', + json_schema: null, + ui_schema: null, }, rules: { - first_name: ['required'], - last_name: ['required'], - email: ['required', 'email'], - phone_number: ['required', 'regexMatch:^((\\+)33|0)[1-9](\\d{2}){4}$'], - birthdate: ['required'], - file_number: ['required'], + name: ['required'] + namespace: ['required'] + json_schema: ['required'] + ui_schema: ['required'] }, formValidation: { valid: false, fields: { - first_name: {valid: null}, - last_name: {valid: null}, - email: {valid: null}, - phone_number: {valid: null}, - birthdate: {valid: null}, - file_number: {valid: null}, + name: {valid: null}, + json_schema: {valid: null}, + ui_schema: {valid: null}, } }, isFormValid: true, @@ -54,129 +47,69 @@

    Informations obligatoires

    -

    Informations personnelles sur le bénéficiaire obligatoires - pour créer son profil dans PARCOURSMOB

    +

    Informations obligatoires + pour créer un diagnostique dans PARCOURSMOB

    - - Nom + -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    -
    - - + x-model="fields.name" @blur="validateField('name')" + :class="formValidation.fields.name.valid == false ? 'border-co-red border-2' : 'border-gray-300'">
    - -
    + +
    -

    Informations optionnelles

    -

    Autres informations de profil optionnelles

    +

    Schéma JSON

    +

    Schéma JSON pour le diagnostique

    -
    +
    -
    - -
    - -
    + +
    - - - -
    -
    +
    -

    Paramètres

    -

    Paramètres liés au bénéficiaire, utiles pour exploiter les fonctionnalités de PARCOURSMOB

    +

    Schéma UI

    +

    Schéma UI pour le diagnostique

    -
    - - {{ $fieldName := "address" }} - {{ template "address_autocomplete" dict "FieldName" $fieldName }} - - - +
    +
    +
    + + +
    +
    -

    Certains champs de sont pas valides.

    - + + class="ml-3 inline-flex justify-center py-2 px-4 border border-transparent shadow-sm text-sm font-medium rounded-2xl text-white bg-co-blue hover:bg-co-blue focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-co-blue">Créer le diagnostique
    From 676eea12381b253e9a91836fca4b9a6a77795801 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Wed, 4 Dec 2024 17:29:10 +0100 Subject: [PATCH 15/53] Add module diags in menu & home page for diags --- config.yaml | 7 ++ .../_partials/beneficiary-diags.html | 4 +- web/layouts/diags/delete-diag.html | 39 ++++++++++ web/layouts/diags/home.html | 71 +++++++++++++++++++ 4 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 web/layouts/diags/delete-diag.html create mode 100644 web/layouts/diags/home.html diff --git a/config.yaml b/config.yaml index 8ba402a..ab209bc 100644 --- a/config.yaml +++ b/config.yaml @@ -172,6 +172,13 @@ views: display_group: files: - web/layouts/group_module/display_group.html + diags: + list: + files: + - web/layouts/diags/home.html + delete: + files: + - web/layouts/diags/delete-diag.html administration: home: diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html index b636c39..d7e5139 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html @@ -21,12 +21,14 @@
  • {{else}} {{range .ViewState.diags}} + {{ $diags := .ID }} {{if eq .Deleted false}}
  • {{.Name}}

    - +
  • {{end}} {{end}} diff --git a/web/layouts/diags/delete-diag.html b/web/layouts/diags/delete-diag.html new file mode 100644 index 0000000..b7c4ad7 --- /dev/null +++ b/web/layouts/diags/delete-diag.html @@ -0,0 +1,39 @@ +{{define "content"}} +
    +
    + +
    + +
    +
    + +
    +
    +
    + {{.IconSet.Icon "hero:outline/information-circle" "h-6 w-6"}} +
    +
    + +
    +

    Voulez-vous vraiment retirer ce dignostique ?

    +
    +
    + +
    + +
    +
    +
    +
    +
    + Annuler + +
    +
    +
    +
    +
    + +
    +{{end}} \ No newline at end of file diff --git a/web/layouts/diags/home.html b/web/layouts/diags/home.html new file mode 100644 index 0000000..f6a34f5 --- /dev/null +++ b/web/layouts/diags/home.html @@ -0,0 +1,71 @@ +{{define "content"}} + + +
    +
    +
    +
    +
    + + + + + + + + + {{range .ViewState.diags}} + {{if eq .Deleted false}} + + + + + + + + {{end}} + {{end}} + + +
    + Nom du diagnostique + + Type + + Actions +
    + +
    {{.Name}}
    +
    + {{if eq .Namespace "parcoursmob_beneficiaries"}} +
    Diagnostique personnelle
    + {{end}} + {{if eq .Namespace "parcoursmob_vehicle"}} +
    Diagnostique automobile
    + {{end}} +
    + Voir +
    +
    +
    +
    +
    +
    +{{end}} \ No newline at end of file From ea6ed41608b151a863fdebbcd7ccaf3f7df4d150 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Wed, 4 Dec 2024 18:20:56 +0100 Subject: [PATCH 16/53] Add display-diag.html --- config.yaml | 3 + .../_partials/beneficiary-diags.html | 12 +++- web/layouts/diags/delete-diag.html | 9 +-- web/layouts/diags/display-diag.html | 57 +++++++++++++++++++ 4 files changed, 72 insertions(+), 9 deletions(-) create mode 100644 web/layouts/diags/display-diag.html diff --git a/config.yaml b/config.yaml index ab209bc..ac66219 100644 --- a/config.yaml +++ b/config.yaml @@ -176,6 +176,9 @@ views: list: files: - web/layouts/diags/home.html + display_diag: + files: + - web/layouts/diags/display-diag.html delete: files: - web/layouts/diags/delete-diag.html diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html index d7e5139..6c10e53 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html @@ -3,7 +3,7 @@ {{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
    -

    Dignostiques réalisées

    +

    Diagnostiques réalisés

    {{end}} + {{if eq .Deleted true}} +
  • +
    +

    {{.Name}}

    +
    +
    +

    Ce diagnostique a été retiré

    +
    +
  • + {{end}} {{end}} {{end}}
diff --git a/web/layouts/diags/delete-diag.html b/web/layouts/diags/delete-diag.html index b7c4ad7..494fee8 100644 --- a/web/layouts/diags/delete-diag.html +++ b/web/layouts/diags/delete-diag.html @@ -17,17 +17,10 @@

Voulez-vous vraiment retirer ce dignostique ?

-
- -
- -
-
- Annuler + Annuler
diff --git a/web/layouts/diags/display-diag.html b/web/layouts/diags/display-diag.html new file mode 100644 index 0000000..4b85d29 --- /dev/null +++ b/web/layouts/diags/display-diag.html @@ -0,0 +1,57 @@ +{{ define "content" }} +
+
+
+
+

{{.ViewState.diag.Name}}

+
+ {{$diag := .ViewState.diag.ID}} +
+
+ + + +
+
+
+
+
+
+
+

Informations

+

Informations sur le diagnostique.

+
+
+
+ {{if eq .ViewState.diag.Namespace "parcoursmob_beneficiaries"}} +
+
Type
+
Diagnostique personnelle
+
+ {{end}} + {{if eq .ViewState.diag.Namespace "parcoursmob_vehicle"}} +
+
Type
+
Diagnostique automobile
+
+ {{end}} + {{if .ViewState.diag.Json_schema}} +
+
JSON_schema
+
{{.ViewState.diag.Json_schema}}
+
+ {{end}} + {{if .ViewState.diag.Ui_schema}} +
+
UI_schema
+
{{.ViewState.diag.Ui_schema}}
+
+ {{end}} +
+
+
+
+{{ end }} \ No newline at end of file From b9692a09f22df7a9735c98b709ab22d09ecced1d Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 9 Dec 2024 13:26:29 +0100 Subject: [PATCH 17/53] Add update-diag.html --- config.yaml | 3 + web/layouts/diags/update-diag.html | 117 +++++++++++++++++++++++++++++ 2 files changed, 120 insertions(+) create mode 100644 web/layouts/diags/update-diag.html diff --git a/config.yaml b/config.yaml index ac66219..fb7f1a1 100644 --- a/config.yaml +++ b/config.yaml @@ -182,6 +182,9 @@ views: delete: files: - web/layouts/diags/delete-diag.html + update: + files: + - web/layouts/diags/update-diag.html administration: home: diff --git a/web/layouts/diags/update-diag.html b/web/layouts/diags/update-diag.html new file mode 100644 index 0000000..7c02b72 --- /dev/null +++ b/web/layouts/diags/update-diag.html @@ -0,0 +1,117 @@ +{{define "content"}} + +
+

Éditer un diagnostique

+
+ +
+
+
+
+
+

Informations obligatoires

+

Informations obligatoires + pour éditer un diagnostique dans PARCOURSMOB

+
+
+
+
+ + +
+
+
+
+
+ +
+
+
+

Schéma JSON

+

Schéma JSON pour le diagnostique

+
+
+
+
+ + +
+
+
+
+
+
+
+
+

Schéma UI

+

Schéma UI pour le diagnostique

+
+
+
+
+ + +
+
+
+
+
+
+

Certains champs de sont pas valides.

+ + + + +
+
+
+{{end}} \ No newline at end of file From d9bb47bc98cfebf65a0804e99adc32f0c53a2627 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 9 Dec 2024 14:17:01 +0100 Subject: [PATCH 18/53] Edit delete-diag.html - Redirect to the diag page --- web/layouts/diags/delete-diag.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/layouts/diags/delete-diag.html b/web/layouts/diags/delete-diag.html index 494fee8..eba96c1 100644 --- a/web/layouts/diags/delete-diag.html +++ b/web/layouts/diags/delete-diag.html @@ -20,7 +20,7 @@
- Annuler + Annuler
From 34faa8c2156ba61377acf0836338481adb9f9fd0 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Tue, 10 Dec 2024 16:10:58 +0100 Subject: [PATCH 19/53] Add vehicles_managment/_partials/vehicle-diag.html & vehicles_management/create-diag.html --- config.yaml | 4 + .../_partials/beneficiary-diags.html | 2 +- web/layouts/diags/display-diag.html | 2 +- web/layouts/diags/home.html | 2 +- .../_partials/vehicle-diags.html | 49 ++++++++ .../vehicles_management/create-diag.html | 116 ++++++++++++++++++ .../vehicles_management/fleet-display.html | 3 + 7 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 web/layouts/vehicles_management/_partials/vehicle-diags.html create mode 100644 web/layouts/vehicles_management/create-diag.html diff --git a/config.yaml b/config.yaml index fb7f1a1..ebbd5d7 100644 --- a/config.yaml +++ b/config.yaml @@ -86,6 +86,7 @@ views: files: - web/layouts/vehicles_management/_partials/calendar.html - web/layouts/vehicles_management/fleet-display.html + - web/layouts/vehicles_management/_partials/vehicle-diags.html fleet_update: files: - web/layouts/_partials/address_autocomplete.html @@ -97,6 +98,9 @@ views: delete_booking: files: - web/layouts/vehicles_management/delete-booking.html + create_diag: + files: + - web/layouts/vehicles_management/create-diag.html agenda: list: files: diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html index 6c10e53..13cf9d7 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html @@ -25,7 +25,7 @@ {{if eq .Deleted false}}
  • -

    {{.Name}}

    + {{.Name}}
    diff --git a/web/layouts/diags/display-diag.html b/web/layouts/diags/display-diag.html index 4b85d29..52ccf15 100644 --- a/web/layouts/diags/display-diag.html +++ b/web/layouts/diags/display-diag.html @@ -32,7 +32,7 @@
    Diagnostique personnelle
    {{end}} - {{if eq .ViewState.diag.Namespace "parcoursmob_vehicle"}} + {{if eq .ViewState.diag.Namespace "parcoursmob_vehicles"}}
    Type
    Diagnostique automobile
    diff --git a/web/layouts/diags/home.html b/web/layouts/diags/home.html index f6a34f5..57213fb 100644 --- a/web/layouts/diags/home.html +++ b/web/layouts/diags/home.html @@ -49,7 +49,7 @@ {{if eq .Namespace "parcoursmob_beneficiaries"}}
    Diagnostique personnelle
    {{end}} - {{if eq .Namespace "parcoursmob_vehicle"}} + {{if eq .Namespace "parcoursmob_vehicles"}}
    Diagnostique automobile
    {{end}}
  • - Nom du diagnostique + Nom du diagnostic Type @@ -47,10 +47,13 @@ {{if eq .Namespace "parcoursmob_beneficiaries"}} -
    Diagnostique personnelle
    +
    Diagnostic personnelle
    {{end}} {{if eq .Namespace "parcoursmob_vehicles"}} -
    Diagnostique automobile
    +
    Diagnostic automobile
    + {{end}} + {{if eq .Namespace "parcoursmob_bookings"}} +
    Diagnostic véhicule réservé
    {{end}}
    diff --git a/web/layouts/vehicles_management/_partials/booking-diags.html b/web/layouts/vehicles_management/_partials/booking-diags.html new file mode 100644 index 0000000..2e1ad05 --- /dev/null +++ b/web/layouts/vehicles_management/_partials/booking-diags.html @@ -0,0 +1,49 @@ +{{define "booking_diags"}} +{{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }} +{{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}} +
    + +
    + {{ $diagCount := len .ViewState.diags }} +
      + {{if eq $diagCount 0}} +
    • +

      Aucun diagnostique effectué pour le moment.

      +
    • + {{else}} + {{range .ViewState.diags}} + {{ $diags := .ID }} + {{if eq .Deleted false}} +
    • +
      + {{.Name}} +
      + +
    • + {{end}} + {{if eq .Deleted true}} +
    • +
      +

      {{.Name}}

      +
      +
      +

      Ce diagnostique a été retiré

      +
      +
    • + {{end}} + {{end}} + {{end}} +
    +
    +
    +{{end}} \ No newline at end of file diff --git a/web/layouts/vehicles_management/_partials/vehicle-diags.html b/web/layouts/vehicles_management/_partials/vehicle-diags.html index 69d4d3a..0b3b42d 100644 --- a/web/layouts/vehicles_management/_partials/vehicle-diags.html +++ b/web/layouts/vehicles_management/_partials/vehicle-diags.html @@ -2,13 +2,13 @@ {{ $calendarIcon := .IconSet.Icon "hero:outline/calendar" "h-6 w-6" }} {{ $carIcon := .IconSet.Icon "tabler-icons:car" "h-6 w-6"}}
    -
    -

    Diagnostiques réalisés

    + diff --git a/web/layouts/vehicles_management/booking-display.html b/web/layouts/vehicles_management/booking-display.html index 027a940..d0cdd0f 100644 --- a/web/layouts/vehicles_management/booking-display.html +++ b/web/layouts/vehicles_management/booking-display.html @@ -103,6 +103,9 @@
    +
    + {{template "booking_diags" .}} +
    diff --git a/web/layouts/vehicles_management/create-booking-diag.html b/web/layouts/vehicles_management/create-booking-diag.html new file mode 100644 index 0000000..8285297 --- /dev/null +++ b/web/layouts/vehicles_management/create-booking-diag.html @@ -0,0 +1,116 @@ +{{define "content"}} + +
    +

    Ajouter un diagnostic

    +
    + +
    +
    +
    +
    +
    +

    Informations obligatoires

    +

    Informations obligatoires + pour créer un diagnostic dans PARCOURSMOB

    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    +

    Schéma JSON

    +

    Schéma JSON pour le diagnostic

    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +

    Schéma UI

    +

    Schéma UI pour le diagnostic

    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +

    Certains champs de sont pas valides.

    + + + + +
    +
    +
    +{{end}} \ No newline at end of file diff --git a/web/layouts/vehicles_management/create-diag.html b/web/layouts/vehicles_management/create-vehicle-diag.html similarity index 97% rename from web/layouts/vehicles_management/create-diag.html rename to web/layouts/vehicles_management/create-vehicle-diag.html index bb347ea..0f335c1 100644 --- a/web/layouts/vehicles_management/create-diag.html +++ b/web/layouts/vehicles_management/create-vehicle-diag.html @@ -1,7 +1,7 @@ {{define "content"}}
    -

    Ajouter un diagnostique

    +

    Ajouter un diagnostic

    Informations obligatoires

    Informations obligatoires - pour créer un diagnostique dans PARCOURSMOB

    + pour créer un diagnostic dans PARCOURSMOB

    @@ -68,7 +68,7 @@

    Schéma JSON

    -

    Schéma JSON pour le diagnostique

    +

    Schéma JSON pour le diagnostic

    @@ -87,7 +87,7 @@

    Schéma UI

    -

    Schéma UI pour le diagnostique

    +

    Schéma UI pour le diagnostic

    From 153e832649f367622f65b7ad629f48720773a8f9 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 16 Dec 2024 14:41:52 +0100 Subject: [PATCH 21/53] Add VehicleBookingsCreateDiag - second route to create a diag in reservation --- config.yaml | 4 + web/layouts/vehicles/booking-display.html | 5 + web/layouts/vehicles/create-booking-diag.html | 116 ++++++++++++++++++ 3 files changed, 125 insertions(+) create mode 100644 web/layouts/vehicles/create-booking-diag.html diff --git a/config.yaml b/config.yaml index 1e1083a..7e23f78 100644 --- a/config.yaml +++ b/config.yaml @@ -63,10 +63,14 @@ views: booking_display: files: - web/layouts/vehicles/booking-display.html + - web/layouts/vehicles_management/_partials/booking-diags.html bookings_list: files: - web/layouts/vehicles_management/_partials/bookings-list.html - web/layouts/vehicles/bookings-list.html + create_booking_diag: + files: + - web/layouts/vehicles/create-booking-diag.html vehicles_management: overview: files: diff --git a/web/layouts/vehicles/booking-display.html b/web/layouts/vehicles/booking-display.html index 21d19c3..64f45dc 100644 --- a/web/layouts/vehicles/booking-display.html +++ b/web/layouts/vehicles/booking-display.html @@ -66,6 +66,11 @@
    +
    +
    + {{template "booking_diags" .}} +
    +
    diff --git a/web/layouts/vehicles/create-booking-diag.html b/web/layouts/vehicles/create-booking-diag.html new file mode 100644 index 0000000..bbe3220 --- /dev/null +++ b/web/layouts/vehicles/create-booking-diag.html @@ -0,0 +1,116 @@ +{{define "content"}} + +
    +

    Ajouter un diagnostic

    +
    + +
    +
    +
    +
    +
    +

    Informations obligatoires

    +

    Informations obligatoires + pour créer un diagnostic dans PARCOURSMOB

    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    +

    Schéma JSON

    +

    Schéma JSON pour le diagnostic

    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +

    Schéma UI

    +

    Schéma UI pour le diagnostic

    +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +

    Certains champs de sont pas valides.

    + + + + +
    +
    +
    +{{end}} \ No newline at end of file From 95afa20373b12b11c3fe8764fbcd9acbada772a4 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Wed, 18 Dec 2024 16:02:13 +0100 Subject: [PATCH 22/53] add history-diags and edit display-diag, home and booking-diags --- config.yaml | 3 + web/layouts/diags/display-diag.html | 3 +- web/layouts/diags/history-diags.html | 73 +++++++++++++++++++ web/layouts/diags/home.html | 10 ++- .../_partials/booking-diags.html | 2 +- 5 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 web/layouts/diags/history-diags.html diff --git a/config.yaml b/config.yaml index 7e23f78..e0e307d 100644 --- a/config.yaml +++ b/config.yaml @@ -197,6 +197,9 @@ views: update: files: - web/layouts/diags/update-diag.html + history: + files: + - web/layouts/diags/history-diags.html administration: home: diff --git a/web/layouts/diags/display-diag.html b/web/layouts/diags/display-diag.html index 39bf8cf..2725362 100644 --- a/web/layouts/diags/display-diag.html +++ b/web/layouts/diags/display-diag.html @@ -9,11 +9,12 @@
    - + {{if eq .ViewState.diag.Deleted false}} + {{end}}
    diff --git a/web/layouts/diags/history-diags.html b/web/layouts/diags/history-diags.html new file mode 100644 index 0000000..a295c3d --- /dev/null +++ b/web/layouts/diags/history-diags.html @@ -0,0 +1,73 @@ +{{define "content"}} +
    +

    Diagnostics retirés

    + +
    +
    +

    +
    + +
    +
    + +
    +
    +
    +
    +
    + + + + + + + + + {{range .ViewState.diags}} + {{if eq .Deleted true}} + + + + + + + + {{end}} + {{end}} + + +
    + Nom du diagnostic + + Type + + Actions +
    + +
    {{.Name}}
    +
    + {{if eq .Namespace "parcoursmob_beneficiaries"}} +
    Diagnostic personnelle
    + {{end}} + {{if eq .Namespace "parcoursmob_vehicles"}} +
    Diagnostic automobile
    + {{end}} + {{if eq .Namespace "parcoursmob_bookings"}} +
    Diagnostic véhicule réservé
    + {{end}} +
    + Voir +
    +
    +
    +
    +
    +
    +{{end}} \ No newline at end of file diff --git a/web/layouts/diags/home.html b/web/layouts/diags/home.html index 451c096..31611ba 100644 --- a/web/layouts/diags/home.html +++ b/web/layouts/diags/home.html @@ -35,10 +35,12 @@
    Actions + Actions +
    @@ -56,13 +58,17 @@
    Diagnostic véhicule réservé
    {{end}}
    + {{if eq .Deleted true}} +
    Diagnostic retiré
    + {{end}} +
    Voir
    diff --git a/web/layouts/vehicles_management/_partials/booking-diags.html b/web/layouts/vehicles_management/_partials/booking-diags.html index 2e1ad05..28c50c8 100644 --- a/web/layouts/vehicles_management/_partials/booking-diags.html +++ b/web/layouts/vehicles_management/_partials/booking-diags.html @@ -25,7 +25,7 @@ {{if eq .Deleted false}}
  • From c7d0f24ca168a6f8ea13fbe4e45910ede1a819ca Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Fri, 27 Dec 2024 16:00:36 +0100 Subject: [PATCH 23/53] Fix name display --- web/layouts/vehicles_management/fleet-display.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/layouts/vehicles_management/fleet-display.html b/web/layouts/vehicles_management/fleet-display.html index aebf48f..a08fd97 100644 --- a/web/layouts/vehicles_management/fleet-display.html +++ b/web/layouts/vehicles_management/fleet-display.html @@ -134,8 +134,10 @@ {{else}} {{end}} From d269edcfe455e12818166bd26a6fbd8ad839de57 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Wed, 8 Jan 2025 11:39:48 +0100 Subject: [PATCH 24/53] add button Voir for all diags pages --- web/layouts/beneficiaries/_partials/beneficiary-diags.html | 5 ++++- web/layouts/diags/home.html | 4 +++- web/layouts/vehicles_management/_partials/booking-diags.html | 5 ++++- web/layouts/vehicles_management/_partials/vehicle-diags.html | 5 ++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html index e80c560..17a1707 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html @@ -29,8 +29,11 @@ + + + + class="w-full ml-4 px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer
  • {{end}} {{if eq .Deleted true}} diff --git a/web/layouts/diags/home.html b/web/layouts/diags/home.html index 31611ba..1be304a 100644 --- a/web/layouts/diags/home.html +++ b/web/layouts/diags/home.html @@ -64,7 +64,9 @@ {{end}} - Voir + + + diff --git a/web/layouts/vehicles_management/_partials/booking-diags.html b/web/layouts/vehicles_management/_partials/booking-diags.html index 28c50c8..bc778d8 100644 --- a/web/layouts/vehicles_management/_partials/booking-diags.html +++ b/web/layouts/vehicles_management/_partials/booking-diags.html @@ -27,8 +27,11 @@ + + + + class="w-full ml-4 px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer {{end}} {{if eq .Deleted true}} diff --git a/web/layouts/vehicles_management/_partials/vehicle-diags.html b/web/layouts/vehicles_management/_partials/vehicle-diags.html index 0b3b42d..2c5ab6a 100644 --- a/web/layouts/vehicles_management/_partials/vehicle-diags.html +++ b/web/layouts/vehicles_management/_partials/vehicle-diags.html @@ -27,8 +27,11 @@ + + + + class="w-full ml-4 px-4 py-2 border border-transparent text-sm font-medium rounded-2xl shadow-sm text-white bg-co-red hover:bg-co-red focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 focus:ring-co-blue">Retirer {{end}} {{if eq .Deleted true}} From 07b91da6bc67d8de680b5c7dd4ab346ab63c5fa8 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 13 Jan 2025 12:07:14 +0100 Subject: [PATCH 25/53] Edit all template for create diag --- web/layouts/beneficiaries/create-diag.html | 8 ++++---- web/layouts/diags/update-diag.html | 6 +++--- web/layouts/vehicles/create-booking-diag.html | 6 +++--- web/layouts/vehicles_management/create-vehicle-diag.html | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/web/layouts/beneficiaries/create-diag.html b/web/layouts/beneficiaries/create-diag.html index 175968a..6ebbf34 100644 --- a/web/layouts/beneficiaries/create-diag.html +++ b/web/layouts/beneficiaries/create-diag.html @@ -13,9 +13,9 @@ ui_schema: null, }, rules: { - name: ['required'] - namespace: ['required'] - json_schema: ['required'] + name: ['required'], + namespace: ['required'], + json_schema: ['required'], ui_schema: ['required'] }, formValidation: { @@ -54,7 +54,7 @@
    - diff --git a/web/layouts/diags/update-diag.html b/web/layouts/diags/update-diag.html index 7c02b72..cb0da04 100644 --- a/web/layouts/diags/update-diag.html +++ b/web/layouts/diags/update-diag.html @@ -13,9 +13,9 @@ ui_schema: '{{.ViewState.diag.Ui_schema}}', }, rules: { - name: ['required'] - namespace: ['required'] - json_schema: ['required'] + name: ['required'], + namespace: ['required'], + json_schema: ['required'], ui_schema: ['required'] }, formValidation: { diff --git a/web/layouts/vehicles/create-booking-diag.html b/web/layouts/vehicles/create-booking-diag.html index bbe3220..15382f7 100644 --- a/web/layouts/vehicles/create-booking-diag.html +++ b/web/layouts/vehicles/create-booking-diag.html @@ -13,9 +13,9 @@ ui_schema: null, }, rules: { - name: ['required'] - namespace: ['required'] - json_schema: ['required'] + name: ['required'], + namespace: ['required'], + json_schema: ['required'], ui_schema: ['required'] }, formValidation: { diff --git a/web/layouts/vehicles_management/create-vehicle-diag.html b/web/layouts/vehicles_management/create-vehicle-diag.html index 0f335c1..a11cca3 100644 --- a/web/layouts/vehicles_management/create-vehicle-diag.html +++ b/web/layouts/vehicles_management/create-vehicle-diag.html @@ -13,9 +13,9 @@ ui_schema: null, }, rules: { - name: ['required'] - namespace: ['required'] - json_schema: ['required'] + name: ['required'], + namespace: ['required'], + json_schema: ['required'], ui_schema: ['required'] }, formValidation: { From 42ba42f3a6dca67ffd32cd0b77d2872b95a588c8 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 13 Jan 2025 14:00:03 +0100 Subject: [PATCH 26/53] Edit update-diag.html --- web/layouts/diags/update-diag.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/layouts/diags/update-diag.html b/web/layouts/diags/update-diag.html index cb0da04..1c53e9e 100644 --- a/web/layouts/diags/update-diag.html +++ b/web/layouts/diags/update-diag.html @@ -8,7 +8,7 @@ x-data="{ fields: { name: '{{.ViewState.diag.Name}}', - namespace: 'parcoursmob_beneficiaries', + namespace: '{{.ViewState.diag.Namespace}}', json_schema: '{{.ViewState.diag.Json_schema}}', ui_schema: '{{.ViewState.diag.Ui_schema}}', }, @@ -64,7 +64,7 @@
    - +
    From 65c2f5243832b61af58a461e021669c0cb559311 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 10 Feb 2025 12:48:43 +0100 Subject: [PATCH 27/53] add Date for diags --- web/layouts/diags/display-diag.html | 4 ++++ web/layouts/diags/home.html | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/web/layouts/diags/display-diag.html b/web/layouts/diags/display-diag.html index 2725362..4f081eb 100644 --- a/web/layouts/diags/display-diag.html +++ b/web/layouts/diags/display-diag.html @@ -27,6 +27,10 @@
    +
    +
    Date du diagnostic
    +
    {{(timeFrom .ViewState.diag.Diagdate).Format "02/01/2006"}}
    +
    {{if eq .ViewState.diag.Namespace "parcoursmob_beneficiaries"}}
    Type
    diff --git a/web/layouts/diags/home.html b/web/layouts/diags/home.html index 1be304a..b358ad8 100644 --- a/web/layouts/diags/home.html +++ b/web/layouts/diags/home.html @@ -32,8 +32,8 @@ Type - - Actions + + Date Actions @@ -44,7 +44,6 @@ -
    {{.Name}}
    @@ -58,6 +57,9 @@
    Diagnostic véhicule réservé
    {{end}} + +
    {{(timeFrom .Diagdate).Format "02/01/2006"}}
    + {{if eq .Deleted true}}
    Diagnostic retiré
    From 038c256fc53c7cd7e4a2e40e33df05ebac102880 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 10 Feb 2025 13:07:41 +0100 Subject: [PATCH 28/53] add Date for diags in all pages --- .../beneficiaries/_partials/beneficiary-diags.html | 10 +++++++--- .../vehicles_management/_partials/booking-diags.html | 10 +++++++--- .../vehicles_management/_partials/vehicle-diags.html | 8 ++++++-- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/web/layouts/beneficiaries/_partials/beneficiary-diags.html b/web/layouts/beneficiaries/_partials/beneficiary-diags.html index 17a1707..4ed0fa2 100644 --- a/web/layouts/beneficiaries/_partials/beneficiary-diags.html +++ b/web/layouts/beneficiaries/_partials/beneficiary-diags.html @@ -29,11 +29,12 @@
    +
    +

    {{(timeFrom .Diagdate).Format "02/01/2006"}}

    +
    - - + {{end}} {{if eq .Deleted true}} @@ -41,6 +42,9 @@

    {{.Name}}

    +
    +

    {{(timeFrom .Diagdate).Format "02/01/2006"}}

    +

    Ce diagnostic a été retiré

    diff --git a/web/layouts/vehicles_management/_partials/booking-diags.html b/web/layouts/vehicles_management/_partials/booking-diags.html index bc778d8..d330481 100644 --- a/web/layouts/vehicles_management/_partials/booking-diags.html +++ b/web/layouts/vehicles_management/_partials/booking-diags.html @@ -27,11 +27,12 @@ +
    +

    {{(timeFrom .Diagdate).Format "02/01/2006"}}

    +
    - - + {{end}} {{if eq .Deleted true}} @@ -39,6 +40,9 @@

    {{.Name}}

    +
    +

    {{(timeFrom .Diagdate).Format "02/01/2006"}}

    +

    Ce diagnostique a été retiré

    diff --git a/web/layouts/vehicles_management/_partials/vehicle-diags.html b/web/layouts/vehicles_management/_partials/vehicle-diags.html index 2c5ab6a..12beeaf 100644 --- a/web/layouts/vehicles_management/_partials/vehicle-diags.html +++ b/web/layouts/vehicles_management/_partials/vehicle-diags.html @@ -26,12 +26,13 @@
  • {{.Name}} +
    +

    {{(timeFrom .Diagdate).Format "02/01/2006"}}

    +
    -
  • {{end}} {{if eq .Deleted true}} @@ -39,6 +40,9 @@

    {{.Name}}

    +
    +

    {{(timeFrom .Diagdate).Format "02/01/2006"}}

    +

    Ce diagnostique a été retiré

    From 89ffff594e9e8395a4422216ea676b4e6fba297f Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 10 Feb 2025 15:27:15 +0100 Subject: [PATCH 29/53] mask button Historique on diags --- web/layouts/diags/home.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/layouts/diags/home.html b/web/layouts/diags/home.html index b358ad8..ae7a699 100644 --- a/web/layouts/diags/home.html +++ b/web/layouts/diags/home.html @@ -6,7 +6,7 @@

    -
    +
    From 1f7515cf92adcb8352185f2739f1593e16367d19 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Mon, 10 Feb 2025 16:17:00 +0100 Subject: [PATCH 30/53] Add documents & delete JSON_Scheme and JSON_UI on diags --- config.yaml | 1 + web/layouts/beneficiaries/create-diag.html | 10 +- web/layouts/diags/_partials/diags-files.html | 132 ++++++++++++++++++ web/layouts/diags/display-diag.html | 16 ++- web/layouts/vehicles/create-booking-diag.html | 10 +- .../create-vehicle-diag.html | 10 +- 6 files changed, 153 insertions(+), 26 deletions(-) create mode 100644 web/layouts/diags/_partials/diags-files.html diff --git a/config.yaml b/config.yaml index e0e307d..9897eb3 100644 --- a/config.yaml +++ b/config.yaml @@ -191,6 +191,7 @@ views: display_diag: files: - web/layouts/diags/display-diag.html + - web/layouts/diags/_partials/diags-files.html delete: files: - web/layouts/diags/delete-diag.html diff --git a/web/layouts/beneficiaries/create-diag.html b/web/layouts/beneficiaries/create-diag.html index 6ebbf34..d91e96e 100644 --- a/web/layouts/beneficiaries/create-diag.html +++ b/web/layouts/beneficiaries/create-diag.html @@ -9,21 +9,15 @@ fields: { name: null, namespace: 'parcoursmob_beneficiaries', - json_schema: null, - ui_schema: null, }, rules: { name: ['required'], namespace: ['required'], - json_schema: ['required'], - ui_schema: ['required'] }, formValidation: { valid: false, fields: { name: {valid: null}, - json_schema: {valid: null}, - ui_schema: {valid: null}, } }, isFormValid: true, @@ -64,7 +58,7 @@
    -
    +
    +
    +
    +
    +

    Documents

    +
    +
    {{template "diags_files" .}}
    +
    +
    +
    +
    +
    {{ end }} \ No newline at end of file diff --git a/web/layouts/vehicles/create-booking-diag.html b/web/layouts/vehicles/create-booking-diag.html index 15382f7..8fd6d26 100644 --- a/web/layouts/vehicles/create-booking-diag.html +++ b/web/layouts/vehicles/create-booking-diag.html @@ -9,21 +9,15 @@ fields: { name: null, namespace: 'parcoursmob_bookings', - json_schema: null, - ui_schema: null, }, rules: { name: ['required'], namespace: ['required'], - json_schema: ['required'], - ui_schema: ['required'] }, formValidation: { valid: false, fields: { name: {valid: null}, - json_schema: {valid: null}, - ui_schema: {valid: null}, } }, isFormValid: true, @@ -64,7 +58,7 @@
    - -
    +

    Certains champs de sont pas valides.

    From 82773f090b4156462d9a7847d87e81e65447a3e0 Mon Sep 17 00:00:00 2001 From: Arnaud Delcasse Date: Fri, 28 Feb 2025 08:29:01 +0100 Subject: [PATCH 31/53] solidarity transport --- config.yaml | 98 +- web/assets/css/main.css | 17 +- .../_partials/address_autocomplete.html | 6 +- web/layouts/_partials/mainmenu.html | 4 +- web/layouts/agenda/home.html | 4 +- web/layouts/beneficiaries/display.html | 8 +- web/layouts/beneficiaries/list.html | 4 +- .../journeys/_partials/journeys-all.html | 34 +- .../journeys-solidarity-transport.html | 36 + web/layouts/journeys/search.html | 15 +- .../_partials/driver_availabilities.html | 84 + .../_partials/driver_documents.html | 136 + .../_partials/drivers_list.html | 55 + .../solidarity_transport/driver_create.html | 173 + .../solidarity_transport/driver_display.html | 138 + .../solidarity_transport/overview.html | 50 + web/layouts/vehicles/booking-display.html | 7 +- .../_partials/bookings-list.html | 2 +- .../_partials/vehicles-list.html | 4 +- .../vehicles_management/booking-display.html | 6 +- .../vehicles_management/fleet-display.html | 3 - web/node_modules/.bin/detect-libc | 1 + web/node_modules/.bin/jiti | 1 + web/node_modules/.bin/tailwindcss | 1 + web/node_modules/.package-lock.json | 345 + .../@parcel/watcher-linux-x64-glibc/LICENSE | 21 + .../@parcel/watcher-linux-x64-glibc/README.md | 1 + .../watcher-linux-x64-glibc/package.json | 33 + .../watcher-linux-x64-glibc/watcher.node | Bin 0 -> 514960 bytes web/node_modules/@parcel/watcher/LICENSE | 21 + web/node_modules/@parcel/watcher/README.md | 135 + web/node_modules/@parcel/watcher/binding.gyp | 93 + web/node_modules/@parcel/watcher/index.d.ts | 49 + web/node_modules/@parcel/watcher/index.js | 41 + .../@parcel/watcher/index.js.flow | 48 + web/node_modules/@parcel/watcher/package.json | 88 + .../watcher/scripts/build-from-source.js | 13 + .../@parcel/watcher/src/Backend.cc | 182 + .../@parcel/watcher/src/Backend.hh | 37 + .../@parcel/watcher/src/Debounce.cc | 113 + .../@parcel/watcher/src/Debounce.hh | 49 + .../@parcel/watcher/src/DirTree.cc | 152 + .../@parcel/watcher/src/DirTree.hh | 50 + web/node_modules/@parcel/watcher/src/Event.hh | 109 + web/node_modules/@parcel/watcher/src/Glob.cc | 22 + web/node_modules/@parcel/watcher/src/Glob.hh | 34 + .../@parcel/watcher/src/PromiseRunner.hh | 101 + .../@parcel/watcher/src/Signal.hh | 46 + .../@parcel/watcher/src/Watcher.cc | 237 + .../@parcel/watcher/src/Watcher.hh | 73 + .../@parcel/watcher/src/binding.cc | 268 + .../watcher/src/kqueue/KqueueBackend.cc | 306 + .../watcher/src/kqueue/KqueueBackend.hh | 35 + .../watcher/src/linux/InotifyBackend.cc | 232 + .../watcher/src/linux/InotifyBackend.hh | 34 + .../watcher/src/macos/FSEventsBackend.cc | 338 + .../watcher/src/macos/FSEventsBackend.hh | 20 + .../watcher/src/shared/BruteForceBackend.cc | 41 + .../watcher/src/shared/BruteForceBackend.hh | 25 + .../@parcel/watcher/src/unix/fts.cc | 50 + .../@parcel/watcher/src/unix/legacy.cc | 77 + .../@parcel/watcher/src/wasm/WasmBackend.cc | 132 + .../@parcel/watcher/src/wasm/WasmBackend.hh | 34 + .../@parcel/watcher/src/wasm/include.h | 74 + .../@parcel/watcher/src/watchman/BSER.cc | 302 + .../@parcel/watcher/src/watchman/BSER.hh | 69 + .../@parcel/watcher/src/watchman/IPC.hh | 175 + .../watcher/src/watchman/WatchmanBackend.cc | 338 + .../watcher/src/watchman/WatchmanBackend.hh | 35 + .../watcher/src/windows/WindowsBackend.cc | 282 + .../watcher/src/windows/WindowsBackend.hh | 18 + .../@parcel/watcher/src/windows/win_utils.cc | 44 + .../@parcel/watcher/src/windows/win_utils.hh | 11 + web/node_modules/@parcel/watcher/wrapper.js | 77 + web/node_modules/@tailwindcss/cli/LICENSE | 21 + web/node_modules/@tailwindcss/cli/README.md | 40 + .../@tailwindcss/cli/dist/index.mjs | 8 + .../@tailwindcss/cli/package.json | 41 + web/node_modules/@tailwindcss/node/LICENSE | 21 + web/node_modules/@tailwindcss/node/README.md | 40 + .../node/dist/esm-cache.loader.d.mts | 5 + .../node/dist/esm-cache.loader.mjs | 1 + .../@tailwindcss/node/dist/index.d.mts | 117 + .../@tailwindcss/node/dist/index.d.ts | 121 + .../@tailwindcss/node/dist/index.js | 15 + .../@tailwindcss/node/dist/index.mjs | 15 + .../@tailwindcss/node/dist/require-cache.d.ts | 3 + .../@tailwindcss/node/dist/require-cache.js | 1 + .../@tailwindcss/node/package.json | 44 + .../@tailwindcss/oxide-linux-x64-gnu/LICENSE | 21 + .../oxide-linux-x64-gnu/README.md | 3 + .../oxide-linux-x64-gnu/package.json | 30 + .../tailwindcss-oxide.linux-x64-gnu.node | Bin 0 -> 2249776 bytes web/node_modules/@tailwindcss/oxide/LICENSE | 21 + .../@tailwindcss/oxide/index.d.ts | 37 + web/node_modules/@tailwindcss/oxide/index.js | 315 + .../@tailwindcss/oxide/package.json | 63 + web/node_modules/braces/LICENSE | 21 + web/node_modules/braces/README.md | 586 + web/node_modules/braces/index.js | 170 + web/node_modules/braces/lib/compile.js | 60 + web/node_modules/braces/lib/constants.js | 57 + web/node_modules/braces/lib/expand.js | 113 + web/node_modules/braces/lib/parse.js | 331 + web/node_modules/braces/lib/stringify.js | 32 + web/node_modules/braces/lib/utils.js | 122 + web/node_modules/braces/package.json | 77 + web/node_modules/detect-libc/.npmignore | 7 + web/node_modules/detect-libc/LICENSE | 201 + web/node_modules/detect-libc/README.md | 78 + .../detect-libc/bin/detect-libc.js | 18 + .../detect-libc/lib/detect-libc.js | 92 + web/node_modules/detect-libc/package.json | 35 + web/node_modules/enhanced-resolve/LICENSE | 20 + web/node_modules/enhanced-resolve/README.md | 183 + .../enhanced-resolve/lib/AliasFieldPlugin.js | 108 + .../enhanced-resolve/lib/AliasPlugin.js | 183 + .../enhanced-resolve/lib/AppendPlugin.js | 49 + .../lib/CachedInputFileSystem.js | 664 + .../lib/CloneBasenamePlugin.js | 53 + .../enhanced-resolve/lib/ConditionalPlugin.js | 59 + .../lib/DescriptionFilePlugin.js | 98 + .../lib/DescriptionFileUtils.js | 201 + .../lib/DirectoryExistsPlugin.js | 63 + .../lib/ExportsFieldPlugin.js | 200 + .../lib/ExtensionAliasPlugin.js | 101 + .../enhanced-resolve/lib/FileExistsPlugin.js | 58 + .../lib/ImportsFieldPlugin.js | 223 + .../lib/JoinRequestPartPlugin.js | 75 + .../enhanced-resolve/lib/JoinRequestPlugin.js | 45 + .../enhanced-resolve/lib/LogInfoPlugin.js | 54 + .../enhanced-resolve/lib/MainFieldPlugin.js | 90 + .../ModulesInHierachicDirectoriesPlugin.js | 9 + .../ModulesInHierarchicalDirectoriesPlugin.js | 87 + .../lib/ModulesInRootPlugin.js | 49 + .../enhanced-resolve/lib/NextPlugin.js | 33 + .../enhanced-resolve/lib/ParsePlugin.js | 76 + .../enhanced-resolve/lib/PnpPlugin.js | 133 + .../enhanced-resolve/lib/Resolver.js | 800 ++ .../enhanced-resolve/lib/ResolverFactory.js | 728 ++ .../lib/RestrictionsPlugin.js | 70 + .../enhanced-resolve/lib/ResultPlugin.js | 42 + .../enhanced-resolve/lib/RootsPlugin.js | 69 + .../lib/SelfReferencePlugin.js | 82 + .../enhanced-resolve/lib/SymlinkPlugin.js | 100 + .../lib/SyncAsyncFileSystemDecorator.js | 220 + .../enhanced-resolve/lib/TryNextPlugin.js | 41 + .../enhanced-resolve/lib/UnsafeCachePlugin.js | 112 + .../enhanced-resolve/lib/UseFilePlugin.js | 55 + .../lib/createInnerContext.js | 46 + .../enhanced-resolve/lib/forEachBail.js | 50 + .../enhanced-resolve/lib/getInnerRequest.js | 36 + .../enhanced-resolve/lib/getPaths.js | 45 + .../enhanced-resolve/lib/index.js | 203 + .../enhanced-resolve/lib/util/entrypoints.js | 573 + .../enhanced-resolve/lib/util/identifier.js | 69 + .../lib/util/module-browser.js | 8 + .../enhanced-resolve/lib/util/path.js | 203 + .../lib/util/process-browser.js | 22 + .../enhanced-resolve/package.json | 72 + web/node_modules/enhanced-resolve/types.d.ts | 1135 ++ web/node_modules/fill-range/LICENSE | 21 + web/node_modules/fill-range/README.md | 237 + web/node_modules/fill-range/index.js | 248 + web/node_modules/fill-range/package.json | 74 + web/node_modules/graceful-fs/LICENSE | 15 + web/node_modules/graceful-fs/README.md | 143 + web/node_modules/graceful-fs/clone.js | 23 + web/node_modules/graceful-fs/graceful-fs.js | 448 + .../graceful-fs/legacy-streams.js | 118 + web/node_modules/graceful-fs/package.json | 53 + web/node_modules/graceful-fs/polyfills.js | 355 + web/node_modules/is-extglob/LICENSE | 21 + web/node_modules/is-extglob/README.md | 107 + web/node_modules/is-extglob/index.js | 20 + web/node_modules/is-extglob/package.json | 69 + web/node_modules/is-glob/LICENSE | 21 + web/node_modules/is-glob/README.md | 206 + web/node_modules/is-glob/index.js | 150 + web/node_modules/is-glob/package.json | 81 + web/node_modules/is-number/LICENSE | 21 + web/node_modules/is-number/README.md | 187 + web/node_modules/is-number/index.js | 18 + web/node_modules/is-number/package.json | 82 + web/node_modules/jiti/LICENSE | 21 + web/node_modules/jiti/README.md | 235 + web/node_modules/jiti/dist/babel.cjs | 246 + web/node_modules/jiti/dist/jiti.cjs | 1 + web/node_modules/jiti/lib/jiti-cli.mjs | 34 + web/node_modules/jiti/lib/jiti-hooks.mjs | 117 + web/node_modules/jiti/lib/jiti-native.mjs | 121 + web/node_modules/jiti/lib/jiti-register.d.mts | 1 + web/node_modules/jiti/lib/jiti-register.mjs | 4 + web/node_modules/jiti/lib/jiti.cjs | 23 + web/node_modules/jiti/lib/jiti.d.cts | 8 + web/node_modules/jiti/lib/jiti.d.mts | 8 + web/node_modules/jiti/lib/jiti.mjs | 22 + web/node_modules/jiti/lib/types.d.ts | 260 + web/node_modules/jiti/package.json | 134 + .../lightningcss-linux-x64-gnu/LICENSE | 373 + .../lightningcss-linux-x64-gnu/README.md | 1 + .../lightningcss.linux-x64-gnu.node | Bin 0 -> 9145136 bytes .../lightningcss-linux-x64-gnu/package.json | 38 + web/node_modules/lightningcss/LICENSE | 373 + web/node_modules/lightningcss/README.md | 105 + web/node_modules/lightningcss/node/ast.d.ts | 9712 +++++++++++++++ .../lightningcss/node/ast.js.flow | 10342 ++++++++++++++++ .../node/browserslistToTargets.js | 48 + .../lightningcss/node/composeVisitors.js | 442 + web/node_modules/lightningcss/node/flags.js | 28 + web/node_modules/lightningcss/node/index.d.ts | 477 + web/node_modules/lightningcss/node/index.js | 27 + .../lightningcss/node/index.js.flow | 824 ++ web/node_modules/lightningcss/node/index.mjs | 4 + .../lightningcss/node/targets.d.ts | 40 + .../lightningcss/node/targets.js.flow | 39 + web/node_modules/lightningcss/package.json | 110 + web/node_modules/micromatch/LICENSE | 21 + web/node_modules/micromatch/README.md | 1024 ++ web/node_modules/micromatch/index.js | 474 + web/node_modules/micromatch/package.json | 119 + web/node_modules/mri/index.d.ts | 21 + web/node_modules/mri/lib/index.js | 119 + web/node_modules/mri/lib/index.mjs | 119 + web/node_modules/mri/license.md | 21 + web/node_modules/mri/package.json | 43 + web/node_modules/mri/readme.md | 166 + web/node_modules/node-addon-api/LICENSE.md | 9 + web/node_modules/node-addon-api/README.md | 319 + web/node_modules/node-addon-api/common.gypi | 20 + web/node_modules/node-addon-api/except.gypi | 25 + web/node_modules/node-addon-api/index.js | 12 + .../node-addon-api/napi-inl.deprecated.h | 186 + web/node_modules/node-addon-api/napi-inl.h | 6607 ++++++++++ web/node_modules/node-addon-api/napi.h | 3201 +++++ .../node-addon-api/node_addon_api.gyp | 32 + web/node_modules/node-addon-api/node_api.gyp | 9 + web/node_modules/node-addon-api/noexcept.gypi | 26 + web/node_modules/node-addon-api/nothing.c | 0 .../node-addon-api/package-support.json | 21 + web/node_modules/node-addon-api/package.json | 480 + .../node-addon-api/tools/README.md | 73 + .../node-addon-api/tools/check-napi.js | 99 + .../node-addon-api/tools/clang-format.js | 71 + .../node-addon-api/tools/conversion.js | 301 + .../node-addon-api/tools/eslint-format.js | 79 + web/node_modules/picocolors/LICENSE | 15 + web/node_modules/picocolors/README.md | 21 + web/node_modules/picocolors/package.json | 25 + .../picocolors/picocolors.browser.js | 4 + web/node_modules/picocolors/picocolors.d.ts | 5 + web/node_modules/picocolors/picocolors.js | 75 + web/node_modules/picocolors/types.d.ts | 51 + web/node_modules/picomatch/CHANGELOG.md | 136 + web/node_modules/picomatch/LICENSE | 21 + web/node_modules/picomatch/README.md | 708 ++ web/node_modules/picomatch/index.js | 3 + web/node_modules/picomatch/lib/constants.js | 179 + web/node_modules/picomatch/lib/parse.js | 1091 ++ web/node_modules/picomatch/lib/picomatch.js | 342 + web/node_modules/picomatch/lib/scan.js | 391 + web/node_modules/picomatch/lib/utils.js | 64 + web/node_modules/picomatch/package.json | 81 + web/node_modules/tailwindcss/LICENSE | 21 + web/node_modules/tailwindcss/README.md | 40 + .../tailwindcss/dist/chunk-6EETJT7O.mjs | 12 + .../tailwindcss/dist/chunk-AZANAYY2.mjs | 1 + .../tailwindcss/dist/chunk-V2K3XTS4.mjs | 1 + .../tailwindcss/dist/colors-b_6i0Oi7.d.ts | 295 + .../tailwindcss/dist/colors.d.mts | 295 + web/node_modules/tailwindcss/dist/colors.d.ts | 5 + web/node_modules/tailwindcss/dist/colors.js | 1 + web/node_modules/tailwindcss/dist/colors.mjs | 1 + .../tailwindcss/dist/default-theme.d.mts | 1147 ++ .../tailwindcss/dist/default-theme.d.ts | 1147 ++ .../tailwindcss/dist/default-theme.js | 1 + .../tailwindcss/dist/default-theme.mjs | 1 + .../dist/flatten-color-palette.d.mts | 6 + .../dist/flatten-color-palette.d.ts | 6 + .../tailwindcss/dist/flatten-color-palette.js | 1 + .../dist/flatten-color-palette.mjs | 1 + web/node_modules/tailwindcss/dist/lib.d.mts | 263 + web/node_modules/tailwindcss/dist/lib.d.ts | 3 + web/node_modules/tailwindcss/dist/lib.js | 33 + web/node_modules/tailwindcss/dist/lib.mjs | 22 + .../tailwindcss/dist/plugin.d.mts | 11 + web/node_modules/tailwindcss/dist/plugin.d.ts | 104 + web/node_modules/tailwindcss/dist/plugin.js | 1 + web/node_modules/tailwindcss/dist/plugin.mjs | 1 + .../dist/resolve-config-BIFUA2FY.d.ts | 29 + .../dist/resolve-config-QUZ9b-Gn.d.mts | 190 + .../tailwindcss/dist/types-B254mqw1.d.mts | 98 + web/node_modules/tailwindcss/index.css | 865 ++ web/node_modules/tailwindcss/package.json | 86 + web/node_modules/tailwindcss/preflight.css | 383 + web/node_modules/tailwindcss/theme.css | 453 + web/node_modules/tailwindcss/utilities.css | 1 + web/node_modules/tapable/LICENSE | 21 + web/node_modules/tapable/README.md | 296 + .../tapable/lib/AsyncParallelBailHook.js | 85 + .../tapable/lib/AsyncParallelHook.js | 37 + .../tapable/lib/AsyncSeriesBailHook.js | 42 + .../tapable/lib/AsyncSeriesHook.js | 37 + .../tapable/lib/AsyncSeriesLoopHook.js | 37 + .../tapable/lib/AsyncSeriesWaterfallHook.js | 47 + web/node_modules/tapable/lib/Hook.js | 175 + .../tapable/lib/HookCodeFactory.js | 468 + web/node_modules/tapable/lib/HookMap.js | 61 + web/node_modules/tapable/lib/MultiHook.js | 54 + web/node_modules/tapable/lib/SyncBailHook.js | 51 + web/node_modules/tapable/lib/SyncHook.js | 46 + web/node_modules/tapable/lib/SyncLoopHook.js | 46 + .../tapable/lib/SyncWaterfallHook.js | 57 + web/node_modules/tapable/lib/index.js | 19 + web/node_modules/tapable/lib/util-browser.js | 16 + web/node_modules/tapable/package.json | 44 + web/node_modules/tapable/tapable.d.ts | 116 + web/node_modules/to-regex-range/LICENSE | 21 + web/node_modules/to-regex-range/README.md | 305 + web/node_modules/to-regex-range/index.js | 288 + web/node_modules/to-regex-range/package.json | 88 + web/package-lock.json | 931 ++ web/package.json | 6 + web/public/css/main.css | 6568 +++++----- 324 files changed, 73119 insertions(+), 2888 deletions(-) create mode 100644 web/layouts/journeys/_partials/journeys-solidarity-transport.html create mode 100644 web/layouts/solidarity_transport/_partials/driver_availabilities.html create mode 100644 web/layouts/solidarity_transport/_partials/driver_documents.html create mode 100644 web/layouts/solidarity_transport/_partials/drivers_list.html create mode 100644 web/layouts/solidarity_transport/driver_create.html create mode 100644 web/layouts/solidarity_transport/driver_display.html create mode 100644 web/layouts/solidarity_transport/overview.html create mode 120000 web/node_modules/.bin/detect-libc create mode 120000 web/node_modules/.bin/jiti create mode 120000 web/node_modules/.bin/tailwindcss create mode 100644 web/node_modules/.package-lock.json create mode 100644 web/node_modules/@parcel/watcher-linux-x64-glibc/LICENSE create mode 100644 web/node_modules/@parcel/watcher-linux-x64-glibc/README.md create mode 100644 web/node_modules/@parcel/watcher-linux-x64-glibc/package.json create mode 100644 web/node_modules/@parcel/watcher-linux-x64-glibc/watcher.node create mode 100644 web/node_modules/@parcel/watcher/LICENSE create mode 100644 web/node_modules/@parcel/watcher/README.md create mode 100644 web/node_modules/@parcel/watcher/binding.gyp create mode 100644 web/node_modules/@parcel/watcher/index.d.ts create mode 100644 web/node_modules/@parcel/watcher/index.js create mode 100644 web/node_modules/@parcel/watcher/index.js.flow create mode 100644 web/node_modules/@parcel/watcher/package.json create mode 100644 web/node_modules/@parcel/watcher/scripts/build-from-source.js create mode 100644 web/node_modules/@parcel/watcher/src/Backend.cc create mode 100644 web/node_modules/@parcel/watcher/src/Backend.hh create mode 100644 web/node_modules/@parcel/watcher/src/Debounce.cc create mode 100644 web/node_modules/@parcel/watcher/src/Debounce.hh create mode 100644 web/node_modules/@parcel/watcher/src/DirTree.cc create mode 100644 web/node_modules/@parcel/watcher/src/DirTree.hh create mode 100644 web/node_modules/@parcel/watcher/src/Event.hh create mode 100644 web/node_modules/@parcel/watcher/src/Glob.cc create mode 100644 web/node_modules/@parcel/watcher/src/Glob.hh create mode 100644 web/node_modules/@parcel/watcher/src/PromiseRunner.hh create mode 100644 web/node_modules/@parcel/watcher/src/Signal.hh create mode 100644 web/node_modules/@parcel/watcher/src/Watcher.cc create mode 100644 web/node_modules/@parcel/watcher/src/Watcher.hh create mode 100644 web/node_modules/@parcel/watcher/src/binding.cc create mode 100644 web/node_modules/@parcel/watcher/src/kqueue/KqueueBackend.cc create mode 100644 web/node_modules/@parcel/watcher/src/kqueue/KqueueBackend.hh create mode 100644 web/node_modules/@parcel/watcher/src/linux/InotifyBackend.cc create mode 100644 web/node_modules/@parcel/watcher/src/linux/InotifyBackend.hh create mode 100644 web/node_modules/@parcel/watcher/src/macos/FSEventsBackend.cc create mode 100644 web/node_modules/@parcel/watcher/src/macos/FSEventsBackend.hh create mode 100644 web/node_modules/@parcel/watcher/src/shared/BruteForceBackend.cc create mode 100644 web/node_modules/@parcel/watcher/src/shared/BruteForceBackend.hh create mode 100644 web/node_modules/@parcel/watcher/src/unix/fts.cc create mode 100644 web/node_modules/@parcel/watcher/src/unix/legacy.cc create mode 100644 web/node_modules/@parcel/watcher/src/wasm/WasmBackend.cc create mode 100644 web/node_modules/@parcel/watcher/src/wasm/WasmBackend.hh create mode 100644 web/node_modules/@parcel/watcher/src/wasm/include.h create mode 100644 web/node_modules/@parcel/watcher/src/watchman/BSER.cc create mode 100644 web/node_modules/@parcel/watcher/src/watchman/BSER.hh create mode 100644 web/node_modules/@parcel/watcher/src/watchman/IPC.hh create mode 100644 web/node_modules/@parcel/watcher/src/watchman/WatchmanBackend.cc create mode 100644 web/node_modules/@parcel/watcher/src/watchman/WatchmanBackend.hh create mode 100644 web/node_modules/@parcel/watcher/src/windows/WindowsBackend.cc create mode 100644 web/node_modules/@parcel/watcher/src/windows/WindowsBackend.hh create mode 100644 web/node_modules/@parcel/watcher/src/windows/win_utils.cc create mode 100644 web/node_modules/@parcel/watcher/src/windows/win_utils.hh create mode 100644 web/node_modules/@parcel/watcher/wrapper.js create mode 100644 web/node_modules/@tailwindcss/cli/LICENSE create mode 100644 web/node_modules/@tailwindcss/cli/README.md create mode 100755 web/node_modules/@tailwindcss/cli/dist/index.mjs create mode 100644 web/node_modules/@tailwindcss/cli/package.json create mode 100644 web/node_modules/@tailwindcss/node/LICENSE create mode 100644 web/node_modules/@tailwindcss/node/README.md create mode 100644 web/node_modules/@tailwindcss/node/dist/esm-cache.loader.d.mts create mode 100644 web/node_modules/@tailwindcss/node/dist/esm-cache.loader.mjs create mode 100644 web/node_modules/@tailwindcss/node/dist/index.d.mts create mode 100644 web/node_modules/@tailwindcss/node/dist/index.d.ts create mode 100644 web/node_modules/@tailwindcss/node/dist/index.js create mode 100644 web/node_modules/@tailwindcss/node/dist/index.mjs create mode 100644 web/node_modules/@tailwindcss/node/dist/require-cache.d.ts create mode 100644 web/node_modules/@tailwindcss/node/dist/require-cache.js create mode 100644 web/node_modules/@tailwindcss/node/package.json create mode 100644 web/node_modules/@tailwindcss/oxide-linux-x64-gnu/LICENSE create mode 100644 web/node_modules/@tailwindcss/oxide-linux-x64-gnu/README.md create mode 100644 web/node_modules/@tailwindcss/oxide-linux-x64-gnu/package.json create mode 100644 web/node_modules/@tailwindcss/oxide-linux-x64-gnu/tailwindcss-oxide.linux-x64-gnu.node create mode 100644 web/node_modules/@tailwindcss/oxide/LICENSE create mode 100644 web/node_modules/@tailwindcss/oxide/index.d.ts create mode 100644 web/node_modules/@tailwindcss/oxide/index.js create mode 100644 web/node_modules/@tailwindcss/oxide/package.json create mode 100644 web/node_modules/braces/LICENSE create mode 100644 web/node_modules/braces/README.md create mode 100644 web/node_modules/braces/index.js create mode 100644 web/node_modules/braces/lib/compile.js create mode 100644 web/node_modules/braces/lib/constants.js create mode 100644 web/node_modules/braces/lib/expand.js create mode 100644 web/node_modules/braces/lib/parse.js create mode 100644 web/node_modules/braces/lib/stringify.js create mode 100644 web/node_modules/braces/lib/utils.js create mode 100644 web/node_modules/braces/package.json create mode 100644 web/node_modules/detect-libc/.npmignore create mode 100644 web/node_modules/detect-libc/LICENSE create mode 100644 web/node_modules/detect-libc/README.md create mode 100755 web/node_modules/detect-libc/bin/detect-libc.js create mode 100644 web/node_modules/detect-libc/lib/detect-libc.js create mode 100644 web/node_modules/detect-libc/package.json create mode 100644 web/node_modules/enhanced-resolve/LICENSE create mode 100644 web/node_modules/enhanced-resolve/README.md create mode 100644 web/node_modules/enhanced-resolve/lib/AliasFieldPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/AliasPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/AppendPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/CachedInputFileSystem.js create mode 100644 web/node_modules/enhanced-resolve/lib/CloneBasenamePlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ConditionalPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/DescriptionFilePlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/DescriptionFileUtils.js create mode 100644 web/node_modules/enhanced-resolve/lib/DirectoryExistsPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ExportsFieldPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ExtensionAliasPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/FileExistsPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ImportsFieldPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/JoinRequestPartPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/JoinRequestPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/LogInfoPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/MainFieldPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ModulesInHierachicDirectoriesPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ModulesInHierarchicalDirectoriesPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ModulesInRootPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/NextPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ParsePlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/PnpPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/Resolver.js create mode 100644 web/node_modules/enhanced-resolve/lib/ResolverFactory.js create mode 100644 web/node_modules/enhanced-resolve/lib/RestrictionsPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/ResultPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/RootsPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/SelfReferencePlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/SymlinkPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/SyncAsyncFileSystemDecorator.js create mode 100644 web/node_modules/enhanced-resolve/lib/TryNextPlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/UnsafeCachePlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/UseFilePlugin.js create mode 100644 web/node_modules/enhanced-resolve/lib/createInnerContext.js create mode 100644 web/node_modules/enhanced-resolve/lib/forEachBail.js create mode 100644 web/node_modules/enhanced-resolve/lib/getInnerRequest.js create mode 100644 web/node_modules/enhanced-resolve/lib/getPaths.js create mode 100644 web/node_modules/enhanced-resolve/lib/index.js create mode 100644 web/node_modules/enhanced-resolve/lib/util/entrypoints.js create mode 100644 web/node_modules/enhanced-resolve/lib/util/identifier.js create mode 100644 web/node_modules/enhanced-resolve/lib/util/module-browser.js create mode 100644 web/node_modules/enhanced-resolve/lib/util/path.js create mode 100644 web/node_modules/enhanced-resolve/lib/util/process-browser.js create mode 100644 web/node_modules/enhanced-resolve/package.json create mode 100644 web/node_modules/enhanced-resolve/types.d.ts create mode 100644 web/node_modules/fill-range/LICENSE create mode 100644 web/node_modules/fill-range/README.md create mode 100644 web/node_modules/fill-range/index.js create mode 100644 web/node_modules/fill-range/package.json create mode 100644 web/node_modules/graceful-fs/LICENSE create mode 100644 web/node_modules/graceful-fs/README.md create mode 100644 web/node_modules/graceful-fs/clone.js create mode 100644 web/node_modules/graceful-fs/graceful-fs.js create mode 100644 web/node_modules/graceful-fs/legacy-streams.js create mode 100644 web/node_modules/graceful-fs/package.json create mode 100644 web/node_modules/graceful-fs/polyfills.js create mode 100644 web/node_modules/is-extglob/LICENSE create mode 100644 web/node_modules/is-extglob/README.md create mode 100644 web/node_modules/is-extglob/index.js create mode 100644 web/node_modules/is-extglob/package.json create mode 100644 web/node_modules/is-glob/LICENSE create mode 100644 web/node_modules/is-glob/README.md create mode 100644 web/node_modules/is-glob/index.js create mode 100644 web/node_modules/is-glob/package.json create mode 100644 web/node_modules/is-number/LICENSE create mode 100644 web/node_modules/is-number/README.md create mode 100644 web/node_modules/is-number/index.js create mode 100644 web/node_modules/is-number/package.json create mode 100644 web/node_modules/jiti/LICENSE create mode 100644 web/node_modules/jiti/README.md create mode 100644 web/node_modules/jiti/dist/babel.cjs create mode 100644 web/node_modules/jiti/dist/jiti.cjs create mode 100755 web/node_modules/jiti/lib/jiti-cli.mjs create mode 100644 web/node_modules/jiti/lib/jiti-hooks.mjs create mode 100644 web/node_modules/jiti/lib/jiti-native.mjs create mode 100644 web/node_modules/jiti/lib/jiti-register.d.mts create mode 100644 web/node_modules/jiti/lib/jiti-register.mjs create mode 100644 web/node_modules/jiti/lib/jiti.cjs create mode 100644 web/node_modules/jiti/lib/jiti.d.cts create mode 100644 web/node_modules/jiti/lib/jiti.d.mts create mode 100644 web/node_modules/jiti/lib/jiti.mjs create mode 100644 web/node_modules/jiti/lib/types.d.ts create mode 100644 web/node_modules/jiti/package.json create mode 100644 web/node_modules/lightningcss-linux-x64-gnu/LICENSE create mode 100644 web/node_modules/lightningcss-linux-x64-gnu/README.md create mode 100644 web/node_modules/lightningcss-linux-x64-gnu/lightningcss.linux-x64-gnu.node create mode 100644 web/node_modules/lightningcss-linux-x64-gnu/package.json create mode 100644 web/node_modules/lightningcss/LICENSE create mode 100644 web/node_modules/lightningcss/README.md create mode 100644 web/node_modules/lightningcss/node/ast.d.ts create mode 100644 web/node_modules/lightningcss/node/ast.js.flow create mode 100644 web/node_modules/lightningcss/node/browserslistToTargets.js create mode 100644 web/node_modules/lightningcss/node/composeVisitors.js create mode 100644 web/node_modules/lightningcss/node/flags.js create mode 100644 web/node_modules/lightningcss/node/index.d.ts create mode 100644 web/node_modules/lightningcss/node/index.js create mode 100644 web/node_modules/lightningcss/node/index.js.flow create mode 100644 web/node_modules/lightningcss/node/index.mjs create mode 100644 web/node_modules/lightningcss/node/targets.d.ts create mode 100644 web/node_modules/lightningcss/node/targets.js.flow create mode 100644 web/node_modules/lightningcss/package.json create mode 100755 web/node_modules/micromatch/LICENSE create mode 100644 web/node_modules/micromatch/README.md create mode 100644 web/node_modules/micromatch/index.js create mode 100644 web/node_modules/micromatch/package.json create mode 100644 web/node_modules/mri/index.d.ts create mode 100644 web/node_modules/mri/lib/index.js create mode 100644 web/node_modules/mri/lib/index.mjs create mode 100644 web/node_modules/mri/license.md create mode 100644 web/node_modules/mri/package.json create mode 100644 web/node_modules/mri/readme.md create mode 100644 web/node_modules/node-addon-api/LICENSE.md create mode 100644 web/node_modules/node-addon-api/README.md create mode 100644 web/node_modules/node-addon-api/common.gypi create mode 100644 web/node_modules/node-addon-api/except.gypi create mode 100644 web/node_modules/node-addon-api/index.js create mode 100644 web/node_modules/node-addon-api/napi-inl.deprecated.h create mode 100644 web/node_modules/node-addon-api/napi-inl.h create mode 100644 web/node_modules/node-addon-api/napi.h create mode 100644 web/node_modules/node-addon-api/node_addon_api.gyp create mode 100644 web/node_modules/node-addon-api/node_api.gyp create mode 100644 web/node_modules/node-addon-api/noexcept.gypi create mode 100644 web/node_modules/node-addon-api/nothing.c create mode 100644 web/node_modules/node-addon-api/package-support.json create mode 100644 web/node_modules/node-addon-api/package.json create mode 100644 web/node_modules/node-addon-api/tools/README.md create mode 100644 web/node_modules/node-addon-api/tools/check-napi.js create mode 100644 web/node_modules/node-addon-api/tools/clang-format.js create mode 100755 web/node_modules/node-addon-api/tools/conversion.js create mode 100644 web/node_modules/node-addon-api/tools/eslint-format.js create mode 100644 web/node_modules/picocolors/LICENSE create mode 100644 web/node_modules/picocolors/README.md create mode 100644 web/node_modules/picocolors/package.json create mode 100644 web/node_modules/picocolors/picocolors.browser.js create mode 100644 web/node_modules/picocolors/picocolors.d.ts create mode 100644 web/node_modules/picocolors/picocolors.js create mode 100644 web/node_modules/picocolors/types.d.ts create mode 100644 web/node_modules/picomatch/CHANGELOG.md create mode 100644 web/node_modules/picomatch/LICENSE create mode 100644 web/node_modules/picomatch/README.md create mode 100644 web/node_modules/picomatch/index.js create mode 100644 web/node_modules/picomatch/lib/constants.js create mode 100644 web/node_modules/picomatch/lib/parse.js create mode 100644 web/node_modules/picomatch/lib/picomatch.js create mode 100644 web/node_modules/picomatch/lib/scan.js create mode 100644 web/node_modules/picomatch/lib/utils.js create mode 100644 web/node_modules/picomatch/package.json create mode 100644 web/node_modules/tailwindcss/LICENSE create mode 100644 web/node_modules/tailwindcss/README.md create mode 100644 web/node_modules/tailwindcss/dist/chunk-6EETJT7O.mjs create mode 100644 web/node_modules/tailwindcss/dist/chunk-AZANAYY2.mjs create mode 100644 web/node_modules/tailwindcss/dist/chunk-V2K3XTS4.mjs create mode 100644 web/node_modules/tailwindcss/dist/colors-b_6i0Oi7.d.ts create mode 100644 web/node_modules/tailwindcss/dist/colors.d.mts create mode 100644 web/node_modules/tailwindcss/dist/colors.d.ts create mode 100644 web/node_modules/tailwindcss/dist/colors.js create mode 100644 web/node_modules/tailwindcss/dist/colors.mjs create mode 100644 web/node_modules/tailwindcss/dist/default-theme.d.mts create mode 100644 web/node_modules/tailwindcss/dist/default-theme.d.ts create mode 100644 web/node_modules/tailwindcss/dist/default-theme.js create mode 100644 web/node_modules/tailwindcss/dist/default-theme.mjs create mode 100644 web/node_modules/tailwindcss/dist/flatten-color-palette.d.mts create mode 100644 web/node_modules/tailwindcss/dist/flatten-color-palette.d.ts create mode 100644 web/node_modules/tailwindcss/dist/flatten-color-palette.js create mode 100644 web/node_modules/tailwindcss/dist/flatten-color-palette.mjs create mode 100644 web/node_modules/tailwindcss/dist/lib.d.mts create mode 100644 web/node_modules/tailwindcss/dist/lib.d.ts create mode 100644 web/node_modules/tailwindcss/dist/lib.js create mode 100644 web/node_modules/tailwindcss/dist/lib.mjs create mode 100644 web/node_modules/tailwindcss/dist/plugin.d.mts create mode 100644 web/node_modules/tailwindcss/dist/plugin.d.ts create mode 100644 web/node_modules/tailwindcss/dist/plugin.js create mode 100644 web/node_modules/tailwindcss/dist/plugin.mjs create mode 100644 web/node_modules/tailwindcss/dist/resolve-config-BIFUA2FY.d.ts create mode 100644 web/node_modules/tailwindcss/dist/resolve-config-QUZ9b-Gn.d.mts create mode 100644 web/node_modules/tailwindcss/dist/types-B254mqw1.d.mts create mode 100644 web/node_modules/tailwindcss/index.css create mode 100644 web/node_modules/tailwindcss/package.json create mode 100644 web/node_modules/tailwindcss/preflight.css create mode 100644 web/node_modules/tailwindcss/theme.css create mode 100644 web/node_modules/tailwindcss/utilities.css create mode 100644 web/node_modules/tapable/LICENSE create mode 100644 web/node_modules/tapable/README.md create mode 100644 web/node_modules/tapable/lib/AsyncParallelBailHook.js create mode 100644 web/node_modules/tapable/lib/AsyncParallelHook.js create mode 100644 web/node_modules/tapable/lib/AsyncSeriesBailHook.js create mode 100644 web/node_modules/tapable/lib/AsyncSeriesHook.js create mode 100644 web/node_modules/tapable/lib/AsyncSeriesLoopHook.js create mode 100644 web/node_modules/tapable/lib/AsyncSeriesWaterfallHook.js create mode 100644 web/node_modules/tapable/lib/Hook.js create mode 100644 web/node_modules/tapable/lib/HookCodeFactory.js create mode 100644 web/node_modules/tapable/lib/HookMap.js create mode 100644 web/node_modules/tapable/lib/MultiHook.js create mode 100644 web/node_modules/tapable/lib/SyncBailHook.js create mode 100644 web/node_modules/tapable/lib/SyncHook.js create mode 100644 web/node_modules/tapable/lib/SyncLoopHook.js create mode 100644 web/node_modules/tapable/lib/SyncWaterfallHook.js create mode 100644 web/node_modules/tapable/lib/index.js create mode 100644 web/node_modules/tapable/lib/util-browser.js create mode 100644 web/node_modules/tapable/package.json create mode 100644 web/node_modules/tapable/tapable.d.ts create mode 100644 web/node_modules/to-regex-range/LICENSE create mode 100644 web/node_modules/to-regex-range/README.md create mode 100644 web/node_modules/to-regex-range/index.js create mode 100644 web/node_modules/to-regex-range/package.json create mode 100644 web/package-lock.json create mode 100644 web/package.json diff --git a/config.yaml b/config.yaml index 9897eb3..24cce69 100644 --- a/config.yaml +++ b/config.yaml @@ -3,7 +3,7 @@ name: PARCOURSMOB views: generic: files: - - web/layouts/layout.html + - web/layouts/layout.html - web/layouts/_partials/mainmenu.html dashboard: files: @@ -55,17 +55,17 @@ views: - web/layouts/administration/_partials/group_members.html - web/layouts/group/settings.html vehicles: - search: - files: + search: + files: - web/layouts/_partials/address_autocomplete.html - web/layouts/vehicles_management/_partials/vehicle-type-select.html - web/layouts/vehicles/search.html - booking_display: - files: + booking_display: + files: - web/layouts/vehicles/booking-display.html - web/layouts/vehicles_management/_partials/booking-diags.html - bookings_list: - files: + bookings_list: + files: - web/layouts/vehicles_management/_partials/bookings-list.html - web/layouts/vehicles/bookings-list.html create_booking_diag: @@ -77,8 +77,8 @@ views: - web/layouts/vehicles_management/_partials/bookings-list.html - web/layouts/vehicles_management/_partials/vehicles-list.html - web/layouts/vehicles_management/overview.html - bookings_list: - files: + bookings_list: + files: - web/layouts/vehicles_management/_partials/bookings-list.html - web/layouts/vehicles_management/bookings-list.html fleet_add: @@ -96,12 +96,12 @@ views: - web/layouts/_partials/address_autocomplete.html - web/layouts/vehicles_management/_partials/vehicle-type-select.html - web/layouts/vehicles_management/fleet-update.html - booking_display: - files: + booking_display: + files: - web/layouts/vehicles_management/booking-display.html - web/layouts/vehicles_management/_partials/booking-diags.html - delete_booking: - files: + delete_booking: + files: - web/layouts/vehicles_management/delete-booking.html create_vehicle_diag: files: @@ -109,25 +109,25 @@ views: create_booking_diag: files: - web/layouts/vehicles_management/create-booking-diag.html - agenda: - list: - files: + agenda: + list: + files: - web/layouts/agenda/home.html - history: - files: + history: + files: - web/layouts/agenda/history.html - display_event: - files: + display_event: + files: - web/layouts/agenda/_partials/subscribers-table.html - web/layouts/agenda/display-event.html - web/layouts/agenda/_partials/event-files.html - create_event: - files: + create_event: + files: - web/layouts/_partials/address_autocomplete.html - web/layouts/agenda/create-event.html - web/layouts/agenda/_partials/event-files.html - delete_subscriber: - files: + delete_subscriber: + files: - web/layouts/agenda/delete-subscriber.html history_event: files: @@ -140,18 +140,19 @@ views: delete: files: - web/layouts/agenda/delete-event.html - directory: - home: - files: + directory: + home: + files: - web/layouts/directory/home.html - journeys: - search: - files: + journeys: + search: + files: - web/layouts/_partials/address_autocomplete.html - web/layouts/journeys/_partials/journeys-all.html - web/layouts/journeys/_partials/journeys-others.html - web/layouts/journeys/_partials/journeys-carpool.html - web/layouts/journeys/_partials/journeys-public-transit.html + - web/layouts/journeys/_partials/journeys-solidarity-transport.html - web/layouts/journeys/search.html list: files: @@ -180,7 +181,7 @@ views: files: - web/layouts/_partials/address_autocomplete.html - web/layouts/group_module/create_group.html - + display_group: files: - web/layouts/group_module/display_group.html @@ -202,6 +203,21 @@ views: files: - web/layouts/diags/history-diags.html + solidarity_transport: + overview: + files: + - web/layouts/solidarity_transport/_partials/drivers_list.html + - web/layouts/solidarity_transport/overview.html + driver_create: + files: + - web/layouts/_partials/address_autocomplete.html + - web/layouts/solidarity_transport/driver_create.html + driver_display: + files: + - web/layouts/solidarity_transport/_partials/driver_availabilities.html + - web/layouts/solidarity_transport/_partials/driver_documents.html + - web/layouts/solidarity_transport/driver_display.html + administration: home: files: @@ -227,7 +243,7 @@ views: files: - web/layouts/administration/_partials/bookings_list.html - web/layouts/administration/bookings_stats.html - settings: + settings: files: - web/layouts/administration/_partials/groups_admins.html - web/layouts/administration/_partials/group_members.html @@ -237,21 +253,21 @@ views: files: - web/layouts/auth/groups.html lost_password: - init: - files: + init: + files: - web/layouts/auth/lost-password-init.html - recover: + recover: form: - files: + files: - web/layouts/auth/lost-password-recover.html - ko: + ko: files: - web/layouts/auth/lost-password-recover-ko.html onboarding: form: files: - web/layouts/auth/onboarding.html - ko: + ko: files: - web/layouts/auth/onboarding-ko.html @@ -287,7 +303,7 @@ icons: tabler-icons:bus: emails: - onboarding: + onboarding: new_administrator: subject: PARCOURSMOB - Vous avez été invité comme administrateur files: @@ -308,10 +324,10 @@ emails: files: - emails/layout.html - emails/onboarding/existing-member.html - auth: + auth: retrieve_password: subject: PAROURSMOB - Réinitialisez votre mot de passe - files: + files: - emails/layout.html - emails/auth/retrieve-password.html fleets: diff --git a/web/assets/css/main.css b/web/assets/css/main.css index 15ab027..d7c2afd 100644 --- a/web/assets/css/main.css +++ b/web/assets/css/main.css @@ -1,6 +1,15 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; +@import "tailwindcss"; + +@theme { + --color-co-blue: #243887; + --color-co-lightblue: #907eff; + --color-co-red: #ff1300; + --color-co-green: #6cc11f; + --color-co-yellow: #ffdd00; + --color-co-orange: #ff5300; + + --radius-co: 40%; +} @font-face { font-family: "Manometer"; @@ -16,4 +25,4 @@ html { font-family: Bitter, serif; } -} \ No newline at end of file +} diff --git a/web/layouts/_partials/address_autocomplete.html b/web/layouts/_partials/address_autocomplete.html index 3ffd1b2..84e47c7 100644 --- a/web/layouts/_partials/address_autocomplete.html +++ b/web/layouts/_partials/address_autocomplete.html @@ -15,7 +15,7 @@ this.responselength = 0 return [] } - result = await fetch('https://geocode.ridygo.fr/v1/autocomplete/\?text=' + this.input) + result = await fetch('https://api.geocode.earth/v1/autocomplete/\?api_key=ge-4949288cd450ad31&text=' + this.input) json = await result.json() this.responselength = json['features'].length @@ -34,7 +34,7 @@ x-model="input">
      + class="absolute z-10 mt-1 w-full bg-white shadow-lg max-h-60 rounded-xl py-1 text-base overflow-auto focus:outline-none sm:text-sm" tabindex="-1" role="listbox" aria-labelledby="listbox-label" aria-activedescendant="listbox-option-3">