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

territories_dashboard_lib/indicators_lib/views.py

@@ -129,6 +129,10 @@ def indicator_values_export_view(request, name, payload):
             "Année": value["annee"],
             f"Valeur {territory_name} ({indicator.unite})": value["valeur"],
         }
+        if indicator.unite_alternative and "valeur_alternative" in value:
+            export_values[value["annee"]][
+                f"Valeur {territory_name} ({indicator.unite_alternative})"
+            ] = value["valeur_alternative"]
     tracking_objet = "historique"
     if results.get("cmp_values") is not None:
         cmp_territory_name = get_territory_name(payload.cmp_territory)

territories_dashboard_lib/superset_lib/logic.py

@@ -1,3 +1,5 @@
+import html
+
 from territories_dashboard_lib.indicators_lib.enums import MeshLevel
 from territories_dashboard_lib.indicators_lib.query.utils import run_custom_query
 
@@ -44,12 +46,13 @@ def get_territory_meshes(territory_id: str, territory_mesh: MeshLevel):
             MeshLevel.Town,
         ]:
             current_com = row["com_name"]
-    return {
+    territory_meshes = {
         MeshLevel.Region: current_reg,
         MeshLevel.Department: current_dep,
         MeshLevel.Epci: current_epci,
         MeshLevel.Town: current_com,
     }
+    return territory_meshes
 
 
 def make_filter(dashboard: Dashboard, territory_id: str, territory_mesh: MeshLevel):
@@ -60,6 +63,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)
             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-0.1.16.dist-info → territories_dashboard_lib-0.1.18.dist-info}/METADATA

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

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

@@ -21,7 +21,7 @@ territories_dashboard_lib/indicators_lib/payloads.py,sha256=I03bgoNoLTehd8lfby0x
 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/views.py,sha256=ibnBgNUcTS6XN3s054AKKfTRuEFqcmnDJGHO7Vnp6Yg,16902
+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
 territories_dashboard_lib/indicators_lib/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,7 +35,7 @@ territories_dashboard_lib/indicators_lib/query/utils.py,sha256=nCeQCLzfq35KZzun9
 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=t3Fl4trVOX9tPeAZTerraHvWGzzV5mml8ZQTsas51AI,2391
+territories_dashboard_lib/superset_lib/logic.py,sha256=upbhWFGkkiMPM8MMtPrGf5FONdbt1zBPT46tcn5Wv3g,2483
 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
@@ -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.16.dist-info/licenses/licence.md,sha256=9Tat8mM_Yyww-wmWps8avlOhzumqEUGYy8853tKy7aE,7804
-territories_dashboard_lib-0.1.16.dist-info/METADATA,sha256=d60ej7wsCRS3s6KXbJKryhoBM3pHaVQw-_NPbcbrhG0,6191
-territories_dashboard_lib-0.1.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-territories_dashboard_lib-0.1.16.dist-info/top_level.txt,sha256=Cih-lil8CSXTpDZV6fgHKIKIBtUjDaNpmkiuW2TSzsk,26
-territories_dashboard_lib-0.1.16.dist-info/RECORD,,
+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,,