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

Merge branch '3257-No_se_ven_graficas_en_plantillas_de_informes_de_availability_SLA' into 'develop' 

fixed error template availability

See merge request artica/pandorafms!2086

Former-commit-id: 94d91ceb98a78fc09a3d6af4e26baeba12343901
This commit is contained in:
daniel 2018-12-24 09:23:35 +01:00
parent 86b1a3e424 84a0f227b9
commit 7de36e1631
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,7 +416,7 @@ function flot_pie_chart ($values, $labels, $width, $height, $water_mark,
$return .= "pandoraFlotPie('$graph_id', '$values', '$labels', $return .= "pandoraFlotPie('$graph_id', '$values', '$labels',
'$series', '$width', $font_size, $water_mark, '$separator', '$series', '$width', $font_size, $water_mark, '$separator',
'$legend_position', '$height', '$colors', " . json_encode($hide_labels) . ")"; '$legend_position', '$height', '$colors', " . json_encode($hide_labels) . ")";
$return .= "});";
$return .= "</script>"; $return .= "</script>";
return $return; return $return;
@ -476,11 +476,11 @@ function flot_custom_pie_chart ($graph_values,
$colors = implode($separator, $temp_colors); $colors = implode($separator, $temp_colors);
$return .= "<script type='text/javascript'>"; $return .= "<script type='text/javascript'>";
$return .= "$(document).ready( function () {";
$return .= "pandoraFlotPieCustom('$graph_id', '$values', '$labels', $return .= "pandoraFlotPieCustom('$graph_id', '$values', '$labels',
'$width', $font_size, '$fontpath', $water_mark, '$width', $font_size, '$fontpath', $water_mark,
'$separator', '$legend_position', '$height', '$colors','$legend','$background_color')"; '$separator', '$legend_position', '$height', '$colors','$legend','$background_color')";
$return .= "});";
$return .= "</script>"; $return .= "</script>";
return $return; return $return;
@ -577,10 +577,10 @@ function flot_hcolumn_chart ($graph_data, $width, $height, $water_mark, $font =
// Javascript code // Javascript code
$return .= "<script type='text/javascript'>"; $return .= "<script type='text/javascript'>";
$return .= "$(document).ready( function () {";
$return .= "pandoraFlotHBars('$graph_id', '$values', '$labels', $return .= "pandoraFlotHBars('$graph_id', '$values', '$labels',
false, $max, '$water_mark', '$separator', '$separator2', '$font', $font_size, '$background_color', '$tick_color', $val_min, $val_max)"; false, $max, '$water_mark', '$separator', '$separator2', '$font', $font_size, '$background_color', '$tick_color', $val_min, $val_max)";
$return .= "});";
$return .= "</script>"; $return .= "</script>";
return $return; return $return;
@ -668,7 +668,7 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon
// Javascript code // Javascript code
$return .= "<script type='text/javascript'>"; $return .= "<script type='text/javascript'>";
$return .= "$(document).ready( function () {";
if ($from_ux) { if ($from_ux) {
if($from_wux){ if($from_wux){
$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, true, '$background_color', '$tick_color')"; $return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, true, true, '$background_color', '$tick_color')";
@ -680,7 +680,7 @@ function flot_vcolumn_chart ($graph_data, $width, $height, $color, $legend, $lon
else { else {
$return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, false, false, '$background_color', '$tick_color')"; $return .= "pandoraFlotVBars('$graph_id', '$values', '$labels', '$labels', '$legend', '$colors', false, $max, '$water_mark', '$separator', '$separator2','$font',$font_size, false, false, '$background_color', '$tick_color')";
} }
$return .= "});";
$return .= "</script>"; $return .= "</script>";
return $return; return $return;
@ -843,7 +843,9 @@ 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 .= "$(document).ready( function () {";
$return .= "pandoraFlotSlicebar('$graph_id','$values','$datacolor','$labels','$legend','$acumulate_data',$intervaltick,'$fontpath',$fontsize,'$separator','$separator2',$id_agent,'$full_legend_date',$not_interactive, '$show')"; $return .= "pandoraFlotSlicebar('$graph_id','$values','$datacolor','$labels','$legend','$acumulate_data',$intervaltick,'$fontpath',$fontsize,'$separator','$separator2',$id_agent,'$full_legend_date',$not_interactive, '$show')";
$return .= "});";
$return .= "\n//]]>"; $return .= "\n//]]>";
$return .= "</script>"; $return .= "</script>";