From 15ab54f5d5ff43bb5648af92145827f1541b9b19 Mon Sep 17 00:00:00 2001 From: Jokob-sk Date: Mon, 19 Feb 2024 07:36:03 +1100 Subject: [PATCH] Hide labels in Online Presence #569 --- front/js/graph_online_history.js | 80 +++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 22 deletions(-) diff --git a/front/js/graph_online_history.js b/front/js/graph_online_history.js index 31d3d137..2fec6c7d 100755 --- a/front/js/graph_online_history.js +++ b/front/js/graph_online_history.js @@ -1,32 +1,68 @@ function pia_draw_graph_online_history(pia_js_graph_online_history_time, pia_js_graph_online_history_ondev, pia_js_graph_online_history_dodev, pia_js_graph_online_history_ardev) { var xValues = pia_js_graph_online_history_time; + + // Data object for online status + onlineData = { + label: 'Online', + data: pia_js_graph_online_history_ondev, + borderColor: "rgba(0, 166, 89)", + fill: true, + backgroundColor: "rgba(0, 166, 89, .6)", + pointStyle: 'circle', + pointRadius: 3, + pointHoverRadius: 3 + }; + + // Data object for offline status + offlineData = { + label: 'Offline/Down', + data: pia_js_graph_online_history_dodev, + borderColor: "rgba(222, 74, 56)", + fill: true, + backgroundColor: "rgba(222, 74, 56, .6)", + }; + + // Data object for archived status + archivedData = { + label: 'Archived', + data: pia_js_graph_online_history_ardev, + borderColor: "rgba(220,220,220)", + fill: true, + backgroundColor: "rgba(220,220,220, .6)", + }; + + // Array to store datasets + datasets = []; + + // Get UI presence settings + showStats = getSetting("UI_PRESENCE"); + + // Check if 'online' status should be displayed + if(showStats.includes("online")) + { + datasets.push(onlineData); // Add onlineData to datasets array + } + + // Check if 'offline' status should be displayed + if(showStats.includes("offline")) + { + datasets.push(offlineData); // Add offlineData to datasets array + } + + // Check if 'archived' status should be displayed + if(showStats.includes("archived")) + { + datasets.push(archivedData); // Add archivedData to datasets array + } + + + new Chart("OnlineChart", { type: "bar", scaleIntegersOnly: true, data: { labels: xValues, - datasets: [{ - label: 'Online', - data: pia_js_graph_online_history_ondev, - borderColor: "rgba(0, 166, 89)", - fill: true, - backgroundColor: "rgba(0, 166, 89, .6)", - pointStyle: 'circle', - pointRadius: 3, - pointHoverRadius: 3 - }, { - label: 'Offline/Down', - data: pia_js_graph_online_history_dodev, - borderColor: "rgba(222, 74, 56)", - fill: true, - backgroundColor: "rgba(222, 74, 56, .6)", - }, { - label: 'Archived', - data: pia_js_graph_online_history_ardev, - borderColor: "rgba(220,220,220)", - fill: true, - backgroundColor: "rgba(220,220,220, .6)", - }] + datasets: datasets }, options: { legend: {