territories-dashboard-lib 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

territories_dashboard_lib/geo_lib/views.py

@@ -1,4 +1,5 @@
 import base64
+import datetime
 import gzip
 import json
 from typing import Optional
@@ -32,6 +33,17 @@ class GeoFeaturesParams(BaseModel):
     feature: str
 
 
+class DateTimeEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, (datetime.date, datetime.datetime)):
+            return (
+                obj.date().isoformat()
+                if isinstance(obj, datetime.datetime)
+                else obj.isoformat()
+            )
+        return super().default(obj)
+
+
 @require_GET
 @cache_control(max_age=3600)
 def geo_features_view(request):
@@ -96,7 +108,7 @@ def geo_features_view(request):
 
     last_queried_order_id = results[-1]["order_id"] if results else None
 
-    compressed_data = gzip.compress(json.dumps(data).encode())
+    compressed_data = gzip.compress(json.dumps(data, cls=DateTimeEncoder).encode())
     compressed_base64 = base64.b64encode(compressed_data).decode()
 
     return JsonResponse({"data": compressed_base64, "last": last_queried_order_id})

territories_dashboard_lib/indicators_lib/export.py

@@ -2,14 +2,14 @@ import csv
 
 from django.http import HttpRequest, HttpResponse
 
-from territories_dashboard_lib.tracking_lib.enums import EventType
+from territories_dashboard_lib.tracking_lib.enums import EventType, GraphType
 from territories_dashboard_lib.tracking_lib.logic import track_event
 
 from .models import Indicator
 
 
 def export_to_csv(
-    request: HttpRequest, indicator: Indicator, graph_name: str, data: list[dict]
+    request: HttpRequest, indicator: Indicator, graph_name: GraphType, data: list[dict]
 ):
     response = HttpResponse(content_type="text/csv")
     response["Content-Disposition"] = (
@@ -24,6 +24,6 @@ def export_to_csv(
         request=request,
         response=response,
         event_name=EventType.download,
-        data={"indicator": indicator.name, "objet": graph_name},
+        data={"indicator": indicator.name, "objet": graph_name, "type": "csv"},
     )
     return response

territories_dashboard_lib/indicators_lib/views.py

@@ -6,7 +6,7 @@ from django.views.decorators.cache import cache_control
 from django.views.decorators.http import require_GET
 
 from territories_dashboard_lib.commons.decorators import use_payload
-from territories_dashboard_lib.tracking_lib.enums import EventType
+from territories_dashboard_lib.tracking_lib.enums import EventType, GraphType
 from territories_dashboard_lib.tracking_lib.logic import track_event
 
 from .enums import MESH_TITLES
@@ -54,7 +54,7 @@ def download_indicator_methodo_view(request, name):
         request=request,
         response=response,
         event_name=EventType.download,
-        data={"indicator": indicator.name, "objet": "methodo"},
+        data={"indicator": indicator.name, "objet": "methodo", "type": "pdf"},
     )
     return response
 
@@ -129,14 +129,16 @@ def indicator_values_export_view(request, name, payload):
             "Année": value["annee"],
             f"Valeur {territory_name} ({indicator.unite})": value["valeur"],
         }
+    tracking_objet = "historique"
     if results.get("cmp_values") is not None:
         cmp_territory_name = get_territory_name(payload.cmp_territory)
         for value in results["cmp_values"]:
             export_values[value["annee"]][
                 f"Valeur {cmp_territory_name} ({indicator.unite})"
             ] = value["valeur"]
+        tracking_objet = "comparaison-" + tracking_objet
     return export_to_csv(
-        request, indicator, "comparaison-historique", list(export_values.values())
+        request, indicator, tracking_objet, list(export_values.values())
     )
 
 
@@ -183,7 +185,7 @@ def indicator_proportions_export_view(request, name, payload):
         {"Dimension": r["label"], f"Valeur {indicator.unite}": r["data"][0]}
         for r in rows
     ]
-    return export_to_csv(request, indicator, "repartition-dimension", rows)
+    return export_to_csv(request, indicator, GraphType.repartition_dimension, rows)
 
 
 @cache_control(max_age=3600)
@@ -227,7 +229,7 @@ def indicator_histogram_export_view(request, name, payload):
             index
         ].replace("\n", " | ")
         rows.append(row)
-    return export_to_csv(request, indicator, "repartition-valeurs", rows)
+    return export_to_csv(request, indicator, GraphType.repartition_valeurs, rows)
 
 
 @cache_control(max_age=3600)
@@ -255,7 +257,7 @@ def indicator_top_10_export_view(request, name, payload):
         payload.submesh,
         filters,
     )
-    return export_to_csv(request, indicator, "top_10", csv_data)
+    return export_to_csv(request, indicator, GraphType.top_10, csv_data)
 
 
 @require_GET
@@ -404,7 +406,7 @@ def comparison_histogram_export_view(request, name, payload):
             cmp_values[index + 1][:10]
         )
         rows.append(row)
