diff --git a/pandora_console/include/functions_reporting.php b/pandora_console/include/functions_reporting.php index 799b22cae2..ef3d734286 100755 --- a/pandora_console/include/functions_reporting.php +++ b/pandora_console/include/functions_reporting.php @@ -179,6 +179,10 @@ function reporting_make_reporting_data( $report['group_name'] = groups_get_name($report['id_group']); $report['contents'] = []; + if (empty($report['period']) && $pdf === false) { + $report['period'] = $period; + } + if (empty($contents)) { return reporting_check_structure_report($report); } diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php index ea32caa767..5331e5419e 100644 --- a/pandora_console/include/functions_reporting_html.php +++ b/pandora_console/include/functions_reporting_html.php @@ -121,12 +121,9 @@ function html_do_report_info($report) '.__('Report date').': '; - if (isset($report['period'])) { - if (is_numeric($report['datetime']) && is_numeric($report['period'])) { - $html .= ''.date($config['date_format'], ($report['datetime'] - $report['period'])).''; - } - - $html .= ''; + if (is_numeric($report['datetime']) && is_numeric($report['period']) && ($report['period'] != 0)) { + $html .= ''.__('From').' '.date($config['date_format'], ($report['datetime'] - $report['period'])).''; + $html .= ''.__('to').' '.date($config['date_format'], $report['datetime']).''; } else { $html .= ''.__('Items period before').' '.date($config['date_format'], $report['datetime']).''; }