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

Merge branch '699-period-format-in-charts-6.0' into 'pandora_6.0' 

Added good period to custom graphs

See merge request !615
This commit is contained in:
vgilc 2017-06-23 12:19:04 +02:00
parent 472d37dbdd 9245f0c0e2
commit 5cfe955f8d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_graph.php
View File

@ -1007,9 +1007,13 @@ function graphic_combined_module ($module_list, $weight_list, $period,
$time_format = 'M d';
$time_format_2 = 'H\h';
}
else {
elseif ($temp_range < SECONDS_6MONTHS) {
$time_format = 'M d';
$time_format_2 = 'H\h';
}
else {
$time_format = 'Y M d';
$time_format_2 = 'H\h';
}
// Set variables