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

fixed report pdf 

Former-commit-id: 442a90512fbb244154749ddefe0007cef65655c5
This commit is contained in:
daniel 2019-02-08 14:10:19 +01:00
parent 4d4b8bbc0d
commit 16c742bd83
3 changed files with 136 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_html.php
View File

@ -1851,6 +1851,7 @@ function html_get_predefined_table($model='transparent', $columns=4)
* $table->titleclass - Title class
* $table->styleTable - Table style
* $table->caption - Table title
* $table->pdf_report - Table repeat title conteiner.
* @param bool Whether to return an output string or echo now
*
* @return string HTML code if return parameter is true.
@ -2990,4 +2991,3 @@ function html_print_csrf_error()
);
return true;
}

47
pandora_console/include/functions_reporting_html.php
View File

@ -672,26 +672,27 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
true
);
} else {
$return_pdf .= '<tr><td colspan=3>';
$table1->title = $item['title'];
$table1->titleclass = 'title_table_pdf';
$table1->titlestyle = 'text-align:left;';
$return_pdf .= html_print_table(
$table1,
true
);
$return_pdf .= '</td></tr>';
$return_pdf .= '<tr><td colspan=3>';
$table2->title = $item['title'];
$table2->titleclass = 'title_table_pdf';
$table2->titlestyle = 'text-align:left;';
$return_pdf .= html_print_table(
$table2,
true
);
$return_pdf .= '</td></tr>';
$return_pdf .= '<tr><td colspan=3>';
$table3->title = $item['title'];
$table3->titleclass = 'title_table_pdf';
$table3->titlestyle = 'text-align:left;';
$return_pdf .= html_print_table(
$table3,
true
);
$return_pdf .= '</td></tr>';
}
} else {
$table->colspan['error']['cell'] = 3;
@ -699,7 +700,6 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
}
if (!empty($item['charts'])) {
/*
$table1 = new stdClass();
$table1->width = '99%';
$table1->size = [];
@ -721,6 +721,9 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
true
);
} else {
$table1->title = $item['title'];
$table1->titleclass = 'title_table_pdf';
$table1->titlestyle = 'text-align:left;';
$return_pdf .= html_print_table(
$table1,
true
@ -774,7 +777,6 @@ function reporting_html_SLA($table, $item, $mini, $pdf=0)
true
);
}
*/
}
}
@ -2348,13 +2350,28 @@ function reporting_html_value(&$table, $item, $mini, $only_value=false, $check_e
}
function reporting_html_increment(&$table, $item)
/**
* Show a brief analysis in which the variation of the value
* of the indicated module is indicated.
*
* @param string $table
* @param array $item
* @param integer $pdf
* @return html
*/
function reporting_html_increment($table, $item, $pdf=0)
{
global $config;
$return_pdf = '';
if (isset($item['data']['error'])) {
if ($pdf === 0) {
$table->colspan['error']['cell'] = 3;
$table->data['error']['cell'] = $item['data']['message'];
} else {
$return_pdf = $item['data']['message'];
}
} else {
$table1 = new stdClass();
$table1->width = '99%';
@ -2403,9 +2420,17 @@ function reporting_html_increment(&$table, $item)
$table1->data[] = $table1_row;
if ($pdf === 0) {
$data = [];
$data[0] = html_print_table($table1, true);
array_push($table->data, $data);
} else {
$return_pdf = html_print_table($table1, true);
}
}
if ($pdf !== 0) {
return $return_pdf;
}
}

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

@ -48,6 +48,12 @@ thead.header_tr tr th.th_first {
text-align: left;
}
thead.header_tr tr th.th_description {
background-color: #f5f5f5;
color: #1c1c1c;
text-align: justify;
}
table.table_beauty {
border-collapse: collapse;
width: 100%;
@ -57,3 +63,12 @@ table.table_beauty tbody tr td {
padding: 5px;
border: 0.1pt solid #acacac;
}
table.databox {
margin-bottom: 20px;
}
th.title_table_pdf {
background-color: #acacac;
padding: 15px;
}