Merge branch 'ent-5947-Mala-representacion-de-graficas-en-PDF-Availability-graph-y-Module-histogram-graph' into 'develop'
Fixed sla graph in pdf See merge request artica/pandorafms!3279
This commit is contained in:
commit
ee577cff35
|
@ -277,7 +277,8 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
|
|||
$params['ttl'],
|
||||
$params['sizeForTicks'],
|
||||
$params['show'],
|
||||
$params['date_to']
|
||||
$params['date_to'],
|
||||
$params['server_id']
|
||||
);
|
||||
break;
|
||||
|
||||
|
|
|
@ -699,6 +699,7 @@ function flot_slicesbar_graph(
|
|||
'show' => $show,
|
||||
'return_img_base_64' => true,
|
||||
'date_to' => $date_to,
|
||||
'server_id' => $server_id,
|
||||
];
|
||||
|
||||
$graph = '<img src="data:image/jpg;base64,';
|
||||
|
@ -738,7 +739,7 @@ function flot_slicesbar_graph(
|
|||
|
||||
$maxticks = (int) 20;
|
||||
if ($sizeForTicks === false) {
|
||||
$maxticks = (int) 20;
|
||||
$maxticks = (int) 12;
|
||||
} else if ($sizeForTicks < 300) {
|
||||
$maxticks = (int) 3;
|
||||
} else if ($sizeForTicks < 600) {
|
||||
|
@ -808,7 +809,23 @@ function flot_slicesbar_graph(
|
|||
// Javascript code.
|
||||
$return .= "<script type='text/javascript'>";
|
||||
$return .= "//<![CDATA[\n";
|
||||
$return .= "pandoraFlotSlicebar('$graph_id','$values','$datacolor','$legend',$intervaltick,'$fontpath',$fontsize,'$separator','$separator2',$id_agent,'$full_legend_date',$not_interactive, '$show', $datelimit, $server_id)";
|
||||
$return .= "pandoraFlotSlicebar(
|
||||
'$graph_id',
|
||||
'$values',
|
||||
'$datacolor',
|
||||
'$legend',
|
||||
$intervaltick,
|
||||
'$fontpath',
|
||||
$fontsize,
|
||||
'$separator',
|
||||
'$separator2',
|
||||
$id_agent,
|
||||
'$full_legend_date',
|
||||
$not_interactive,
|
||||
'$show',
|
||||
$datelimit,
|
||||
'$server_id'
|
||||
)";
|
||||
$return .= "\n//]]>";
|
||||
$return .= '</script>';
|
||||
|
||||
|
|
Loading…
Reference in New Issue