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

2011-11-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_graph.php
	include/functions_forecast.php: Fixed X axis time format in graphs.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5105 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-11-03 15:14:12 +00:00
parent a553fa1941
commit e24daa4aef
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/ChangeLog
View File

@ -1,3 +1,8 @@
2011-11-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_graph.php
include/functions_forecast.php: Fixed X axis time format in graphs.
2011-11-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_reporting.php

2
pandora_console/include/functions_forecast.php
View File

@ -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();

7
pandora_console/include/functions_graph.php
View File

@ -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) {