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

aggiustato filtro default

This commit is contained in:
nicola 2025-03-19 17:31:48 +01:00
parent 0ac771833b
commit 3bb611c248
1 changed files with 90 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
js/browseMgr_5.1.js
View File

@ -55,7 +55,6 @@ $(document).ready(function() {
var filterBottonAdded = false; var filterBottonAdded = false;
var listarisultati = []; var listarisultati = [];
var showingComments = false; var showingComments = false;
var filterOn = true;
listaPeriodiRisultato = []; listaPeriodiRisultato = [];
listaClausoleRisultato = [] listaClausoleRisultato = []
/*var commentsArray = [] /*var commentsArray = []
@ -1027,18 +1026,65 @@ $(document).ready(function() {
jQuery(document).delegate(' .showcomments', 'click', function() { jQuery(document).delegate(' .showcomments', 'click', function() {
var cid = $(this).attr('id'); var cid = $(this).attr('id');
var queryComment = false; var filterOn = true;
var idClass = $(this).attr('class'); var risultato;
//var parentClass = $(this).parent().attr('class'); var parcid = cid.split("_")
filterOn = true; var idsRisultato = getListaRis();
var cantica;
if (idClass.includes("filterRiferimentiOn")) { var idRisultato;
filterOn = true; switch (parcid[1]) {
} else { case "1": cantica = "Inferno";
if (idClass.includes("filterRiferimentiOff")) { break;
filterOn = false; case "2": cantica = "Purgatorio";
} break;
case "3": cantica = "Paradiso";
} }
if (idsRisultato.length > 0) {
risultato = true;
} else {
risultato = false;
}
idRisultato = cantica + "_Canto_" + parcid[2] + "_" + parcid[3] + "_sp";
if (idsRisultato.includes(idRisultato)){
risultato = true;
}else{
risultato = false;
}
switch (parcid[0]) {
case "Commento":
case "CommentoRes":
if (risultato){
$(".filterRiferimentiOn").css('display', 'none');
$(".filterRiferimentiOff").css('display', 'inline-block');
filterOn = true;
}else{
$(".filterRiferimentiOn").css('display', 'none');
$(".filterRiferimentiOff").css('display', 'none');
filterOn = false;
}
break;
/*case "CommentoRes":
$(".filterRiferimentiOn").css('display', 'none');
$(".filterRiferimentiOff").css('display', 'inline-block');
filterOn = true;
break;*/
case "CommentoQuery":
if(parcid[4] == "On"){
$(".filterRiferimentiOn").css('display','none');
$(".filterRiferimentiOff").css('display','inline-block');
filterOn = true;
}else{
$(".filterRiferimentiOn").css('display','inline-block');
$(".filterRiferimentiOff").css('display','none');
filterOn = false;
}
break;
}
if (cantoDisplayed.includes('#vistaFrasi')) { if (cantoDisplayed.includes('#vistaFrasi')) {
commentsSQL=getCommentsInResult($(this).attr('id'), $(this).attr('class')) commentsSQL=getCommentsInResult($(this).attr('id'), $(this).attr('class'))
@ -1049,60 +1095,26 @@ $(document).ready(function() {
if (!cantoDisplayed.includes('#vistaFrasi') && !hasCommentsJson(cid)) { if (!cantoDisplayed.includes('#vistaFrasi') && !hasCommentsJson(cid)) {
return return
} }
if (getListaIdCommenti().length > 0) {
if (filterOn) {
if (idClass.includes("risultato")) {
$(".filterRiferimentiOn").css('display', 'inline-block');
$(".filterRiferimentiOff").css('display', 'none');
} else {
$(".filterRiferimentiOn").css('display', 'none');
$(".filterRiferimentiOff").css('display', 'none');
}
} else {
$(".filterRiferimentiOff").css('display', 'inline-block');
$(".filterRiferimentiOn").css('display', 'none');
}
} else {
$(".filterRiferimentiOn").css('display', 'none');
$(".filterRiferimentiOff").css('display', 'none');
}
var parcid = cid.split('_')
var cantica;
var verso = parcid[3];
switch (parcid[1]) {
case "1": cantica = "Inferno";
break;
case "2": cantica = "Purgatorio";
break;
case "3": cantica = "Paradiso";
}
var commentArea = $('#displaynote'); var commentArea = $('#displaynote');
var idCommento = "CommentoQuery_" + parcid[1] + "_" + parcid[2] + "_" + parcid[3]; var idCommento = "CommentoQuery_" + parcid[1] + "_" + parcid[2] + "_" + parcid[3];
$(".filterRiferimentiOn").attr("id", idCommento)
$(".filterRiferimentiOn").attr("id", idCommento+"_On")
$(".filterRiferimentiOff").attr("id", idCommento+"_Off") $(".filterRiferimentiOff").attr("id", idCommento+"_Off")
if (parcid[0] == "CommentoQuery") { // verificare
queryComment = true;
}
commentArea.empty() commentArea.empty()
if ($('#noteCard0').length) { if ($('#noteCard0').length) {
$("#noteCard0")[0].remove(); $("#noteCard0")[0].remove();
} }
var id = cid.substr(9); var id = parcid[3];
id = parcid.at(-1)
var gruppoVersi; var gruppoVersi;
var versText = ""; var versText = "";
//var allGrouplKeys = Object.keys(commentsJson);
var allGrouplKeys = Object.keys(commentsSQL); var allGrouplKeys = Object.keys(commentsSQL);
var currentGroup; var currentGroup;
allGrouplKeys.sort().some(function(k) { allGrouplKeys.sort().some(function(k) {
if (k == id || k.startsWith(id + '-')) { //~k.indexOf(id + '-')) { if (k == id || k.startsWith(id + '-')) {
//console.log(commentsSQL[k].length)
//gruppoVersi = k.split("_").slice(-1)[0]
gruppoVersi = k gruppoVersi = k
if (gruppoVersi.includes("-")) { if (gruppoVersi.includes("-")) {
versText = ", Versi " + gruppoVersi; versText = ", Versi " + gruppoVersi;
@ -1110,33 +1122,21 @@ $(document).ready(function() {
versText = ", Verso " + gruppoVersi; versText = ", Verso " + gruppoVersi;
} }
currentGroup = createNoteGroup(cantica, getRoman(parcid[2]), versText, k, commentsSQL[k].length, queryComment) currentGroup = createNoteGroup(cantica, getRoman(parcid[2]), versText, k, commentsSQL[k].length)
noteAdded = false; noteAdded = false;
commentsSQL[k].forEach(function(value, i) { commentsSQL[k].forEach(function(value, i) {
currentGroup.append(createNoteEntry(value, k, i, queryComment)) currentGroup.append(createNoteEntry(value, k, i, filterOn, risultato))
}); });
if (queryComment) { if (!filterOn) {
if (noteAdded) {
commentArea.append(currentGroup);
if (filterOn) {
$(".filterRiferimentiOff").css('display', 'inline-block');
$(".filterRiferimentiOn").css('display', 'none');
} else {
$(".filterRiferimentiOn").css('display', 'inline-block');
$(".filterRiferimentiOff").css('display', 'none');
}
} else {
if (k.includes("-") && !filterOn) {
commentArea.append(currentGroup);
}
}
} else {
commentArea.append(currentGroup); commentArea.append(currentGroup);
} } else {
if (!k.includes("-")) {
commentArea.append(currentGroup);
}
}
} }
$('#tab-list #vis0-tab').tab('show') $('#tab-list #vis0-tab').tab('show')
}) })
}) })
function getCommentsInResult(tmpcid, tmpclass) { function getCommentsInResult(tmpcid, tmpclass) {
@ -1179,7 +1179,7 @@ $(document).ready(function() {
} }
function createNoteGroup(cantica, canto, versi, id, len, queryComment) { function createNoteGroup(cantica, canto, versi, id, len) {
var noteGroupCard = $('<div class="card card-body noteCardGroup well well-sm mx-1 my-2 p-0" id="noteGroupCard' + id + '">'); var noteGroupCard = $('<div class="card card-body noteCardGroup well well-sm mx-1 my-2 p-0" id="noteGroupCard' + id + '">');
var commentHeader = $('<div class="d-flex align-content-start flex-nowrap text-muted" id="commentoGruppoVersi' + id + '">') var commentHeader = $('<div class="d-flex align-content-start flex-nowrap text-muted" id="commentoGruppoVersi' + id + '">')
var rigaNota = $('<div class="p-0 m-0">'); var rigaNota = $('<div class="p-0 m-0">');
@ -1215,16 +1215,14 @@ $(document).ready(function() {
return false; return false;
} }
function createNoteEntry(comments, id, pos, queryComment) { function createNoteEntry(comments, id, pos, filterOn, risultato) {
var idref = comments.IdRiferimento var idref = comments.IdRiferimento
var noteCard = $('<div class="card card-body well well-sm mx-1 mb-1 mt-0 p-0 border-lida08" id="noteCard' + id + '_' + pos + '"' + ' name= "' + idref + '">');
if (isCommentInResult(idref)) { if(risultato){
var noteCard = $('<div class="card card-body bg-light border-success well well-sm mx-1 mb-1 mt-0 p-0" id="noteCard' + id + '_' + pos + '"' + ' name= "' + idref + '">'); if (isCommentInResult(idref)) {
noteAdded = true; var noteCard = $('<div class="card card-body bg-light border-success well well-sm mx-1 mb-1 mt-0 p-0" id="noteCard' + id + '_' + pos + '"' + ' name= "' + idref + '">');
} }else{
else {
var noteCard = $('<div class="card card-body well well-sm mx-1 mb-1 mt-0 p-0 border-lida08" id="noteCard' + id + '_' + pos + '"' + ' name= "' + idref + '">');
if (queryComment) {
if (filterOn) { if (filterOn) {
noteCard.css("display", "none"); noteCard.css("display", "none");
} else { } else {
@ -1232,6 +1230,7 @@ $(document).ready(function() {
} }
} }
} }
var collapseCardBody = $('<div class="card-body px-0 py-1 mx-3 my-0 border-top rounded" >'); var collapseCardBody = $('<div class="card-body px-0 py-1 mx-3 my-0 border-top rounded" >');
var divCampiSingoli = $('<div class="d-flex align-content-start flex-wrap text-muted">'); var divCampiSingoli = $('<div class="d-flex align-content-start flex-wrap text-muted">');
//createNoteHeader(noteCard, comments, id, pos, cantica, parcid, saveVersoCitazione); //createNoteHeader(noteCard, comments, id, pos, cantica, parcid, saveVersoCitazione);
@ -1516,7 +1515,7 @@ $(document).ready(function() {
function hasCommentsJson(cid) { function hasCommentsJson(cid) {
var id = cid.split('_').at(-1) var id = cid.split('_')[3]
for (const [keyt, value] of Object.entries(commentsSQL)) { for (const [keyt, value] of Object.entries(commentsSQL)) {
if (keyt == id || keyt.startsWith(id + '-')) { if (keyt == id || keyt.startsWith(id + '-')) {
return true return true
@ -1872,8 +1871,6 @@ $(document).ready(function() {
filterButton.attr('id', 'filterRiferimentiOn') filterButton.attr('id', 'filterRiferimentiOn')
filterButton.attr('class', 'btn btn-sm btn-outline-primary filterRiferimentiOn showcomments border-0 rounded text-primary px-1 pt-1 pb-0 ml-1'); filterButton.attr('class', 'btn btn-sm btn-outline-primary filterRiferimentiOn showcomments border-0 rounded text-primary px-1 pt-1 pb-0 ml-1');
var filterIcon = '<ion-icon name="funnel"></ion-icon>'; var filterIcon = '<ion-icon name="funnel"></ion-icon>';
//var filterIcon = '<img id="filterImgOn" src="./images/filterOn.png" width="50%" height="50%">'
//var filterIcon1 = '<img id="filterImgOff" src="./images/filterOff.png" width="50%" height="50%">'
var filterIcon1 = '<ion-icon name="funnel"></ion-icon>'; var filterIcon1 = '<ion-icon name="funnel"></ion-icon>';
var filterButton1 = $('<button />'); var filterButton1 = $('<button />');
filterButton1.attr('id', 'filterRiferimentiOff') filterButton1.attr('id', 'filterRiferimentiOff')
@ -1903,7 +1900,6 @@ $(document).ready(function() {
elencoRiferimenti = $("#vistaFrasi"); elencoRiferimenti = $("#vistaFrasi");
elencoRiferimenti.empty(); elencoRiferimenti.empty();
$("#displaynote").empty(); $("#displaynote").empty();
filterOn = true;
$(".filterRiferimentiOn").css('display', 'none'); $(".filterRiferimentiOn").css('display', 'none');
$(".filterRiferimentiOff").css('display', 'none'); $(".filterRiferimentiOff").css('display', 'none');
@ -2093,9 +2089,8 @@ $(document).ready(function() {
var ultimaFormaCanto; var ultimaFormaCanto;
let numeroPeriodo = 1; let numeroPeriodo = 1;
showingComments = false; showingComments = false;
let initmap=850*(parseInt(canto)-1)
var subformecantica=formecantica.slice(initmap) formecantica.map(function(item) {
subformecantica.map(function(item) {
formaItem = item.split("_"); formaItem = item.split("_");
var sentenceid = idcantica + "_" + formaItem[1] + "_s_" + formaItem[5] var sentenceid = idcantica + "_" + formaItem[1] + "_s_" + formaItem[5]
if (formaItem[1] == canto) { if (formaItem[1] == canto) {
@ -2320,15 +2315,15 @@ $(document).ready(function() {
if (digits == 2) if (digits == 2)
spannum.append('\xa0') spannum.append('\xa0')
spannum.append(num + '. ')*/ spannum.append(num + '. ')*/
var elementoverso = $('<li class="f6 mb-0 text-muted text-nowrap font-weight-lighter " value="'+num+'"/>') var elementoverso = $('<li />')
/*var elementoversospan=$('<span />')*/ /*var elementoversospan=$('<span />')*/
//elementoverso.append(spannum) //elementoverso.append(spannum)
//elementoverso.attr("value", num) elementoverso.attr("value", num)
//elementoverso.attr("style", "line-height: 1.0em") //elementoverso.attr("style", "line-height: 1.0em")
//elementoverso.attr('class', 'f6 mb-0 text-muted text-nowrap font-weight-lighter ')//+cantica+' '+canto) elementoverso.attr('class', 'f6 mb-0 text-muted text-nowrap font-weight-lighter ')//+cantica+' '+canto)
//elementoverso.attr('class', 'text-nowrap ')//+cantica+' '+canto) //elementoverso.attr('class', 'text-nowrap ')//+cantica+' '+canto)
elementoverso.attr('id', cantica + "_" + canto + "_" + num) elementoverso.attr('id', cantica + "_" + canto + "_" + num)
@ -2381,7 +2376,7 @@ $(document).ready(function() {
var canto = "Canto " + i var canto = "Canto " + i
var cantoRomano = "Canto " + getRoman(i) var cantoRomano = "Canto " + getRoman(i)
var divcanto = $('<div class="canto pt-3"/>') var divcanto = $('<div />')
var titolocanto = $('<h4 class="titolo-canto pb-2" />') var titolocanto = $('<h4 class="titolo-canto pb-2" />')
//titolocanto.append(cantica + ", " + cantoRomano) //titolocanto.append(cantica + ", " + cantoRomano)
var spantitolocanto = $('<span />') var spantitolocanto = $('<span />')
@ -2389,14 +2384,14 @@ $(document).ready(function() {
spantitolocanto.append(cantica + ", " + cantoRomano) spantitolocanto.append(cantica + ", " + cantoRomano)
titolocanto.append(spantitolocanto) titolocanto.append(spantitolocanto)
//divcanto.attr('class', 'canto pt-3') divcanto.attr('class', 'canto pt-3')
divcanto.css("display", "none") divcanto.css("display", "none")
divcanto.attr('id', (cantica + canto).replace(" ", "_")) divcanto.attr('id', (cantica + canto).replace(" ", "_"))
titolocanto.appendTo(divcanto) titolocanto.appendTo(divcanto)
//nuovo //nuovo
var olversi = $('<ol class="pb-4 pr-4"/>') var olversi = $('<ol />')
//olversi.attr('class', 'pb-4 pr-4') olversi.attr('class', 'pb-4 pr-4')
olversi.appendTo(divcanto) olversi.appendTo(divcanto)
//fine nuovo //fine nuovo
divcanto.appendTo('#displaycanto') divcanto.appendTo('#displaycanto')