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

Fix reporting format for exportdata 

- for 'data', timestamp should be timestamp of data
- for 'avg', timestamp should be averaging period
This commit is contained in:
Akihiro Uchida 2016-04-04 15:43:51 +09:00
parent 8c2b73c474
commit 57d6ae5c8b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pandora_console/operation/agentes/exportdata.php
View File

@ -124,7 +124,7 @@ if (!empty ($export_btn) && !empty ($module)) {
}
$work_end = $end - $period + $work_period;
$work_start = $end - $work_period;
$work_start = $work_end - $work_period;
//Buffer to get data, anyway this will report a memory exhaustin
$flag_last_time_slice = false;
@ -166,7 +166,14 @@ if (!empty ($export_btn) && !empty ($module)) {
$output .= $divider;
$output .= $module['data'];
$output .= $divider;
$output .= date ("Y-m-d G:i:s", $work_start ) . ' - ' . date ("Y-m-d G:i:s", $module['utimestamp']);
switch($export_type) {
case "data":
$output .= date("Y-m-d G:i:s", $module['utimestamp']);
break;
case "avg":
$output .= date ("Y-m-d G:i:s", $work_start) . ' - ' . date ("Y-m-d G:i:s", $work_end);
break;
}
$output .= $rowend;
}
@ -196,6 +203,7 @@ if (!empty ($export_btn) && !empty ($module)) {
else {
$work_end = $work_end + $work_period;
}
$work_start = $work_end - $work_period;
}
unset ($output);
$output = "";