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:
commit
973bd5f98c
|
@ -202,7 +202,9 @@ if (file_exists ('languages/'.$user_language.'.mo')) {
|
|||
$params['id_agent'],
|
||||
$params['full_legend_daterray'],
|
||||
$params['not_interactive'],
|
||||
1
|
||||
$params['ttl'],
|
||||
$params['widgets'],
|
||||
$params['show']
|
||||
);
|
||||
break;
|
||||
default:
|
||||
|
|
|
@ -663,7 +663,9 @@ function reporting_make_reporting_data($report = null, $id_report,
|
|||
$content,
|
||||
$type,
|
||||
$force_width_chart,
|
||||
$force_height_chart);
|
||||
$force_height_chart,
|
||||
$pdf
|
||||
);
|
||||
break;
|
||||
case 'module_histogram_graph':
|
||||
$report['contents'][] = reporting_enterprise_module_histogram_graph(
|
||||
|
|
|
@ -706,13 +706,15 @@ function flot_slicesbar_graph (
|
|||
'fontpath' => $fontpath,
|
||||
'round_corner' => $round_corner,
|
||||
'homeurl' => $homeurl,
|
||||
'watermark' => $watermark = '',
|
||||
'adapt_key' => $adapt_key = '',
|
||||
'stat_win' => $stat_win = false,
|
||||
'id_agent' => $id_agent = 0,
|
||||
'full_legend_date' => $full_legend_date = array(),
|
||||
'not_interactive' => $not_interactive = 0,
|
||||
'ttl' => $ttl = 1
|
||||
'watermark' => $watermark,
|
||||
'adapt_key' => $adapt_key,
|
||||
'stat_win' => $stat_win,
|
||||
'id_agent' => $id_agent,
|
||||
'full_legend_date' => $full_legend_date,
|
||||
'not_interactive' => $not_interactive,
|
||||
'ttl' => 1,
|
||||
'widgets' => $widgets,
|
||||
'show' => $show
|
||||
);
|
||||
|
||||
return generator_chart_to_pdf('slicebar', $params);
|
||||
|
|
Loading…
Reference in New Issue