territories-dashboard-lib 0.1.13__tar.gz → 0.1.15__tar.gz

{territories_dashboard_lib-0.1.13/territories_dashboard_lib.egg-info → territories_dashboard_lib-0.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: territories-dashboard-lib
-Version: 0.1.13
+Version: 0.1.15
 Summary: Librairie pour la visualisation d'indicateurs territoriaux.
 Author-email: Bastien <bastien@prune.sh>
 Classifier: Programming Language :: Python :: 3

{territories_dashboard_lib-0.1.13 → territories_dashboard_lib-0.1.15}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "territories-dashboard-lib"
-version = "0.1.13"
+version = "0.1.15"
 description = "Librairie pour la visualisation d'indicateurs territoriaux."
 authors = [
     { name = "Bastien", email = "bastien@prune.sh" }

{territories_dashboard_lib-0.1.13 → territories_dashboard_lib-0.1.15}/territories_dashboard_lib/tracking_lib/geolocalisation/logic.py

@@ -4,7 +4,7 @@ from functools import lru_cache
 import geoip2.database
 
 
-def _get_client_ip(request):
+def get_client_ip(request):
     x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
     if x_forwarded_for:
         ip = x_forwarded_for.split(",")[0]
@@ -14,7 +14,7 @@ def _get_client_ip(request):
 
 
 @lru_cache(maxsize=100_000)
-def _get_country_from_geolite(ip_address):
+def get_country_from_geolite(ip_address):
     database_name = "GeoLite2-Country.mmdb"
     database_path = os.path.join(os.path.dirname(__file__), database_name)
     reader = geoip2.database.Reader(database_path)
@@ -25,11 +25,3 @@ def _get_country_from_geolite(ip_address):
         country = "UNKNOWN"
     reader.close()
     return country
-
-
-def get_country_of_ip(request):
-    """
-    Guess the country of an ip thanks to the geoip2 library and the Geolite mmdb database file.
-    """
-    ip_address = _get_client_ip(request)
-    return _get_country_from_geolite(ip_address)

{territories_dashboard_lib-0.1.13 → territories_dashboard_lib-0.1.15}/territories_dashboard_lib/tracking_lib/logic.py

@@ -7,7 +7,8 @@ from django.urls import resolve
 
 from territories_dashboard_lib.tracking_lib.enums import TRACKING_COOKIE_NAME, EventType
 from territories_dashboard_lib.tracking_lib.geolocalisation.logic import (
-    get_country_of_ip,
+    get_client_ip,
+    get_country_from_geolite,
 )
 from territories_dashboard_lib.tracking_lib.models import CookieInfo, Event, Page
 
@@ -27,8 +28,11 @@ def get_or_set_tracking_cookie(request: HttpRequest, response: HttpResponse) ->
     try:
         CookieInfo.objects.get(id=tracking_cookie)
     except CookieInfo.DoesNotExist:
-        country = get_country_of_ip(request)
-        CookieInfo.objects.create(id=tracking_cookie, country=country)
+        ip_address = get_client_ip(request)
+        country = get_country_from_geolite(ip_address)
+        CookieInfo.objects.create(
+            id=tracking_cookie, country=country, ip_address=ip_address
+        )
     return tracking_cookie
 
 

territories_dashboard_lib-0.1.15/territories_dashboard_lib/tracking_lib/migrations/0004_cookieinfo_ip_address.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.3 on 2025-06-30 16:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tracking_lib', '0003_cookieinfo'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='cookieinfo',
+            name='ip_address',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

{territories_dashboard_lib-0.1.13 → territories_dashboard_lib-0.1.15}/territories_dashboard_lib/tracking_lib/models.py

@@ -83,3 +83,4 @@ class Event(models.Model):
 class CookieInfo(models.Model):
     id = models.TextField(primary_key=True)
     country = models.TextField(null=True, blank=True)
+    ip_address = models.TextField(null=True, blank=True)

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/layout/base.css

@@ -0,0 +1,82 @@
+.fr-header__logo:hover {
+    background-color: var(--grey-1000-50-hover);
+}
+
+.delay-spinner {
+    opacity: 0%;
+}
+
+.filters-dimension {
+    display: flex;
+    flex-direction: column;
+}
+
+.filters-dimension > label {
+    margin-bottom: 4px;
+    font-style: italic;
+    font-size: smaller;
+}
+
+.filters-dimension:not(:last-child) {
+    margin-bottom: 16px;
+}
+
+.fr-tag-list .fr-tag {
+    margin: 0 0.25rem 0.5rem;
+    vertical-align: top;
+}
+
+.tdbmd-content {
+    position: relative;
+}
+
+.tdbmd-indicator-source {
+    font-style: italic;
+}
+
+.tdbmd-indicator-source__title {
+    text-decoration: underline;
+}
+
+.tdbmd-thematics {
+    box-sizing: border-box;
+}
+
+.tdbmd-thematics .fr-sidemenu {
+    padding-right: 0;
+    margin: 0;
+}
+
+.tdbmd-thematics .fr-sidemenu__inner {
+    box-shadow: none;
+}
+
+.tdbmd-thematics .subtheme h2 {
+    padding: 1rem 0;
+    margin-bottom: 0;
+}
+
+.tdbmd-thematics .subtheme:nth-child(even) {
+    background: var(--background-alt-blue-france);
+}
+
+.tdbmd-thematics .subtheme:nth-child(odd) {
+    background: white;
+}
+
+.tdbmd-thematics__content {
+    box-sizing: border-box;
+    border-left: 1px solid var(--border-default-grey);
+}
+.tdbmd-thematics__btns {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    margin: 0 1rem;
+}
+@media (min-width: 575px) {
+    .tdbmd-thematics__btns {
+        flex-direction: row;
+        justify-content: flex-end;
+    }
+}

{territories_dashboard_lib-0.1.13 → territories_dashboard_lib-0.1.15}/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/layout/base.html

@@ -15,7 +15,6 @@
 
     <link rel="stylesheet" href="/dsfr.min.css">
     <link rel="stylesheet" href="/utility/utility.min.css">
-    <link rel="stylesheet" href="{% static 'territories_dashboard_lib/website/css/website.css' %}">
 
     <!-- Script en version es6 module et nomodule pour les navigateurs le ne supportant pas -->
     <script defer type="module" src="/dsfr.module.min.js"></script>
@@ -30,6 +29,13 @@
       <meta name="robots" content="noindex, nofollow">
     {% endif %}
 
+    <style>
+      {% include "territories_dashboard_lib/website/layout/header.css" %}
+      {% include "territories_dashboard_lib/website/layout/footer.css" %}
+      {% include "territories_dashboard_lib/website/layout/base.css" %}
+      {% block css %}{% endblock %}
+    </style>
+
     {% block extra_head %}
     {% endblock %}
   </head>

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/layout/footer.css

@@ -0,0 +1,12 @@
+footer .fr-follow {
+    border-top: 1px solid var(--border-default-grey);
+}
+@media (min-width: 48em) {
+    .fr-footer__bottom-item::before {
+        margin-right: 0.5rem;
+    }
+}
+
+.fr-footer__bottom-link {
+    white-space: nowrap;
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/layout/header.css

@@ -0,0 +1,26 @@
+#header-navigation > div:first-child {
+    position: relative;
+}
+
+@media (max-width: 991px) {
+    .fr-nav__btn[aria-current]:not([aria-current="false"]),
+    .fr-nav__link[aria-current]:not([aria-current="false"]) {
+        text-decoration: underline;
+    }
+}
+
+.fr-notice[data-show="false"] {
+    display: none;
+}
+
+.fr-notice[data-show="true"] {
+    display: block;
+}
+
+.fr-notice__link {
+    text-decoration: underline;
+}
+
+.internal-outline:focus {
+    outline-offset: -2px;
+}

{territories_dashboard_lib-0.1.13 → territories_dashboard_lib-0.1.15}/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/comparaison/[theme]/page.html

@@ -14,6 +14,19 @@
     <script defer type="module" src="{% static 'territories_dashboard_lib/website/js/pages/indicators/comparaison/page.mjs' %}"></script>
 {% endblock %}
 
+{% block css %}
+    {% include "territories_dashboard_lib/website/pages/indicators/components/geo_params.css" %}
+    {% include "territories_dashboard_lib/website/pages/indicators/components/chart-buttons.css" %}
+    {% include "territories_dashboard_lib/website/pages/indicators/themes/components/extremum.css" %}
+    {% include "territories_dashboard_lib/website/pages/indicators/components/themes-list.css" %}
+    {% include "territories_dashboard_lib/website/pages/indicators/themes/components/indicateur-card.css" %}
+    {% include "territories_dashboard_lib/website/pages/indicators/components/indicator-card.css" %}
+    {% include "territories_dashboard_lib/website/pages/indicators/components/side_panel_geo.css" %}
+    {% include "territories_dashboard_lib/website/pages/indicators/components/side_panel.css" %}
+    {% include "territories_dashboard_lib/website/pages/indicators/components/side_panel_methodo.css" %}
+{% endblock %}
+
+
 {% block main %}
 
 <div class="tdbmd-thematics">

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/components/chart-buttons.css

@@ -0,0 +1,16 @@
+.chart-buttons {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 2rem;
+    padding: 2rem;
+}
+
+.chart-buttons label::before {
+    margin-right: 0.5rem;
+}
+
+.checkbox-label {
+    text-wrap: nowrap;
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/components/geo_params.css

@@ -0,0 +1,94 @@
+.tdbmd-mesh {
+    position: relative;
+    width: 100%;
+}
+
+.tdbmd-mesh .tdbmd-mesh__btn {
+    width: 100%;
+    text-align: left;
+    display: inline-block;
+    border-bottom: 3px solid var(--text-action-high-blue-france);
+    position: relative;
+    background: white;
+}
+
+.tdbmd-mesh .tdbmd-mesh__btn-mesh {
+    display: block;
+}
+
+.tdbmd-mesh .tdbmd-mesh__btn-title {
+    display: block;
+    color: var(--text-mention-grey);
+}
+
+.tdbmd-mesh .tdbmd-mesh__btn:after {
+    position: absolute;
+    top: 50%;
+    right: 1rem;
+    transform: translateY(-50%);
+}
+
+.tdbmd-mesh .tdbmd-mesh__list-btn {
+    width: 100%;
+    padding: 0 1rem;
+    padding-right: 2.5rem;
+}
+@media (min-width: 575px) {
+    .tdbmd-mesh {
+        width: 200px;
+    }
+}
+.tdbmd-mesh ul {
+    position: absolute;
+    z-index: 100;
+    width: 100%;
+}
+
+.tdbmd-mesh__list {
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    background: white;
+    box-shadow: -1px 1px 5px 1px var(--border-default-grey);
+}
+
+.tdbmd-mesh__list .tdbmd-mesh__list-btn {
+    color: var(--text-default-grey);
+}
+
+.tdbmd-mesh__list .tdbmd-mesh__list-btn--current {
+    color: var(--text-action-high-blue-france);
+}
+
+.tdbmd-mesh__list-item {
+    margin: 0;
+    padding: 0;
+}
+
+.tdbmd-territory .tdbmd-territory__btn {
+    width: 100%;
+    text-align: left;
+    display: inline-block;
+    border-bottom: 3px solid var(--text-action-high-blue-france);
+    position: relative;
+    background: white;
+    padding-right: 2.5rem;
+}
+
+.tdbmd-territory .tdbmd-territory__btn-mesh {
+    display: block;
+    white-space: nowrap;
+}
+
+.tdbmd-territory .tdbmd-territory__btn-title {
+    display: block;
+    color: var(--text-mention-grey);
+    white-space: nowrap;
+}
+
+.tdbmd-territory .tdbmd-territory__btn:after {
+    position: absolute;
+    top: 50%;
+    right: 1rem;
+    transform: translateY(-50%);
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/components/indicator-card.css

@@ -0,0 +1,6 @@
+.tdbmd-indicator-card {
+    background: var(--grey-1000-50);
+    border: 1px solid var(--border-default-grey);
+    border-bottom: none;
+    box-shadow: none;
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/components/side_panel.css

@@ -0,0 +1,110 @@
+.tdbmd-slide-panel {
+    display: none;
+    position: fixed;
+    width: 100vw;
+    top: 0;
+    right: 0;
+    transform: translateX(110%);
+    z-index: 1000;
+    box-sizing: border-box;
+    transition: transform ease-in-out 0.3s;
+}
+
+.tdbmd-slide-panel .fr-accordion,
+.tdbmd-slide-panel h2,
+.tdbmd-slide-panel p,
+.tdbmd-slide-panel ul {
+    margin-left: 2rem;
+    margin-right: 2rem;
+}
+
+.tdbmd-slide-panel .tdbmd-combobox-suggestions {
+    max-height: 200px;
+    overflow-y: scroll;
+    width: 100%;
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+    box-sizing: border-box;
+    margin-bottom: 2rem;
+    margin-top: 2px;
+}
+
+.tdbmd-slide-panel .tdbmd-combobox-suggestions--opened {
+    border-bottom: 2px solid var(--background-action-high-blue-france);
+    border-left: 2px solid var(--background-action-high-blue-france);
+    border-right: 2px solid var(--background-action-high-blue-france);
+}
+
+.tdbmd-slide-panel .tdbmd-slide-panel__title {
+    color: var(--text-action-high-blue-france);
+    padding-top: 1rem !important;
+}
+
+.tdbmd-slide-panel .tdbmd-territory-tabs .autocomplete-input {
+    margin-bottom: 0;
+}
+
+.tdbmd-slide-panel .tdbmd-territory-tabs h2 {
+    margin-left: 0;
+}
+
+.tdbmd-slide-panel.tdbmd-slide-panel--show {
+    transform: initial;
+}
+
+@media (min-width: 992px) {
+    .tdbmd-slide-panel {
+        width: 60vw;
+        right: 0;
+        left: initial;
+    }
+    .tdbmd-slide-panel__btn {
+        display: block !important;
+        position: absolute;
+        left: 0;
+        transform: translateX(calc(-50% + 0.5rem));
+    }
+    .tdbmd-slide-panel__btn--mobile {
+        display: none !important;
+    }
+    .tdbmd-slide-panel__content {
+        margin-left: 2rem;
+        border: 1px solid var(--border-default-grey);
+    }
+}
+@media (min-width: 1248px) {
+    .tdbmd-slide-panel {
+        width: 50vw;
+    }
+}
+.tdbmd-slide-panel__btn--mobile {
+    display: block;
+}
+.tdbmd-slide-panel__btn.fr-btn.fr-btn--tertiary {
+    display: none;
+    box-sizing: border-box;
+    padding: 0 0.8rem 0.4rem;
+    border: none;
+    background: white;
+    color: var(--text-action-high-blue-france);
+}
+
+.tdbmd-slide-panel__content {
+    height: 100vh;
+    background: white;
+    overflow: scroll;
+    /* Hide scrollbar for Chrome, Safari and Opera */
+    /* Hide scrollbar for IE, Edge and Firefox */
+    -ms-overflow-style: none;
+    /* IE and Edge */
+    scrollbar-width: none;
+    /* Firefox */
+}
+
+.tdbmd-slide-panel__content::-webkit-scrollbar {
+    display: none;
+}
+.tdbmd-slide-panel__icon:before {
+    transform: scaleX(-1);
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/components/side_panel_geo.css

@@ -0,0 +1,20 @@
+.side-panel-last-close-button-container {
+    display: flex;
+    justify-content: end;
+    margin-top: 32px;
+    margin-right: 4px;
+}
+
+.tdbmbd-tabpanel-panel {
+    padding-bottom: 64px;
+}
+
+.tdbmd-combobox-suggestions li {
+    padding: 0.25rem 1rem;
+    box-sizing: border-box;
+}
+
+.tdbmd-combobox-suggestions li:hover {
+    background-color: var(--background-alt-blue-france);
+    cursor: pointer;
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/components/side_panel_methodo.css

@@ -0,0 +1,29 @@
+.tdbmd-slide-panel-fiche-methodo {
+    overflow-y: scroll;
+    height: 100vh;
+}
+
+.tdbmd-slide-panel-fiche-methodo .tdbmd-markdown .tdbmd-slide-panel__subtitle {
+    margin-left: 0;
+}
+
+.tdbmd-slide-panel-fiche-methodo .tdbmd-markdown h3 {
+    font-size: 1.4rem;
+}
+
+.tdbmd-slide-panel-fiche-methodo h3 {
+    color: var(--text-default-grey);
+    font-size: 1.2rem;
+}
+
+.tdbmd-slide-panel__subtitle {
+    background: var(--background-action-high-blue-france);
+    color: white !important;
+    padding: 0.5rem 2rem;
+    margin-top: 2rem !important;
+    margin-bottom: 2rem !important;
+}
+
+.tdbmd-slide-panel__thematic {
+    margin-left: 0px !important;
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/components/themes-list.css

@@ -0,0 +1,10 @@
+#thematics-links {
+    margin-top: 2rem;
+    line-height: 2rem;
+    list-style: none;
+}
+@media (min-width: 768px) {
+    #thematics-links {
+        display: none;
+    }
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/components/title.css

@@ -0,0 +1,8 @@
+.title-tooltip {
+    display: flex;
+    align-items: center;
+}
+
+.title-tooltip > div:last-child {
+    padding: 8px;
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/details/components/filters-reminder.css

@@ -0,0 +1,17 @@
+.filters-reminder {
+    margin-top: 16px;
+}
+
+.filters-reminder a {
+    margin-left: 8px;
+}
+
+.filters-reminder label {
+    font-style: italic;
+    font-size: smaller;
+    margin-right: 8px;
+}
+
+.filters-reminder-dimension > p:not(:first-child) {
+    margin-left: 4px;
+}

territories_dashboard_lib-0.1.15/territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/pages/indicators/details/components/table.css

@@ -0,0 +1,83 @@
+.data-table {
+    overflow-x: auto;
+}
+
+.data-table-export-buttons {
+    margin-bottom: 16px;
+    margin-top: 16px;
+    display: flex;
+    gap: 16px;
+    flex-wrap: wrap;
+}
+
+.fr-pagination__link.fr-pagination__link-override {
+    margin-left: 0.2rem;
+    margin-right: 0.2rem;
+}
+
+.fr-pagination__link.fr-pagination__link-override:hover {
+    margin-left: 0.2rem;
+    margin-right: 0.2rem;
+    background-color: #f6f6f6;
+}
+
+.orderableTh > div:first-child {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 4px;
+}
+
+.tdbmd-table {
+    width: 100%;
+    border-collapse: collapse;
+    border: 1px solid #929292;
+    text-align: left;
+}
+
+.tdbmd-table tbody > tr:focus > td {
+    background-color: #ececfe;
+}
+
+.tdbmd-table td {
+    background-color: white;
+    font-size: smaller;
+}
+
+.tdbmd-table th {
+    background-color: #f6f6f6;
+    cursor: pointer;
+    justify-content: center;
+}
+
+.tdbmd-table th .orderArrow {
+    font-size: 14px;
+}
+.tdbmd-table th,
+.tdbmd-table td {
+    padding: 8px 16px;
+    border: 1px solid #929292;
+}
+.tdbmd-table th .orderArrow.orderArrowBoth {
+    font-size: 20px;
+    padding-bottom: 4px;
+}
+
+.tdbmd-table th[data-name="annee"] {
+    width: 64px;
+}
+
+.tdbmd-table th[data-name="lieu"] {
+    width: 35%;
+}
+
+.tdbmd-table-container {
+    max-width: 900px;
+}
+
+.tdbmd-table-header {
+    width: 100%;
+    display: flex;
+    justify-content: end;
+    margin-bottom: 1rem;
+}