territories-dashboard-lib 0.1.18__py3-none-any.whl → 0.1.20__py3-none-any.whl

territories_dashboard_lib/indicators_lib/query/utils.py

@@ -11,8 +11,32 @@ def get_breakdown_dimension(indicator):
     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):
-    with connections[settings.INDICATORS_DATABASE].cursor() as cursor:
+    connection = get_connection()
+    with connection.cursor() as cursor:
         cursor.execute(query, params)
         columns = [col[0] for col in cursor.description]
         rows = cursor.fetchall()

territories_dashboard_lib/indicators_lib/urls.py

@@ -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/superset_lib/logic.py

@@ -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:

territories_dashboard_lib/website_lib/params.py

@@ -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.dist-info → territories_dashboard_lib-0.1.20.dist-info}/METADATA

@@ -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

{territories_dashboard_lib-0.1.18.dist-info → territories_dashboard_lib-0.1.20.dist-info}/RECORD

@@ -20,7 +20,7 @@ territories_dashboard_lib/indicators_lib/models.py,sha256=9f8XmM_WDuIjQTF9V3p3BA
 territories_dashboard_lib/indicators_lib/payloads.py,sha256=I03bgoNoLTehd8lfby0xbSy2zUXKRILMUOqYGqvg-Ig,1288
 territories_dashboard_lib/indicators_lib/refresh_filters.py,sha256=uPdKKcCtfwQL2QoGXtRcZcxagYpVv2yiiiTTsCYaXEI,652
 territories_dashboard_lib/indicators_lib/table.py,sha256=BsvimE68NxXdRI7xnUVYK1axZRZTywVpSUDEtAYWlMo,5332
-territories_dashboard_lib/indicators_lib/urls.py,sha256=BrizGcGJzvcijMvkImMzsi4zRzsgw4fl_cIScsfDYcU,2482
+territories_dashboard_lib/indicators_lib/urls.py,sha256=1Rr5mDOitIA40bZcO3lGlseQsvXIwyw1QM6PyUPi_Nw,2489
 territories_dashboard_lib/indicators_lib/views.py,sha256=EH0bMC_zCXXpou6hqohk2tni3oGLR5rZGVFHu1QH3a4,17138
 territories_dashboard_lib/indicators_lib/migrations/0001_initial.py,sha256=3EyizMGkqve5Gtxrmf-mADzzmOhcAVWe-P0y1TIBKCs,8092
 territories_dashboard_lib/indicators_lib/migrations/0002_filter_color_indicator_min_mesh_and_more.py,sha256=Lz6_UVKLAmaRT-OskwbTMh3PjIh0k4BaGyIOHCC8zMI,884
@@ -31,11 +31,11 @@ territories_dashboard_lib/indicators_lib/query/details.py,sha256=si43KVB5QxgQTc9
 territories_dashboard_lib/indicators_lib/query/histogram.py,sha256=NpQdAqVzm-bB5AuMZF3jOzEJKLjecwafhlorkYQY6IU,2964
 territories_dashboard_lib/indicators_lib/query/indicator_card.py,sha256=pu-oGTQ8-niIFtZP09HIgJJWkFfJb1CGX99EdsojJDw,3232
 territories_dashboard_lib/indicators_lib/query/top_10.py,sha256=3eDBd5w1ovfaMOyN3JQ5mYxBSUrcRJjR1i0v7HG04o4,3677
-territories_dashboard_lib/indicators_lib/query/utils.py,sha256=nCeQCLzfq35KZzun9hpM5U34TN7JowB4t3NshIzfLAo,649
+territories_dashboard_lib/indicators_lib/query/utils.py,sha256=o9tQTMSSlidH60JLo5RwVfWY3UXFCx0b44VeHiWC6cM,1610
 territories_dashboard_lib/superset_lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 territories_dashboard_lib/superset_lib/admin.py,sha256=3Yj3PjCd-jC0g4uMNmah-OST-yoE7DDEzJkx2kWlrXg,563
 territories_dashboard_lib/superset_lib/guest_token.py,sha256=smsl11NS2Sgsuz5UJlvI_lDaBi6Fj9rdpSVmuUol8Fs,2300
