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

Merge branch '3190-Bugarro_en_informe_servicios_SLA' into 'develop' 

3190 bugarro en informe servicios sla

See merge request artica/pandorafms!2036
This commit is contained in:
vgilc 2018-12-04 11:07:26 +01:00
parent 1e9be8d161 05e94ece90
commit 973bd5f98c
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/chart_generator.php
View File

@ -202,7 +202,9 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
$params['id_agent'], $params['id_agent'],
$params['full_legend_daterray'], $params['full_legend_daterray'],
$params['not_interactive'], $params['not_interactive'],
1 $params['ttl'],
$params['widgets'],
$params['show']
); );
break; break;
default: default:

8
pandora_console/include/functions_reporting.php
View File

@ -663,7 +663,9 @@ function reporting_make_reporting_data($report = null, $id_report,
$content, $content,
$type, $type,
$force_width_chart, $force_width_chart,
$force_height_chart); $force_height_chart,
$pdf
);
break; break;
case 'module_histogram_graph': case 'module_histogram_graph':
$report['contents'][] = reporting_enterprise_module_histogram_graph( $report['contents'][] = reporting_enterprise_module_histogram_graph(
@ -1201,10 +1203,10 @@ function reporting_event_top_n($report, $content, $type = 'dinamic',
} }
} }
$ag_name = modules_get_agentmodule_agent_alias($row ['id_agent_module']); $ag_name = modules_get_agentmodule_agent_alias($row ['id_agent_module']);
$mod_name = modules_get_agentmodule_name ($row ['id_agent_module']); $mod_name = modules_get_agentmodule_name ($row ['id_agent_module']);
$unit = db_get_value('unit', 'tagente_modulo', $unit = db_get_value('unit', 'tagente_modulo',
'id_agente_modulo', $row ['id_agent_module']); 'id_agente_modulo', $row ['id_agent_module']);
switch ($top_n) { switch ($top_n) {

16
pandora_console/include/graphs/functions_flot.php
View File

@ -706,13 +706,15 @@ function flot_slicesbar_graph (
'fontpath' => $fontpath, 'fontpath' => $fontpath,
'round_corner' => $round_corner, 'round_corner' => $round_corner,
'homeurl' => $homeurl, 'homeurl' => $homeurl,
'watermark' => $watermark = '', 'watermark' => $watermark,
'adapt_key' => $adapt_key = '', 'adapt_key' => $adapt_key,
'stat_win' => $stat_win = false, 'stat_win' => $stat_win,
'id_agent' => $id_agent = 0, 'id_agent' => $id_agent,
'full_legend_date' => $full_legend_date = array(), 'full_legend_date' => $full_legend_date,
'not_interactive' => $not_interactive = 0, 'not_interactive' => $not_interactive,
'ttl' => $ttl = 1 'ttl' => 1,
'widgets' => $widgets,
'show' => $show
); );
return generator_chart_to_pdf('slicebar', $params); return generator_chart_to_pdf('slicebar', $params);