Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 04:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply proper sorting whilst preserve the color order for the doughnut forward destinations chart

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2017-09-27 17:03:00 +02:00
parent 76e5548ea9
commit 0ed1901a8e
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/pi-hole/js/index.js
View File

@@ -272,17 +272,27 @@ function updateForwardDestinationsPie() {
var colors = [];
// Get colors from AdminLTE
$.each($.AdminLTE.options.colors, function(key, value) { colors.push(value); });
var v = [], c = [], k = [];
// Collect values and colors, immediately push individual labels
var v = [], c = [], k = [], values = [];
// Collect values and colors
$.each(data.forward_destinations, function(key , value) {
v.push(value);
c.push(colors.shift());
if(key.indexOf("|") > -1)
{
key = key.substr(0, key.indexOf("|"));
}
k.push(key);
values.push([key, value, colors.shift()]);
});
// Sort data ASC accorwing to 2nd column, keep already assigned labels and colors
values = values.sort(function(a,b) { return b[1] - a[1]; });
// Split data into individual arrays for the graphs
$.each(values, function(key , value) {
k.push(value[0]);
v.push(value[1]);
c.push(value[2]);
});
// Build a single dataset with the data to be pushed
var dd = {data: v, backgroundColor: c};
// and push it at once