From 9ba34805076b43e0df8f67a5c10127eaec45ce1d Mon Sep 17 00:00:00 2001 From: soukainna Date: Wed, 22 Feb 2023 11:04:49 +0100 Subject: [PATCH 01/17] fix config yaml --- config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config.yaml b/config.yaml index 9344cc3..eef86a0 100644 --- a/config.yaml +++ b/config.yaml @@ -40,6 +40,9 @@ views: update: files: - web/layouts/members/update.html + list: + files: + - web/layouts/members/membersList.html vehicles: search: files: @@ -72,6 +75,9 @@ views: files: - web/layouts/vehicles_management/_partials/calendar.html - web/layouts/vehicles_management/fleet-display.html + unbooking_display: + files: + - web/layouts/vehicles_management/unbooking-display.html fleet_update: files: - web/layouts/_partials/address_autocomplete.html From 70186d13574b261bd6f08edcfc69e5185237b60a Mon Sep 17 00:00:00 2001 From: soukainna Date: Wed, 22 Feb 2023 11:05:36 +0100 Subject: [PATCH 02/17] add url to redirect sataistique page --- web/layouts/administration/home.html | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/web/layouts/administration/home.html b/web/layouts/administration/home.html index 8c47e1f..1418344 100644 --- a/web/layouts/administration/home.html +++ b/web/layouts/administration/home.html @@ -14,7 +14,7 @@
- Bénéficiaires + Bénéficiaires

{{len .ViewState.beneficiaries }} bénéficiaires

