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

spostate clausole a dx, inizio adattamento clausole

This commit is contained in:
Luca Trupiano 2022-11-21 10:25:31 +01:00
parent edd13f73c2
commit edf5f8c11c
2 changed files with 102 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

151
index_2.0.html
View File

@ -76,6 +76,15 @@
<a class="dropdown-item" href="#">Risultati in formato...</a>
</div>
</li>
<li class="nav-item dropleft">
<a class="nav-link dropdown-toggle" href="http://example.com" id="navbarDropdownRicerca" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
Ricerca
</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownRicerca">
<a class="dropdown-item" href="#" id="dropSimple">Semplice</a>
<a class="dropdown-item" href="#" id="dropAdvanced">Avanzata</a>
</div>
</li>
</ul>
</div>
</nav>
@ -84,11 +93,11 @@
</div>
</div>
<div class="row py-2">
<div class="col-2 fixed-top">
<br><br><br>
<div class="col-2 fixed-top my-3" style="z-index: 1000">
<br><br>
<div id="accordion">
<div class="card">
<div class="card-header" id="headingOne">
<div class="card-header px-1" id="headingOne">
<h6 class="mb-0">
<button class="btn btn-sm btn-link" id="cantica1" data-toggle="collapse"
data-target="#collapseOne" aria-expanded="true"
@ -137,7 +146,7 @@
</div>
</div>
<div class="card">
<div class="card-header" id="headingTwo">
<div class="card-header px-1" id="headingTwo">
<h6 class="mb-0">
<button class="btn btn-sm btn-link collapsed" id="cantica2" data-toggle="collapse"
data-target="#collapseTwo" aria-expanded="false"
@ -183,7 +192,7 @@
</div>
</div>
<div class="card">
<div class="card-header" id="headingThree">
<div class="card-header px-1" id="headingThree">
<h6 class="mb-0">
<button class="btn btn-sm btn-link collapsed" id="cantica3" data-toggle="collapse"
data-target="#collapseThree" aria-expanded="false"
@ -233,69 +242,69 @@
</div>
<div class="col-2">&nbsp;
</div>
<div class="col-2">&nbsp;</div>
<div class="col-10 pl-0 mt-1">
<div class="col-10 pl-0 mt-2">
<div class="row bg-lida10 border mx-0 p-2">
<div class="row bg-lida10 border mx-0 p-2 d-flex justify-content-end">
<div class="col-2 d-flex p-0">
</div>
<div class="col-10" id="simpleSearchDiv" style="display: flex">
<div class="form-inline input-group bg-lida10 pt-1" action="" style="display: flex">
<input class="form-control-sm mr-sm-2" type="text" id="queryText" placeholder="Cerca">
<button class="btn btn-sm btn-lida4 my-2 my-sm-0" type="submit" id='searchcomm'>Cerca</button>
<button class="btn btn-sm btn-outline-lida4 m-2 my-sm-0" type="button" data-toggle="collapse" data-target="#collapseOptions" aria-expanded="false" aria-controls="collapseExample">
<div class="col-10 d-flex justify-content-end px-0" id="simpleSearchDiv" style="display: flex">
<div class="form-inline input-group bg-lida10 justify-content-end" action="">
<span class="small text-muted pr-2" id="tipoRicerca">Ricerca Semplice</span>
<div class="pr-2">
<input class="form-control-sm pr-2" type="text" id="queryText" placeholder="Cerca">
</div>
<button class="btn btn-sm btn-lida4 mr-2" type="submit" id='searchcomm'>Cerca</button>
<button class="btn btn-sm btn-outline-lida4 mr-2" type="button" data-toggle="collapse" data-target="#collapseOptions" aria-expanded="false" aria-controls="collapseExample">
Opzioni
</button>
<button class="btn btn-sm btn-outline-lida4 m-2 my-sm-0" type="submit" id='cleanresult' aria-expanded="false" aria-controls="collapseExample">
<button class="btn btn-sm btn-outline-lida4" type="submit" id='cleanresult' aria-expanded="false" aria-controls="collapseExample">
Reset
</button>
</div>
</div>
<div class="col-10" id="advancedSearchDiv" style="display: none">
<div class="btn-group pt-1 mx-2 " role="group" aria-label="Bottoni menu clausole">
<div class="btn-group dropright" role="group">
<button id="btnGroupDrop1" type="button" class="btn btn-sm btn-outline-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Aggiungi clausola di tipo: </button>
<div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
<a class="dropdown-item" id="Grammaticale" href="#"><span class="text-lida9">Categoria grammaticale</span></a>
<a class="dropdown-item" id="Sintattico" href="#"><span class="text-lida3">Tipo sintattico</span></a>
<a class="dropdown-item" id="Metafore" href="#"><span class="text-lida5">Metafore</span></a>
</div>
</div>
<div class="col-10 justify-content-end px-0" id="advancedSearchDiv" style="display: none">
<span class="small text-muted pr-2" id="tipoRicerca">Ricerca Avanzata</span>
<div class="btn-group" role="group" aria-label="Bottoni menu clausole">
<div class="btn-group dropright pr-2" role="group">
<button id="btnGroupDrop1" type="button" class="btn btn-sm btn-outline-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Aggiungi clausola di tipo: </button>
<div class="dropdown-menu" aria-labelledby="btnGroupDrop1">
<a class="dropdown-item" id="Grammaticale" href="#"><span class="text-lida9">Categoria grammaticale</span></a>
<a class="dropdown-item" id="Sintattico" href="#"><span class="text-lida3">Tipo sintattico</span></a>
<a class="dropdown-item" id="Metafore" href="#"><span class="text-lida5">Metafore</span></a>
</div>
</div>
<div class="btn-group pt-1 mx-2" role="group" aria-label="Bottoni menu logiche">
<div class="btn-group dropright" role="group">
<button id="btnGroupDrop2" type="button" class="btn btn-sm btn-outline-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Aggiungi condizione logica: </button>
<div class="dropdown-menu" aria-labelledby="btnGroupDrop2" style="">
<a class="dropdown-item" id="andCond" href="#"><span class="text-muted bg-lida10">AND</span></a>
<a class="dropdown-item" id="orCond" href="#"><span class="text-muted bg-lida11">OR</span></a>
</div>
</div>
</div>
<button class="btn btn-sm btn-lida4 m-2 my-sm-0" type="submit" id='searchcomm2'>Cerca</button>
<button class="btn btn-sm btn-outline-lida4 m-2 my-sm-0" type="submit" id='cleanresult2' aria-expanded="false" aria-controls="collapseExample">
<div class="btn-group dropright pr-2" role="group">
<button id="btnGroupDrop2" type="button" class="btn btn-sm btn-outline-danger dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Aggiungi condizione logica: </button>
<div class="dropdown-menu" aria-labelledby="btnGroupDrop2" style="">
<a class="dropdown-item" id="andCond" href="#"><span class="text-muted bg-lida10">AND</span></a>
<a class="dropdown-item" id="orCond" href="#"><span class="text-muted bg-lida11">OR</span></a>
</div>
</div>
<button class="btn btn-sm btn-lida4 mr-2" type="submit" id='searchcomm2'>Cerca</button>
<button class="btn btn-sm btn-outline-lida4" type="submit" id='cleanresult2' aria-expanded="false" aria-controls="collapseExample">
Reset
</button>
</button>
</div>
</div>
<div class="col-2 float-right">
<div class="custom-control custom-switch mx-3 bd-highlight pt-2 float-right">
<input type="checkbox" class="custom-control-input btn-lida4" name="avanzata-attiva" data-toggle="collapse" data-target="#collapseAdvanced" aria-label="Ricerca avanzata" id="advanSW">
<label class="custom-control-label btn-outline-lida4" for="advanSW">
<div class="pb-1 ">Avanzata
</div></label>
</div>
</div>
</div>
<!-- <div class="row mx-1"> -->
<div class="col px-0">
<div class="row mx-0">
<div class="col-5 px-0">
<div class="blog-main p-3 text-muted overflow-auto" target='area' id='displaycanto' style='max-height: 500px; '></div>
</div>
<div class="col-1 px-0" id="displayminimap"></div>
<div class="col-6 px-0" id="displayOptions">
<div class="collapse" id="collapseOptions">
<div class="card card-body bg-lida10">
<div class="card card-body bg-lida10 p-2">
<div class="form-inline input-group" action="">
<select class="form-control custom-select custom-select-sm bg-light" id="lemma_forma">
<option value="forma">La Forma</option>
@ -471,14 +480,13 @@
</div>
</div>
<!-- INIZIO AVANZATE -->
<div class="collapse" id="collapseAdvanced">
<div class="col-md-12 p-2 bg-lida10">
<ul class="nav nav-tabs" id="tab-list" role="tablist">
<li class="nav-item" role="presentation">
<a class="nav-link active" id="cla0-tab" data-toggle="tab" href="#cla0" role="tab" aria-controls="cla0" aria-selected="true"><span class="text-secondary"><ion-icon name="search-circle"></ion-icon></span><span class="text-dark font-weight-bold">&nbsp;&nbsp;Componi</span></a>
<a class="nav-link active" id="cla0-tab" data-toggle="tab" href="#cla0" role="tab" aria-controls="cla0" aria-selected="true"><span class="text-secondary"><ion-icon name="search-circle"></ion-icon></span><span class="text-dark small font-weight-bold">&nbsp;&nbsp;Componi</span></a>
</li>
</ul>
@ -490,12 +498,12 @@
<div class="input-group-prepend">
<label class="input-group-text"><ion-icon name="document-text"></ion-icon></label>
</div>
<select class="form-control custom-select" id="lemma_forma">
<select class="form-control custom-select-sm" id="lemma_forma">
<option value="forma">la forma</option>
<option value="lemma">il lemma</option>
<option disabled value="testo">il testo</option>
</select>
<input type="text" class="form-control" id="queryText" placeholder="stelle" aria-describedby="name-desc" name="query">
<input type="text" class="form-control-sm" id="queryText" placeholder="stelle" aria-describedby="name-desc" name="query">
<div class="btn-group pl-2" role="group" aria-label="Bottone ricerca">
<label class="input-group-text"><ion-icon name="search-circle"></ion-icon></label>
<button type="submit" class="btn btn-outline-primary">Cerca</button>
@ -682,10 +690,10 @@
<div class="small text-muted p-1">
Definisci i filtri usando le clausole e le condizioni logiche:
</div>
<div class=" px-2 pb-2 pt-1 m-2 mx-3 border bg-light well" id="cla-list">
<div class=" px-2 pb-2 pt-1 m-1 border bg-light well" id="cla-list">
<div class="row ml-0 justify-content-between"><div class="pb-1 small font-weight-bold text-muted">AND</div></div>
<ul id="sortable0" class="condLIand list-group ui-sortable">
<li id="H-cla0" class="list-group-item align-items-center ui-state-default ui-state-disabled border text-muted bg-white ui-state-disabled-opacity-06">Nessuna clausola aggiunta.</li>
<li id="H-cla0" class="list-group-item align-items-center ui-state-default ui-state-disabled border text-muted bg-white ui-state-disabled-opacity-06 small">Nessuna clausola aggiunta.</li>
</ul>
</div>
@ -707,21 +715,21 @@
<div class="input-group-prepend">
<label class="input-group-text"><ion-icon name="document-text"></ion-icon></label>
</div>
<select class="form-control custom-select" id="lemma_formaN">
<select class="form-control custom-select-sm" id="lemma_formaN">
<option value="forma">la forma</option>
<option value="lemma">il lemma</option>
<option disabled value="testo">il testo</option>
</select>
<input type="text" class="form-control" id="queryTextN" placeholder="stelle" aria-describedby="name-desc" name="query">
<input type="text" class="form-control-sm" id="queryTextN" placeholder="stelle" aria-describedby="name-desc" name="query">
</div>
<div class="form-group px-1 pb-1">
<label for="typeGramm0" class="text-muted control-label">Categoria grammaticale:</label>
<label for="typeGramm0" class="text-muted control-label small">Categoria grammaticale:</label>
<div class="form-inline input-group p-1" action="">
<div class="input-group-prepend">
<label class="input-group-text"><ion-icon name="options"></ion-icon></label>
</div>
<select class="form-control custom-select catgram" name="typeGramm0" id="grammtypes" title="Categoria grammaticale" value="oggetto" onchange="">
<select class="form-control custom-select-sm catgram" name="typeGramm0" id="grammtypes" title="Categoria grammaticale" value="oggetto" onchange="">
<option value="all">Tutte le categorie</option>
<optgroup label="Volgare">
<option value="verbovolgare">Verbo volgare</option>
@ -772,21 +780,21 @@
<div class="input-group-prepend">
<label class="input-group-text"><ion-icon name="document-text"></ion-icon></label>
</div>
<select class="form-control custom-select" id="lemma_formaN">
<select class="form-control custom-select-sm" id="lemma_formaN">
<option value="forma">la forma</option>
<option value="lemma">il lemma</option>
<option disabled value="testo">il testo</option>
</select>
<input type="text" class="form-control" id="queryTextN" placeholder="stelle" aria-describedby="name-desc" name="query">
<input type="text" class="form-control-sm" id="queryTextN" placeholder="stelle" aria-describedby="name-desc" name="query">
</div>
<div class="form-group px-1 pb-1">
<label for="typeSyntax0" class="text-muted control-label">Tipo sintattico:</label>
<label for="typeSyntax0" class="text-muted control-label small">Tipo sintattico:</label>
<div class="form-inline input-group p-1" action="">
<div class="input-group-prepend">
<label class="input-group-text"><ion-icon name="options"></ion-icon></label>
</div>
<select class="form-control custom-select" name="typeSyntax0" id="synttypes" title="Tipo sintattico" value="oggetto">
<select class="form-control custom-select-sm" name="typeSyntax0" id="synttypes" title="Tipo sintattico" value="oggetto">
<option value=".+" class="w-10" onclick="myformsyntax.functionSyntax0.disabled = false;">Qualsiasi tipo sintattico</option>
<optgroup
@ -1216,12 +1224,12 @@
</div>
</div>
<div class="form-group px-1 pb-1">
<label for="functionSyntax" class="text-muted control-label">Livello di subordinazione:</label>
<label for="functionSyntax" class="text-muted control-label small">Livello di subordinazione:</label>
<div class="form-inline input-group p-1" action="">
<div class="input-group-prepend">
<label class="input-group-text"><ion-icon name="options"></ion-icon></label>
</div>
<select class="form-control custom-select" name="functionSyntax" id="syntfunc" title="Livello di subordinazione">
<select class="form-control custom-select-sm" name="functionSyntax" id="syntfunc" title="Livello di subordinazione">
<option value=".+">Qualsiasi livello di subordinazione</option>
<optgroup label="Livelli di subordinazione">
@ -1331,18 +1339,9 @@
</div>
</div>
<!-- FINE AVANZATE -->
<!-- </div> -->
<div class="row mx-0">
<div class="col-4 px-0">
<div class="blog-main p-3 text-muted overflow-auto" target='area' id='displaycanto' style='max-height: 500px'></div>
</div>
<div class="col-1 px-0" id="displayminimap"></div>
</div>
</div>

