From 9ca5c9bca40fa7e962b932364228731a6b9714a8 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Mon, 4 Jul 2022 18:25:06 +0200 Subject: [js_chart] Update to Chart.js 3.0.8 --- .../statistics/templates/clientlist.html | 6 ++++ .../statistics/templates/cpumodels.html | 25 ++----------- .../statistics/templates/filterbox.html | 42 ++++++++++++++++++++++ modules-available/statistics/templates/id44.html | 25 ++----------- .../statistics/templates/kvmstate.html | 25 ++----------- modules-available/statistics/templates/memory.html | 25 ++----------- .../statistics/templates/summary.html | 7 ++-- 7 files changed, 60 insertions(+), 95 deletions(-) (limited to 'modules-available/statistics/templates') diff --git a/modules-available/statistics/templates/clientlist.html b/modules-available/statistics/templates/clientlist.html index ebd9af4b..3df95d92 100644 --- a/modules-available/statistics/templates/clientlist.html +++ b/modules-available/statistics/templates/clientlist.html @@ -219,6 +219,12 @@ {{lang_remoteExec}} {{/canExec}} + {{#canBenchmark}} + + {{/canBenchmark}} diff --git a/modules-available/statistics/templates/cpumodels.html b/modules-available/statistics/templates/cpumodels.html index 91464031..e133bec6 100644 --- a/modules-available/statistics/templates/cpumodels.html +++ b/modules-available/statistics/templates/cpumodels.html @@ -16,7 +16,7 @@ {{#rows}} - +
{{systemmodel}} @@ -40,28 +40,7 @@
-
- - -
+
diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html index 72754b21..aba4b41c 100644 --- a/modules-available/statistics/templates/filterbox.html +++ b/modules-available/statistics/templates/filterbox.html @@ -117,6 +117,48 @@ document.addEventListener("DOMContentLoaded", function () { }); }); + // All the pie chars + function makePieChart($parent) { + var data = $parent.data('chart'); + var chartData = { + datasets: [{ + data: data.map(function(x) { return x.value; }), + backgroundColor: data.map(function(x) { return x.color; }) + }] + }; + var $canv = $(''); + $parent.append($canv); + (function() { + var $dest = $parent.data('chart-dest'); + var cur = null; + new Chart($canv[0].getContext('2d'), { + type: 'pie', data: chartData, options: { + animation: false, + onHover: function (_, list) { + if (list.length === 0 || list[0].index !== cur) { + if (cur !== null) { + $($dest + cur).removeClass('slx-bold'); + cur = null; + } + } + if (list.length !== 0 && list[0].index !== cur) { + console.log(list[0]); + cur = list[0].index; + $($dest + cur).addClass('slx-bold'); + } + }, + plugins: { + tooltip: {enabled: false}, + legend: {display: false} + } + } + }); + })(); + } + $('.auto-chart').each(function() { + makePieChart($(this)); + }); + }, false); function popupFilter(field) { diff --git a/modules-available/statistics/templates/id44.html b/modules-available/statistics/templates/id44.html index bc549fa8..7851ba87 100644 --- a/modules-available/statistics/templates/id44.html +++ b/modules-available/statistics/templates/id44.html @@ -15,7 +15,7 @@ {{#rows}} - + {{gb}} GiB @@ -34,28 +34,7 @@ -
- - -
+
diff --git a/modules-available/statistics/templates/kvmstate.html b/modules-available/statistics/templates/kvmstate.html index 4f8994d1..b3c65733 100644 --- a/modules-available/statistics/templates/kvmstate.html +++ b/modules-available/statistics/templates/kvmstate.html @@ -15,7 +15,7 @@ {{#rows}} - + {{kvmstate}} @@ -25,28 +25,7 @@ -
- - -
+
diff --git a/modules-available/statistics/templates/memory.html b/modules-available/statistics/templates/memory.html index 185c1a34..0ccbca98 100644 --- a/modules-available/statistics/templates/memory.html +++ b/modules-available/statistics/templates/memory.html @@ -15,7 +15,7 @@ {{#rows}} - + {{gb}} GiB @@ -34,28 +34,7 @@ -
- - -
+
diff --git a/modules-available/statistics/templates/summary.html b/modules-available/statistics/templates/summary.html index 3ede7bc5..a71d50c0 100644 --- a/modules-available/statistics/templates/summary.html +++ b/modules-available/statistics/templates/summary.html @@ -28,10 +28,11 @@ document.addEventListener("DOMContentLoaded", function() { var data = {{{json}}}; var sel = false; - new Chart(document.getElementById('usagehist').getContext('2d')).Line(data, { + new Chart(document.getElementById('usagehist').getContext('2d'), {type: 'line', data: data, options: { animation: false, - pointHitDetectionRadius: 5 - }); + pointHitDetectionRadius: 5, + plugins: { legend: {position: 'left' }} + }}); }, false); -- cgit v1.2.3-55-g7522