Skip to content

Meilleure gestion des analytics : rajout de Matomo sur la carte et le formulaire #2001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Meilleure gestion des analytics : rajout de Matomo sur la carte et le formulaire #2001

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b4fbf7
Factorise analytics / add back matomo on carte / formulaire
fabienheureux Sep 11, 2025
b3814e4
Merge branch 'main' into add-back-matomo
fabienheureux Sep 11, 2025
c6157dd
Oopsy
fabienheureux Sep 12, 2025
e03db5a
Oopsy
fabienheureux Sep 12, 2025
f6568ee
Rename LVAO to Carte
fabienheureux Sep 12, 2025
8929890
Merge branch 'main' into add-back-matomo
fabienheureux Sep 15, 2025
3ed54fb
Merge branch 'main' into add-back-matomo
fabienheureux Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions core/context_processors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ def global_context(request) -> dict:
"POSTHOG_KEY": settings.ASSISTANT["POSTHOG_KEY"],
"MATOMO_ID": settings.ASSISTANT["MATOMO_ID"],
},
"lvao": {
"POSTHOG_KEY": settings.LVAO["POSTHOG_KEY"],
"carte": {
"POSTHOG_KEY": settings.CARTE["POSTHOG_KEY"],
"MATOMO_ID": settings.CARTE["MATOMO_ID"],
},
}

Expand Down
3 changes: 2 additions & 1 deletion core/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@

# Carte settings
# --------------
LVAO = {
CARTE = {
"MATOMO_ID": decouple.config("LVAO_MATOMO_ID", default=50, cast=int),
"GOOGLE_SEARCH_CONSOLE": "google9dfbbc61adbe3888.html",
"POSTHOG_KEY": decouple.config(
"LVAO_POSTHOG_KEY",
Expand Down
13 changes: 13 additions & 0 deletions core/templatetags/analytics_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
9 changes: 0 additions & 9 deletions qfdmd/templatetags/qfdmd_tags.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -90,11 +89,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"],
}
4 changes: 2 additions & 2 deletions qfdmo/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion qfdmo/views/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
0 templates/tracking/matomo.html → templates/analytics/matomo.html
View file
Open in desktop
File renamed without changes.
8 changes: 8 additions & 0 deletions templates/analytics/posthog_data_attributes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 %}"
15 changes: 4 additions & 11 deletions templates/layout/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% load qfdmo_tags static %}
{% load analytics_tags qfdmo_tags static %}
<!DOCTYPE html>
<html
lang="fr"
Expand Down Expand Up @@ -31,6 +31,8 @@
{% block css_extras %}{% endblock %}

{# Js #}
{% matomo carte.MATOMO_ID %}

<script src="{% static 'qfdmo.js' %}"></script>
{% block javascript_extras %}{% endblock %}

Expand All @@ -46,17 +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 carte.POSTHOG_KEY %}
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 %}"
>
<main id="solutions" class="qf-h-full qf-overflow-auto qf-overscroll-none qf-scroll-smooth">
<noscript>
Expand Down
14 changes: 3 additions & 11 deletions templates/qfdmd/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %}

Expand Down Expand Up @@ -31,7 +31,7 @@
{% block social_media %}
{% endblock social_media %}

{% matomo %}
{% matomo assistant.MATOMO_ID %}

{% block extra_css %}
{% endblock extra_css %}
Expand All @@ -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 assistant.POSTHOG_KEY %}
{# Actions #}
data-action="address-autocomplete:change->state#setLocation"
>
Expand Down
Loading