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

Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop' 

the itil type is removed in the report types

See merge request artica/pandorafms!2757
This commit is contained in:
Daniel Rodriguez 2019-10-04 13:55:54 +02:00
parent 915edd455d 93941f334a
commit 658d71568a
7 changed files with 122 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pandora_console/extensions/resource_exportation.php
View File

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

17
pandora_console/extensions/resource_registration.php
View File

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

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

@ -482,7 +482,8 @@ switch ($action) {
$period = $item['period'];
break;
case 'TTRT':
/*
case 'TTRT':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter(
@ -491,9 +492,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule]
);
$period = $item['period'];
break;
break;
case 'TTO':
case 'TTO':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter(
@ -502,9 +503,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule]
);
$period = $item['period'];
break;
break;
case 'MTBF':
case 'MTBF':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter(
@ -513,9 +514,9 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule]
);
$period = $item['period'];
break;
break;
case 'MTTR':
case 'MTTR':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
$idAgent = db_get_value_filter(
@ -524,8 +525,8 @@ switch ($action) {
['id_agente_modulo' => $idAgentModule]
);
$period = $item['period'];
break;
break;
*/
case 'alert_report_module':
$description = $item['description'];
$idAgentModule = $item['id_agent_module'];
@ -790,10 +791,11 @@ switch ($action) {
case 'avg_value':
case 'projection_graph':
case 'prediction_date':
case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
/*
case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':*/
case 'simple_baseline_graph':
case 'event_report_log':
case 'increment':
@ -3755,10 +3757,10 @@ $(document).ready (function () {
case 'event_report_module':
case 'simple_graph':
case 'simple_baseline_graph':
case 'TTRT':
/* case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
case 'MTTR':*/
case 'prediction_date':
case 'projection_graph':
case 'avg_value':
@ -3796,10 +3798,10 @@ $(document).ready (function () {
case 'event_report_module':
case 'simple_graph':
case 'simple_baseline_graph':
case 'TTRT':
/* case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
case 'MTTR':*/
case 'prediction_date':
case 'projection_graph':
case 'avg_value':
@ -4831,7 +4833,7 @@ function chooseType() {
$("#row_period").show();
$("#row_historical_db_check").hide();
break;
/*
case 'TTRT':
$("#row_description").show();
$("#row_agent").show();
@ -4862,7 +4864,7 @@ function chooseType() {
$("#row_module").show();
$("#row_period").show();
$("#row_historical_db_check").hide();
break;
break;*/
case 'alert_report_module':
$("#row_description").show();
@ -5216,10 +5218,10 @@ function chooseType() {
case 'min_value':
case 'max_value':
case 'avg_value':
case 'TTRT':
/* case 'TTRT':
case 'TTO':
case 'MTBF':
case 'MTTR':
case 'MTTR':*/
case 'simple_baseline_graph':
$("#row_label").show();
break;

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

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

70
pandora_console/include/functions_reporting.php
View File

@ -505,42 +505,43 @@ function reporting_make_reporting_data(
);
break;
case 'MTTR':
/*
case 'MTTR':
$report['contents'][] = reporting_value(
$report,
$content,
'MTTR',
$pdf
);
break;
break;
case 'MTBF':
case 'MTBF':
$report['contents'][] = reporting_value(
$report,
$content,
'MTBF',
$pdf
);
break;
break;
case 'TTO':
case 'TTO':
$report['contents'][] = reporting_value(
$report,
$content,
'TTO',
$pdf
);
break;
break;
case 'TTRT':
case 'TTRT':
$report['contents'][] = reporting_value(
$report,
$content,
'TTRT',
$pdf
);
break;
break;
*/
case 'agent_configuration':
$report['contents'][] = io_safe_output(
reporting_agent_configuration(
@ -4702,21 +4703,22 @@ function reporting_value($report, $content, $type, $pdf=false)
$return['type'] = 'sumatory';
break;
case 'MTTR':
/*
case 'MTTR':
$return['type'] = 'MTTR';
break;
break;
case 'MTBF':
case 'MTBF':
$return['type'] = 'MTBF';
break;
break;
case 'TTO':
case 'TTO':
$return['type'] = 'TTO';
break;
break;
case 'TTRT':
case 'TTRT':
$return['type'] = 'TTRT';
break;
break;*/
}
if (empty($content['name'])) {
@ -4737,21 +4739,22 @@ function reporting_value($report, $content, $type, $pdf=false)
$content['name'] = __('Summatory');
break;
case 'MTTR':
/*
case 'MTTR':
$content['name'] = __('MTTR');
break;
break;
case 'MTBF':
case 'MTBF':
$content['name'] = __('MTBF');
break;
break;
case 'TTO':
case 'TTO':
$content['name'] = __('TTO');
break;
break;
case 'TTRT':
case 'TTRT':
$content['name'] = __('TTRT');
break;
break;*/
}
}
@ -4924,25 +4927,26 @@ function reporting_value($report, $content, $type, $pdf=false)
}
break;
case 'MTTR':
/*
case 'MTTR':
$value = reporting_get_agentmodule_mttr(
$content['id_agent_module'],
$content['period'],
$report['datetime']
);
$formated_value = null;
break;
break;
case 'MTBF':
case 'MTBF':
$value = reporting_get_agentmodule_mtbf(
$content['id_agent_module'],
$content['period'],
$report['datetime']
);
$formated_value = null;
break;
break;
case 'TTO':
case 'TTO':
$value = reporting_get_agentmodule_tto(
$content['id_agent_module'],
$content['period'],
@ -4953,9 +4957,9 @@ function reporting_value($report, $content, $type, $pdf=false)
} else {
$formated_value = human_time_description_raw($value);
}
break;
break;
case 'TTRT':
case 'TTRT':
$value = reporting_get_agentmodule_ttr(
$content['id_agent_module'],
$content['period'],
@ -4966,7 +4970,7 @@ function reporting_value($report, $content, $type, $pdf=false)
} else {
$formated_value = human_time_description_raw($value);
}
break;
break;*/
}
$return['data'] = [

46
pandora_console/include/functions_reporting_html.php
View File

@ -287,22 +287,23 @@ function reporting_html_print_report($report, $mini=false, $report_info=1)
reporting_html_sum_value($table, $item, $mini);
break;
case 'MTTR':
/*
case 'MTTR':
reporting_html_MTTR_value($table, $item, $mini, true, true);
break;
break;
case 'MTBF':
case 'MTBF':
reporting_html_MTBF_value($table, $item, $mini, true, true);
break;
break;
case 'TTO':
case 'TTO':
reporting_html_TTO_value($table, $item, $mini, false, true);
break;
break;
case 'TTRT':
case 'TTRT':
reporting_html_TTRT_value($table, $item, $mini, false, true);
break;
break;
*/
case 'agent_configuration':
reporting_html_agent_configuration($table, $item);
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);
}
}
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);
}
}
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);
}
}
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);
}
}
*/
function reporting_html_sum_value(&$table, $item, $mini)
{

19
pandora_console/include/functions_reports.php
View File

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