tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '699-wrong_format_in_graphs' into 'pandora_6.0'

Browse Source 
Added new row to graph period

See merge request !356
This commit is contained in:
vgilc 2017-05-16 13:16:08 +02:00
commit 59719bdffc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/functions_graph.php
View File

@ -351,10 +351,13 @@ 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
@ -369,10 +372,13 @@ 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);