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

fixed error and visual erros pdf, xml, csv, json

Browse Source 
(cherry picked from commit fb942ab6cfc76e253dde2075e60eb6c6d61919df)
This commit is contained in:
daniel 2016-12-14 14:02:00 +01:00
parent 5fb00903b0
commit 916e45c161
3 changed files with 67 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/functions_reporting.php
View File

@ -5012,9 +5012,9 @@ function reporting_availability_graph($report, $content, $date=false, $time=fals
"6" => $content["friday"],
"7" => $content["saturday"]
),
$content['time_from'],
$content['time_to'],
$slice
$content['time_from'],
$content['time_to'],
$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->data = array ();
$table->head = array ();
$table->style = array ();
$table->colspan = array ();
$table->rowstyle = array ();
@ -2158,6 +2157,7 @@ function reporting_html_availability(&$table, $item) {
}
function reporting_html_availability_graph(&$table, $item, $pdf=0) {
global $config;
$table1 = new stdClass();
$table1->width = '99%';
$table1->data = array ();
@ -2181,8 +2181,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->data['charts']['cell'] = html_print_table($table1, true);
$table->colspan['legend']['cell'] = 2;
$table->data['legend']['cell'] = html_print_table($table2, true);
if($pdf){
return html_print_table($table, true);
}

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

@ -1639,6 +1639,9 @@ input[type=image] {
border:0px;
background-color: transparent !important;
}
table#simple{
padding: 30px;
}
table#simple select#id_module_type,
table#alert_search select#id_agent,
table#alert_search select#id_group,
@ -2371,6 +2374,25 @@ span#plugin_description {
.visual_font_size_72pt, .visual_font_size_72pt > em, .visual_font_size_72pt > strong, .visual_font_size_72pt > strong > span, .visual_font_size_72pt > span {
font-size: 72pt !important;
}
.visual_font_size_96pt, .visual_font_size_96pt > em, .visual_font_size_96pt > strong, .visual_font_size_96pt > strong > span, .visual_font_size_96pt > span {
font-size: 96pt !important;
}
.visual_font_size_128pt, .visual_font_size_128pt > em, .visual_font_size_128pt > strong, .visual_font_size_128pt > strong > span, .visual_font_size_128pt > span {
font-size: 128pt !important;
}
.visual_font_size_154pt, .visual_font_size_154pt > em, .visual_font_size_154pt > strong, .visual_font_size_154pt > strong > span, .visual_font_size_154pt > span {
font-size: 154pt !important;
}
.visual_font_size_196pt, .visual_font_size_196pt > em, .visual_font_size_196pt > strong, .visual_font_size_196pt > strong > span, .visual_font_size_196pt > span {
font-size: 196pt !important;
}
.resize_visual_font_size_8pt, .resize_visual_font_size_8pt > em, .resize_visual_font_size_8pt > strong, .resize_visual_font_size_8pt > strong > span, .resize_visual_font_size_8pt > span {
font-size: 4pt !important;
}
@ -3572,20 +3594,6 @@ color:#82b92e;font-family:Nunito;font-size:10pt;position:relative;top:6px;
background-color: #dedede !important;
}
.legend_graphs_sla{
width: 40px;
height: 15px;
float:left;
margin-left: 20px;
}
.label_legend_graph{
float:left;
margin-left: 20px;
}
<<<<<<< HEAD
=======
#table_hourly,
#table_hourly2{
border-spacing: 2px;
}
>>>>>>> 2b0820d... add new reports sla_hourly , weekly and availability graph
.input_error {
border: 1px solid red;
}