maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

output traffic values correctly when not using bcmath and kind of fix wrong unit display on mouseover, fixes #425

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2020-09-07 21:51:24 +02:00
parent 4ad8b62576
commit 746548492b
2 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
templates/Sparkle/assets/js/traffic.js vendored
View File

@@ -19,8 +19,8 @@ $(document).ready(function() {
} else {
ticks.push([i, $(row).children().first().html()]);
}
ftp.push([i, parseFloat(ftpd / 1024)]);
http.push([i, parseFloat(httpd / 1024)]);
ftp.push([i, parseFloat(ftpd)]);
http.push([i, parseFloat(httpd)]);
mail.push([i, parseFloat(maild)]);
i++;
});
@@ -107,24 +107,16 @@ $(document).ready(function() {
"font-size": "11px"
}).appendTo("body");
$("#ftpchart, #httpchart").bind("plothover", function(event, pos, item) {
$("#ftpchart, #httpchart, #mailchart").bind("plothover", function(event, pos, item) {
if (item) {
var y = item.datapoint[1].toFixed(2);
var y = item.datapoint[1];
var unit = 'MiB';
if (y > 1024) {
y /= 1024;
unit = 'GiB';
}
$("#tooltip").html(item.series.label + ": " + y + " GiB").css({
top: item.pageY + 5,
left: item.pageX - $("#tooltip").width() / 2
}).fadeIn(200);
} else {
$("#tooltip").hide();
}
});
$("#mailchart").bind("plothover", function(event, pos, item) {
if (item) {
var y = item.datapoint[1].toFixed(2);
$("#tooltip").html(item.series.label + ": " + y + " MiB").css({
$("#tooltip").html(item.series.label + ": " + y.toFixed(2) + " " + unit).css({
top: item.pageY + 5,
left: item.pageX - $("#tooltip").width() / 2
}).fadeIn(200);