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

Merge branch '700-wrong_format_in_graphs' into 'develop' 

Added new ranges to graph period

See merge request !355
This commit is contained in:
vgilc 2017-05-17 17:17:47 +02:00
parent 28eaae4601 41b49770ee
commit eb7514dcd0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions_graph.php
View File

@ -353,9 +353,12 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
elseif ($period < SECONDS_1MONTH) { elseif ($period < SECONDS_1MONTH) {
$time_format = "M \nd H\h"; $time_format = "M \nd H\h";
} }
else { elseif ($period < SECONDS_6MONTHS) {
$time_format = "M \nd H\h"; $time_format = "M \nd H\h";
} }
else {
$time_format = "M Y";
}
} }
else { else {
// Set the title and time format // Set the title and time format
@ -371,9 +374,12 @@ function grafico_modulo_sparse_data_chart (&$chart, &$chart_data_extra, &$long_i
elseif ($period < SECONDS_1MONTH) { elseif ($period < SECONDS_1MONTH) {
$time_format = "M d H\h"; $time_format = "M d H\h";
} }
else { elseif ($period < SECONDS_6MONTHS) {
$time_format = "M d H\h"; $time_format = "M d H\h";
} }
else {
$time_format = "M Y";
}
} }
$timestamp_short = date($time_format, $timestamp); $timestamp_short = date($time_format, $timestamp);