40
js/script_2.0.js
View File

@ -10,16 +10,26 @@ require("../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js");
$(document).ready(function() {
$("#advanSW").on('change', function() {
if ($(this).prop('checked')) {
//$('#multidraggable1').multidraggable();
$("#dropAdvanced").on('click', function () {
$("#simpleSearchDiv").removeClass( "d-flex" )
$("#simpleSearchDiv").attr('style', "display: none;");
$("#collapseOptions").collapse('hide');
$("#collapseAdvanced").collapse('show');
$("#advancedSearchDiv").addClass( "d-flex" )
$("#advancedSearchDiv").attr('style', "display: flex;");
} else {
$("#simpleSearchDiv").attr('style', "display: flex;");
//$("#tipoRicerca").html("Ricerca Avanzata");
});
$("#dropSimple").on('click', function () {
$("#advancedSearchDiv").removeClass( "d-flex" )
$("#advancedSearchDiv").attr('style', "display: none;");
}
});
$("#simpleSearchDiv").addClass( "d-flex" )
$("#simpleSearchDiv").attr('style', "display: flex;");
$("#collapseAdvanced").collapse('hide');
//$("#tipoRicerca").html("Ricerca Semplice");
});
$("#copiaTesto").prop("disabled", true);
@ -178,10 +188,14 @@ $(document).ready(function() {
$('#cla' + tabID + '-tab').tab('show');
break;
case "andCond":
addLogicCond("AND","#sortable0")
addLogicCond("AND","#sortable0");
refreshClaList();
$('#cla0-tab').tab('show');
break;
case "orCond":
addLogicCond("OR","#sortable0")
addLogicCond("OR","#sortable0");
refreshClaList();
$('#cla0-tab').tab('show');
break;
default:
};
@ -452,10 +466,10 @@ $(document).ready(function() {
var iconReset = '<div class="text-right text-primary radioReset"><ion-icon name="refresh-circle"></ion-icon></div>';
var iconCloseCond = '<div class="p-0 mr-1 text-right text-primary"><span class="iconClClass removeCond">' + iconClose + '</span></div>';
var iconCheckAndClose = '<div class="p-0 m-1 text-right text-primary"><span class="return2Query">' + iconCheck + '</span>&nbsp;&nbsp;<span class="removeClaInTab">' + iconClose + '</span></div>';
var emptyClaList = '<li id="H-cla0" class="list-group-item align-items-center ui-state-default ui-state-disabled border text-muted bg-white ui-state-disabled-opacity-06">Nessuna clausola aggiunta.</li>';
var emptyClaList = '<li id="H-cla0" class="list-group-item align-items-center ui-state-default ui-state-disabled border text-muted bg-white ui-state-disabled-opacity-06 small">Nessuna clausola aggiunta.</li>';
var claLIpart1 = '<li id="'
var claLIpart2 = '" class="claLI mx-4 my-1 p-1 list-group-item align-items-center border text-muted bg-white"><div class="handle container-fluid"><div class="row"><div class="col-md-11 px-0 pr-2"> \
var claLIpart2 = '" class="claLI ml-4 my-1 p-1 list-group-item align-items-center border text-muted bg-white"><div class="handle container-fluid"><div class="row"><div class="col-md-11 px-0 pr-2"> \
<div class="bd-highlight text-primary"><span class="ui-icon ui-icon-arrowthick-2-n-s"></span></div><div class="p-1 bd-highlight flex-grow-1 border-right clatext">';
var claLIpart3 = '</div></div><div class="col-md-1 px-0 pl-4"><div class="row"><div class="col-md-12 px-0 float-right"><div class="d-flex px-3 flex-nowrap float-right"> \
<div class="p-1 align-top bd-highlight text-primary editCla">' + iconEdit + '</div><div class="p-1 align-top bd-highlight text-primary removeClaInList">' + iconClose + '</div> \
@ -469,7 +483,7 @@ $(document).ready(function() {
var condLIplaceholderText1d = 'Trascina qui almeno 1 clausola o condizione, oppure attiva le clausole inattive';
var condLIplaceholderText2d = 'Trascina qui almeno 2 clausole o condizioni, oppure attiva le clausole inattive';
var condLIplaceholderPart1 = '<li id="placeholderSort';
var condLIplaceholderPart2 = '" class="p-1 mx-4 mb-2 mt-1 list-group-item align-items-center border text-muted small bg-light ui-state-disabled ui-state-disabled-opacity-06">';
var condLIplaceholderPart2 = '" class="p-1 ml-4 mb-2 mt-1 list-group-item align-items-center border text-muted small bg-light ui-state-disabled ui-state-disabled-opacity-06">';
var condLIpart1 = '<li id="cond';
var condLIpart2and = '" class="condLIand p-1 m-1 list-group-item align-items-center border text-muted bg-lida10"><ul id="sortable';
var condLIpart3and = '" class="handle list-group ui-sortable"><div class="row ml-1 pr-2 justify-content-between"><div class=" pb-1 small font-weight-bold text-muted">AND</div>' + iconCloseCond + '</div>' + condLIplaceholderPart1;
@ -835,7 +849,7 @@ $(document).ready(function() {
switch (claType) {
case "Grammaticale":
var gramSelect = $("#" + claId).find(".catgram");
claText = len + ". Categoria grammaticale: " + gramSelect[0].options[gramSelect[0].selectedIndex].text + '<br><span class="small ml-3">';
claText = '<span class="small mx-1">' + len + ". Categoria grammaticale: " + gramSelect[0].options[gramSelect[0].selectedIndex].text + '</span><br><span class="small mx-1">';
jsonTextToParse = jsonTextToParse + ', "' + gramSelect.attr('name') + '": "' + gramSelect[0].options[gramSelect[0].selectedIndex].value + '"';
var claSubParList = $("#" + claId).children(".dettaglifiltri").find("select, fieldset");
claSubParList.each(function(){
@ -857,7 +871,7 @@ $(document).ready(function() {
case "Sintattico":
var syntSelect = $("#" + claId).find("#synttypes");
; var funcSelect = $("#" + claId).find("#syntfunc");
claText = len + ". Tipo sintattico: " + syntSelect[0].options[syntSelect[0].selectedIndex].text + '; <br><span class="ml-3"">Livello di subordinazione: ' + funcSelect[0].options[funcSelect[0].selectedIndex].text;
claText = '<span class="small mx-1">' + len + ". Tipo sintattico: " + syntSelect[0].options[syntSelect[0].selectedIndex].text + '; </span><br><span class="small mx-1">Livello di subordinazione: ' + funcSelect[0].options[funcSelect[0].selectedIndex].text;
jsonTextToParse = jsonTextToParse + ', "' + syntSelect.attr('name') + '": "' + syntSelect[0].options[syntSelect[0].selectedIndex].value + '", "' + funcSelect.attr('name') + '": "' + funcSelect[0].options[funcSelect[0].selectedIndex].value + '"';
break;
default: