territories-dashboard-lib 0.1.22__tar.gz → 0.1.24__tar.gz

{territories_dashboard_lib-0.1.22/territories_dashboard_lib.egg-info → territories_dashboard_lib-0.1.24}/PKG-INFO

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

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/pyproject.toml

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

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/indicators_lib/format.py

@@ -8,27 +8,28 @@ def _remove_useless_0(value):
     return value
 
 
-def format_indicator_value(value, force_integer=False):
+def format_indicator_value(value, *, force_integer=False, precise=False):
     if value is None:
         return "-"
 
     abs_value = abs(value)
 
-    if abs_value > 999999:
+    if abs_value > 999 and precise:
+        nb = f"{round(value):,}".replace(",", " ")
+    elif abs_value > 999999:
         nb = _remove_useless_0(_get_precision((value / 1_000_000), force_integer)) + "M"
     elif abs_value > 999:
         nb = _remove_useless_0(_get_precision((value / 1_000), force_integer)) + "k"
-
     else:
         nb = _remove_useless_0(_get_precision(value, force_integer))
     return nb.replace(".", ",")
 
 
-def _format_value(k, v):
+def _format_value(k, v, *, precise=False):
     if k.lower().startswith("valeur"):
-        v = format_indicator_value(v)
+        v = format_indicator_value(v, precise=precise)
     return v
 
 
-def format_data(data):
-    return {k: _format_value(k, v) for k, v in data.items()}
+def format_data(data, *, precise=False):
+    return {k: _format_value(k, v, precise=precise) for k, v in data.items()}

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/indicators_lib/views.py

@@ -465,7 +465,7 @@ def indicator_details_table_view(request, name, payload):
     indicator = get_object_or_404(Indicator, name=name)
     filters = get_filters(request, indicator)
     count, data = get_count_and_data_for_indicator_table(indicator, payload, filters)
-    formated_data = [format_data(element) for element in data]
+    formated_data = [format_data(element, precise=True) for element in data]
     keys = [
         {"db": key, "label": get_label(payload, indicator, key)}
         for key in (formated_data[0].keys() if formated_data else [])

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/comparaison/main-values.mjs

@@ -17,13 +17,17 @@ function updateMainValues(indicator) {
         `#card-${indicator.id} .territory-value > span:first-child`
     );
 
-    const value = formatIndicatorValue(data.values[0].valeur);
+    const value = formatIndicatorValue(data.values[0].valeur, {
+        precise: true,
+    });
     element.innerHTML = `<strong>${params.territory_name} : </strong>${value}`;
 
     const cmpElement = document.querySelector(
         `#card-${indicator.id} .compared-territory-value > span:first-child`
     );
-    const cmpValue = formatIndicatorValue(data.cmp_values[0].valeur);
+    const cmpValue = formatIndicatorValue(data.cmp_values[0].valeur, {
+        precise: true,
+    });
     cmpElement.innerHTML = `<strong>${params.cmp_territory_name} : </strong>${cmpValue}`;
 }
 

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/details/histogram.mjs

