PyPI - territories-dashboard-lib - Versions diffs - 0.1.18__tar.gz → 0.1.20__tar.gz - Mend

@@ -2,4 +2,5 @@ recursive-include territories_dashboard_lib *.js *.mjs *.css *.html *.svg *.mmdb
 include README.md
 include licence.md
-prune territories_dashboard_lib/website_lib/react-components
+prune territories_dashboard_lib/website_lib/react-components
+prune test_project

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

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

@@ -0,0 +1,44 @@
+from django.conf import settings
+from django.db import connections
+def get_breakdown_dimension(indicator):
+    breakdown_dimension = (
+        indicator.dimensions.filter(is_breakdown=True).first()
+        if indicator.dimensions.count() > 1
+        else indicator.dimensions.first()
+    )
+    return breakdown_dimension
+def get_connection():
+    """
+    The connection to the indicators database is defined in DATABASES
+    The key for the database in DATABASES is defined in settings.INDICATORS_DATABASE
+    During testing, the connection can also be defined in READONLY_DATABASES_HANDLER
+    which defines a readonly database which will not be recreated during tests
+    """
+    connection = None
+    indicators_database = getattr(settings, "INDICATORS_DATABASE", None)
+    if indicators_database:
+        connection = connections[indicators_database]
+    else:
+        testing = getattr(settings, "TESTING", False)
+        readonly_databases_handler = getattr(
+            settings, "READONLY_DATABASES_HANDLER", None
+        )
+        if testing and readonly_databases_handler:
+            connection = readonly_databases_handler["default"]
+    if connection is None:
+        raise ValueError("No connection was defined for the indicators database")
+    return connection
+def run_custom_query(query, params=None):
+    connection = get_connection()
+    with connection.cursor() as cursor:
+        cursor.execute(query, params)
+        columns = [col[0] for col in cursor.description]
+        rows = cursor.fetchall()
+        results = [dict(zip(columns, row)) for row in rows]
+        return results

@@ -36,7 +36,7 @@ urlpatterns = [
     path(
         "<str:name>/values/export/",
         indicator_values_export_view,
-        name="values",
+        name="values-export",
     ),
     path(
         "<str:name>/values/",

territories-dashboard-lib 0.1.18tar.gz → 0.1.20tar.gz

Potentially problematic release.

@@ -1,5 +1,3 @@
-import html
 from territories_dashboard_lib.indicators_lib.enums import MeshLevel
 from territories_dashboard_lib.indicators_lib.query.utils import run_custom_query
@@ -63,7 +61,7 @@ def make_filter(dashboard: Dashboard, territory_id: str, territory_mesh: MeshLev
     for f in dashboard.filters.all():
         value = territory_meshes.get(f.mesh)
         if value:
-            value = html.escape(value)
+            value = value.replace("'", "!'")  # RISON escape
             filter_string = f"""NATIVE_FILTER-{f.superset_id}:(__cache:(label:'{value}',validateStatus:!f,value:!('{value}')),extraFormData:(filters:!((col:{f.superset_col},op:IN,val:!('{value}')))),filterState:(label:'{value}',validateStatus:!f,value:!('{value}')),id:NATIVE_FILTER-{f.superset_id},ownState:())"""
             filters.append(filter_string)
     if not filters:

@@ -201,13 +201,9 @@ class ParamsHandler:
             for m in get_all_meshes()
             if not (m == MeshLevel.Town and max_territory_mesh == MeshLevel.National)
         ]
-        print("MESHES", meshes)
         min_mesh_index = meshes.index(max_territory_mesh)
-        print("index", min_mesh_index)
         if get_allow_same_mesh() is False:
             min_mesh_index += 1
-        print("AGAIN", min_mesh_index)
-        print("Allow same mesh", get_allow_same_mesh())
         self.meshes = meshes[min(min_mesh_index, len(meshes) - 1) :]
     ######################## Commons
@@ -278,7 +274,6 @@ def with_params(view_func):
         response = view_func(request, *args, context=context, **kwargs)
         handler.set_cookie(response)
-        print(context["params"])
         return response
     return wrapper

territories-dashboard-lib 0.1.18__tar.gz → 0.1.20__tar.gz

Potentially problematic release.

territories-dashboard-lib 0.1.18tar.gz → 0.1.20tar.gz