Merge branch 'master' of http://dev.restore.ovi.cnr.it:3000/TEAMOVI/Ricerche

flask_be/engine/cooccorrenze.py

@@ -79,6 +79,7 @@ class cooccorrenze(basicQueries):
                     test = test & (textlist['numperiod'] == nperiodo1)
 
                 df_temp = textlist[test]
+                cod_cols = [] + df_temp['cod'].tolist()
                 df_new = pd.concat([df_new, df_temp])
 
             ##########################################

site2/js/ricerca.js

@@ -169,7 +169,12 @@ function funzioneRicerca(){
     }
     getData('/simple_get_query', queryDTO)
     // After request finishes, process response data
-    .done(response => processData(response));
+    .done(response => processData(response))
+    .fail(err => {
+      console.log(err);
+      $("#loader").css("display", "none");
+      alert('Something went wrong!');
+    });
   } else {
       queryDTO = {
         queryList: queryList,
@@ -177,7 +182,12 @@ function funzioneRicerca(){
     }
     getData('/simple_get_query', queryDTO)
     // After request finishes, process response data
-    .done(response => processOccData(response));
+    .done(response => processOccData(response))
+    .fail(err => {
+      console.log(err);
+      $("#loader").css("display", "none");
+      alert('Something went wrong!');
+    });
   } 
 
   console.log(queryDTO);
@@ -212,7 +222,11 @@ function checkContext() {
   getData('/get_context', queryDTO)
   // After request finishes, process response data
   .done(response => processContext(response))
-  .fail(err => console.log("Something went wrong!"))
+  .fail(err => {
+    console.log(err);
+    $("#loader").css("display", "none");
+    alert('Something went wrong!');
+  });
 //  .always(response => console.log(response));
 }