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

fixed minor error slicebar

This commit is contained in:
daniel 2018-11-29 17:00:55 +01:00
parent 4b1649d5f8
commit 3bf215782e
4 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_graph.php
View File

@ -2456,7 +2456,9 @@ function graph_sla_slicebar (
0, 0,
array(), array(),
true, true,
$ttl $ttl,
false,
false
); );
} }

8
pandora_console/include/functions_reporting_html.php
View File

@ -3640,7 +3640,9 @@ function reporting_get_event_histogram ($events, $text_header_event = false) {
0, 0,
array(), array(),
true, true,
$ttl $ttl,
false,
false
); );
$table->data[0][0] = $slicebar; $table->data[0][0] = $slicebar;
@ -3823,7 +3825,9 @@ function reporting_get_event_histogram_meta ($width) {
0, 0,
$full_legend_date, $full_legend_date,
true, true,
1 1,
false,
false
); );
$table->data[0][0] = $slicebar; $table->data[0][0] = $slicebar;

3
pandora_console/include/graphs/flot/pandora.flot.js
View File

@ -670,7 +670,7 @@ function pandoraFlotVBars(graph_id, values, labels, labels_long, legend, colors,
} }
function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumulate_data, intervaltick, function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumulate_data, intervaltick,
font, font_size, separator, separator2, id_agent, full_legend, not_interactive) { font, font_size, separator, separator2, id_agent, full_legend, not_interactive, show_date) {
values = values.split(separator2); values = values.split(separator2);
labels = labels.split(separator); labels = labels.split(separator);
@ -728,6 +728,7 @@ function pandoraFlotSlicebar(graph_id, values, datacolor, labels, legend, acumul
tickColor: '#fff' tickColor: '#fff'
}, },
xaxes: [ { xaxes: [ {
show:show_date,
tickFormatter: xFormatter, tickFormatter: xFormatter,
color: '', color: '',
tickSize: intervaltick, tickSize: intervaltick,

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

@ -691,7 +691,7 @@ function flot_slicesbar_graph (
$adapt_key = '', $stat_win = false, $adapt_key = '', $stat_win = false,
$id_agent = 0, $full_legend_date = array(), $id_agent = 0, $full_legend_date = array(),
$not_interactive = 0, $ttl = 1, $not_interactive = 0, $ttl = 1,
$widgets = false) { $widgets = false, $show = true) {
global $config; global $config;
@ -839,7 +839,7 @@ 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','$labels','$legend','$acumulate_data',$intervaltick,'$fontpath',$fontsize,'$separator','$separator2',$id_agent,'$full_legend_date',$not_interactive)"; $return .= "pandoraFlotSlicebar('$graph_id','$values','$datacolor','$labels','$legend','$acumulate_data',$intervaltick,'$fontpath',$fontsize,'$separator','$separator2',$id_agent,'$full_legend_date',$not_interactive, '$show')";
$return .= "\n//]]>"; $return .= "\n//]]>";
$return .= "</script>"; $return .= "</script>";