tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-04-08 18:55:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed reports

Browse Source 
Former-commit-id: 99e8d84b1db440156f8b382ded51be7c39322eed
This commit is contained in:
Daniel Barbero 2019-02-14 15:50:13 +01:00
parent 444b5c4bfd
commit 40143a1402
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/include/functions_reporting_html.php
View File

@ -2955,7 +2955,7 @@ function reporting_html_availability_graph($table, $item, $pdf=0)
global $config;
$metaconsole_on = is_metaconsole();
if ($metaconsole_on) {
if ($metaconsole_on !== false) {
$hack_metaconsole = '../../';
} else {
$hack_metaconsole = '';
@ -2997,7 +2997,10 @@ function reporting_html_availability_graph($table, $item, $pdf=0)
break;
}
$sla_value = sla_truncate($chart['sla_value'], $config['graph_precision']).'%';
$sla_value = sla_truncate(
$chart['sla_value'],
$config['graph_precision']
).'%';
$checks_resume = '('.$chart['checks_ok'].'/'.$chart['checks_total'].')';
}
@ -3005,7 +3008,10 @@ function reporting_html_availability_graph($table, $item, $pdf=0)
$table1->data[0][1] = $chart['chart'];
$table1->data[0][2] = "<span style = 'font: bold 2em Arial, Sans-serif; color: ".$color."'>".$sla_value.'</span>';
$table1->data[0][3] = $checks_resume;
$tables_chart .= html_print_table($table1, true);
$tables_chart .= html_print_table(
$table1,
true
);
}
if ($item['type'] == 'availability_graph') {
@ -3045,13 +3051,20 @@ function reporting_html_availability_graph($table, $item, $pdf=0)
$table2->data[0][11] = '<span>'.__('Ignore time').'</span>';
}
$table->colspan['charts']['cell'] = 2;
$table->data['charts']['cell'] = $tables_chart;
$table->colspan['legend']['cell'] = 2;
$table->data['legend']['cell'] = html_print_table($table2, true);
if ($pdf !== 0) {
return $tables_chart.'<br />'.html_print_table($table2, true);
$tables_chart .= html_print_table(
$table2,
true
);
return $tables_chart;
} else {
$table->colspan['charts']['cell'] = 2;
$table->data['charts']['cell'] = $tables_chart;
$table->colspan['legend']['cell'] = 2;
$table->data['legend']['cell'] = html_print_table(
$table2,
true
);
}
}