From d269edcfe455e12818166bd26a6fbd8ad839de57 Mon Sep 17 00:00:00 2001 From: Nicolas CARON Date: Wed, 8 Jan 2025 11:39:48 +0100 Subject: [PATCH 1/7] 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 @@
{{.Name}}
+ + + + 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 @@
{{.Name}}
+ + + + 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 @@
{{.Name}}
+ + + + 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 2/7] 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 3/7] 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 4/7] 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 5/7] 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 @@
{{.Name}}
+
+

{{(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 @@
{{.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é

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 6/7] 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 7/7] 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 @@
    -
    +

    Certains champs de sont pas valides.

    diff --git a/web/layouts/diags/_partials/diags-files.html b/web/layouts/diags/_partials/diags-files.html new file mode 100644 index 0000000..f3f2e5e --- /dev/null +++ b/web/layouts/diags/_partials/diags-files.html @@ -0,0 +1,132 @@ +{{define "diags_files"}} +
    + {{if eq (len .ViewState.documents) 0}} +

    Aucun document

    + {{end}} + + {{if gt (len .ViewState.documents) 0}} + +
    + + + + + + + + + + + {{range .ViewState.documents}} + + + + + + + {{end}} + + + + +
    Type + Actions +
    +
    + {{index $.ViewState.file_types_map .Metadata.Type}} +
    +     		{{.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/diags/display-diag.html b/web/layouts/diags/display-diag.html index 4f081eb..cfc5718 100644 --- a/web/layouts/diags/display-diag.html +++ b/web/layouts/diags/display-diag.html @@ -49,7 +49,7 @@
    Diagnostic véhicule réservé
    {{end}} - {{if .ViewState.diag.Json_schema}} +
    +
    +
    +
    +
    +

    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.

     diff --git a/web/layouts/vehicles_management/create-vehicle-diag.html b/web/layouts/vehicles_management/create-vehicle-diag.html index a11cca3..dc234af 100644 --- a/web/layouts/vehicles_management/create-vehicle-diag.html +++ b/web/layouts/vehicles_management/create-vehicle-diag.html @@ -9,21 +9,15 @@ fields: { name: null, namespace: 'parcoursmob_vehicles', - 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.