-    return export_to_csv(request, indicator, "comparison-histogram", rows)
+    return export_to_csv(request, indicator, GraphType.comparison_histogram, rows)
 
 
 def get_label(props, indicator, key):
@@ -487,4 +489,4 @@ def indicator_details_table_export_view(request, name, payload):
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
     table_values = get_export_indicator_table_values(indicator, payload, filters)
-    return export_to_csv(request, indicator, "table", table_values)
+    return export_to_csv(request, indicator, GraphType.table, table_values)

territories_dashboard_lib/tracking_lib/enums.py

@@ -5,3 +5,13 @@ TRACKING_COOKIE_NAME = "omnibus"
 
 class EventType(models.TextChoices):
     download = "download"
+
+
+class GraphType(models.TextChoices):
+    comparaison_historique = "comparaison-historique"
+    repartition_dimension = "repartition-dimension"
+    repartition_valeurs = "repartition-valeurs"
+    top_10 = "top_10"
+    historique = "historique"
+    comparison_histogram = "comparison-histogram"
+    table = "table"

territories_dashboard_lib/tracking_lib/payloads.py

@@ -0,0 +1,10 @@
+from pydantic import BaseModel
+
+from territories_dashboard_lib.tracking_lib.enums import EventType
+
+
+class EventPayload(BaseModel):
+    indicator: str
+    event: EventType
+    objet: str
+    type: str

territories_dashboard_lib/tracking_lib/urls.py

@@ -0,0 +1,9 @@
+from django.urls import path
+
+from territories_dashboard_lib.tracking_lib.views import track_event_view
+
+app_name = "tracking-api"
+
+urlpatterns = [
+    path("event/", track_event_view, name="event"),
+]

territories_dashboard_lib/tracking_lib/views.py

@@ -0,0 +1,43 @@
+import json
+from datetime import timedelta
+
+from django.http import HttpResponse, JsonResponse
+from django.utils import timezone
+from django.views.decorators.csrf import csrf_exempt
+from django.views.decorators.http import require_POST
+from pydantic import ValidationError
+
+from territories_dashboard_lib.tracking_lib.logic import (
+    track_event,
+)
+from territories_dashboard_lib.tracking_lib.models import Event
+from territories_dashboard_lib.tracking_lib.payloads import EventPayload
+
+
+@require_POST
+@csrf_exempt
+def track_event_view(request):
+    try:
+        data = json.loads(request.body)
+        payload = EventPayload(**data)
+    except json.JSONDecodeError:
+        return JsonResponse({"error": "Invalid JSON"}, status=400)
+    except ValidationError as e:
+        return JsonResponse({"error": e.errors()}, status=422)
+    if (
+        Event.objects.filter(created_at__gte=timezone.now() - timedelta(days=1)).count()
+        > 1000
+    ):
+        return HttpResponse(status=429)
+    response = HttpResponse()
+    track_event(
+        request=request,
+        response=response,
+        event_name=payload.event,
+        data={
+            "indicator": payload.indicator,
+            "objet": payload.objet,
+            "type": payload.type,
+        },
+    )
+    return HttpResponse()

territories_dashboard_lib/website_lib/migrations/0003_alter_mainconf_footer_navigation_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.6 on 2025-06-23 12:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('website_lib', '0002_mainconf_contact_email_mainconf_newsletter_link_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='mainconf',
+            name='footer_navigation',
+            field=models.TextField(default='', help_text='Navigation du footer, mettre les liens au format markdown, un par ligne. <br/><br/>\n    Si le lien est interne, commencer et terminer le lien par un slash comme "/accueil/"<br/><br/>\n    Par exemple : <br/><br/>\n    [Plan du site](/plan-site/)<br/>\n    [Accessibilité](/accessibilite/)<br/>\n    [Mentions légales](/mentions-legales/) <br/>\n    ', verbose_name='Navigation du footer'),
+        ),
+        migrations.AlterField(
+            model_name='mainconf',
+            name='header_navigation',
+            field=models.TextField(default='', help_text='Navigation du header, mettre les liens au format markdown avec un slash à la fin du lien, mettre une ligne vide entre chaque rubrique. <br/><br/>\n        \n        Une rubrique peut contenir un seul lien, ou bien plusiers, dans ce cas la rubrique sera sous forme de dropdown et il faut mettre un titre en premier. <br/><br/>Par exemple : <br/>\n        <br/><br/>\n        [Accueil](/accueil/)\n        <br/><br/>\n        [Indicateurs territoriaux](/indicateurs/)\n        <br/><br/>\n        À propos\n        [Présentation](/presentation/)\n        [Journal des versions](/journal/)\n        ', verbose_name='Navigation du header'),
+        ),
+    ]

territories_dashboard_lib/website_lib/models.py

