From 28d88c740c52386ae464b0f03d1db7058b3ddcf9 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Wed, 15 Jul 2015 18:31:22 +0000
Subject: Fixed issue where chromosome view doesn't work on qtlreaper mapping
 results

---
 wqflask/wqflask/static/new/javascript/chr_lod_chart.js |  9 ++++++++-
 wqflask/wqflask/templates/search_result_page.html      | 14 ++++----------
 2 files changed, 12 insertions(+), 11 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/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index ca80af40..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" },
@@ -201,7 +197,6 @@
             } );
             {% 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" },
@@ -232,5 +227,4 @@
          
         });
     </script>
-    
 {% endblock %}
-- 
cgit v1.2.3