@@ -20,7 +20,9 @@ function getDatalabels(dataset, mesh) {
             weight: "bold",
         },
         formatter: function (value, context) {
-            const formatted = formatIndicatorValue(value.y, true);
+            const formatted = formatIndicatorValue(value.y, {
+                forceInteger: true,
+            });
             if (!formatted) {
                 return "";
             }
@@ -60,7 +62,7 @@ function getScales(labels, maxFromData) {
                         }
                         return formatIndicatorValue(
                             Number.parseFloat(labels[v]),
-                            true
+                            { forceInteger: true }
                         );
                     }
                     if (value === labels.length - 1) {

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/details/proportions.mjs

@@ -5,14 +5,30 @@ import { COLORS } from "../enums.mjs";
 import { addEmptyGraphMessage } from "./utils.mjs";
 import { formatIndicatorValue } from "../format.mjs";
 
-function getPlugins(indicator) {
+function getPlugins(indicator, total) {
+    function getLabelFromValue(value) {
+        return `${formatIndicatorValue(value)} ${indicator.unite}`;
+    }
     return {
         datalabels: {
-            display: (ctx) => {
-                if (!ctx.dataset.data[ctx.dataIndex]) {
-                    return false;
-                }
-                return "auto";
+            display: (context) => {
+                const chart = context.chart;
+                const canvasWidth = chart.canvas.width;
+                const value = context.dataset.data[context.dataIndex];
+                const barWidth = (value / total) * canvasWidth;
+                const label = getLabelFromValue(value);
+
+                // --- measure text width in pixels ---
+                const ctx = chart.ctx;
+                const font = Chart.helpers.toFont(Chart.defaults.font);
+                ctx.font = font.string;
+                const labelWidth = ctx.measureText(label).width;
+
+                // Add some padding
+                const padding = 4;
+
+                // Only display label if it fits
+                return labelWidth + padding < barWidth;
             },
             color: (context) => {
                 const bgColor = context.dataset.backgroundColor;
@@ -23,14 +39,14 @@ function getPlugins(indicator) {
             font: {
                 weight: "bold",
             },
-            formatter: (value) =>
-                `${formatIndicatorValue(value)} ${indicator.unite}`,
+            formatter: getLabelFromValue,
         },
         tooltip: getToolTip(indicator.unite),
     };
 }
 
 function makeProportionsChart(indicator) {
+    console.log("PROPORTIONS");
     const { territory_name: label } = getParams();
 
     const ctx = document.getElementById("proportionsChart");
@@ -54,6 +70,8 @@ function makeProportionsChart(indicator) {
         return;
     }
 
+    const total = datasets.map((d) => d.data[0]).reduce((a, b) => a + b, 0);
+
     setBackgroundInDatasets(datasets);
 
     const data = {
@@ -63,7 +81,7 @@ function makeProportionsChart(indicator) {
     const options = {
         indexAxis: "y",
         maintainAspectRatio: false,
-        plugins: getPlugins(indicator),
+        plugins: getPlugins(indicator, total),
         scales: {
             x: {
                 display: false,

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/details/top10.mjs

@@ -17,7 +17,9 @@ function getPlugins(indicator) {
             align: "center",
             color: "white",
             formatter: function (value) {
-                return formatIndicatorValue(value);
+                return `${formatIndicatorValue(value, { precise: true })} ${
+                    indicator.unite
+                }`;
             },
         },
         tooltip: getToolTip(indicator.unite),

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/format.mjs

@@ -24,12 +24,18 @@ function getPrecision(value, forceInteger) {
     return value.toFixed(1);
 }
 
-function formatIndicatorValue(value, forceInteger) {
-    if (value === undefined || isNaN(value) || value === null) {
+function formatIndicatorValue(
+    value,
+    { forceInteger = false, precise = false } = {}
+) {
+    if (value === undefined || value === null || isNaN(value)) {
         return "-";
     }
     let nb = null;
-    if (Math.abs(value) > 999999) {
+
+    if (Math.abs(value) > 999 && precise) {
+        nb = new Intl.NumberFormat("fr-FR").format(Math.round(value));
+    } else if (Math.abs(value) > 999999) {
         nb =
             removeUseless0(
                 getPrecision(
@@ -48,7 +54,8 @@ function formatIndicatorValue(value, forceInteger) {
     } else {
         nb = removeUseless0(getPrecision(value, forceInteger));
     }
-    return nb.replace(".", ",");
+    nb = nb.replace(".", ",");
+    return nb;
 }
 
 export { formatIndicatorValue };

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/theme/main-value.mjs

@@ -16,7 +16,7 @@ function updateMainValueDOM(indicator) {
     removeDelaySpinner(`#card-${indicator.id} .delay-spinner`);
     document.querySelector(
         `#card-${indicator.id} .main-value span:first-child`
-    ).textContent = `${formatIndicatorValue(val)}`;
+    ).textContent = `${formatIndicatorValue(val, { precise: true })}`;
 }
 
 export { updateMainValueDOM };

{territories_dashboard_lib-0.1.22 → territories_dashboard_lib-0.1.24}/territories_dashboard_lib/website_lib/static/territories_dashboard_lib/website/js/pages/indicators/utils.mjs

@@ -36,7 +36,9 @@ export function getToolTip(unite) {
                     context.dataset.label === unite
                         ? ""
                         : ` ${context.dataset.label}: `;
-                return `${prefix} ${formatIndicatorValue(value)} ${unite}`;
+                return `${prefix} ${formatIndicatorValue(value, {
+                    precise: true,
+                })} ${unite}`;
             },
         },
     };