concordia
/
LiDa_Search
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ultimi cambiamenti con Cesare via Skyep

This commit is contained in:
nicola 2022-10-13 15:39:12 +02:00
parent 921b538667
commit 5fed3fbabd
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
index_work_Nik.html
View File

@ -25,7 +25,8 @@
crossorigin="anonymous"></script> crossorigin="anonymous"></script>
<script src="https://code.jquery.com/ui/1.13.1/jquery-ui.js" defer></script> <script src="https://code.jquery.com/ui/1.13.1/jquery-ui.js" defer></script>
<script type="text/javascript" src="./js/datatables.min.js" defer></script> <script type="text/javascript" src="./js/datatables.min.js" defer></script>
<script type="text/javascript" src="./js/jquery.ui.touch-punch.js"></script> <script type="text/javascript" src="./js/lib/jquery.ui.touch-punch.js"></script>
<script type="text/javascript" src="./js/lib/peg-0.10.0.min.js"></script>
<!-- FINE AGGIUNTI --> <!-- FINE AGGIUNTI -->
@ -292,8 +293,8 @@
style="display: none;" style="display: none;"
class="w-100 db h2 f6 bg-near-white ba b--sliver gray andorconditions" class="w-100 db h2 f6 bg-near-white ba b--sliver gray andorconditions"
name="condizionelogica" onchange="" title="Condizione logica"> name="condizionelogica" onchange="" title="Condizione logica">
<option value="all">AND</option> <option value="and">AND</option>
<option value="all">OR</option> <option value="or">OR</option>
</select> </select>
</nav> </nav>
<div class="pa1 pa1-ns listacondizioni"> <div class="pa1 pa1-ns listacondizioni">
@ -397,9 +398,9 @@
<div style="display: none;" id='tiposintattico'> <div style="display: none;" id='tiposintattico'>
<div class="outline ml1 col-md-5 pa1 pt0"> <div class="outline ml1 col-md-5 mt0 pa0 pt0">
<div class="flex flex-wrap h1 pa0"> <div class="flex flex-wrap h1-ns mt0 pa0">
<!-- <div class="outline w-25 pv1 ph1"> --> <!-- <div class="outline w-25 pv1 ph1"> -->
<!-- <div class="flex flex-column"> --> <!-- <div class="flex flex-column"> -->
@ -1072,7 +1073,7 @@
</div> </div>
<div class="flex items-center mb2"> <div class="flex items-center mb2">
<input class="mr2 f6" type="radio" id="lemmamaschile" <input class="mr2 f6" type="radio" id="lemmamaschile"
value="Lemma maschile" name="Genere lemma"> <label value="Lemma maschile" name="Genere_lemma"> <label
for="lemmamaschile" class="lh-copy">Lemma di genere for="lemmamaschile" class="lh-copy">Lemma di genere
maschile</label> maschile</label>
</div> </div>
@ -1084,7 +1085,7 @@
<div class="flex items-center mb2"> <div class="flex items-center mb2">
<input class="mr2 f6" type="radio" id="formafemminile" <input class="mr2 f6" type="radio" id="formafemminile"
value="Forma femminile" name="Genere forma"> <label value="Forma femminile" name="Genere_forma"> <label
for="formafemminile" class="lh-copy">Forma di genere for="formafemminile" class="lh-copy">Forma di genere
femminile</label> femminile</label>
</div> </div>

19
js/guimanagerNik.js
View File

@ -559,6 +559,25 @@ $(document).ready(function() {
condizioniFiltro['filtro-1'] = filtro; condizioniFiltro['filtro-1'] = filtro;
} }
//definizione struttura della query
var EsprLogica = ""
filters = $("[id^=filtro-]")
term = "";
filters.each(function(index, element) {
var mx = $(this).find('#andor');
if (index == 0) {
EsprLogica += ''
term = $(this).attr('id')
}
else {
EsprLogica = "(" + mx.val() + " " + term + " " + $(this).attr('id') + ") "
term = EsprLogica
}
});
condizioniFiltro['EsprLogica'] = EsprLogica.split(" ")
// fine definizione struttura
spquery = buildSQ(condizioniFiltro) spquery = buildSQ(condizioniFiltro)
queryFields = []; queryFields = [];
for (var i in spquery.variables) { for (var i in spquery.variables) {