-territories_dashboard_lib/superset_lib/logic.py,sha256=upbhWFGkkiMPM8MMtPrGf5FONdbt1zBPT46tcn5Wv3g,2483
+territories_dashboard_lib/superset_lib/logic.py,sha256=vVzSimSlrwefVVdEf2dMr83MW2c_yB4k2uw_Szu_nHg,2492
 territories_dashboard_lib/superset_lib/models.py,sha256=D_IKcYggr8OeH4Gc9KxmU0ArQ3lq8DFN-e0JDQs9Dng,2613
 territories_dashboard_lib/superset_lib/serializers.py,sha256=k5DcdwN-k5w9dPchiyxBZtG3BAULp8c00JTO3DR6rA4,250
 territories_dashboard_lib/superset_lib/urls.py,sha256=URXJLciWDTlzU7gIymlK0nWwAm3Iq8bMkhO0P7RwMuk,254
@@ -63,7 +63,7 @@ territories_dashboard_lib/website_lib/context_processors.py,sha256=Xq9W_w86Oh242
 territories_dashboard_lib/website_lib/forms.py,sha256=BNbHx6CgMlA33z6eD-1VaI7AkyO20ZsloJKsec4BcoU,1146
 territories_dashboard_lib/website_lib/models.py,sha256=y5L7MtONhA9oev5UI6rBejHexLo7r1v_XyxB8h2OEs4,5356
 territories_dashboard_lib/website_lib/navigation.py,sha256=D9YNfBVPpO9bRgNT02j99sp0A0_uqDaBgc25BbQOako,3994
-territories_dashboard_lib/website_lib/params.py,sha256=M7a3SsLpFiGsPlHy9hOzbwvnWRGyOHSCeDLym70gFTA,10067
+territories_dashboard_lib/website_lib/params.py,sha256=RiRMbj5TJxyUUuf-_H98X5UucJlh9gICXofJrDTv6Jg,9868
 territories_dashboard_lib/website_lib/serializers.py,sha256=PVcOC52zlNn2tp7IRwMuB4T7rOaLl3bLKiqqesWgRE4,3772
 territories_dashboard_lib/website_lib/static_content.py,sha256=08Fw3190RsTZ8wXwZkmskh-86widq7NRmTD9Ve-9PJY,589
 territories_dashboard_lib/website_lib/views.py,sha256=ZNz23Vrws-L49xeZzrhSJA8KFpqSnURn-9-b0RdR9JE,6760
@@ -173,8 +173,8 @@ territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/websit
 territories_dashboard_lib/website_lib/templates/territories_dashboard_lib/website/svg/delete-back.svg,sha256=fJPjkZT2jdTcW2nmwr7YtBayOmQKOxiGNyO8bM8jP2U,618
 territories_dashboard_lib/website_lib/templatetags/htmlparams.py,sha256=jWXlmT-nFh7YefVP_zJSXEA1YgT37wnWqelPhmj7UoM,2092
 territories_dashboard_lib/website_lib/templatetags/other_filters.py,sha256=EEczSQi8lJZ_rfceuXQz3iF1SIxh5d-3-liTY8lkKtU,944
-territories_dashboard_lib-0.1.18.dist-info/licenses/licence.md,sha256=9Tat8mM_Yyww-wmWps8avlOhzumqEUGYy8853tKy7aE,7804
-territories_dashboard_lib-0.1.18.dist-info/METADATA,sha256=KYZodmgolAFZaZftmzy1o8EfGdQtaFI2zF9o4p6YQkM,6191
-territories_dashboard_lib-0.1.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-territories_dashboard_lib-0.1.18.dist-info/top_level.txt,sha256=Cih-lil8CSXTpDZV6fgHKIKIBtUjDaNpmkiuW2TSzsk,26
-territories_dashboard_lib-0.1.18.dist-info/RECORD,,
+territories_dashboard_lib-0.1.20.dist-info/licenses/licence.md,sha256=9Tat8mM_Yyww-wmWps8avlOhzumqEUGYy8853tKy7aE,7804
+territories_dashboard_lib-0.1.20.dist-info/METADATA,sha256=V2rYOF3qDF6uN1aMWqb-kZvITZUrMgCPwwqimHlxodw,6191
+territories_dashboard_lib-0.1.20.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+territories_dashboard_lib-0.1.20.dist-info/top_level.txt,sha256=Cih-lil8CSXTpDZV6fgHKIKIBtUjDaNpmkiuW2TSzsk,26
+territories_dashboard_lib-0.1.20.dist-info/RECORD,,