From 8156df8df153c2d6e7a2f68917837f1076d75c58 Mon Sep 17 00:00:00 2001 From: soukainna Date: Fri, 9 Dec 2022 10:25:40 +0100 Subject: [PATCH 1/6] Ajouter le groupCovoiturage --- config.yaml | 11 +++++++++++ web/layouts/journeys/search.html | 16 +++++++++++++++- web/layouts/layout.html | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index e7449ef..26ab6ab 100644 --- a/config.yaml +++ b/config.yaml @@ -97,6 +97,17 @@ views: - web/layouts/journeys/_partials/journeys-carpool.html - web/layouts/journeys/_partials/journeys-public-transit.html - web/layouts/journeys/search.html + list: + files: + - web/layouts/journeys/group_management.html + create: + files: + - web/layouts/journeys/create_groups.html + - web/layouts/_partials/address_autocomplete.html + display: + files: + - web/layouts/journeys/display_groups.html + - web/layouts/journeys/_partials/map.html support: request: files: diff --git a/web/layouts/journeys/search.html b/web/layouts/journeys/search.html index bbe6f8f..ab091d9 100644 --- a/web/layouts/journeys/search.html +++ b/web/layouts/journeys/search.html @@ -1,7 +1,20 @@ {{define "content"}}

Déplacements

- +
+
+

+
+
+ + + +
+
@@ -116,5 +129,6 @@ {{end}}
+
{{end}} \ No newline at end of file diff --git a/web/layouts/layout.html b/web/layouts/layout.html index 980f5c5..e46e4b1 100644 --- a/web/layouts/layout.html +++ b/web/layouts/layout.html @@ -8,6 +8,8 @@ + + From bc2f281e4c9c5b6e2ec4507077a9d2d2950fb966 Mon Sep 17 00:00:00 2001 From: soukainna Date: Fri, 9 Dec 2022 10:26:17 +0100 Subject: [PATCH 2/6] Ajouter le groupCovoiturage --- web/layouts/journeys/_partials/map.html | 223 +++++++++++++ web/layouts/journeys/create_groups.html | 318 +++++++++++++++++++ web/layouts/journeys/display_groups.html | 344 +++++++++++++++++++++ web/layouts/journeys/group_management.html | 158 ++++++++++ 4 files changed, 1043 insertions(+) create mode 100644 web/layouts/journeys/_partials/map.html create mode 100644 web/layouts/journeys/create_groups.html create mode 100644 web/layouts/journeys/display_groups.html create mode 100644 web/layouts/journeys/group_management.html diff --git a/web/layouts/journeys/_partials/map.html b/web/layouts/journeys/_partials/map.html new file mode 100644 index 0000000..61c0f49 --- /dev/null +++ b/web/layouts/journeys/_partials/map.html @@ -0,0 +1,223 @@ +{{define "map"}} + + + + +Add a default marker + + + + + + + + + + + + + + + + + + + +
+ +
+ + + +{{end}} \ No newline at end of file diff --git a/web/layouts/journeys/create_groups.html b/web/layouts/journeys/create_groups.html new file mode 100644 index 0000000..433ead7 --- /dev/null +++ b/web/layouts/journeys/create_groups.html @@ -0,0 +1,318 @@ +{{define "content"}} + + +
+

Groups > Créer un group

+
+ +
+
+
+
+
+

Nouveau groupe

+

Informations de base sur le groupe à créer

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

Paramètres

+

Paramètres liés au groupe, utiles pour exploiter les fonctionnalités de PARCOURSMOB

+
+
+ + + {{ $departureField := "departure" }} + {{ $departureLabel := "Départ" }} + {{ $departure := .ViewState.departure }} + {{ template "address_autocomplete" dict "FieldName" $departureField "FieldLabel" $departureLabel "Address" $departure }} + + {{ $destinationField := "destination" }} + {{ $destinationLabel := "Destination" }} + {{ $destination := .ViewState.destination }} + {{ template "address_autocomplete" dict "FieldName" $destinationField "FieldLabel" $destinationLabel "Address" $destination }} + + +
+ +
+ +
+
+
+
+

