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

#12099 Fix filter position

This commit is contained in:
miguel angel rasteu 2023-09-25 10:57:46 +02:00
parent 9a5a1f02bf
commit 4b999b79d3
3 changed files with 55 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/include/functions_html.php
View File

@ -7384,11 +7384,15 @@ function html_print_select_date_range(
$('#".$name."_default').hide();
$('#".$name."_extend').hide();
$('#hidden-custom_date').val('1');
$('.filter_label_position_before').addClass('filter_label_position_after');
} else if ($(this).val() === 'custom') {
$('#".$name."_range').hide();
$('#".$name."_default').hide();
$('#".$name."_extend').show();
$('#hidden-custom_date').val('2');
$('.filter_label_position_before').removeClass('filter_label_position_after');
} else {
$('.filter_label_position_before').removeClass('filter_label_position_after');
}
});

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

@ -12568,12 +12568,19 @@ tr[id^="network_component-plugin-snmp-fields-dynamicMacroRow-"] input {
}
.div-report_export_filter {
left: -7em;
position: absolute;
left: 0em;
top: 0em;
position: relative;
}
.button-export_filter {
position: absolute;
left: 7em;
margin-top: 20px;
position: relative;
left: 17em;
top: -38px;
width: 30%;
}
.filter_label_position_after {
position: relative;
top: -92px;
}

54
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -312,11 +312,19 @@ if ($html_menu_export === ENTERPRISE_NOT_HOOK) {
$html_menu_export = '';
}
if ((bool) is_metaconsole() === true) {
$table2->data[0][2] = html_print_label_input_block(
__('Date').' ',
html_print_select_date_range('date', true, get_parameter('date', SECONDS_1DAY), $date_init, $time_init, date('Y/m/d'), date('H:i:s'), $date_text),
);
} else {
$table2->data[0][2] = html_print_label_input_block(
__('Date').' ',
html_print_select_date_range('date', true, get_parameter('date', SECONDS_1DAY), $date_init, $time_init, date('Y/m/d'), date('H:i:s'), $date_text),
['label_class' => 'filter_label_position_before']
);
}
$table2->data[0][2] = html_print_label_input_block(
__('Date').':<br>',
html_print_select_date_range('date', true, get_parameter('date', SECONDS_1DAY), $date_init, $time_init, date('Y/m/d'), date('H:i:s'), $date_text)
);
$table2->data[0][3] = $html_menu_export;
@ -325,17 +333,32 @@ $searchForm = '<form method="post" action="'.$url.'&pure='.$config['pure'].'" cl
$searchForm .= html_print_table($table2, true);
$searchForm .= html_print_input_hidden('id_report', $id_report, true);
$Actionbuttons .= html_print_submit_button(
__('Update'),
'date_submit',
false,
[
'mode' => 'mini',
'icon' => 'next',
'style' => 'position: absolute; top: 25px;',
],
true
);
if ((bool) is_metaconsole() === true) {
$Actionbuttons .= html_print_submit_button(
__('Update'),
'date_submit',
false,
[
'mode' => 'mini',
'icon' => 'next',
'style' => 'position: absolute; top: 60px;',
],
true
);
} else {
$Actionbuttons .= html_print_submit_button(
__('Update'),
'date_submit',
false,
[
'mode' => 'mini',
'icon' => 'next',
'style' => 'position: absolute; top: 20px;',
],
true
);
}
$searchForm .= html_print_div(
[
@ -428,6 +451,7 @@ $(document).ready (function () {
$("#string_to").show();
$('#string_from').show();
$("#string_items").hide();
console.log($(".filter_label_position_before").html());
} else {
$("#string_to").hide();
$('#string_from').hide();