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 error and visual erros pdf, xml, csv, json

Browse Source
This commit is contained in:
daniel 2016-12-14 14:02:00 +01:00
parent 2b0820d70e
commit fb942ab6cf
3 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_reporting.php
View File

@ -5009,9 +5009,9 @@ function reporting_availability_graph($report, $content, $date=false, $time=fals
"6" => $content["friday"], "6" => $content["friday"],
"7" => $content["saturday"] "7" => $content["saturday"]
), ),
$content['time_from'], $content['time_from'],
$content['time_to'], $content['time_to'],
$slice $slice
); );

40
pandora_console/include/functions_reporting_html.php
View File

@ -112,7 +112,6 @@ function reporting_html_print_report($report, $mini = false) {
$table->rowclass[0] = 'datos3'; $table->rowclass[0] = 'datos3';
$table->data = array (); $table->data = array ();
$table->head = array (); $table->head = array ();
$table->style = array ();
$table->colspan = array (); $table->colspan = array ();
$table->rowstyle = array (); $table->rowstyle = array ();
@ -2160,6 +2159,7 @@ function reporting_html_availability(&$table, $item) {
} }
function reporting_html_availability_graph(&$table, $item, $pdf=0) { function reporting_html_availability_graph(&$table, $item, $pdf=0) {
global $config;
$table1 = new stdClass(); $table1 = new stdClass();
$table1->width = '99%'; $table1->width = '99%';
$table1->data = array (); $table1->data = array ();
@ -2183,8 +2183,46 @@ function reporting_html_availability_graph(&$table, $item, $pdf=0) {
} }
} }
} }
//table_legend_graphs;
$table2 = new stdClass();
$table2->width = '99%';
$table2->data = array ();
$table2->size = array ();
$table2->size[0] = '2%';
$table2->data[0][0] = '<img src ="'. $config['homeurl'] .'images/square_green.png">';
$table2->size[1] = '14%';
$table2->data[0][1] = '<span>'.__('OK') . '</span>';
$table2->size[2] = '2%';
$table2->data[0][2] = '<img src ="'. $config['homeurl'] .'images/square_red.png">';
$table2->size[3] = '14%';
$table2->data[0][3] = '<span>'.__('Critical'). '</span>';
$table2->size[4] = '2%';
$table2->data[0][4] = '<img src ="'. $config['homeurl'] .'images/square_gray.png">';
$table2->size[5] = '14%';
$table2->data[0][5] = '<span>'.__('Unknow'). '</span>';
$table2->size[6] = '2%';
$table2->data[0][6] = '<img src ="'. $config['homeurl'] .'images/square_blue.png">';
$table2->size[7] = '14%';
$table2->data[0][7] = '<span>'.__('Not Init'). '</span>';
$table2->size[8] = '2%';
$table2->data[0][8] = '<img src ="'. $config['homeurl'] .'images/square_orange.png">';
$table2->size[9] = '14%';
$table2->data[0][9] = '<span>'.__('Downtimes'). '</span>';
$table2->size[10] = '2%';
$table2->data[0][10] = '<img src ="'. $config['homeurl'] .'images/square_light_gray.png">';
$table2->size[11] = '15%';
$table2->data[0][11] = '<span>'.__('Ignore time'). '</span>';
$table->colspan['charts']['cell'] = 2; $table->colspan['charts']['cell'] = 2;
$table->data['charts']['cell'] = html_print_table($table1, true); $table->data['charts']['cell'] = html_print_table($table1, true);
$table->colspan['legend']['cell'] = 2;
$table->data['legend']['cell'] = html_print_table($table2, true);
if($pdf){ if($pdf){
return html_print_table($table, true); return html_print_table($table, true);
} }

15
pandora_console/include/styles/pandora.css
View File

@ -3596,19 +3596,4 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
.input_error { .input_error {
border: 1px solid red; border: 1px solid red;
}
.legend_graphs_sla{
width: 40px;
height: 15px;
float:left;
margin-left: 20px;
}
.label_legend_graph{
float:left;
margin-left: 20px;
}
#table_hourly,
#table_hourly2{
border-spacing: 2px;
} }