Planification

+

Informations liés a la planification de groupe, veuillez cocher la solution qui vous convient

+
+ +
+ + +
+   Recurrent    +   Ponctuelle + + + + + + + + +
+
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+ +
+
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+ +
+ +
+
+ + +
+
+ +
+
+ + + + +
+
+ +
+ +{{end}} \ No newline at end of file diff --git a/web/layouts/journeys/display_groups.html b/web/layouts/journeys/display_groups.html new file mode 100644 index 0000000..90c2641 --- /dev/null +++ b/web/layouts/journeys/display_groups.html @@ -0,0 +1,344 @@ +{{define "content"}} +
+

Gestion du groupe

+
+
+

+ +
+ +
+ + +
+ +
+
+

Info du groupe

+
+
+
+
+
+
Nom
+
+ {{.ViewState.group.Data.name}}
+
+
+
Type de covoiturage
+ {{if .ViewState.group.Data.recurrent}} +
+ Recurrent
{{else}} +
+ Ponctuelle
{{end}} +
+
+
Conducteur
+
+ {{.ViewState.group.Data.driver_first_name}}  + {{.ViewState.group.Data.driver_last_name}}
+
+
+
N° de passager
+
+ {{.ViewState.group.Data.number}}
+
+
+
Départ
+
+ {{.ViewState.group.Data.depart.properties.label}}
+
+
+
Déstination
+
+ {{.ViewState.group.Data.arrive.properties.label}}
+
+ + + + + {{if .ViewState.group.Data.recurrent}} +
+
Les jours de covoiturage
+ {{if .ViewState.group.Data.planDays.lundi}} +
+ Lundi   + {{if .ViewState.group.Data.planDays.mardi}} + Mardi   {{end}} + {{if .ViewState.group.Data.planDays.mercredi}} + Mercredi   {{end}} + {{if .ViewState.group.Data.planDays.jeudi}} + Jeudi   {{end}} + {{if .ViewState.group.Data.planDays.vendredi}} + Vendredi   {{end}} + {{if .ViewState.group.Data.planDays.samedi}} + Samedi   {{end}} + {{if .ViewState.group.Data.planDays.dimanche}} + Dimanche  {{end}} +
+ {{end}} +
+ + {{end}} + {{if .ViewState.group.Data.recurrent}} +
+
Date de départ
+
+ {{.ViewState.group.Data.date}}
+
+ {{else}} +
+
Date de départ
+
+ {{.ViewState.group.Data.departdate}}
+
+ {{end}} + + + {{if .ViewState.group.Data.recurrent}} +
+ +
Date de fin
+
+ {{.ViewState.group.Data.enddate}}
+ +
+ {{end}} + {{if .ViewState.group.Data.recurrent}} +
+
Heure de départ
+
+ {{.ViewState.group.Data.time}}
+
+ {{else}} +
+
Heure de départ
+
+ {{.ViewState.group.Data.departtime}}
+
+ {{end}} +
+
+ +
+
+
+ +
+ + + + + +
+
+
+
+ {{template "map" .}} +
+
+
+ + +
+ +
+ +
+ + + + + + + + + + + + + +
+ Nom du bénéficiaire + + Téléphone + + Email +
+ +
+
+ Previous + Next +
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+

Ajouter un passager

+
+
+
+ + +
+ + + + +
    + + + + +
+
+
+ + + +
+
+
+ +
+
+ +
+ +{{end}} \ No newline at end of file diff --git a/web/layouts/journeys/group_management.html b/web/layouts/journeys/group_management.html new file mode 100644 index 0000000..b316645 --- /dev/null +++ b/web/layouts/journeys/group_management.html @@ -0,0 +1,158 @@ + + {{define "content"}} +
+

