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

Merge branch 'ent-4902-Querys-predefinidas-en-plantillas-de-informes-no-funcionan' into 'develop' 

Fixed visual bug in general report item

See merge request artica/pandorafms!2854
This commit is contained in:
Daniel Rodriguez 2019-11-05 16:43:52 +01:00
parent 01ba485401 d0c2c0d1eb
commit dd86598298
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3777,11 +3777,14 @@ $(document).ready (function () {
}); });
$("#checkbox-checkbox_show_resume").change(function(){ $("#checkbox-checkbox_show_resume").change(function(){
if($(this).is(":checked")){ type = $("#type").val();
if($(this).is(":checked") && type !== 'general'){
$("#row_select_fields2").show(); $("#row_select_fields2").show();
$("#row_select_fields3").show();
} }
else{ else{
$("#row_select_fields2").hide(); $("#row_select_fields2").hide();
$("#row_select_fields3").hide();
} }
}); });

30
pandora_console/include/functions_reporting_html.php
View File

@ -3583,10 +3583,10 @@ function reporting_html_general($table, $item, $pdf=0)
} }
$table1->head[3] = __('Value'); $table1->head[3] = __('Value');
$table1->style[0] = 'text-align: left'; $table1->style[0] = 'text-align: center';
$table1->style[1] = 'text-align: left'; $table1->style[1] = 'text-align: center';
$table1->style[2] = 'text-align: left'; $table1->style[2] = 'text-align: center';
$table1->style[3] = 'text-align: left'; $table1->style[3] = 'text-align: center';
// Begin - Order by agent. // Begin - Order by agent.
foreach ($item['data'] as $key => $row) { foreach ($item['data'] as $key => $row) {
@ -3717,12 +3717,16 @@ function reporting_html_general($table, $item, $pdf=0)
$table_summary->head = []; $table_summary->head = [];
$table_summary->head_colspan = []; $table_summary->head_colspan = [];
$table_summary->align = []; $table_summary->align = [];
$table_summary->headstyle = [];
$table_summary->headstyle[0] = 'text-align: center;';
$table_summary->headstyle[1] = 'text-align: center;';
$table_summary->headstyle[2] = 'text-align: center;';
$table_summary->align[0] = 'left'; $table_summary->align[0] = 'center';
$table_summary->align[1] = 'right'; $table_summary->align[1] = 'center';
$table_summary->align[2] = 'right'; $table_summary->align[2] = 'center';
$table_summary->align[3] = 'left'; $table_summary->align[3] = 'center';
$table_summary->align[4] = 'right'; $table_summary->align[4] = 'center';
$table_summary->head_colspan[0] = 2; $table_summary->head_colspan[0] = 2;
$table_summary->head[0] = __('Min Value'); $table_summary->head[0] = __('Min Value');
@ -3730,11 +3734,11 @@ function reporting_html_general($table, $item, $pdf=0)
$table_summary->head_colspan[2] = 2; $table_summary->head_colspan[2] = 2;
$table_summary->head[2] = __('Max Value'); $table_summary->head[2] = __('Max Value');
$table_summary->data[0][0] = $item['min']['agent'].' - '.$item['min']['module']; $table_summary->data[0][0] = $item['min']['agent'].' - '.$item['min']['module'].str_repeat(' ', 20).$item['min']['formated_value'];
$table_summary->data[0][1] = $item['min']['formated_value']; $table_summary->data[0][1] = '';
$table_summary->data[0][2] = format_for_graph($item['avg_value'], 2); $table_summary->data[0][2] = format_for_graph($item['avg_value'], 2);
$table_summary->data[0][3] = $item['max']['agent'].' - '.$item['max']['module']; $table_summary->data[0][3] = $item['max']['agent'].' - '.$item['max']['module'].str_repeat(' ', 20).$item['max']['formated_value'];
$table_summary->data[0][4] = $item['max']['formated_value']; $table_summary->data[0][4] = '';
if ($pdf !== 0) { if ($pdf !== 0) {
$return_pdf .= html_print_table($table_summary, true); $return_pdf .= html_print_table($table_summary, true);