territories-dashboard-lib 0.1.21__tar.gz → 0.1.23__tar.gz

{territories_dashboard_lib-0.1.21/territories_dashboard_lib.egg-info → territories_dashboard_lib-0.1.23}/PKG-INFO

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

{territories_dashboard_lib-0.1.21 → territories_dashboard_lib-0.1.23}/pyproject.toml

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

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

@@ -5,10 +5,31 @@ 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: true,
+            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;
                 return COLORS[bgColor] || "white";
@@ -18,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");
@@ -49,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 = {
@@ -58,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.21 → territories_dashboard_lib-0.1.23/territories_dashboard_lib.egg-info}/PKG-INFO

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