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

Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop

Browse Source
This commit is contained in:
cesar991 2017-01-02 12:04:33 +01:00
commit ded2c97d55
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -1330,7 +1330,7 @@ You can of course remove the warnings, that's why we include the source and do n
</tr> </tr>
<tr id="row_show_resume" style="" class="datos"> <tr id="row_show_resume" style="" class="datos">
<td style="font-weight:bold;"><?php echo __('Show resume') . ui_print_help_tip(__('Show a resume table with max, min, average of total modules on the report bottom'), true);?></td> <td style="font-weight:bold;"><?php echo __('Show resume') . ui_print_help_tip(__('Show a summary chart with max, min and average number of total modules at the end of the report and Checks.'), true);?></td>
<td> <td>
<?php <?php
html_print_checkbox('checkbox_show_resume', 1, html_print_checkbox('checkbox_show_resume', 1,

9
pandora_console/include/functions_reporting_html.php
View File

@ -2143,10 +2143,13 @@ function reporting_html_availability(&$table, $item) {
$table->colspan[2][0] = 2; $table->colspan[2][0] = 2;
$data = array(); $data = array();
$data[0] = html_print_table($table1, true); $data[0] = html_print_table($table1, true);
$data2 = array();
$data2[0] = html_print_table($table2, true);
array_push ($table->data, $data); array_push ($table->data, $data);
array_push ($table->data, $data2);
if ($item['resume']['resume']){
$data2 = array();
$data2[0] = html_print_table($table2, true);
array_push ($table->data, $data2);
}
if ($item['resume']['resume'] && !empty($item["data"])) { if ($item['resume']['resume'] && !empty($item["data"])) {
$table1->width = '99%'; $table1->width = '99%';