Merge branch 'samuel' into unstable

annotations/views.py

@@ -90,6 +90,9 @@ class NgramEdit(APIView):
             'list_id': list_id,
             } for ngram_id in ngram_ids)
 
+    def put(self, request, list_id, ngram_ids):
+        return Response(None, 204)
+
     def delete(self, request, list_id, ngram_ids):
         """
         Delete a ngram from a list

rest_v1_0/ngrams.py

@@ -305,9 +305,14 @@ class Ngrams(APIView):
     def post(self , request , node_id ):
         return JsonHttpResponse(["POST","ok"])
 
-    def delete(self , request , node_id ):
-        print(node_id)
-        return JsonHttpResponse(["DELETE","ok"])
+    def put (self, request, corpus_id):
+        """
+        Add ngrams to Miam list
+        """
+        group_rawreq = dict(request.data)
+        print( "group_rawreq:" )
+        print( group_rawreq )
+        return JsonHttpResponse(["PUT","ok"])
 
 class Group(APIView):
     '''

static/js/Docs_dyna_chart_and_table.js

@@ -434,6 +434,9 @@ function Main_test( Data , SearchFilter ) {
                 pushState: false,
                 // sort: false //i need to fix the sorting function... the current one just sucks
               },
+              // inputs: {
+              //   queries: $('#searchAB')
+              // },
               writers: {
                 _rowWriter: ulWriter
                 // _cellWriter: customCellWriter
@@ -454,6 +457,19 @@ function Main_test( Data , SearchFilter ) {
   var the_content = $("#filter_search").html();
   $(""+the_content).insertAfter("#dynatable-query-search-my-ajax-table")
 
+
+  // $('#searchAB').click( function() {
+  //   if($(this).is(':checked')) {
+  //       console.log( "Do stuff")
+  //       $("#dynatable-query-search-my-ajax-table").keyup(function (e) {
+  //         if (e.keyCode == 13) {
+  //           console.log("Do stuff: Just pressed ENTER")
+  //         }
+  //       })
+  //   }
+  // });
+    // MyTable.data('dynatable').settings.inputs.queries = { $('#searchAB') }
+
   // .insertAfter("#dynatable-query-search-my-ajax-table")
   
   return "OK"
@@ -461,6 +477,7 @@ function Main_test( Data , SearchFilter ) {
 
 
 
+
 function SearchFilters( elem ) {
   var MODE = elem.value;
 
@@ -501,6 +518,7 @@ function SearchFilters( elem ) {
 
 
 
+
 // FIRST portion of code to be EXECUTED:
 // (3) Get records and hyperdata for paginator
 $.ajax({

static/js/NGrams_dyna_chart_and_table.js

@@ -182,35 +182,35 @@ function printCorpuses() {
     $("#closecorpuses").click();
 
     var whichlist = $('input[name=whichlist]:checked').val()
-	var url = window.location.origin+"/api/node/"+selected_corpus+"/ngrams/list/"+whichlist+"?custom"
-	console.log( url )
-
-	GET_( url , function(results) {
-		if(Object.keys( results ).length>0) {
-			var sub_ngrams_data = {
-				"ngrams":[],
-				"scores": $.extend({}, NGrams["main"].scores)
-			}
-
-			if(whichlist=="stop") {
-				for(var r in results) {
-					var a_ngram = results[r]
-					a_ngram["state"] = System[0]["statesD"]["delete"]
-					sub_ngrams_data["ngrams"].push( a_ngram )
-				}
-				var result = Main_test(sub_ngrams_data , NGrams["main"].scores.initial , "filter_stop-list")
-			}
-
-			if(whichlist=="miam") {
-				for(var i in NGrams["main"].ngrams) {
-					var local_ngram = NGrams["main"].ngrams[i]
-					console.log( local_ngram )
-				}
-				var result = Main_test(sub_ngrams_data , NGrams["main"].scores.initial , "filter_all")
-			}
-  	
-		}
-	});
+  	var url = window.location.origin+"/api/node/"+selected_corpus+"/ngrams/list/"+whichlist+"?custom"
+  	console.log( url )
+
+  	GET_( url , function(results) {
+  		if(Object.keys( results ).length>0) {
+  			var sub_ngrams_data = {
+  				"ngrams":[],
+  				"scores": $.extend({}, NGrams["main"].scores)
+  			}
+
+  			if(whichlist=="stop") {
+  				for(var r in results) {
+  					var a_ngram = results[r]
+  					a_ngram["state"] = System[0]["statesD"]["delete"]
+  					sub_ngrams_data["ngrams"].push( a_ngram )
+  				}
+  				var result = Main_test(sub_ngrams_data , NGrams["main"].scores.initial , "filter_stop-list")
+  			}
+
+  			if(whichlist=="miam") {
+  				for(var i in NGrams["main"].ngrams) {
+  					var local_ngram = NGrams["main"].ngrams[i]
+  					console.log( local_ngram )
+  				}
+  				var result = Main_test(sub_ngrams_data , NGrams["main"].scores.initial , "filter_all")
+  			}
+    	
+  		}
+  	});
 }
 
 
@@ -631,17 +631,17 @@ $("#Save_All").click(function(){
 	var corpus_id = getIDFromURL( "corpus" ) // not used
 
 
+  // CRUD( list_id , "" , Object.keys(FlagsBuffer["inmap"]).map(Number) , [] , "PUT", function(result) {
+  //   console.log( result )
+  // });
+
 	$("#Save_All").append('<img width="8%" src="/static/img/ajax-loader.gif"></img>')
 	CRUD( corpus_id , "/group" , [] , nodes_2group , "PUT" , function(result) {
-		console.log(" UN ELEFANTE "+result)
 		CRUD( corpus_id , "/keep" , [] , nodes_2inmap , "PUT" , function(result) {
-			console.log(" DOS ELEFANTES "+result)
 			CRUD( corpus_id , "/keep" , [] , nodes_2outmap , "DELETE" , function(result) {
-				console.log(" TRES ELEFANTES "+result)
-				CRUD( list_id , "" , nodes_2del , [] , "DELETE", function(result) {
-					console.log(" CUATRO ELEFANTES "+result)
-					window.location.reload()
-				});
+  				CRUD( list_id , "" , nodes_2del , [] , "DELETE", function(result) {
+  					window.location.reload()
+  				});
 			});
 		});
 	});

static/js/jquery/jquery.dynatable.js

@@ -1149,6 +1149,8 @@
       if (settings.features.paginate) {
         settings.dataset.page = 1;
       }
+      console.log("ADD:")
+      console.log(value)
       settings.dataset.queries[name] = value;
       obj.$element.trigger('dynatable:queries:added', [name, value]);
       return dt;
@@ -1177,9 +1179,50 @@
             }
           }
           // collect all records that return true for query
-          settings.dataset.records = $.map(settings.dataset.records, function(record) {
-            return _this.functions[query](record, value) ? record : null;
-          });
+          if($('input[name=searchAB]:checked').length==0) {
+              settings.dataset.records = $.map(settings.dataset.records, function(record) {
+                return _this.functions[query](record, value) ? record : null;
+              });
+          } else {
+              var pageurl = window.location.href.split("/")
+              var cid;
+              for(var i in pageurl) {
+                  if(pageurl[i]=="corpus") {
+                      cid=parseInt(i);
+                      break;
+                  }
+              } 
+              var corpus_id = pageurl[cid+1];
+              var search_api = window.location.origin+"/v1.0/nodes/"+corpus_id+"/children/ids?limit=1000&contain="+encodeURI(value)
+              var coincidences_ = []
+              $.ajax({
+                  type: "GET",
+                  url: search_api,
+                  dataType: "json",
+                  async: false,
+                  success : function(data, textStatus, jqXHR) { 
+                    var results_ = {}
+                    if(data.pagination.total>0) {
+                      for(var i in data.data) {
+                        results_[data.data[i].id]=true
+                      }
+                      for(var i in settings.dataset.records) {
+                        if(   results_[settings.dataset.records[i].id]  ) {
+                          coincidences_.push( settings.dataset.records[i] )
+                        }
+                      }
+
+                    }
+                  },
+                  error: function(exception) { 
+                    console.log("error in search_api:");
+                    console.log(exception)
+                    console.log(" - - - -- - - -")
+                  }
+              })
+              settings.dataset.records = coincidences_
+          }
+
         }
       }
       settings.dataset.queryRecordCount = obj.records.count();

templates/corpus/documents.html

@@ -105,8 +105,8 @@ th a {
 
 <div id="filter_search" style="visibility:hidden">
 <span style="font-size:70%;">
-  <input title="Search in Titles" type="checkbox" checked onclick="return false">TI</input>&nbsp;
-  <input title="Search in Abstracts" type="checkbox">AB</input>
+  <input title="Search in Titles" id="searchTI" name="searchTI" type="checkbox" checked onclick="return false">TI&nbsp;
+  <input title="Search in Abstracts" id="searchAB" name="searchAB" type="checkbox">AB
 </span>&nbsp;&nbsp;
 <select id="example-single-optgroups" onchange="SearchFilters(this);">
     <!-- <optgroup label=""> -->

templates/corpus/terms.html

@@ -243,6 +243,10 @@ input[type=radio]:checked + label {
 
 
 <div id="filter_search" style="visibility:hidden">
+<span style="font-size:70%;">
+  <input title="Search in Titles" type="checkbox" checked onclick="return false">TI</input>&nbsp;
+  <input title="Search in Abstracts" type="checkbox">AB</input>
+</span>&nbsp;&nbsp;
 <select id="example-single-optgroups" onchange="SearchFilters(this);">
     <!-- <optgroup label=""> -->
         <option id="filter_all" value="filter_all">All</option>
@@ -255,9 +259,9 @@ input[type=radio]:checked + label {
         <option id="filter_stop-list" value="filter_stop-list">Stop-List</option>
     <!-- </optgroup> -->
 </select>
-
+<!-- 
 <button id="ImportList" onclick="GetUserPortfolio(); $('#corpuses').modal('show');" class="btn btn-warning">Import a Corpus-List</button>
-
+ -->
 </div>
 
 <script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>