From 73b3ed3b154af1df096c4d15cf1746c318d79569 Mon Sep 17 00:00:00 2001
From: Fabien Le Frapper <contact@fabienlefrapper.me>
Date: Thu, 11 Sep 2025 12:44:04 +0200
Subject: [PATCH 1/7] Factorise analytics / add back matomo on carte /
 formulaire

---
 core/context_processors.py                       |  1 +
 core/settings.py                                 |  1 +
 core/templatetags/analytics_tags.py              | 13 +++++++++++++
 qfdmd/templatetags/qfdmd_tags.py                 |  9 ---------
 templates/{tracking => analytics}/matomo.html    |  0
 templates/analytics/posthog_data_attributes.html |  8 ++++++++
 templates/layout/base.html                       | 14 ++++----------
 templates/qfdmd/base.html                        | 14 +++-----------
 8 files changed, 30 insertions(+), 30 deletions(-)
 create mode 100644 core/templatetags/analytics_tags.py
 rename templates/{tracking => analytics}/matomo.html (100%)
 create mode 100644 templates/analytics/posthog_data_attributes.html

diff --git a/core/context_processors.py b/core/context_processors.py
index dba9553f2..136ff6a70 100644
--- a/core/context_processors.py
+++ b/core/context_processors.py
@@ -38,6 +38,7 @@ def global_context(request) -> dict:
             "DECLARATION_ACCESSIBILITE_PAGE_ID": settings.LVAO[
                 "DECLARATION_ACCESSIBILITE_PAGE_ID"
             ],
+            "MATOMO_ID": settings.LVAO["MATOMO_ID"],
         },
     }
 
