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

Merge branch '528-informes-pdf-no-muestra-titulo-por-defecto-en-los-items-open' into 'develop' 

Show agent - module in pdf reports item - #528

See merge request !265
This commit is contained in:
Enrique Camargo 2017-03-15 20:59:20 +01:00
parent 18123ac62d 00f0a171b4
commit 4ae0d567a4
1 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
pandora_console/include/functions_reporting.php
View File

@ -2341,7 +2341,13 @@ function reporting_historical_data($report, $content) {
$content['name'] = __('Historical data');
}
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module']));
$agent_name = io_safe_output(
modules_get_agentmodule_agent_alias ($content['id_agent_module']));
$return['title'] = $content['name'];
$return['subtitle'] = $agent_name . " - " . $module_name;
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
@ -2398,7 +2404,14 @@ function reporting_database_serialized($report, $content) {
$content['name'] = __('Database Serialized');
}
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module']));
$agent_name = io_safe_output(
modules_get_agentmodule_agent_alias ($content['id_agent_module']));
$return['title'] = $content['name'];
$return['subtitle'] = $agent_name . " - " . $module_name;
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
@ -3123,13 +3136,13 @@ function reporting_sql_graph($report, $content, $type,
if (empty($content['name'])) {
switch ($type_sql_graph) {
case 'sql_graph_vbar':
$return['name'] = __('SQL Graph Vertical Bars');
$content['name'] = __('SQL Graph Vertical Bars');
break;
case 'sql_graph_hbar':
$return['name'] = __('SQL Graph Horizontal Bars');
$content['name'] = __('SQL Graph Horizontal Bars');
break;
case 'sql_graph_pie':
$return['name'] = __('SQL Graph Pie');
$content['name'] = __('SQL Graph Pie');
break;
}
}
@ -3179,7 +3192,13 @@ function reporting_monitor_report($report, $content) {
$content['name'] = __('Monitor Report');
}
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module']));
$agent_name = io_safe_output(
modules_get_agentmodule_agent_alias ($content['id_agent_module']));
$return['title'] = $content['name'];
$return['subtitle'] = $agent_name . " - " . $module_name;
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
@ -3247,19 +3266,19 @@ function reporting_netflow($report, $content, $type,
if (empty($content['name'])) {
switch ($type_netflow) {
case 'netflow_area':
$return['name'] = __('Netflow Area');
$content['name'] = __('Netflow Area');
break;
case 'netflow_pie':
$return['name'] = __('Netflow Pie');
$content['name'] = __('Netflow Pie');
break;
case 'netflow_data':
$return['name'] = __('Netflow Data');
$content['name'] = __('Netflow Data');
break;
case 'netflow_statistics':
$return['name'] = __('Netflow Statistics');
$content['name'] = __('Netflow Statistics');
break;
case 'netflow_summary':
$return['name'] = __('Netflow Summary');
$content['name'] = __('Netflow Summary');
break;
}
}
@ -3325,7 +3344,13 @@ function reporting_simple_baseline_graph($report, $content,
$content['name'] = __('Simple baseline graph');
}
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module']));
$agent_name = io_safe_output(
modules_get_agentmodule_agent_alias ($content['id_agent_module']));
$return['title'] = $content['name'];
$return['subtitle'] = $agent_name . " - " . $module_name;
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
@ -3386,16 +3411,17 @@ function reporting_prediction_date($report, $content) {
$content['name'] = __('Prediction Date');
}
$return['title'] = $content['name'];
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module']));
$agent_name = io_safe_output(
modules_get_agentmodule_agent_name ($content['id_agent_module']));
modules_get_agentmodule_agent_alias ($content['id_agent_module']));
$return['title'] = $content['name'];
$return['subtitle'] = $agent_name . " - " . $module_name;
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
$return['agent_name'] = $agent_name;
$return['module_name'] = $module_name;
@ -3436,16 +3462,17 @@ function reporting_projection_graph($report, $content,
$content['name'] = __('Projection Graph');
}
$return['title'] = $content['name'];
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
$module_name = io_safe_output(
modules_get_agentmodule_name($content['id_agent_module']));
$agent_name = io_safe_output(
modules_get_agentmodule_agent_name ($content['id_agent_module']));
modules_get_agentmodule_agent_alias ($content['id_agent_module']));
$return['title'] = $content['name'];
$return['subtitle'] = $agent_name . " - " . $module_name;
$return["description"] = $content["description"];
$return["date"] = reporting_get_date_text($report, $content);
$return['label'] = (isset($content['style']['label'])) ? $content['style']['label'] : '';
$return['agent_name'] = $agent_name;
$return['module_name'] = $module_name;
@ -3688,7 +3715,7 @@ function reporting_value($report, $content, $type) {
$content['name'] = __('TTO');
break;
case 'TTRT':
$return['type'] = __('TTRT');
$content['name'] = __('TTRT');
break;
}
}