@@ -22,7 +22,7 @@ class MainConf(CommonModel):
         help_text="Renseigner le nom de l'entité au même format que le logo officiel en respectant les mises à la ligne.",
     )
     header_navigation = models.TextField(
-        verbose_name="Navigation",
+        verbose_name="Navigation du header",
         help_text="""Navigation du header, mettre les liens au format markdown avec un slash à la fin du lien, mettre une ligne vide entre chaque rubrique. <br/><br/>
         
         Une rubrique peut contenir un seul lien, ou bien plusiers, dans ce cas la rubrique sera sous forme de dropdown et il faut mettre un titre en premier. <br/><br/>Par exemple : <br/>
@@ -38,7 +38,7 @@ class MainConf(CommonModel):
         default="",
     )
     footer_navigation = models.TextField(
-        verbose_name="Navigation",
+        verbose_name="Navigation du footer",
         help_text="""Navigation du footer, mettre les liens au format markdown, un par ligne. <br/><br/>
     Si le lien est interne, commencer et terminer le lien par un slash comme "/accueil/"<br/><br/>
     Par exemple : <br/><br/>

territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/css/website.css

@@ -875,13 +875,17 @@ footer .fr-follow {
     display: flex;
     flex-direction: column;
     gap: 8px;
-    padding-bottom: 32px;
+    padding-bottom: 64px;
 }
 
 .table-geo-filters summary {
     font-size: 0.9rem;
 }
 
+.table-geo-filters:has(details[open]) {
+    padding-bottom: 300px;
+}
+
 .table-geo-filters input,
 .table-geo-filters select {
     padding: 4px 8px;
@@ -890,10 +894,11 @@ footer .fr-follow {
 }
 
 .table-geo-filters input[type="number"] {
-    max-width: 150px;
+    max-width: 70px;
 }
 
-.table-geo-filters label {
+.table-geo-filters label,
+.table-geo-filters i {
     font-size: 0.8rem;
 }
 
@@ -908,6 +913,12 @@ footer .fr-follow {
     gap: 8px;
 }
 
+.geo-filters-numbers-row {
+    display: flex;
+    flex-direction: row;
+    gap: 32px;
+}
+
 .staticPage .code {
     background-color: #ececfe;
     font-family: inherit;
@@ -954,3 +965,43 @@ footer .fr-follow {
 .glossary .definitions dd {
     width: 100%;
 }
+
+@media (min-width: 48em) {
+    .fr-footer__bottom-item::before {
+        margin-right: 0.5rem;
+    }
+}
+
+.fr-footer__bottom-link {
+    white-space: nowrap;
+}
+
+.react-datepicker__input-container input {
+    border-color: hsl(0, 0%, 80%);
+    border-radius: 4px;
+    border-style: solid;
+    border-width: 1px;
+    width: 95px;
+}
+
+.date-pickers-range {
+    display: flex;
+    flex-direction: row;
+    gap: 32px;
+}
+
+.react-datepicker__header {
+    background-color: #ececfe !important;
+}
+
+.react-datepicker__header h2 {
+    padding: 0px !important;
+}
+
+.react-datepicker__header__dropdown {
+    padding-bottom: 16px !important;
+}
+
+.react-datepicker__close-icon:hover {
+    background-color: inherit !important;
+}

territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/comparaison/page.mjs

@@ -74,7 +74,9 @@ document
             await new Promise((resolve) => setTimeout(resolve, 50));
             await exportImageAsync(
                 button.parentElement.previousElementSibling,
-                `${indicator.name} - ${button.dataset.title}`
+                `${indicator.name} - ${button.dataset.title}`,
+                indicator,
+                button.dataset["trackingobjet"]
             );
             button.removeAttribute("disabled");
         });

territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/details/page.mjs

@@ -59,7 +59,9 @@ document
             await new Promise((resolve) => setTimeout(resolve, 50));
             await exportImageAsync(
                 button.parentElement.previousElementSibling,
-                `${indicator.name} - ${button.dataset.title}`
+                `${indicator.name} - ${button.dataset.title}`,
+                indicator,
+                button.dataset["trackingobjet"]
             );
             button.removeAttribute("disabled");
         });

territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/export-graph.mjs

@@ -1,6 +1,6 @@
 /* globals html2canvas */
 
-async function exportImageAsync(element, fileName) {
+async function exportImageAsync(element, fileName, indicator, graphName) {
     const canvas = await html2canvas(element);
     const image = canvas.toDataURL("image/png", 1.0);
     const tempLink = document.createElement("a");
@@ -10,6 +10,15 @@ async function exportImageAsync(element, fileName) {
     tempLink.click();
     document.body.removeChild(tempLink);
     tempLink.remove();
+    fetch("/api/tracking/event/", {
+        method: "POST",
+        body: JSON.stringify({
+            indicator: indicator.name,
+            event: "download",
+            objet: graphName,
+            type: "image",
+        }),
+    });
 }
 
 export { exportImageAsync };

territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/theme/page.mjs

@@ -155,7 +155,9 @@ document
             await new Promise((resolve) => setTimeout(resolve, 50));
             await exportImageAsync(
                 button.parentElement.previousElementSibling,
-                `${indicator.name} - ${button.dataset.title}`
+                `${indicator.name} - ${button.dataset.title}`,
+                indicator,
+                button.dataset["trackingobjet"]
             );
             button.removeAttribute("disabled");
         });