tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-module-graph-decimals' into 'develop' 

Resolve: "Fix module graph decimals"

See merge request artica/pandorafms!1121
This commit is contained in:
vgilc 2018-01-29 12:58:13 +01:00
parent 86a581ec02 82012959af
commit 94e2e0b908
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -1759,7 +1759,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
$('#timestamp_'+graph_id).show(); $('#timestamp_'+graph_id).show();
// If no legend, the timestamp labels are short and with value // If no legend, the timestamp labels are short and with value
if (legend.length == 0) { if (legend.length == 0) {
$('#timestamp_'+graph_id).text(labels[j] + ' (' + parseFloat(y).toFixed(2) + ')'); $('#timestamp_'+graph_id).text(labels[j] + ' (' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + ')');
} }
else { else {
$('#timestamp_'+graph_id).text(labels_long[j]); $('#timestamp_'+graph_id).text(labels_long[j]);
@ -1795,7 +1795,7 @@ function pandoraFlotArea(graph_id, values, labels, labels_long, legend,
// The graphs of points type and unknown graphs will dont be updated // The graphs of points type and unknown graphs will dont be updated
if (serie_types[i] != 'points' && series.label != $('#hidden-unknown_text').val()) { if (serie_types[i] != 'points' && series.label != $('#hidden-unknown_text').val()) {
$('#legend_' + graph_id + ' .legendLabel') $('#legend_' + graph_id + ' .legendLabel')
.eq(i).html(label_aux + '= ' + parseFloat(y).toFixed(precision_graph) + how_bigger + ' ' + unit); .eq(i).html(label_aux + '= ' + (short_data ? parseFloat(y).toFixed(2) : parseFloat(y)) + how_bigger + ' ' + unit);
} }
$('#legend_' + graph_id + ' .legendLabel') $('#legend_' + graph_id + ' .legendLabel')
@ -2170,9 +2170,8 @@ function number_format(number, force_integer, unit) {
} }
} }
else { else {
var decimals = 2; // Round to 2 decimals
var factor = 10 * decimals; number = Math.round(number * 100) / 100;
number = Math.round(number*factor)/factor;
} }
var shorts = ["", "K", "M", "G", "T", "P", "E", "Z", "Y"]; var shorts = ["", "K", "M", "G", "T", "P", "E", "Z", "Y"];
@ -2186,10 +2185,6 @@ function number_format(number, force_integer, unit) {
pos++; pos++;
number = number / 1000; number = number / 1000;
} }
else if (number <= -1000) {
pos++;
number = number / 1000;
}
else { else {
break; break;
} }