From 3bf215782e5eb021d07177c4f019d51c244b1d0a Mon Sep 17 00:00:00 2001 From: daniel Date: Thu, 29 Nov 2018 17:00:55 +0100 Subject: [PATCH] fixed minor error slicebar --- pandora_console/include/functions_graph.php | 4 +++- pandora_console/include/functions_reporting_html.php | 8 ++++++-- pandora_console/include/graphs/flot/pandora.flot.js | 3 ++- pandora_console/include/graphs/functions_flot.php | 4 ++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index 2953b6843d..f3c1d22490 100644 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -2456,7 +2456,9 @@ function graph_sla_slicebar ( 0, array(), true, - $ttl + $ttl, + false, + false ); } diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index f9fc970918..5114a79b19 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -3640,7 +3640,9 @@ function reporting_get_event_histogram ($events, $text_header_event = false) { 0, array(), true, - $ttl + $ttl, + false, + false ); $table->data[0][0] = $slicebar; @@ -3823,7 +3825,9 @@ function reporting_get_event_histogram_meta ($width) { 0, $full_legend_date, true, - 1 + 1, + false, + false ); $table->data[0][0] = $slicebar; diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js index e2b606f709..72cb3054ad 100644 --- a/pandora_console/include/graphs/flot/pandora.flot.js +++ b/pandora_console/include/graphs/flot/pandora.flot.js @@ -670,7 +670,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors, } function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumulate_data, intervaltick, - font, font_size, separator, separator2, id_agent, full_legend, not_interactive) { + font, font_size, separator, separator2, id_agent, full_legend, not_interactive, show_date) { values = values.split(separator2); labels = labels.split(separator); @@ -728,6 +728,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul tickColor: '#fff' }, xaxes: [ { + show:show_date, tickFormatter: xFormatter, color: '', tickSize: intervaltick, diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php index a3b9a6cb37..e519505085 100644 --- a/pandora_console/include/graphs/functions_flot.php +++ b/pandora_console/include/graphs/functions_flot.php @@ -691,7 +691,7 @@ function flot_slicesbar_graph ( $adapt_key = '', $stat_win = false, $id_agent = 0, $full_legend_date = array(), $not_interactive = 0, $ttl = 1, - $widgets = false) { + $widgets = false, $show = true) { global $config; @@ -839,7 +839,7 @@ function flot_slicesbar_graph ( // Javascript code $return .= "";