From feae62f11ca4a200fe44f1206f912beee04ab98d Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 22 Sep 2017 11:39:54 +0200 Subject: [PATCH] add tip reports simple graph --- .../godmode/reporting/reporting_builder.item_editor.php | 8 ++++++++ pandora_console/godmode/reporting/reporting_builder.php | 6 ++++-- pandora_console/include/functions_reporting.php | 9 ++++++--- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 00df36a2c7..094199349f 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -94,6 +94,7 @@ $inventory_modules = array(); $date = null; // Only avg is selected by default for the simple graphs $only_avg = true; +$fullscale = false; $percentil = false; $time_compare_overlapped = false; @@ -212,6 +213,7 @@ switch ($action) { break; case 'simple_graph': $only_avg = isset($style['only_avg']) ? (bool) $style['only_avg'] : true; + $fullscale = isset($style['fullscale']) ? (bool) $style['fullscale'] : 0; $percentil = isset($style['percentil']) ? $config['percentil'] : 0; // The break hasn't be forgotten. case 'simple_baseline_graph': @@ -1353,6 +1355,10 @@ You can of course remove the warnings, that's why we include the source and do n + + + + @@ -2643,6 +2649,7 @@ function chooseType() { $("#row_show_graph").hide(); $("#row_max_min_avg").hide(); $("#row_only_avg").hide(); + $("#row_fullscale").hide(); $("#row_time_compare_overlapped").hide(); $("#row_quantity").hide(); $("#row_exception_condition_value").hide(); @@ -2725,6 +2732,7 @@ function chooseType() { case 'simple_graph': $("#row_time_compare_overlapped").show(); $("#row_only_avg").show(); + $("#row_fullscale").show(); if ($("#checkbox-percentil").prop("checked")) $("#row_percentil").show(); // The break hasn't be forgotten, this element diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index 705f49c2d0..ead62db0c9 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -1172,8 +1172,9 @@ switch ($action) { case 'simple_graph': // Warning. We are using this column to hold this value to avoid // the modification of the database for compatibility reasons. - $style['only_avg'] = (int) get_parameter('only_avg'); + $style['only_avg'] = (int) get_parameter('only_avg'); $style['percentil'] = (int) get_parameter('percentil'); + $style['fullscale'] = (int) get_parameter('fullscale'); if ($label != '') $style['label'] = $label; else @@ -1516,8 +1517,9 @@ switch ($action) { case 'simple_graph': // Warning. We are using this column to hold this value to avoid // the modification of the database for compatibility reasons. - $style['only_avg'] = (int) get_parameter('only_avg'); + $style['only_avg'] = (int) get_parameter('only_avg'); $style['percentil'] = (int) get_parameter('percentil'); + $style['fullscale'] = (int) get_parameter('fullscale'); if ($label != '') $style['label'] = $label; else diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 7209d11094..e68bb9b76f 100644 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -6034,13 +6034,15 @@ function reporting_simple_graph($report, $content, $type = 'dinamic', if (isset($content['style']['only_avg'])) { $only_avg = (bool) $content['style']['only_avg']; } + + if (isset($content['style']['fullscale'])) { + $fullscale = (bool) $content['style']['fullscale']; + } $moduletype_name = modules_get_moduletype_name( modules_get_agentmodule_type( $content['id_agent_module'])); - - $return['chart'] = ''; // Get chart reporting_set_conf_charts($width, $height, $only_image, $type, @@ -6114,7 +6116,8 @@ function reporting_simple_graph($report, $content, $type = 'dinamic', ($content['style']['percentil'] == 1) ? $config['percentil'] : null, false, false, - $config['type_module_charts']); + $config['type_module_charts'], + $fullscale); } break; case 'data':