Merge branch 'samuel' into unstable

static/js/Docs_dyna_chart_and_table.js

@@ -293,11 +293,6 @@ function Main_test( Data , SearchFilter ) {
     // console.log(Data[i]["date"]+"  :  originalRecords["+arr_id+"] <- "+orig_id+" | "+Data[i]["name"])
   }
 
-
-  // $("#move2trash").prop('disabled', true);
-
-
-
   var t0 = AjaxRecords[0].date.split("-").map(Number)
   var t1 = AjaxRecords.slice(-1)[0].date.split("-").map(Number)
   oldest = t0;

static/js/NGrams_dyna_chart_and_table.js

@@ -632,8 +632,6 @@ function Main_test( data , initial) {
       div_table += '</p>';
     $("#div-table").html(div_table)
 
-    
-
     var div_stats = "<p>";
     for(var i in data.scores) {
       var value = (!isNaN(Number(data.scores[i])))? Number(data.scores[i]).toFixed(1) : data.scores[i];
@@ -642,7 +640,6 @@ function Main_test( data , initial) {
     div_stats += "</p>"
     $("#stats").html(div_stats)
 
-
     for(var i in data.ngrams) {
     
       var le_ngram = data.ngrams[i]
@@ -698,10 +695,6 @@ function Main_test( data , initial) {
         return d.y_frec;
     });
 
-    console.log("scores: [ "+min_occ+" , "+max_occ+" ] ")
-    console.log("frecs: [ "+min_frec+" , "+max_frec+" ] ")
-
-
     LineChart
       .width(800)
       .height(150)
@@ -770,8 +763,8 @@ function Main_test( data , initial) {
                 });
             })
             .xAxis()
-      volumeChart.yAxis().ticks(5)
-      volumeChart.render()
+    volumeChart.yAxis().ticks(5)
+    volumeChart.render()
 
     LineChart.filterAll();
     volumeChart.filterAll();
@@ -835,9 +828,33 @@ function Main_test( data , initial) {
     $(".imadiv").html('<div style="float: left; text-align:left;">'+Div_PossibleActions+Div_SelectAll+'</div><br>');
 
 
+	$("#filter_search").html( $("#filter_search").html().replace('selected="selected"') );
+	$("#filter_all").attr( "selected" , "selected" )
+	var the_content = $("#filter_search").html();
+	$(""+the_content).insertAfter("#dynatable-query-search-my-ajax-table")
     return "OK"
 }
 
+
+
+function SearchFilters( elem ) {
+  var MODE = elem.value;
+
+  if( MODE == "filter_all") {
+    var result = Main_test(AjaxRecords , MODE)
+    console.log( result )
+  }
+
+  if( MODE == "filter_map-list") {
+
+  }
+
+  if( MODE == "filter_stop-list") {
+
+  }
+
+}
+
 function getIDFromURL( item ) {
 	var pageurl = window.location.href.split("/")
 	var cid;

templates/corpus/terms.html

@@ -217,6 +217,21 @@ input[type=radio]:checked + label {
 </div> 
 
 
+<div id="filter_search" style="visibility:hidden">
+<select id="example-single-optgroups" onchange="SearchFilters(this);">
+    <!-- <optgroup label=""> -->
+        <option id="filter_all" value="filter_all">All</option>
+        <!-- <option id="filter_title" value="filter_title">Title</option> -->
+        <!-- <option id="filter_date" value="filter_date">Date</option> -->
+    <!-- </optgroup> -->
+    <!-- <optgroup label="Duplicates"> -->
+        <!-- <option value="filter_doi">By DOI</option> -->
+        <option id="filter_map-list" value="filter_map-list">Map-List</option>
+        <option id="filter_stop-list" value="filter_stop-list">Stop-List</option>
+    <!-- </optgroup> -->
+</select>
+
+</div>
 
 <script type="text/javascript" src="{% static "js/jquery/jquery.min.js" %}"></script>
 <script src="{% static "js/charts/bootstrap.min.js" %}"></script>