Gestion des groupes de covoiturage

+ +
+
+

+
+
+ + + +
+
+ +
+ + +
+
+
+
+
+ + + + + + + + + + + +
+ + Nom de groupe +
+
+
+ Previous + Next +
+ +
+
+
+ +
+
+
+{{end}} \ No newline at end of file From 94b621e8838b474fc8e726436d5cb5418e29fd9d Mon Sep 17 00:00:00 2001 From: soukainna Date: Wed, 14 Dec 2022 12:26:16 +0100 Subject: [PATCH 3/6] add profile admin --- config.yaml | 5 +- .../_partials/groups_admins.html | 2 +- web/layouts/conseillers/display.html | 55 +++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 web/layouts/conseillers/display.html diff --git a/config.yaml b/config.yaml index 26ab6ab..53729cf 100644 --- a/config.yaml +++ b/config.yaml @@ -32,7 +32,10 @@ views: files: - web/layouts/_partials/address_autocomplete.html - web/layouts/beneficiaries/update.html - + conseillers: + display: + files: + - web/layouts/conseillers/display.html vehicles: search: files: diff --git a/web/layouts/administration/_partials/groups_admins.html b/web/layouts/administration/_partials/groups_admins.html index 3495123..010f313 100644 --- a/web/layouts/administration/_partials/groups_admins.html +++ b/web/layouts/administration/_partials/groups_admins.html @@ -11,7 +11,7 @@
- +

{{.Data.first_name}} {{.Data.last_name}}

{{.Data.email}}

diff --git a/web/layouts/conseillers/display.html b/web/layouts/conseillers/display.html new file mode 100644 index 0000000..9ffb285 --- /dev/null +++ b/web/layouts/conseillers/display.html @@ -0,0 +1,55 @@ +{{define "content"}} +
+ +
+
+
+
+ + +
+
+
+

{{.ViewState.admins.Data.first_name}} + {{.ViewState.admins.Data.last_name}}

+
+
+
+ +
+
+
+
+
+

+ Informations personnelles

+

Informations générales sur le Conseiller.

+
+
+ +
+ {{if .ViewState.admins.Data.email}} +
+
Email
+
{{.ViewState.admins.Data.email}}
+
+ {{end}} +
+
+
Nom
+
{{.ViewState.admins.Data.first_name}}
+
+
+
Prénon
+
{{.ViewState.admins.Data.last_name}} +
+
+
+
+
+
+
+ +
+
+{{end}} \ No newline at end of file From c46c03fc4f182a818dacb6ae4c74311a8badac86 Mon Sep 17 00:00:00 2001 From: soukainna Date: Thu, 15 Dec 2022 17:11:28 +0100 Subject: [PATCH 4/6] add update profile --- config.yaml | 3 +++ .../administration/_partials/groups_admins.html | 2 +- web/layouts/conseillers/display.html | 17 ++++++++++++++++- web/layouts/layout.html | 14 ++++++-------- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/config.yaml b/config.yaml index 53729cf..8121a11 100644 --- a/config.yaml +++ b/config.yaml @@ -36,6 +36,9 @@ views: display: files: - web/layouts/conseillers/display.html + update: + files: + - web/layouts/conseillers/update.html vehicles: search: files: diff --git a/web/layouts/administration/_partials/groups_admins.html b/web/layouts/administration/_partials/groups_admins.html index 010f313..2debd04 100644 --- a/web/layouts/administration/_partials/groups_admins.html +++ b/web/layouts/administration/_partials/groups_admins.html @@ -11,7 +11,7 @@
- +

{{.Data.first_name}} {{.Data.last_name}}

{{.Data.email}}

