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

Implement monthly sla. Ticket#3031

This commit is contained in:
Arturo Gonzalez 2015-12-11 16:55:11 +01:00
parent bbfcf7b45e
commit 59ceab13cf
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_reporting.php
View File

@ -112,7 +112,6 @@ function reporting_make_reporting_data($report = null, $id_report,
$contents = db_get_all_rows_field_filter ('treport_content',
'id_report', $id_report, db_escape_key_identifier('order'));
}
$datetime = strtotime($date . ' ' . $time);
$report["datetime"] = $datetime;
$report["group"] = $report['id_group'];
@ -3697,7 +3696,6 @@ function reporting_availability($report, $content) {
$data = array();
$avg = 0;

4
pandora_console/include/functions_reports.php
View File

@ -534,11 +534,11 @@ function reports_get_report_types ($template = false, $not_editor = false) {
$types['SLA'] = array('optgroup' => __('SLA'),
'name' => __('S.L.A.'));
if (!$template && $config['enterprise_installed']) {
if ($config['enterprise_installed']) {
$types['SLA_monthly'] = array('optgroup' => __('SLA'),
'name' => __('Monthly S.L.A.'));
if (!$config['metaconsole']) {
if (!$config['metaconsole'] && !$template) {
$types['SLA_services'] = array('optgroup' => __('SLA'),
'name' => __('Services S.L.A.'));
}