Merge https://github.com/genenetwork/genenetwork2

3 files changed, 32 insertions, 29 deletions

diff --git a/wqflask/wqflask/static/new/javascript/chr_lod_chart.js b/wqflask/wqflask/static/new/javascript/chr_lod_chart.js
index c060d9d7..616a89f6 100644
--- a/wqflask/wqflask/static/new/javascript/chr_lod_chart.js
+++ b/wqflask/wqflask/static/new/javascript/chr_lod_chart.js
@@ -96,11 +96,18 @@ Chr_Lod_Chart = (function() {
   Chr_Lod_Chart.prototype.create_coordinates = function() {
     var i, len, ref, result, results;
     ref = this.these_results;
+    console.log("THESE_RESULTS:", ref)
     results = [];
     for (i = 0, len = ref.length; i < len; i++) {
       result = ref[i];
       this.x_coords.push(parseFloat(result.Mb));
-      this.y_coords.push(result.lod_score);
+      if (js_data.result_score_type == "LOD") {
+        this.y_coords.push(result.lod_score);
+      }
+      else {
+        console.log("LRS VALUE:", result['lrs_value']) 
+        this.y_coords.push(result['lrs_value']);
+      }
       results.push(this.marker_names.push(result.name));
     }
     return results;
diff --git a/wqflask/wqflask/static/packages/TableTools/media/css/TableTools.css b/wqflask/wqflask/static/packages/TableTools/media/css/TableTools.css
index 705008b0..ffa2af34 100755
--- a/wqflask/wqflask/static/packages/TableTools/media/css/TableTools.css
+++ b/wqflask/wqflask/static/packages/TableTools/media/css/TableTools.css
@@ -319,3 +319,8 @@ div.DTTT_collection a.DTTT_button {
 	line-height: 20px;
 }
 
+.no-sort::after { display: none!important; }
+.no-sort { pointer-events: none!important; 
+           cursor: default!important; 
+}
+
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index a1d67779..cc1a6a88 100755
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -119,15 +119,12 @@
     <script language="javascript" type="text/javascript" src="/static/packages/DT_bootstrap/DT_bootstrap.js"></script>
     <script language="javascript" type="text/javascript" src="/static/packages/TableTools/media/js/TableTools.min.js"></script>
 	
-	<link href="//cdn.datatables.net/fixedheader/2.1.2/css/dataTables.fixedHeader.css" rel="stylesheet">
-	<link href="//cdn.datatables.net/fixedcolumns/3.0.4/css/dataTables.fixedColumns.css" rel="stylesheet">
-	<script src="//cdn.datatables.net/fixedheader/2.1.2/js/dataTables.fixedHeader.min.js"></script>
-	<script src="//cdn.datatables.net/fixedcolumns/3.0.4/js/dataTables.fixedColumns.min.js"></script>
+    <link href="//cdn.datatables.net/fixedheader/2.1.2/css/dataTables.fixedHeader.css" rel="stylesheet">
+    <link href="//cdn.datatables.net/fixedcolumns/3.0.4/css/dataTables.fixedColumns.css" rel="stylesheet">
+    <script src="//cdn.datatables.net/fixedheader/2.1.2/js/dataTables.fixedHeader.min.js"></script>
+    <script src="//cdn.datatables.net/fixedcolumns/3.0.4/js/dataTables.fixedColumns.min.js"></script>
 	
     <script type="text/javascript" charset="utf-8">
-
-        console.log("TESTING:", parseFloat("TESTING"))
-
         function getValue(x) {
             if (x.indexOf('input') >= 0) {
                 if ($(x).val() == 'x') {
@@ -176,7 +173,6 @@
             console.time("Creating table");
             {% if dataset.type == 'ProbeSet' %}
             $('#trait_table').dataTable( {
-                //"sDom": "<<'span3'l><'span3'T><'span4'f>'row-fluid'r>t<'row-fluid'<'span6'i><'span6'p>>",
                 "aoColumns": [
                     { "bSortable": true, "sType": "natural" },
                     { "sType": "natural" },
@@ -193,11 +189,14 @@
                 "autoWidth": true,
                 "bLengthChange": true,
                 "bDeferRender": true,
-                "bSortClasses": false
+                "bSortClasses": false,
+                "scrollY": "300px",
+                "scrollX": "100%",
+                "scrollCollapse": true,
+                "paging": false
             } );
             {% elif dataset.type == 'Publish' %}
             $('#trait_table').dataTable( {
-                //"sDom": "<<'span3'l><'span3'T><'span4'f>'row-fluid'r>t<'row-fluid'<'span6'i><'span6'p>>",
                 "aoColumns": [
                     { "bSortable": true, "sType": "natural" },
                     { "sType": "natural" },
@@ -213,27 +212,19 @@
                 "autoWidth": true,
                 "bLengthChange": true,
                 "bDeferRender": true,
-                "bSortClasses": false
+                "bSortClasses": false,
+                "scrollY": "300px",
+                "scrollX": "100%",
+                "scrollCollapse": true,
+                "paging": false
             } );
             {% endif %}
             console.timeEnd("Creating table");
+
+            var table = $('#trait_table').DataTable();
+            new $.fn.dataTable.FixedHeader( table );
+            new $.fn.dataTable.FixedColumns( table );
+         
         });
-		
-		$(document).ready( function () {
-			var table = $('#trait_table').DataTable();
-			new $.fn.dataTable.FixedHeader( table );
-		});
-
-		$(document).ready( function () {
-			var table = $('#trait_table').DataTable( {
-				"scrollY": "300px",
-				"scrollX": "100%",
-				"scrollCollapse": true,
-				"paging": false
-			});
-			new $.fn.dataTable.FixedColumns( table );
-		});
-        
     </script>
-    
 {% endblock %}