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

Merge branch '757-fullscale-charts-all-data-dev' into 'develop' 

Added some code to put all data in the chart

See merge request !579
This commit is contained in:
vgilc 2017-06-12 16:56:32 +02:00
parent d3df682528 e3443e044f
commit dbd510f6a0
1 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pandora_console/include/functions_graph.php
View File

@ -681,55 +681,22 @@ function grafico_modulo_sparse_data ($agent_module_id, $period, $show_events,
if ($fullscale) {
if (!$flash_chart) {
// Set the title and time format
if ($period <= SECONDS_6HOURS) {
$time_format = 'H:i:s';
}
elseif ($period < SECONDS_1DAY) {
$time_format = 'H:i';
}
elseif ($period < SECONDS_15DAYS) {
$time_format = "M \nd H:i";
}
elseif ($period < SECONDS_1MONTH) {
$time_format = "M \nd H\h";
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M \nd H\h";
}
else {
$time_format = "M Y";
}
$time_format = "Y M \nd H:i:s";
}
else {
// Set the title and time format
if ($period <= SECONDS_6HOURS) {
$time_format = 'H:i:s';
}
elseif ($period < SECONDS_1DAY) {
$time_format = 'H:i';
}
elseif ($period < SECONDS_15DAYS) {
$time_format = "M d H:i";
}
elseif ($period < SECONDS_1MONTH) {
$time_format = "M d H\h";
}
elseif ($period < SECONDS_6MONTHS) {
$time_format = "M d H\h";
}
else {
$time_format = "M Y";
}
$time_format = "Y M d H:i:s";
}
$new_chart = array();
$new_long_index = array();
foreach ($chart as $c_timestamp => $c_data) {
$timestamp_short = date($time_format, $c_timestamp);
$new_long_index[$timestamp_short] = date(
html_entity_decode($config['date_format'], ENT_QUOTES, "UTF-8"), $c_timestamp);
$new_chart[$timestamp_short] = $c_data;
}
$long_index = $new_long_index;
$chart = $new_chart;
}