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

Merge branch 'new/clientsovertime' of github.com:pi-hole/AdminLTE into new/clientsovertime

Browse Source
This commit is contained in:
DL6ER
2017-09-30 11:10:03 +02:00
parent 6a75cc2751 1ba190bfa2
commit 1e89f12d18
2 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,17 +359,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
@@ -967,7 +977,7 @@ $(document).ready(function() {
}
},
animation: {
duration: 2000
duration: 750
},
cutoutPercentage: 0
}
@@ -1005,7 +1015,7 @@ $(document).ready(function() {
}
},
animation: {
duration: 2000
duration: 750
},
cutoutPercentage: 0
}