enhance display filter editor

This commit is contained in:
Mohamed DAOUD 2024-11-18 21:55:30 +01:00
parent b2bad15a04
commit b23efea01e
3 changed files with 44 additions and 20 deletions

View file

@ -11298,14 +11298,14 @@ class Form
$ret .= '<p class="assistance-errors error" style="display:none">' . $langs->trans('AllFieldsRequired') . ' </p>';
$ret .= '<div class="inline-block">';
$ret .= '<div class="operand">';
$ret .= $form->selectarray('search_filter_field', $arrayoffilterfieldslabel, '', $langs->trans("Fields"), 0, 0, '', 0, 0, 0, '', 'width250', 1);
$ret .= '</div>';
$ret .= '<span class="separator"></span>';
// Operator selector (will be populated dynamically)
$ret .= '<div class="inline-block">';
$ret .= '<div class="operator">';
$ret .= '<select class="operator-selector width150" id="operator-selector"">';
$ret .= '</select>';
$ret .= '<script>$(document).ready(function() {';
@ -11317,7 +11317,7 @@ class Form
$ret .= '<span class="separator"></span>';
$ret .= '<div class="inline-block">';
$ret .= '<div class="value">';
// Input field for entering values
$ret .= '<input type="text" class="flat width100 value-input" placeholder="' . dolPrintHTML($langs->trans('Value')) . '">';
@ -11329,8 +11329,8 @@ class Form
$ret .= '</div>';
$ret .= '<div class="inline-block">';
$ret .= '<button class="button buttongen button-save small add-filter-btn" type="button">' . $langs->trans("addToFilter") . '</button>';
$ret .= '<div class="btn-div">';
$ret .= '<button class="button buttongen button-save add-filter-btn" type="button">' . $langs->trans("addToFilter") . '</button>';
$ret .= '</div>';
$ret .= '</div>';
@ -11347,7 +11347,7 @@ class Form
const inputHeight = $(this).outerHeight();
$(".search-component-assistance").css({
top: inputPosition.top + inputHeight + 5 + "px",
left: $("#divadvancedsearchfieldcompinput").css("left")
left: $("#divsearch_component_params").position().left
}).slideToggle(200);
});
$(document).on("click", function(e) {

View file

@ -5337,7 +5337,6 @@ img.boxhandle, img.boxclose {
z-index: 1000;
top: 208.933px;
left: 352.683px;
min-width: 600px
}
.search-component-assistance .assistance-title {
font-size: 15px;
@ -5346,12 +5345,10 @@ img.boxhandle, img.boxclose {
margin: 5px
}
.search-component-assistance .separator {
border-left: 1px solid #ccc;
padding-left: 8px;
margin-left: 5px
}
.search-component-assistance .end-separator {
border-left: 1px solid #ccc;
margin-left: 8px;
}
.search-component-assistance .assistance-errors {
@ -5363,6 +5360,25 @@ img.boxhandle, img.boxclose {
margin-bottom: 0px;
text-align: center;
}
.add-filter-btn {
margin: 0 !important;
}
.search-component-assistance .operand, .operator, .value {
display: contents;
}
.search-component-assistance .btn-div{
margin-top: 10px;
text-align: right;
}
@media only screen and (max-width: 620px) {
.search-component-assistance .operand, .operator, .value {
display: block;
}
.search-component-assistance .separator, .end-separator {
padding: 0px;
margin: 0px
}
}
/*

View file

@ -5326,7 +5326,6 @@ img.boxhandle, img.boxclose {
z-index: 1000;
top: 208.933px;
left: 352.683px;
min-width: 600px
}
.search-component-assistance .assistance-title {
font-size: 15px;
@ -5335,12 +5334,10 @@ img.boxhandle, img.boxclose {
margin: 5px
}
.search-component-assistance .separator {
border-left: 1px solid #ccc;
padding-left: 8px;
margin-left: 5px
}
.search-component-assistance .end-separator {
border-left: 1px solid #ccc;
margin-left: 8px;
}
.search-component-assistance .assistance-errors {
@ -5352,7 +5349,25 @@ img.boxhandle, img.boxclose {
margin-bottom: 0px;
text-align: center;
}
.add-filter-btn {
margin: 0 !important;
}
.search-component-assistance .operand, .operator, .value {
display: contents;
}
.search-component-assistance .btn-div{
margin-top: 10px;
text-align: right;
}
@media only screen and (max-width: 620px) {
.search-component-assistance .operand, .operator, .value {
display: block;
}
.search-component-assistance .separator, .end-separator {
padding: 0px;
margin: 0px
}
}
/*
@ -8428,10 +8443,6 @@ table.jPicker {
font-size: small;
width: 122px;
}
.search-component-assistance {
min-width: 300px;
}
}
@media only screen and (max-width: 1024px)
@ -8443,9 +8454,6 @@ table.jPicker {
div#ecm-layout-center {
width: 100%;
}
.search-component-assistance {
min-width: 400px;
}
}
.menuhider {