sistemato graficamente tutti filtri

This commit is contained in:
nicola 2022-10-14 16:22:37 +02:00
parent 816ed3eb19
commit e101328bde
2 changed files with 8 additions and 8 deletions

View File

@ -200,8 +200,8 @@
</div> </div>
<!-- <div class="fl w-100 w-20-ns pa4" id='tuttiFiltri'> --> <!-- <div class="fl w-100 w-20-ns pa4" id='tuttiFiltri'> -->
<div class="mt0 mb0 pb0 ml7 h-25 d-inline-block"> <div class="mt0 mb0 pb0 ml7 h-1 d-inline-block">
<div class="bg-washed-blue h-25 pv0" id='filtri' <div class="bg-washed-blue h-1 pv0" id='filtri'
style="display: none;"> style="display: none;">
<img src="./images/filters1.png" class="ui-state-disabled" style="width: 40px; height: 48px;" <img src="./images/filters1.png" class="ui-state-disabled" style="width: 40px; height: 48px;"
alt="Filtri"> <input type="hidden" id="IdFiltro" type="text" alt="Filtri"> <input type="hidden" id="IdFiltro" type="text"
@ -291,13 +291,13 @@
href="#" title="EditFilter"><img src="./images/edit.png" href="#" title="EditFilter"><img src="./images/edit.png"
style="width: 22px; height: 20px;"></a> style="width: 22px; height: 20px;"></a>
<select id="andor" style="display: none;" <select id="andor" style="display: none;"
class="w-100 db h1 mb0 pv0 pa0 f6 bg-near-white ba b--sliver gray andorconditions" class="w-100 db h1 mb2 pv0 pa0 f6 bg-near-white ba b--sliver gray andorconditions"
name="condizionelogica" onchange="" title="Condizione logica"> name="condizionelogica" onchange="" title="Condizione logica">
<option value="AND">AND</option> <option value="AND">AND</option>
<option value="OR">OR</option> <option value="OR">OR</option>
</select> </select>
</nav> </nav>
<div class=" mb0 pv0 pa0 listacondizioni"> <div class="flex mb0 pv0 pa0 listacondizioni">
<!--<h4 class="f6 fw6">Clausola</h4> --> <!--<h4 class="f6 fw6">Clausola</h4> -->
</div> </div>

View File

@ -479,16 +479,16 @@ $(document).ready(function() {
let tuttiFiltri = ""; let tuttiFiltri = "";
var keys = Object.keys(filtro)//condizioniFiltro) var keys = Object.keys(filtro)//condizioniFiltro)
for (key in keys) { for (key in keys) {
var dlclass = $('<dl class="f6 lh-title mv2" />'), var dlclass = $('<dl class="flex mb0 pa0 f6 lh-title mv0" />'),
dtclass = $('<dt class="dib b mainflabel" />'), dtclass = $('<dt class="flex mb0 pa0 b mainflabel" />'),
ddclass = $('<dd class="dib ml0 gray mainfvalue"/>'); ddclass = $('<dd class="flex mb0 pa0 ml0 gray mainfvalue"/>');
tuttiFiltri = tuttiFiltri + filtro[[keys[key]]] + ", "; tuttiFiltri = tuttiFiltri + filtro[[keys[key]]] + ", ";
} }
//element.find('.listacondizioni').append(dlclass); //element.find('.listacondizioni').append(dlclass);
let virgola = tuttiFiltri.lastIndexOf(','); let virgola = tuttiFiltri.lastIndexOf(',');
tuttiFiltri = tuttiFiltri.substring(0, virgola); tuttiFiltri = tuttiFiltri.substring(0, virgola);
let txtAreaFiltri = '<textarea id = ' + 'textarea-' + filterconditions + let txtAreaFiltri = '<textarea id = ' + 'textarea-' + filterconditions +
' readonly style="resize:none" class="bg-washed-blue bn" rows="2" cols="20" name="usrtxt" wrap="hard">' + ' readonly style="resize:none" class="flex mb0 pb0 bg-washed-blue bn" rows="1" cols="20" name="usrtxt" wrap="hard">' +
tuttiFiltri + "</textarea>" tuttiFiltri + "</textarea>"
ddclass.append(txtAreaFiltri); ddclass.append(txtAreaFiltri);
dlclass.append(dtclass); dlclass.append(dtclass);