From 64407bd46d7df6f1f589bfd4ec9104c6f00282c1 Mon Sep 17 00:00:00 2001 From: PY Date: Tue, 21 Jan 2025 10:30:15 +0100 Subject: [PATCH 1/7] add faq in headers --- config/settings/base.py | 2 ++ envergo/templates/haie/_header.html | 6 ++++++ envergo/templates/haie/_slim_header.html | 6 ++++-- envergo/utils/context_processors.py | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/config/settings/base.py b/config/settings/base.py index 1630158b6..8c807aa6c 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -430,3 +430,5 @@ "BREVO_NEWSLETTER_DOUBLE_OPT_IN_TEMPLATE_ID", default=None ), } + +HAIE_FAQ_URL = "https://www.notion.so/Guichet-unique-de-la-haie-propos-17afe5fe476680a9abe6c4bdf5301abb" diff --git a/envergo/templates/haie/_header.html b/envergo/templates/haie/_header.html index 2470c117e..2c3aff124 100644 --- a/envergo/templates/haie/_header.html +++ b/envergo/templates/haie/_header.html @@ -32,6 +32,12 @@ diff --git a/envergo/templates/haie/_slim_header.html b/envergo/templates/haie/_slim_header.html index f6dc566ea..97553704a 100644 --- a/envergo/templates/haie/_slim_header.html +++ b/envergo/templates/haie/_slim_header.html @@ -27,9 +27,11 @@
diff --git a/envergo/utils/context_processors.py b/envergo/utils/context_processors.py index 8bcff912e..160b7f36a 100644 --- a/envergo/utils/context_processors.py +++ b/envergo/utils/context_processors.py @@ -44,6 +44,7 @@ def settings_context(_request): "ENV_NAME": settings.ENV_NAME, "CRISP_CHATBOX_ENABLED": chatbox_enabled, "CRISP_WEBSITE_ID": crisp_website_id, + "HAIE_FAQ_URL": settings.HAIE_FAQ_URL, } From 3654b52a39e12fbd8b233eb6fe68ea85f2523882 Mon Sep 17 00:00:00 2001 From: PY Date: Tue, 28 Jan 2025 06:46:21 +0100 Subject: [PATCH 2/7] do not wait for geo API --- e2e/evaluations/request.spec.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/e2e/evaluations/request.spec.ts b/e2e/evaluations/request.spec.ts index f3cc47c04..4fc408490 100644 --- a/e2e/evaluations/request.spec.ts +++ b/e2e/evaluations/request.spec.ts @@ -5,8 +5,7 @@ test('User can request an evaluation', async ({ page }) => { await page.getByLabel('Menu principal').getByRole('link', { name: 'Demander un avis réglementaire' }).click(); await page.locator('p').filter({ hasText: 'Commencer la demande Durée : 1 min' }).getByRole('link').click(); await page.getByLabel('Address of the project Type').click(); - await page.getByLabel('Address of the project Type').fill('Vue'); - await page.getByRole('option', { name: 'Vue 44, Loire-Atlantique,' }).click(); + await page.getByLabel('Address of the project Type').fill('44640 Vue'); await page.getByPlaceholder('15 caractères commençant par').click(); await page.getByPlaceholder('15 caractères commençant par').fill('PA1234567981011'); await page.getByLabel('Project description, comments').click(); From dba7f5d1b2c65be2c8d677a98a22466f15cfe019 Mon Sep 17 00:00:00 2001 From: Thibault Jouannic Date: Tue, 28 Jan 2025 11:07:29 +0100 Subject: [PATCH 3/7] Use correct "from" adr in password reset emails --- config/urls_amenagement.py | 2 ++ config/urls_haie.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/config/urls_amenagement.py b/config/urls_amenagement.py index 3fc9a3838..cb5868ac2 100644 --- a/config/urls_amenagement.py +++ b/config/urls_amenagement.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.contrib.auth import views as auth_views from django.contrib.auth.forms import SetPasswordForm from django.urls import include, path @@ -48,6 +49,7 @@ subject_template_name="amenagement/emails/password_reset_subject.txt", email_template_name="amenagement/emails/password_reset.txt", html_email_template_name="amenagement/emails/password_reset.html", + from_email=settings.SITE_FROM_EMAIL["amenagement"], ), name="password_reset", ), diff --git a/config/urls_haie.py b/config/urls_haie.py index 49c192e17..5b1b23519 100644 --- a/config/urls_haie.py +++ b/config/urls_haie.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.contrib.auth import views as auth_views from django.contrib.auth.forms import SetPasswordForm from django.urls import include, path @@ -44,6 +45,7 @@ subject_template_name="haie/emails/password_reset_subject.txt", email_template_name="haie/emails/password_reset.txt", html_email_template_name="haie/emails/password_reset.html", + from_email=settings.SITE_FROM_EMAIL["haie"], ), name="password_reset", ), From d1ae8cb2cdf29406af5e66c5cf8f1d8ca86c0000 Mon Sep 17 00:00:00 2001 From: Thibault Jouannic Date: Tue, 28 Jan 2025 11:07:49 +0100 Subject: [PATCH 4/7] Fix mattermost notif not sending from haie site --- envergo/users/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envergo/users/views.py b/envergo/users/views.py index 0d5c1e318..057372e40 100644 --- a/envergo/users/views.py +++ b/envergo/users/views.py @@ -97,8 +97,8 @@ def get(self, request, *args, **kwargs): user.access_amenagement = True elif site_literal == "haie": user.access_haie = True - send_new_account_notification.delay(user.id) user.save() + send_new_account_notification.delay(user.id) return super().get(request, *args, **kwargs) From dda72ac49f361f71b2e92239fff949e34dc1fb1d Mon Sep 17 00:00:00 2001 From: Thibault Jouannic Date: Wed, 29 Jan 2025 14:34:33 +0100 Subject: [PATCH 5/7] Fix label color --- envergo/static/sass/project.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/envergo/static/sass/project.scss b/envergo/static/sass/project.scss index 5430cd483..c4e43e146 100644 --- a/envergo/static/sass/project.scss +++ b/envergo/static/sass/project.scss @@ -105,7 +105,7 @@ article { &.probability-soumis, &.probability-systematique, - &.probability-derogation, + &.probability-derogation_inventaire, &.probability-derogation_simplifiee, &.probability-4 { background-color: #ffb7a5; From 4ab28d81d5988b686b5ae0eed741f1854096bb5f Mon Sep 17 00:00:00 2001 From: Thibault Jouannic Date: Wed, 29 Jan 2025 14:36:20 +0100 Subject: [PATCH 6/7] Fix hedge species filtering --- envergo/hedges/models.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/envergo/hedges/models.py b/envergo/hedges/models.py index 93567029d..a66f16864 100644 --- a/envergo/hedges/models.py +++ b/envergo/hedges/models.py @@ -137,10 +137,9 @@ def __str__(self): def __iter__(self): return iter(self.hedges()) - def get_bounding_box(self): - """Return the bounding box of the whole hedge set.""" + def get_bounding_box(self, hedges): + """Return the bounding box of the given hedge set.""" - hedges = self.hedges() min_x, min_y, max_x, max_y = hedges[0].geometry.bounds for hedge in hedges[1:]: x0, y0, x1, y1 = hedge.geometry.bounds @@ -237,7 +236,7 @@ def get_hedge_species(self): def get_local_species_codes(self): """Return species names that are known to live here.""" - bbox = self.get_bounding_box() + bbox = self.get_bounding_box(self.hedges_to_remove()) zones = Zone.objects.filter(geometry__intersects=bbox).filter( map__map_type="species" ) From f93d89e2347cea80abc23943de106b66b494de07 Mon Sep 17 00:00:00 2001 From: Thibault Jouannic Date: Wed, 29 Jan 2025 14:48:34 +0100 Subject: [PATCH 7/7] Fix regulation result grouping MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Je ne suis pas certain d'avoir bien saisi la logique derrière le regroupement. Pourrais-tu jeter un œil @pydez ? --- envergo/moulinette/templatetags/moulinette.py | 7 ++++--- envergo/templates/haie/moulinette/result_base.html | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/envergo/moulinette/templatetags/moulinette.py b/envergo/moulinette/templatetags/moulinette.py index 8a38a7b17..cab9b1567 100644 --- a/envergo/moulinette/templatetags/moulinette.py +++ b/envergo/moulinette/templatetags/moulinette.py @@ -305,8 +305,6 @@ def get_display_result(regulation): RESULTS.non_soumis, RESULTS.non_concerne, RESULTS.non_disponible, - RESULTS.derogation_inventaire, - RESULTS.derogation_simplifiee, ] return regulation.result if regulation.result not in other_results else "autre" @@ -320,13 +318,16 @@ def group_regulations_for_display(moulinette): result_cascade = [ RESULTS.interdit, RESULTS.soumis, + RESULTS.derogation_simplifiee, + RESULTS.derogation_inventaire, "autre", ] regulations_list.sort(key=lambda reg: result_cascade.index(get_display_result(reg))) # Group the regulations by their result - return { + grouped = { key: list(group) for key, group in groupby(regulations_list, key=get_display_result) } + return grouped diff --git a/envergo/templates/haie/moulinette/result_base.html b/envergo/templates/haie/moulinette/result_base.html index 08fa6bf1c..7619c3729 100644 --- a/envergo/templates/haie/moulinette/result_base.html +++ b/envergo/templates/haie/moulinette/result_base.html @@ -41,7 +41,7 @@

Réglementations interdisant le projet

{% elif result == "soumis" and moulinette.result != "soumis" %}

Autres réglementations concernant le projet

- {% elif result == "soumis" %} + {% elif result != "autre" %}

Réglementations concernant le projet

{% else %}

Autres réglementations