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

Added hooks to the service SLA wizard for reports 

* godmode/reporting/reporting_builder.item_editor.php,
  godmode/reporting/reporting_builder.php,
  include/functions_reporting.php,
  include/functions_reports.php: Added hooks to the
	enterprise services SLA wizard.
This commit is contained in:
Alejandro Gallardo Escobar 2014-09-03 19:46:29 +02:00
parent d3b484372e
commit f9c1d822cc
5 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2014-09-03 Alejandro Gallardo <alejandro.gallardo@artica.es>
* godmode/reporting/reporting_builder.item_editor.php,
godmode/reporting/reporting_builder.php,
include/functions_reporting.php,
include/functions_reports.php: Added hooks to the
enterprise services SLA wizard.
2014-09-03 Alejandro Gallardo <alejandro.gallardo@artica.es> 2014-09-03 Alejandro Gallardo <alejandro.gallardo@artica.es>
* general/pandora_help.php: Error fixes on the help file * general/pandora_help.php: Error fixes on the help file

25
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -120,6 +120,7 @@ switch ($action) {
$type = get_parameter('type', 'SLA'); $type = get_parameter('type', 'SLA');
switch ($type) { switch ($type) {
case 'SLA_monthly': case 'SLA_monthly':
case 'SLA_services':
case 'SLA': case 'SLA':
case 'top_n': case 'top_n':
case 'exception': case 'exception':
@ -235,6 +236,23 @@ switch ($action) {
// 'top_n' filed will be reused for SLA sort option // 'top_n' filed will be reused for SLA sort option
$sla_sorted_by = $item['top_n']; $sla_sorted_by = $item['top_n'];
break; break;
case 'SLA_services':
$description = $item['description'];
$period = $item['period'];
$only_display_wrong = $item['only_display_wrong'];
$monday = $item['monday'];
$tuesday = $item['tuesday'];
$wednesday = $item['wednesday'];
$thursday = $item['thursday'];
$friday = $item['friday'];
$saturday = $item['saturday'];
$sunday = $item['sunday'];
$time_from = $item['time_from'];
$time_to = $item['time_to'];
$show_graph = $item['show_graph'];
// 'top_n' filed will be reused for SLA sort option
$sla_sorted_by = $item['top_n'];
break;
case 'monitor_report': case 'monitor_report':
$description = $item['description']; $description = $item['description'];
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
@ -1886,6 +1904,13 @@ function chooseType() {
$("#row_show_in_two_columns").show(); $("#row_show_in_two_columns").show();
$("#row_sort").show(); $("#row_sort").show();
break; break;
case 'SLA_services':
$("#row_description").show();
$("#row_period").show();
$("#row_only_display_wrong").show();
$("#row_working_time").show();
$("#row_sort").show();
break;
case 'monitor_report': case 'monitor_report':
$("#row_description").show(); $("#row_description").show();
$("#row_agent").show(); $("#row_agent").show();

1
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -752,6 +752,7 @@ switch ($action) {
$values['text'] = $intervals; $values['text'] = $intervals;
break; break;
case 'SLA_monthly': case 'SLA_monthly':
case 'SLA_services':
case 'SLA': case 'SLA':
$values['period'] = get_parameter('period'); $values['period'] = get_parameter('period');
$values['top_n'] = get_parameter('combo_sla_sort_options',0); $values['top_n'] = get_parameter('combo_sla_sort_options',0);

3
pandora_console/include/functions_reporting.php
View File

@ -3369,6 +3369,9 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
case 'SLA_monthly': case 'SLA_monthly':
reporting_enterprise_sla_monthly($mini, $content, $report, $table, $item_title); reporting_enterprise_sla_monthly($mini, $content, $report, $table, $item_title);
break; break;
case 'SLA_services':
reporting_enterprise_sla_services($mini, $content, $report, $table, $item_title);
break;
case 3: case 3:
case 'SLA': case 'SLA':
if (empty($item_title)) { if (empty($item_title)) {

2
pandora_console/include/functions_reports.php
View File

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