From 5fed3fbabd46a40180dd458672b0edb9b8e834db Mon Sep 17 00:00:00 2001
From: nicola <nicola@mbpdiniolaaloia.lan>
Date: Thu, 13 Oct 2022 15:39:12 +0200
Subject: [PATCH] ultimi cambiamenti con Cesare via Skyep

---
 index_work_Nik.html | 15 ++++++++-------
 js/guimanagerNik.js | 19 +++++++++++++++++++
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/index_work_Nik.html b/index_work_Nik.html
index b3514b5..fe7b5e8 100644
--- a/index_work_Nik.html
+++ b/index_work_Nik.html
@@ -25,7 +25,8 @@
 	crossorigin="anonymous"></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/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 -->
 
@@ -292,8 +293,8 @@
 						style="display: none;"
 						class="w-100 db h2 f6 bg-near-white ba b--sliver gray andorconditions"
 						name="condizionelogica" onchange="" title="Condizione logica">
-						<option value="all">AND</option>
-						<option value="all">OR</option>
+						<option value="and">AND</option>
+						<option value="or">OR</option>
 					</select>
 				</nav>
 				<div class="pa1 pa1-ns listacondizioni">
@@ -397,9 +398,9 @@
 
 		<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="flex flex-column"> -->
@@ -1072,7 +1073,7 @@
 					</div>
 					<div class="flex items-center mb2">
 						<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
 							maschile</label>
 					</div>
@@ -1084,7 +1085,7 @@
 
 					<div class="flex items-center mb2">
 						<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
 							femminile</label>
 					</div>
diff --git a/js/guimanagerNik.js b/js/guimanagerNik.js
index 57023e4..2a15f46 100644
--- a/js/guimanagerNik.js
+++ b/js/guimanagerNik.js
@@ -559,6 +559,25 @@ $(document).ready(function() {
 			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)
 		queryFields = [];
 		for (var i in spquery.variables) {