diff --git a/core/settings.py b/core/settings.py
index d9ebee7d0..251920042 100644
--- a/core/settings.py
+++ b/core/settings.py
@@ -39,6 +39,7 @@
 # Carte settings
 # --------------
 LVAO = {
+    "MATOMO_ID": decouple.config("LVAO_MATOMO_ID", default=50, cast=int),
     "GOOGLE_SEARCH_CONSOLE": "google9dfbbc61adbe3888.html",
     "POSTHOG_KEY": decouple.config(
         "LVAO_POSTHOG_KEY",
diff --git a/core/templatetags/analytics_tags.py b/core/templatetags/analytics_tags.py
new file mode 100644
index 000000000..9d518054e
--- /dev/null
+++ b/core/templatetags/analytics_tags.py
@@ -0,0 +1,13 @@
+from django import template
+
+register = template.Library()
+
+
+@register.inclusion_tag("analytics/matomo.html")
+def matomo(id):
+    return {"matomo_url": "stats.beta.gouv.fr", "matomo_id": id}
+
+
+@register.inclusion_tag("analytics/posthog_data_attributes.html")
+def posthog_data_attributes(key):
+    return {"key": key}
diff --git a/qfdmd/templatetags/qfdmd_tags.py b/qfdmd/templatetags/qfdmd_tags.py
index 54a39f95d..9da1bb6e7 100644
--- a/qfdmd/templatetags/qfdmd_tags.py
+++ b/qfdmd/templatetags/qfdmd_tags.py
@@ -2,7 +2,6 @@
 from typing import cast
 
 from django import template
-from django.conf import settings
 from django.core.cache import cache
 from django.forms import FileField
 from django.utils.safestring import mark_safe
@@ -100,11 +99,3 @@ def carte(context, carte_config: CarteConfig) -> dict:
 @register.inclusion_tag("head/favicon.html")
 def favicon() -> dict:
     return {}
-
-
-@register.inclusion_tag("tracking/matomo.html")
-def matomo():
-    return {
-        "matomo_url": "stats.beta.gouv.fr",
-        "matomo_id": settings.ASSISTANT["MATOMO_ID"],
-    }
diff --git a/templates/tracking/matomo.html b/templates/analytics/matomo.html
similarity index 100%
rename from templates/tracking/matomo.html
rename to templates/analytics/matomo.html
diff --git a/templates/analytics/posthog_data_attributes.html b/templates/analytics/posthog_data_attributes.html
new file mode 100644
index 000000000..24dc3d745
--- /dev/null
+++ b/templates/analytics/posthog_data_attributes.html
@@ -0,0 +1,8 @@
+data-analytics-posthog-key-value="{{ key }}"
+data-analytics-posthog-debug-value="{{ POSTHOG_DEBUG|lower }}"
+{% if request.user.is_authenticated %}
+    data-analytics-user-username-value="{{ request.user.username }}"
+    data-analytics-user-email-value="{{ request.user.email }}"
+    data-analytics-user-admin-value="{{ request.user.is_superuser|lower }}"
+{% endif %}
+data-analytics-initial-action-value="{% block analytics_action %}{% endblock %}"
diff --git a/templates/layout/base.html b/templates/layout/base.html
index 10bcec77b..5bcc3a7a1 100644
--- a/templates/layout/base.html
+++ b/templates/layout/base.html
@@ -1,4 +1,4 @@
-{% load qfdmo_tags static %}
+{% load analytics_tags qfdmd_tags qfdmo_tags static %}
 <!DOCTYPE html>
 <html
     lang="fr"
@@ -31,6 +31,8 @@
         {% block css_extras %}{% endblock %}
 
         {# Js #}
+        {% matomo lvao.MATOMO_ID %}
+
         <script src="{% static 'qfdmo.js' %}"></script>
         {% block javascript_extras %}{% endblock %}
 
@@ -48,15 +50,7 @@
         data-state-search-solution-form-outlet="[data-controller='search-solution-form']"
         data-action="address-autocomplete:change->state#setLocation"
         {# Analytics #}
-        {# TODO: factorize with django-templating-language template as soon as jinja2 will be removed #}
-        data-analytics-posthog-key-value="{{ lvao.POSTHOG_KEY }}"
-        data-analytics-posthog-debug-value="{{ POSTHOG_DEBUG|lower }}"
-        {% if request.user.is_authenticated %}
-            data-analytics-user-username-value="{{ request.user.username }}"
-            data-analytics-user-email-value="{{ request.user.email }}"
-            data-analytics-user-admin-value="{{ request.user.is_superuser|lower }}"
-        {% endif %}
-        data-analytics-initial-action-value="{% block analytics_action %}{% endblock %}"
+        {% posthog_data_attributes assistant.POSTHOG_KEY %}
     >
         <main id="solutions" class="qf-h-full qf-overflow-auto qf-overscroll-none qf-scroll-smooth">
             <noscript>
diff --git a/templates/qfdmd/base.html b/templates/qfdmd/base.html
index 5ad3748f9..b6bee9f15 100644
--- a/templates/qfdmd/base.html
+++ b/templates/qfdmd/base.html
@@ -1,4 +1,4 @@
-{% load dsfr_tags qfdmd_tags static wagtailuserbar %}
+{% load analytics_tags dsfr_tags qfdmd_tags static wagtailuserbar %}
 
 {% with contact_modal_id="contact" %}
 
@@ -31,7 +31,7 @@
         {% block social_media %}
         {% endblock social_media %}
 
-        {% matomo %}
+        {% matomo assistant.MATOMO_ID %}
 
         {% block extra_css %}
         {% endblock extra_css %}
@@ -57,15 +57,7 @@
         data-state-map-outlet="[data-controller='map']"
         data-state-address-autocomplete-outlet="[data-controller='address-autocomplete']"
         data-state-search-solution-form-outlet="[data-controller='search-solution-form']"
-        {# Analytics #}
-        data-analytics-posthog-key-value="{{ assistant.POSTHOG_KEY }}"
-        data-analytics-posthog-debug-value="{{ POSTHOG_DEBUG|lower }}"
-        {% if request.user.is_authenticated %}
-            data-analytics-user-username-value="{{ request.user.username }}"
-            data-analytics-user-email-value="{{ request.user.email }}"
-            data-analytics-user-admin-value="{{ request.user.is_superuser|lower }}"
-        {% endif %}
-        data-analytics-initial-action-value="{% block analytics_action %}{% endblock %}"
+        {% posthog_data_attributes lvao.POSTHOG_KEY %}
         {# Actions #}
         data-action="address-autocomplete:change->state#setLocation"
     >

From 56f1e78e695ef0c070345288b2b8604918d8f972 Mon Sep 17 00:00:00 2001
From: Fabien Le Frapper <contact@fabienlefrapper.me>
Date: Fri, 12 Sep 2025 10:24:20 +0200
Subject: [PATCH 2/7] Oopsy

---
 templates/layout/base.html | 3 +--
 templates/qfdmd/base.html  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/templates/layout/base.html b/templates/layout/base.html
index 5bcc3a7a1..e74f7cf0c 100644
--- a/templates/layout/base.html
+++ b/templates/layout/base.html
@@ -48,9 +48,8 @@
         data-state-address-autocomplete-outlet="[data-controller='address-autocomplete']"
         data-state-map-outlet="[data-controller='map']"
         data-state-search-solution-form-outlet="[data-controller='search-solution-form']"
+        {% posthog_data_attributes lvao.POSTHOG_KEY %}
         data-action="address-autocomplete:change->state#setLocation"
-        {# Analytics #}
-        {% posthog_data_attributes assistant.POSTHOG_KEY %}
     >
         <main id="solutions" class="qf-h-full qf-overflow-auto qf-overscroll-none qf-scroll-smooth">
             <noscript>
diff --git a/templates/qfdmd/base.html b/templates/qfdmd/base.html
index b6bee9f15..d47a71805 100644
--- a/templates/qfdmd/base.html
+++ b/templates/qfdmd/base.html
@@ -57,7 +57,7 @@
         data-state-map-outlet="[data-controller='map']"
         data-state-address-autocomplete-outlet="[data-controller='address-autocomplete']"
         data-state-search-solution-form-outlet="[data-controller='search-solution-form']"
-        {% posthog_data_attributes lvao.POSTHOG_KEY %}
+        {% posthog_data_attributes assistant.POSTHOG_KEY %}
         {# Actions #}
         data-action="address-autocomplete:change->state#setLocation"
     >

From da110c916fdfaac081be25bf4a5ee6fdf3150c51 Mon Sep 17 00:00:00 2001
From: Fabien Le Frapper <contact@fabienlefrapper.me>
Date: Fri, 12 Sep 2025 10:24:53 +0200
Subject: [PATCH 3/7] Oopsy

---
 templates/layout/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/layout/base.html b/templates/layout/base.html
index e74f7cf0c..6ab9fbf0b 100644
--- a/templates/layout/base.html
+++ b/templates/layout/base.html
@@ -1,4 +1,4 @@
-{% load analytics_tags qfdmd_tags qfdmo_tags static %}
+{% load analytics_tags qfdmo_tags static %}
 <!DOCTYPE html>
 <html
     lang="fr"

From de55de1dd3e9e5f5a8e20878bd605a4a0b7ee29a Mon Sep 17 00:00:00 2001
From: Fabien Le Frapper <contact@fabienlefrapper.me>
Date: Fri, 12 Sep 2025 10:27:07 +0200
Subject: [PATCH 4/7] Rename LVAO to Carte

---
 core/context_processors.py | 9 ++++-----
 core/settings.py           | 2 +-
 qfdmo/urls.py              | 4 ++--
 qfdmo/views/__init__.py    | 2 +-
 templates/layout/base.html | 4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/core/context_processors.py b/core/context_processors.py
index 136ff6a70..46a2019b4 100644
--- a/core/context_processors.py
+++ b/core/context_processors.py
@@ -33,12 +33,11 @@ def global_context(request) -> dict:
             "POSTHOG_KEY": settings.ASSISTANT["POSTHOG_KEY"],
             "MATOMO_ID": settings.ASSISTANT["MATOMO_ID"],
         },
-        "lvao": {
-            "POSTHOG_KEY": settings.LVAO["POSTHOG_KEY"],
-            "DECLARATION_ACCESSIBILITE_PAGE_ID": settings.LVAO[
+        "carte": {
+            "DECLARATION_ACCESSIBILITE_PAGE_ID": settings.CARTE[
                 "DECLARATION_ACCESSIBILITE_PAGE_ID"
-            ],
-            "MATOMO_ID": settings.LVAO["MATOMO_ID"],
+            "POSTHOG_KEY": settings.CARTE["POSTHOG_KEY"],
+            "MATOMO_ID": settings.CARTE["MATOMO_ID"],
         },
     }
 
diff --git a/core/settings.py b/core/settings.py
index 251920042..c989241e2 100644
--- a/core/settings.py
+++ b/core/settings.py
@@ -38,7 +38,7 @@
 
 # Carte settings
 # --------------
-LVAO = {
+CARTE = {
     "MATOMO_ID": decouple.config("LVAO_MATOMO_ID", default=50, cast=int),
     "GOOGLE_SEARCH_CONSOLE": "google9dfbbc61adbe3888.html",
     "POSTHOG_KEY": decouple.config(
diff --git a/qfdmo/urls.py b/qfdmo/urls.py
index 31633c1bd..2e34f3240 100644
--- a/qfdmo/urls.py
+++ b/qfdmo/urls.py
@@ -21,14 +21,14 @@
 
 urlpatterns = [
     # This route needs to be touched with care is it is embedded
-    # on many website, enabling the load of LVAO as an iframe
+    # on many website, enabling the load of Carte / Formulaire as an iframe
     path("static/carte.js", get_carte_iframe_script, name="carte_script"),
     path("static/iframe.js", get_formulaire_iframe_script, name="formulaire_script"),
     path("carte", CarteSearchActeursView.as_view(), name="carte"),
     path("carte/<slug:slug>/", CarteConfigView.as_view(), name="carte_custom"),
     path("carte.json", CarteSearchActeursView.as_view(), name="carte_json"),
     path("formulaire", FormulaireSearchActeursView.as_view(), name="formulaire"),
-    path(settings.LVAO.get("GOOGLE_SEARCH_CONSOLE"), google_verification),
+    path(settings.CARTE.get("GOOGLE_SEARCH_CONSOLE"), google_verification),
     path(
         "donnez-votre-avis",
         RedirectView.as_view(
diff --git a/qfdmo/views/__init__.py b/qfdmo/views/__init__.py
index afafdda49..32e4e9275 100644
--- a/qfdmo/views/__init__.py
+++ b/qfdmo/views/__init__.py
@@ -13,5 +13,5 @@ def get_formulaire_iframe_script(request):
 
 
 def google_verification(request):
-    content = f"google-site-verification: {settings.LVAO.get('GOOGLE_SEARCH_CONSOLE')}"
+    content = f"google-site-verification: {settings.CARTE.get('GOOGLE_SEARCH_CONSOLE')}"
     return HttpResponse(content, content_type="text/plain")
diff --git a/templates/layout/base.html b/templates/layout/base.html
index 6ab9fbf0b..a84441f73 100644
--- a/templates/layout/base.html
+++ b/templates/layout/base.html
@@ -31,7 +31,7 @@
         {% block css_extras %}{% endblock %}
 
         {# Js #}
-        {% matomo lvao.MATOMO_ID %}
+        {% matomo carte.MATOMO_ID %}
 
         <script src="{% static 'qfdmo.js' %}"></script>
         {% block javascript_extras %}{% endblock %}
@@ -48,7 +48,7 @@
         data-state-address-autocomplete-outlet="[data-controller='address-autocomplete']"
         data-state-map-outlet="[data-controller='map']"
         data-state-search-solution-form-outlet="[data-controller='search-solution-form']"
-        {% posthog_data_attributes lvao.POSTHOG_KEY %}
+        {% posthog_data_attributes carte.POSTHOG_KEY %}
         data-action="address-autocomplete:change->state#setLocation"
     >
         <main id="solutions" class="qf-h-full qf-overflow-auto qf-overscroll-none qf-scroll-smooth">

From f92a17db9175c376f3377a765c8d707061fb4fe3 Mon Sep 17 00:00:00 2001
From: Fabien Le Frapper <contact@fabienlefrapper.me>
Date: Mon, 22 Sep 2025 15:32:05 +0200
Subject: [PATCH 5/7]  oopsy

---
 core/context_processors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/context_processors.py b/core/context_processors.py
index 46a2019b4..9743d92a4 100644
--- a/core/context_processors.py
+++ b/core/context_processors.py
@@ -35,7 +35,7 @@ def global_context(request) -> dict:
         },
         "carte": {
             "DECLARATION_ACCESSIBILITE_PAGE_ID": settings.CARTE[
-                "DECLARATION_ACCESSIBILITE_PAGE_ID"
+                "DECLARATION_ACCESSIBILITE_PAGE_ID"],
             "POSTHOG_KEY": settings.CARTE["POSTHOG_KEY"],
             "MATOMO_ID": settings.CARTE["MATOMO_ID"],
         },

From 721c20eee18395c64c8fd8e4bcef84edaadc22e3 Mon Sep 17 00:00:00 2001
From: Fabien Le Frapper <contact@fabienlefrapper.me>
Date: Mon, 22 Sep 2025 15:35:24 +0200
Subject: [PATCH 6/7]  Format

---
 core/context_processors.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/context_processors.py b/core/context_processors.py
index 9743d92a4..bc1845438 100644
--- a/core/context_processors.py
+++ b/core/context_processors.py
@@ -35,7 +35,8 @@ def global_context(request) -> dict:
         },
         "carte": {
             "DECLARATION_ACCESSIBILITE_PAGE_ID": settings.CARTE[
-                "DECLARATION_ACCESSIBILITE_PAGE_ID"],
+                "DECLARATION_ACCESSIBILITE_PAGE_ID"
+            ],
             "POSTHOG_KEY": settings.CARTE["POSTHOG_KEY"],
             "MATOMO_ID": settings.CARTE["MATOMO_ID"],
         },

From eb15c4c438754d81c441923b8229e6f434647b38 Mon Sep 17 00:00:00 2001
From: Fabien Le Frapper <contact@fabienlefrapper.me>
Date: Mon, 22 Sep 2025 15:46:21 +0200
Subject: [PATCH 7/7] Prevent error without page id

---
 qfdmd/templatetags/qfdmd_tags.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/qfdmd/templatetags/qfdmd_tags.py b/qfdmd/templatetags/qfdmd_tags.py
index 9da1bb6e7..386d45a7f 100644
--- a/qfdmd/templatetags/qfdmd_tags.py
+++ b/qfdmd/templatetags/qfdmd_tags.py
@@ -52,6 +52,10 @@ def canonical_url(context: dict) -> dict:
 @register.simple_tag(takes_context=True)
 def pageurl_by_id(context, page_id):
     request = context["request"]
+
+    if not page_id:
+        return ""
+
     try:
         return Page.objects.get(id=page_id).get_full_url(request)
     except Page.DoesNotExist: