diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b91f4e4278..8861bb9e2e 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,8 @@ +2011-11-03 Juan Manuel Ramon + + * include/functions_graph.php + include/functions_forecast.php: Fixed X axis time format in graphs. + 2011-11-03 Juan Manuel Ramon * include/functions_reporting.php diff --git a/pandora_console/include/functions_forecast.php b/pandora_console/include/functions_forecast.php index 2182143132..a503d0f37c 100644 --- a/pandora_console/include/functions_forecast.php +++ b/pandora_console/include/functions_forecast.php @@ -37,7 +37,7 @@ function forecast_projection_graph($module_id, $period = 5184000, $prediction_pe 300, 300 , '', null, false, 0, false, 0, '', 0, 1, false, - false, '', 1); + false, '', 1, true); if (empty($module_data)){ return array(); diff --git a/pandora_console/include/functions_graph.php b/pandora_console/include/functions_graph.php index a4e53322ea..aa09c2680c 100755 --- a/pandora_console/include/functions_graph.php +++ b/pandora_console/include/functions_graph.php @@ -29,7 +29,7 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events, $width, $height , $title = '', $unit_name = null, $show_alerts = false, $avg_only = 0, $pure = false, $date = 0, $unit = '', $baseline = 0, $return_data = 0, $show_title = true, - $only_image = false, $homeurl = '', $ttl = 1) { + $only_image = false, $homeurl = '', $ttl = 1, $projection = false) { global $config; global $graphic_type; @@ -214,8 +214,9 @@ function grafico_modulo_sparse ($agent_module_id, $period, $show_events, $timestamp_short = date($time_format, $timestamp); $long_index[$timestamp_short] = date( html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $timestamp); - //$timestamp = $timestamp_short; - + if (!$projection){ + $timestamp = $timestamp_short; + } // Data if ($count > 0) { if ($avg_only) {