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

Merge branch '215-graph_date_format' into 'pandora_6.0' 

Now times under 1 day will be shown in a correct format. Ticket #215

See merge request !93
This commit is contained in:
vgilc 2017-01-31 15:51:30 +01:00
parent 50b4ddc589 f7908f4838
commit af462a6c07
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions_graph.php
View File

@ -987,11 +987,8 @@ function graphic_combined_module ($module_list, $weight_list, $period,
}
// Set the title and time format
if ($temp_range <= SECONDS_6HOURS) {
$time_format = 'H:i:s';
}
elseif ($temp_range < SECONDS_1DAY) {
$time_format = 'H:i';
if ($temp_range <= SECONDS_1DAY) {
$time_format = 'd.m.Y H:i:s';
}
elseif ($temp_range < SECONDS_15DAYS) {
$time_format = 'M d';