tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sla graph in pdf

Browse Source
This commit is contained in:
Daniel Barbero Martin 2020-06-08 14:14:35 +02:00
parent 201c28233f
commit 82b66d567d
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/chart_generator.php
View File

@ -277,7 +277,8 @@ if (file_exists('languages/'.$user_language.'.mo') === true) {
$params['ttl'], $params['ttl'],
$params['sizeForTicks'], $params['sizeForTicks'],
$params['show'], $params['show'],
$params['date_to'] $params['date_to'],
$params['server_id']
); );
break; break;

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

@ -699,6 +699,7 @@ function flot_slicesbar_graph(
'show' => $show, 'show' => $show,
'return_img_base_64' => true, 'return_img_base_64' => true,
'date_to' => $date_to, 'date_to' => $date_to,
'server_id' => $server_id,
]; ];
$graph = '<img src="data:image/jpg;base64,'; $graph = '<img src="data:image/jpg;base64,';
@ -738,7 +739,7 @@ function flot_slicesbar_graph(
$maxticks = (int) 20; $maxticks = (int) 20;
if ($sizeForTicks === false) { if ($sizeForTicks === false) {
$maxticks = (int) 20; $maxticks = (int) 12;
} else if ($sizeForTicks < 300) { } else if ($sizeForTicks < 300) {
$maxticks = (int) 3; $maxticks = (int) 3;
} else if ($sizeForTicks < 600) { } else if ($sizeForTicks < 600) {
@ -808,7 +809,23 @@ function flot_slicesbar_graph(
// Javascript code. // Javascript code.
$return .= "<script type='text/javascript'>"; $return .= "<script type='text/javascript'>";
$return .= "//<![CDATA[\n"; $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 .= "\n//]]>";
$return .= '</script>'; $return .= '</script>';