Browse Source

Multiple contexts on cooccorrenze view

Alessia 2 years ago
parent
commit
98cef2d2d1
3 changed files with 222 additions and 8 deletions
  1. 41 0
      flask_be/Progetto2023_BE.log
  2. 1 1
      site2/index.html
  3. 180 7
      site2/js/ricerca.js

+ 41 - 0
flask_be/Progetto2023_BE.log

@@ -13,3 +13,44 @@ INFO:werkzeug:127.0.0.1 - - [13/Apr/2023 21:24:49] "POST /simple_get_query HTTP/
 INFO:werkzeug: * Detected change in '/home/kora/Desktop/Freelance_Local/OVI_Data/Development/Ricerche/flask_be/app.py', reloading
 WARNING:werkzeug: * Debugger is active!
 INFO:werkzeug: * Debugger PIN: 121-241-415
+INFO:werkzeug:WARNING: This is a development server. Do not use it in a production deployment. Use a production WSGI server instead.
+ * Running on http://127.0.0.1:5000
+INFO:werkzeug:Press CTRL+C to quit
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 10:26:17] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 10:26:38] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:00:35] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:00:57] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:06:17] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:06:23] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:06:52] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:15:46] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:15:52] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:19:19] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:20:59] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:32:06] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:32:32] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:33:03] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:34:15] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:35:33] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:36:21] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:36:47] "POST /simple_get_query HTTP/1.1" 200 -
+INFO:app:This is a log
+INFO:werkzeug:127.0.0.1 - - [14/Apr/2023 11:36:51] "POST /simple_get_query HTTP/1.1" 200 -

+ 1 - 1
site2/index.html

@@ -91,7 +91,7 @@
                         </label>
                      </div>
                      <div id="inner_lemmatizzato" class="form-check" style="display:none;">
-                        <input class="showLem form-check-input" value="nonLemmatizzato" type="checkbox" name="nonLemmatizzato">
+                        <input class="showLem form-check-input lemmatizzata" value="nonLemmatizzato" type="checkbox" name="nonLemmatizzato">
                         <label class="form-check-label" for="showLem">
                         Cerca anche non lemmatizzati
                         </label>

+ 180 - 7
site2/js/ricerca.js

@@ -40,6 +40,24 @@ function processData(response){
     //$("#result").append(response);
 }
 