@@ -23,13 +23,13 @@
  • - {{.IconSet.Icon "hero:outline/office-building" "h-6 w-6"}} + {{.IconSet.Icon "hero:outline/calendar" "h-6 w-6"}}
    - Organisations -

    {{len .ViewState.groups}} organisations

    + Évenements +

    {{len .ViewState.events}} évenements

    • @@ -42,7 +42,7 @@
    - Référents + Référents

    {{len .ViewState.accounts}} membres

    @@ -65,8 +65,11 @@
    -

    Gestion des organisations

    - + +
    +

    Gestion des organisations

    +

    ( {{len .ViewState.groups}} organisations )

    +

    From 1c29f0072084568d723ee34b9085897ab1080378 Mon Sep 17 00:00:00 2001 From: soukainna Date: Wed, 22 Feb 2023 11:05:54 +0100 Subject: [PATCH 03/17] add organisations --- web/layouts/members/display.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/web/layouts/members/display.html b/web/layouts/members/display.html index 2d8d487..19d125d 100644 --- a/web/layouts/members/display.html +++ b/web/layouts/members/display.html @@ -60,6 +60,13 @@
    {{.ViewState.admins.Data.last_name}}
    +
    +
    Organisations
    + {{range .ViewState.groups}} +
    {{.}} +
    + {{end}} +
    From 18f126e4eb09bf0d797886aa3bdc428da9bacdbb Mon Sep 17 00:00:00 2001 From: soukainna Date: Wed, 22 Feb 2023 11:06:21 +0100 Subject: [PATCH 04/17] create members list --- web/layouts/members/membersList.html | 159 +++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 web/layouts/members/membersList.html diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html new file mode 100644 index 0000000..a339435 --- /dev/null +++ b/web/layouts/members/membersList.html @@ -0,0 +1,159 @@ +{{define "content"}} +
    +

    Les membres de l'organisation {{.Group.Data.name}}

    + +
    +
    +

    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + +
    + Nom + + Téléphone + + Email + + Organisations + + +
    +
    +
    + Previous + Next +
    + +
    +
    +
    + +
    +
    +
    + +{{end}} \ No newline at end of file From 5ffb2bcf852a03e7a896f018463684b86b87c3d4 Mon Sep 17 00:00:00 2001 From: soukainna Date: Wed, 22 Feb 2023 12:23:10 +0100 Subject: [PATCH 05/17] add file unbloking --- .../unbooking-display.html | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 web/layouts/vehicles_management/unbooking-display.html diff --git a/web/layouts/vehicles_management/unbooking-display.html b/web/layouts/vehicles_management/unbooking-display.html new file mode 100644 index 0000000..8b5de9d --- /dev/null +++ b/web/layouts/vehicles_management/unbooking-display.html @@ -0,0 +1,61 @@ +{{define "content"}} +
    +
    +
    +
    +
    + + + + + + + + + + + + {{range .ViewState.vehicles}} + + + + + + + + {{end}} + +
    + Numéro (Immat / Bicycode) + + Type + + Modèle + + Lieu + + Actions +
    +
    {{.Data.licence_plate}}
    +     		+
    + {{.Type}} + {{if eq .Type "Voiture"}} + {{ if .Data.automatic}} (boite auto){{ end }} + {{end}} +
    +     		+
    {{.Data.name}}
    +     		+
    {{if .Data.address}}{{.Data.address.properties.label}}{{end}}
    +     		+ Voir +
    +
    +
    +
    +
    +
    +{{end}} \ No newline at end of file From ea4eea03dada64a029bf8b109ab06c2c0c5a2243 Mon Sep 17 00:00:00 2001 From: soukainna Date: Fri, 24 Feb 2023 18:47:58 +0100 Subject: [PATCH 06/17] delete some logs --- web/layouts/members/membersList.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html index a339435..fcb46d6 100644 --- a/web/layouts/members/membersList.html +++ b/web/layouts/members/membersList.html @@ -96,7 +96,6 @@ x-text="member.data.last_name"> - @@ -140,7 +139,6 @@ Next - From 6ccb72e566340bcb5085c6a7e7b529076fa4cfc4 Mon Sep 17 00:00:00 2001 From: soukainna Date: Fri, 24 Feb 2023 18:49:13 +0100 Subject: [PATCH 07/17] drop my comment --- web/layouts/members/membersList.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html index fcb46d6..e5b2c84 100644 --- a/web/layouts/members/membersList.html +++ b/web/layouts/members/membersList.html @@ -97,7 +97,6 @@ - @@ -124,7 +123,7 @@ Previous - + @@ -135,7 +134,6 @@ :class="i == current+1 ? 'z-10 bg-indigo-50 border-co-blue text-co-blue' : 'bg-white border-gray-300 text-gray-500 hover:bg-gray-50'" x-text="i"> - Next From 612f74202df8bf1ea8bb3cd739abbc58ac3e1872 Mon Sep 17 00:00:00 2001 From: soukainna Date: Fri, 24 Feb 2023 18:50:26 +0100 Subject: [PATCH 08/17] remove sup button --- web/layouts/members/display.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/layouts/members/display.html b/web/layouts/members/display.html index 19d125d..8e4a2e9 100644 --- a/web/layouts/members/display.html +++ b/web/layouts/members/display.html @@ -16,8 +16,6 @@
    - {{if eq .UserID .ViewState.admins.ID}} From 675974a9e75421e09a52b8ec7aa74b8bc74305c5 Mon Sep 17 00:00:00 2001 From: soukainna Date: Mon, 27 Feb 2023 14:09:30 +0100 Subject: [PATCH 09/17] add config stats --- config.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index eef86a0..0899334 100644 --- a/config.yaml +++ b/config.yaml @@ -151,7 +151,15 @@ views: - web/layouts/administration/_partials/groups_admins.html - web/layouts/administration/_partials/group_members.html - web/layouts/administration/display_group.html - group: + beneficaires_list: + files: + - web/layouts/administration/beneficaires_stats.html + events_list: + files: + - web/layouts/administration/events_stats.html + vehicles_list: + files: + - web/layouts/administration/vehicles_stats.html settings: files: - web/layouts/administration/_partials/groups_admins.html From 274f6c16167c43ca8dd5477d22dcc647bf18c681 Mon Sep 17 00:00:00 2001 From: soukainna Date: Mon, 27 Feb 2023 14:09:57 +0100 Subject: [PATCH 10/17] add beneficaires stats --- .../administration/beneficaires_stats.html | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 web/layouts/administration/beneficaires_stats.html diff --git a/web/layouts/administration/beneficaires_stats.html b/web/layouts/administration/beneficaires_stats.html new file mode 100644 index 0000000..d4eaf9c --- /dev/null +++ b/web/layouts/administration/beneficaires_stats.html @@ -0,0 +1,156 @@ +{{define "content"}} +
    +
    +
    +

    La liste des bénéficaires

    +
    +
    + + + +
    +
    +
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + +
    + Nom + + Téléphone + + Adresse + + Labels + + Modifier +
    +
    +
    + Previous + Next +
    + +
    +
    +
    + +
    +
    +
    +{{end}} \ No newline at end of file From 33c182574cf4154636e520b8f597359c6a8c777d Mon Sep 17 00:00:00 2001 From: soukainna Date: Mon, 27 Feb 2023 14:10:26 +0100 Subject: [PATCH 11/17] add events stats --- web/layouts/administration/events_stats.html | 107 +++++++++++++++ web/layouts/administration/home.html | 4 +- .../administration/vehicles_stats.html | 128 ++++++++++++++++++ web/layouts/members/membersList.html | 13 +- web/layouts/vehicles/bookings-list.html | 19 ++- .../unbooking-display.html | 19 +++ 6 files changed, 283 insertions(+), 7 deletions(-) create mode 100644 web/layouts/administration/events_stats.html create mode 100644 web/layouts/administration/vehicles_stats.html diff --git a/web/layouts/administration/events_stats.html b/web/layouts/administration/events_stats.html new file mode 100644 index 0000000..eeeeaf2 --- /dev/null +++ b/web/layouts/administration/events_stats.html @@ -0,0 +1,107 @@ +{{define "content"}} + +
    +
    +
    +

    La liste des événements

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

    {{len .ViewState.beneficiaries }} bénéficiaires

    @@ -28,7 +28,7 @@
    - Évenements + Évenements

    {{len .ViewState.events}} évenements

    diff --git a/web/layouts/administration/vehicles_stats.html b/web/layouts/administration/vehicles_stats.html new file mode 100644 index 0000000..57834fc --- /dev/null +++ b/web/layouts/administration/vehicles_stats.html @@ -0,0 +1,128 @@ +{{define "content"}} +
    +
    +
    +

    La liste des voitures

    +
    +
    + + + +
    +
    +
    + +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + {{range .ViewState.vehicles}} + + + + + + + + + + + {{end}} + +
    + Statut Réservation + + Organisation + + Numéro (Immat / Bicycode) + + Type + + Modèle + + Lieu + + Actions +
    +
    + {{if not .Bookings}} + + Disponible + + {{else}} + {{range .Bookings}} + {{if .Data.administrator_unavailability}} + + Retiré + + {{else}} + {{if eq .Status 1 }} + + A venir + + {{else if eq .Status 0 }} + + En cours + + {{else}} + + Disponible + + {{end}} + {{end}} + {{end}} + {{end}} +
    +     		+ {{range .Bookings}} +
    {{.Data.booked_by.group.name}}
    + + + {{end}} +     		+
    {{.Data.licence_plate}}
    +     		+
    + {{.Type}} + {{if eq .Type "Voiture"}} + {{ if .Data.automatic}} (boite auto){{ end }} + {{end}} +
    +     		+
    {{.Data.name}}
    +     		+
    {{if .Data.address}}{{.Data.address.properties.label}}{{end}}
    +     		+ Voir +
    +
    +
    +
    +
    +
    + + +{{end}} + + \ No newline at end of file diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html index e5b2c84..73e3fd0 100644 --- a/web/layouts/members/membersList.html +++ b/web/layouts/members/membersList.html @@ -1,15 +1,20 @@ {{define "content"}}
    -

    Les membres de l'organisation {{.Group.Data.name}}

    -
    -

    +

    La listes des référents

    +
    +
    + + +
    -
    -

    Réservations

    +
    +
    +

    Réservations

    +
    +
    + + + +
    +
    @@ -64,6 +76,11 @@ {{end}} {{end}} + {{if not .bookings}} + + Disponible + + {{end}}
    {{(index $.ViewState.vehicles_map .Vehicleid).Type}}
    diff --git a/web/layouts/vehicles_management/unbooking-display.html b/web/layouts/vehicles_management/unbooking-display.html index 8b5de9d..7552f9a 100644 --- a/web/layouts/vehicles_management/unbooking-display.html +++ b/web/layouts/vehicles_management/unbooking-display.html @@ -1,4 +1,23 @@ {{define "content"}} +
    +

    Voitures disponibles

    + + + +
    From e0fd3aa510a44b44a75f61c2b53022c5251e62b1 Mon Sep 17 00:00:00 2001 From: soukainna Date: Mon, 27 Feb 2023 14:14:08 +0100 Subject: [PATCH 12/17] fix events stats --- web/layouts/administration/events_stats.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/layouts/administration/events_stats.html b/web/layouts/administration/events_stats.html index eeeeaf2..53bd498 100644 --- a/web/layouts/administration/events_stats.html +++ b/web/layouts/administration/events_stats.html @@ -88,8 +88,6 @@ {{end}}
    - - Voir From afc403bded1966e3ec02385f3a316e7e2eb2138c Mon Sep 17 00:00:00 2001 From: soukainna Date: Mon, 27 Feb 2023 14:15:02 +0100 Subject: [PATCH 13/17] add vehicles stats --- web/layouts/administration/vehicles_stats.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/layouts/administration/vehicles_stats.html b/web/layouts/administration/vehicles_stats.html index 57834fc..62705ca 100644 --- a/web/layouts/administration/vehicles_stats.html +++ b/web/layouts/administration/vehicles_stats.html @@ -124,5 +124,3 @@ {{end}} - - \ No newline at end of file From fc60854e21b7c00771848e4cd8096b8e173e5ec6 Mon Sep 17 00:00:00 2001 From: soukainna Date: Mon, 27 Feb 2023 14:16:01 +0100 Subject: [PATCH 14/17] add members stats --- web/layouts/members/membersList.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/web/layouts/members/membersList.html b/web/layouts/members/membersList.html index 73e3fd0..884a889 100644 --- a/web/layouts/members/membersList.html +++ b/web/layouts/members/membersList.html @@ -59,13 +59,8 @@ - - - +