tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-19 20:04:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Working in the refactor the code of reports.

Browse Source
This commit is contained in:
mdtrooper 2015-03-18 13:51:14 +01:00
parent 868d1d5b39
commit 10156ffa77
2 changed files with 98 additions and 8413 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8468
pandora_console/include/functions_reporting.php
View File

File diff suppressed because it is too large Load Diff

5
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -41,6 +41,7 @@ if (empty($report) || ! check_acl ($config['id_user'], $report['id_group'], "RR"
// Include with the functions to calculate each kind of report. // Include with the functions to calculate each kind of report.
require_once ($config['homedir'] . '/include/functions_reporting.php'); require_once ($config['homedir'] . '/include/functions_reporting.php');
require_once ($config['homedir'] . '/include/functions_reporting_html.php');
require_once ($config['homedir'] . '/include/functions_groups.php'); require_once ($config['homedir'] . '/include/functions_groups.php');
enterprise_include("include/functions_reporting.php"); enterprise_include("include/functions_reporting.php");
@ -192,7 +193,7 @@ if (defined("METACONSOLE")) {
$table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true) . ' '; $table->data[1][2] .= html_print_input_text ('time', $time, '', 10, 7, true) . ' ';
$table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true) . ' </div>'; $table->data[1][2] .= html_print_submit_button (__('Update'), 'date_submit', false, 'class="sub next"', true) . ' </div>';
} }
else{ else {
if ($report['description'] != '') { if ($report['description'] != '') {
$table->data[0][1] = '<div style="float:left">'.$report['description'].'</div>'; $table->data[0][1] = '<div style="float:left">'.$report['description'].'</div>';
} }
@ -353,7 +354,7 @@ foreach ($contents as $content) {
$table->rowstyle = array (); $table->rowstyle = array ();
// Calculate new inteval for all reports // Calculate new inteval for all reports
if ($enable_init_date){ if ($enable_init_date) {
if ($datetime_init >= $datetime) { if ($datetime_init >= $datetime) {
$datetime_init = $date_init_less; $datetime_init = $date_init_less;
} }