+function processOccData(response){
+  console.log(response);
+  if(response.length==0){
+      alert('No results!')
+  }
+  else {
+    arrayResponse = response;
+    var keys = Object.keys(response[0]);
+    createFirstRowOcc(keys);
+    var ll = response.length;
+    for (var i=0; i<ll; i++) {
+      let newRow = response[i];
+      createOccRow(i, newRow);
+    }
+  }
+  //$("#result").append(response);
+}
+
 //Funzione per gestire i contesti
 function processContext(response){
   if(response.length==0){
@@ -120,19 +138,21 @@ function funzioneRicerca(){
       queryDTO = {
         queryList: queryList
     }
+    getData(queryDTO)
+    // After request finishes, process response data
+    .done(response => processData(response));
   } else {
       queryDTO = {
         queryList: queryList,
         cooccorrenze: cooccorrenze
     }
+    getData(queryDTO)
+    // After request finishes, process response data
+    .done(response => processOccData(response));
   } 
 
   console.log(queryDTO);
 
-  getData(queryDTO)
-    // After request finishes, process response data
-    .done(response => processData(response));
-
   $("#lauchSearchContext").css("display", "flex");
   
 } 
@@ -167,11 +187,11 @@ $( document ).ready(function() {
   $("select").on("change", function(event) {
     var e = this.value;
     var word = "";
-    var parent = $(this).parent();
-    console.log(parent.class);
     if (e == "forma") {
       word = "lemmi";
-
+      var parent = this.parentElement.parentElement.parentElement.parentElement.parentElement;
+      var pp = parent.getElementsByClassName("lemmatizzata");
+      console.log(pp[0]);
     }
     else {
       word = "forme";
@@ -387,6 +407,78 @@ function createFirstRow(param) {
 
 }
 
+//Crea prima riga per contesti multipli 
+
+function createFirstRowOcc(param) {
+
+  var row = document.createElement('div');
+  row.className = "row height d-flex justify-content-center align-items-center";
+  row.id = "first_row";
+
+  
+    if (param.includes("Titolo Abbreviato")) {
+      var colTitolo = document.createElement('div');
+      colTitolo.className = "col-2 abbrCol";
+      colTitolo.append("Titolo Abbreviato");
+      row.append(colTitolo);
+    }
+
+    if (param.includes("Rif_organico")) {
+      var colRif = document.createElement('div');
+      colRif.className = "col rifCol";
+      colRif.append("Rif organico");
+      row.append(colRif);
+    }
+    
+    if (param.includes("pag")) {
+      var colPag = document.createElement('div');
+      colPag.className = "col pag";
+      colPag.append("Pag");
+      row.append(colPag);
+    }
+    
+    if (param.includes("riga")) {
+      var colRiga = document.createElement('div');
+      colRiga.className = "col riga";
+      colRiga.append("Riga");
+      row.append(colRiga);
+    }
+    
+    if (param.includes("stanza")) {
+      var colStanza = document.createElement('div');
+      colStanza.className = "col stanza";
+      colStanza.append("Stanza");
+      row.append(colStanza);
+    }
+
+    if (param.includes("tipostanza")) {
+      var colTipoStanza = document.createElement('div');
+      colTipoStanza.className = "col tipostanza";
+      colTipoStanza.append("Tipo stanza");
+      row.append(colTipoStanza);
+    }
+
+    if (param.includes("verso")) {
+      var colVerso = document.createElement('div');
+      colVerso.className = "col verso";
+      colVerso.append("Verso");
+      row.append(colVerso);
+    }
+
+    if (param.includes("contesto")) {
+      var colContesto = document.createElement('div');
+      colContesto.className = "col-4 contesto";
+      colContesto.append("Contesto");
+      row.append(colContesto);
+    }
+
+
+  $("#result").append(row);
+
+}
+
+//
+
 function createRow(num, elem) {
   var cat_gr = elem["cat_gr"];
   var disambiguatore = elem["disambiguatore"];
@@ -445,9 +537,86 @@ function createRow(num, elem) {
 
   $("#result").append(row);
 
+}
+
+//Crea tabella cooccorrenze
+
+function createOccRow(num, elem) {
+  var titolo_abbreviato = elem["Titolo Abbreviato"];
+  var contesto = elem["contesto"];
+  var rif_organico = elem["Rif_organico"];
+  var pag = elem["pag"];
+  var riga = elem["riga"];
+  var stanza = elem["stanza"];
+  var tipostanza = elem["tipostanza"];
+  var verso = elem["verso"];
+
+  var row = document.createElement('div');
+  row.className = "row height d-flex justify-content-center align-items-center";
+  row.id = num;
+
+  if (elem.hasOwnProperty('Titolo Abbreviato')) {
+    var colTitolo = document.createElement('div');
+    colTitolo.className = "col-2 abbrCol";
+    colTitolo.append(titolo_abbreviato);
+    row.append(colTitolo);
+  }
+
+  if (elem.hasOwnProperty('Rif_organico')) {
+    var colRif = document.createElement('div');
+    colRif.className = "col rifCol";
+    colRif.append(rif_organico);
+    row.append(colRif);
+  }
+
+  if (elem.hasOwnProperty('pag')) {
+    var colPag = document.createElement('div');
+    colPag.className = "col pagCol";
+    colPag.append(pag);
+    row.append(colPag);
+  }
+
+  if (elem.hasOwnProperty('riga')) {
+    var colRiga = document.createElement('div');
+    colRiga.className = "col rigaCol";
+    colRiga.append(riga);
+    row.append(colRiga);
+  }
+
+  if (elem.hasOwnProperty('stanza')) {
+    var colStanza = document.createElement('div');
+    colStanza.className = "col stanzaCol";
+    colStanza.append(stanza);
+    row.append(colStanza);
+  }
+
+  if (elem.hasOwnProperty('tipostanza')) {
+    var colTipoStanza = document.createElement('div');
+    colTipoStanza.className = "col tipostanzaCol";
+    colTipoStanza.append(tipostanza);
+    row.append(colTipoStanza);
+  }
+
+  if (elem.hasOwnProperty('verso')) {
+    var colVerso = document.createElement('div');
+    colVerso.className = "col versoCol";
+    colVerso.append(verso);
+    row.append(colVerso);
+  }
+
+  if (elem.hasOwnProperty('contesto')) {
+    var colContesto = document.createElement('div');
+    colContesto.className = "col-4 contestoCol";
+    colContesto.append(contesto);
+    row.append(colContesto);
+  }
+
+  $("#result").append(row);
 
 }
 
+//
+
 $(document).on("click", ".deleteCC", function (ev) {
   var deleteID = "occ_" + this.id;
   const element = document.getElementById(deleteID);
@@ -460,4 +629,8 @@ $(document).on("click", ".deleteCC", function (ev) {
     $("#inner_lemmatizzato").css("display", "none");
   }
 
+});
+
+$("select").on("change", function(event) {
+  alert("Change!");
 });