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

the itil type is removed in the report types

This commit is contained in:
marcos.alconada 2019-09-25 16:12:57 +02:00
parent 0a6c5352e6
commit 93941f334a
7 changed files with 122 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/extensions/resource_exportation.php
View File

@ -239,6 +239,7 @@ function output_xml_report($id)
echo '<column_separator><![CDATA['.io_safe_output($item['header_definition']).']]></column_separator>'; echo '<column_separator><![CDATA['.io_safe_output($item['header_definition']).']]></column_separator>';
break; break;
/*
case 'TTRT': case 'TTRT':
break; break;
@ -249,7 +250,7 @@ function output_xml_report($id)
break; break;
case 'MTTR': case 'MTTR':
break; break;*/
} }
echo "</item>\n"; echo "</item>\n";

3
pandora_console/extensions/resource_registration.php
View File

@ -376,6 +376,7 @@ function process_upload_xml_report($xml, $group_filter=0)
$values['column_separator'] = io_safe_input($item['column_separator']); $values['column_separator'] = io_safe_input($item['column_separator']);
break; break;
/*
case 'TTRT': case 'TTRT':
break; break;
@ -386,7 +387,7 @@ function process_upload_xml_report($xml, $group_filter=0)
break; break;
case 'MTTR': case 'MTTR':
break; break;*/
} }
if (empty($agents_item)) { if (empty($agents_item)) {

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

@ -480,6 +480,7 @@ switch ($action) {
$period = $item['period']; $period = $item['period'];
break; break;
/*
case 'TTRT': case 'TTRT':
$description = $item['description']; $description = $item['description'];
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
@ -523,7 +524,7 @@ switch ($action) {
); );
$period = $item['period']; $period = $item['period'];
break; break;
*/
case 'alert_report_module': case 'alert_report_module':
$description = $item['description']; $description = $item['description'];
$idAgentModule = $item['id_agent_module']; $idAgentModule = $item['id_agent_module'];
@ -788,10 +789,11 @@ switch ($action) {
case 'avg_value': case 'avg_value':
case 'projection_graph': case 'projection_graph':
case 'prediction_date': case 'prediction_date':
/*
case 'TTRT': case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'event_report_log': case 'event_report_log':
case 'increment': case 'increment':
@ -3738,10 +3740,10 @@ $(document).ready (function () {
case 'event_report_module': case 'event_report_module':
case 'simple_graph': case 'simple_graph':
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'TTRT': /* case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'prediction_date': case 'prediction_date':
case 'projection_graph': case 'projection_graph':
case 'avg_value': case 'avg_value':
@ -3779,10 +3781,10 @@ $(document).ready (function () {
case 'event_report_module': case 'event_report_module':
case 'simple_graph': case 'simple_graph':
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'TTRT': /* case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'prediction_date': case 'prediction_date':
case 'projection_graph': case 'projection_graph':
case 'avg_value': case 'avg_value':
@ -4814,7 +4816,7 @@ function chooseType() {
$("#row_period").show(); $("#row_period").show();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
break; break;
/*
case 'TTRT': case 'TTRT':
$("#row_description").show(); $("#row_description").show();
$("#row_agent").show(); $("#row_agent").show();
@ -4845,7 +4847,7 @@ function chooseType() {
$("#row_module").show(); $("#row_module").show();
$("#row_period").show(); $("#row_period").show();
$("#row_historical_db_check").hide(); $("#row_historical_db_check").hide();
break; break;*/
case 'alert_report_module': case 'alert_report_module':
$("#row_description").show(); $("#row_description").show();
@ -5199,10 +5201,10 @@ function chooseType() {
case 'min_value': case 'min_value':
case 'max_value': case 'max_value':
case 'avg_value': case 'avg_value':
case 'TTRT': /* case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'simple_baseline_graph': case 'simple_baseline_graph':
$("#row_label").show(); $("#row_label").show();
break; break;

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

@ -2006,10 +2006,11 @@ switch ($action) {
case 'avg_value': case 'avg_value':
case 'projection_graph': case 'projection_graph':
case 'prediction_date': case 'prediction_date':
/*
case 'TTRT': case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'nt_top_n': case 'nt_top_n':
if ($label != '') { if ($label != '') {
@ -2612,10 +2613,11 @@ switch ($action) {
case 'avg_value': case 'avg_value':
case 'projection_graph': case 'projection_graph':
case 'prediction_date': case 'prediction_date':
/*
case 'TTRT': case 'TTRT':
case 'TTO': case 'TTO':
case 'MTBF': case 'MTBF':
case 'MTTR': case 'MTTR':*/
case 'simple_baseline_graph': case 'simple_baseline_graph':
case 'nt_top_n': case 'nt_top_n':
if ($label != '') { if ($label != '') {

12
pandora_console/include/functions_reporting.php
View File

@ -505,6 +505,7 @@ function reporting_make_reporting_data(
); );
break; break;
/*
case 'MTTR': case 'MTTR':
$report['contents'][] = reporting_value( $report['contents'][] = reporting_value(
$report, $report,
@ -540,7 +541,7 @@ function reporting_make_reporting_data(
$pdf $pdf
); );
break; break;
*/
case 'agent_configuration': case 'agent_configuration':
$report['contents'][] = io_safe_output( $report['contents'][] = io_safe_output(
reporting_agent_configuration( reporting_agent_configuration(
@ -4691,6 +4692,7 @@ function reporting_value($report, $content, $type, $pdf=false)
$return['type'] = 'sumatory'; $return['type'] = 'sumatory';
break; break;
/*
case 'MTTR': case 'MTTR':
$return['type'] = 'MTTR'; $return['type'] = 'MTTR';
break; break;
@ -4705,7 +4707,7 @@ function reporting_value($report, $content, $type, $pdf=false)
case 'TTRT': case 'TTRT':
$return['type'] = 'TTRT'; $return['type'] = 'TTRT';
break; break;*/
} }
if (empty($content['name'])) { if (empty($content['name'])) {
@ -4726,6 +4728,7 @@ function reporting_value($report, $content, $type, $pdf=false)
$content['name'] = __('Summatory'); $content['name'] = __('Summatory');
break; break;
/*
case 'MTTR': case 'MTTR':
$content['name'] = __('MTTR'); $content['name'] = __('MTTR');
break; break;
@ -4740,7 +4743,7 @@ function reporting_value($report, $content, $type, $pdf=false)
case 'TTRT': case 'TTRT':
$content['name'] = __('TTRT'); $content['name'] = __('TTRT');
break; break;*/
} }
} }
@ -4913,6 +4916,7 @@ function reporting_value($report, $content, $type, $pdf=false)
} }
break; break;
/*
case 'MTTR': case 'MTTR':
$value = reporting_get_agentmodule_mttr( $value = reporting_get_agentmodule_mttr(
$content['id_agent_module'], $content['id_agent_module'],
@ -4955,7 +4959,7 @@ function reporting_value($report, $content, $type, $pdf=false)
} else { } else {
$formated_value = human_time_description_raw($value); $formated_value = human_time_description_raw($value);
} }
break; break;*/
} }
$return['data'] = [ $return['data'] = [

30
pandora_console/include/functions_reporting_html.php
View File

@ -287,6 +287,7 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
reporting_html_sum_value($table, $item, $mini); reporting_html_sum_value($table, $item, $mini);
break; break;
/*
case 'MTTR': case 'MTTR':
reporting_html_MTTR_value($table, $item, $mini, true, true); reporting_html_MTTR_value($table, $item, $mini, true, true);
break; break;
@ -302,7 +303,7 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
case 'TTRT': case 'TTRT':
reporting_html_TTRT_value($table, $item, $mini, false, true); reporting_html_TTRT_value($table, $item, $mini, false, true);
break; break;
*/
case 'agent_configuration': case 'agent_configuration':
reporting_html_agent_configuration($table, $item); reporting_html_agent_configuration($table, $item);
break; break;
@ -2728,29 +2729,30 @@ function reporting_html_agent_configuration(
} }
function reporting_html_TTRT_value(&$table, $item, $mini, $only_value=false, $check_empty=false) /*
{ function reporting_html_TTRT_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{
reporting_html_value($table, $item, $mini, $only_value, $check_empty); reporting_html_value($table, $item, $mini, $only_value, $check_empty);
} }
function reporting_html_TTO_value(&$table, $item, $mini, $only_value=false, $check_empty=false) function reporting_html_TTO_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{ {
reporting_html_value($table, $item, $mini, $only_value, $check_empty); reporting_html_value($table, $item, $mini, $only_value, $check_empty);
} }
function reporting_html_MTBF_value(&$table, $item, $mini, $only_value=false, $check_empty=false) function reporting_html_MTBF_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{ {
reporting_html_value($table, $item, $mini, $only_value, $check_empty); reporting_html_value($table, $item, $mini, $only_value, $check_empty);
} }
function reporting_html_MTTR_value(&$table, $item, $mini, $only_value=false, $check_empty=false) function reporting_html_MTTR_value(&$table, $item, $mini, $only_value=false, $check_empty=false)
{ {
reporting_html_value($table, $item, $mini, $only_value, $check_empty); reporting_html_value($table, $item, $mini, $only_value, $check_empty);
} }
*/
function reporting_html_sum_value(&$table, $item, $mini) function reporting_html_sum_value(&$table, $item, $mini)
{ {

3
pandora_console/include/functions_reports.php
View File

@ -679,6 +679,7 @@ function reports_get_report_types($template=false, $not_editor=false)
'name' => __('Module Histogram graph'), 'name' => __('Module Histogram graph'),
]; ];
/*
$types['TTRT'] = [ $types['TTRT'] = [
'optgroup' => __('ITIL'), 'optgroup' => __('ITIL'),
'name' => __('TTRT'), 'name' => __('TTRT'),
@ -695,7 +696,7 @@ function reports_get_report_types($template=false, $not_editor=false)
'optgroup' => __('ITIL'), 'optgroup' => __('ITIL'),
'name' => __('MTTR'), 'name' => __('MTTR'),
]; ];
*/
$types['SLA'] = [ $types['SLA'] = [
'optgroup' => __('SLA'), 'optgroup' => __('SLA'),
'name' => __('S.L.A.'), 'name' => __('S.L.A.'),