diff --git a/web/layouts/conseillers/display.html b/web/layouts/conseillers/display.html index 9ffb285..3614dda 100644 --- a/web/layouts/conseillers/display.html +++ b/web/layouts/conseillers/display.html @@ -14,6 +14,13 @@ {{.ViewState.admins.Data.last_name}}
+
+ + +
@@ -34,7 +41,14 @@
{{.ViewState.admins.Data.email}}
{{end}} -
+ {{if .ViewState.admins.Data.phone_number}} +
+
Télephone
+
{{.ViewState.admins.Data.phone_number}} +
+
+ {{end}} +
Nom
{{.ViewState.admins.Data.first_name}}
@@ -44,6 +58,7 @@
{{.ViewState.admins.Data.last_name}}
+ diff --git a/web/layouts/layout.html b/web/layouts/layout.html index e46e4b1..9e8f2f0 100644 --- a/web/layouts/layout.html +++ b/web/layouts/layout.html @@ -8,8 +8,6 @@ - - @@ -133,12 +131,12 @@
-
@@ -153,14 +151,14 @@ x-transition:leave-start="transform opacity-100 scale-100" x-transition:leave-end="transform opacity-0 scale-95"> - Votre profil - Paramètres - Se déconnecter +
From 9641f8e7001c6524a259d42c61afd106743ee7fc Mon Sep 17 00:00:00 2001 From: soukainna Date: Thu, 15 Dec 2022 17:11:41 +0100 Subject: [PATCH 5/6] add update profile --- web/layouts/conseillers/update.html | 131 ++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 web/layouts/conseillers/update.html diff --git a/web/layouts/conseillers/update.html b/web/layouts/conseillers/update.html new file mode 100644 index 0000000..bd972a5 --- /dev/null +++ b/web/layouts/conseillers/update.html @@ -0,0 +1,131 @@ +{{define "content"}} + +
+

Modifier vos informations

+
+ +
+
+
+
+
+

Informations obligatoires

+

Informations personnelles sur le conseiller obligatoires + pour créer son profil dans PARCOURSMOB

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

Informations optionnelles

+

Autres informations de profil optionnelles

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

Certains champs de sont pas valides.

+ + + + +
+
+
+{{end}} \ No newline at end of file From 4af0ffd3d665e273cabeb7b7e9ae3b3ffd65f6b1 Mon Sep 17 00:00:00 2001 From: soukainna Date: Mon, 19 Dec 2022 15:27:50 +0100 Subject: [PATCH 6/6] add module support & groups --- web/layouts/administration/create_group.html | 22 +++++++++++++++++++ web/layouts/administration/display_group.html | 22 +++++++++++++++++++ web/layouts/conseillers/display.html | 2 +- web/layouts/conseillers/update.html | 12 +++++----- 4 files changed, 51 insertions(+), 7 deletions(-) diff --git a/web/layouts/administration/create_group.html b/web/layouts/administration/create_group.html index c5485ab..deaff46 100644 --- a/web/layouts/administration/create_group.html +++ b/web/layouts/administration/create_group.html @@ -122,6 +122,28 @@

+
+
+ +
+
+ +

Contacter notre support en cas de problème. +

+
+
+
+
+ +
+
+ +

Créer des groupes pour ses bénéficiaires. +

+
+
diff --git a/web/layouts/administration/display_group.html b/web/layouts/administration/display_group.html index eece157..c1dc8f5 100644 --- a/web/layouts/administration/display_group.html +++ b/web/layouts/administration/display_group.html @@ -119,6 +119,28 @@

+
+
+ +
+
+ +

Contacter notre support en cas de problème. +

+
+
+
+
+ +
+
+ +

Créer des groupes pour ses bénéficiaires. +

+
+

Informations personnelles

-

Informations générales sur le Conseiller.

+

Informations générales sur le conseiller.

diff --git a/web/layouts/conseillers/update.html b/web/layouts/conseillers/update.html index bd972a5..82afce3 100644 --- a/web/layouts/conseillers/update.html +++ b/web/layouts/conseillers/update.html @@ -56,25 +56,25 @@
-
-
-