From d3ef23cc1cc17ba31bb37775e2fabef3125d2195 Mon Sep 17 00:00:00 2001 From: Orestis Moresis Date: Fri, 2 Jun 2023 14:02:41 +0300 Subject: [PATCH] add descriptor labels in custom tooltip in stats --- public/js/stats.js | 72 ++++++++++++++++++++--------------- src/Views/main-statistics.php | 8 ++-- 2 files changed, 46 insertions(+), 34 deletions(-) diff --git a/public/js/stats.js b/public/js/stats.js index 04de35c..63d4fd7 100644 --- a/public/js/stats.js +++ b/public/js/stats.js @@ -32,42 +32,54 @@ async function populateTimeseries(category) { response.json().then(response => { const data = response.map(row => ({ x: row.sampling_date, - y: parseInt(row.counts) + y: parseInt(row.counts), + details: row.details })); - console.debug(data); + console.debug(response); const chartOptions = { type: 'bar', - data: { - datasets: [{ - label: label, - data: data, - backgroundColor: 'rgba(54, 162, 235, 0.5)', - borderColor: 'rgba(54, 162, 235, 1)', - borderWidth: 1, - barPercentage: 0.8, // Adjust the bar percentage as desired - categoryPercentage: 0.9 - }] - }, - options: { - scales: { - y: { - beginAtZero: true, - ticks: { - precision: 0 - } - }, - x: { - displayFormats: { - month: 'MMM' - }, + data: { + datasets: [{ + label: label, + data: data, + backgroundColor: 'rgba(54, 162, 235, 0.5)', + borderColor: 'rgba(54, 162, 235, 1)', + borderWidth: 1, + barPercentage: 0.8, // Adjust the bar percentage as desired + categoryPercentage: 0.9 + }] + }, + options: { + scales: { + y: { + beginAtZero: true, ticks: { - length: 4 + precision: 0 + } + }, + x: { + displayFormats: { + month: 'MMM' + }, + ticks: { + length: 4 + } + } + }, + plugins: { + tooltip: { + callbacks: { + label: function(tooltipItems) { + console.debug('adsfasdfasdf',tooltipItems); + return tooltipItems.raw.details; + } } - } - } - - } }; + } + } + + } + }; const ctx = document.getElementById(category + '-timeseries').getContext('2d'); new Chart(ctx, chartOptions); diff --git a/src/Views/main-statistics.php b/src/Views/main-statistics.php index 2b5d2b6..5d1499e 100644 --- a/src/Views/main-statistics.php +++ b/src/Views/main-statistics.php @@ -3,16 +3,16 @@

General

-
-
+
+

Timeline

-
-
+
+