From 1df4248f88a1bbbc82446cd5e51daf07597b57bc Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 15 Oct 2019 10:52:38 -0500
Subject: Added a description with the marker name for genotype traits in
 collections page

Fixed X/Y axis labels on correlation scatterplot page to correctly show genotype traits
---
 wqflask/wqflask/templates/collections/view.html |  6 ++++++
 wqflask/wqflask/templates/corr_scatterplot.html | 22 +++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html
index a23f3f70..26dcef65 100644
--- a/wqflask/wqflask/templates/collections/view.html
+++ b/wqflask/wqflask/templates/collections/view.html
@@ -134,7 +134,13 @@
                             {% else %}
                             <TD data-export="N/A">N/A</TD>
                             {% endif %}
+                            {% if this_trait.dataset.type == "Geno" %}
+                            <TD title="Marker: {{ this_trait.name }}" data-export="Marker: {{ this_trait.name }}">Marker: {{ this_trait.name }}</TD>
+                            {% elif this_trait.description_display != "" %}
                             <TD title="{{ this_trait.description_display }}" data-export="{{ this_trait.description_display }}">{{ this_trait.description_display }}</TD>
+                            {% else %}
+                            <TD title="N/A" data-export="N/A">N/A</TD>
+                            {% endif %}
                             <TD data-export="{{ this_trait.location_repr }}">{{ this_trait.location_repr }}</TD>
                             <TD data-export="{{ this_trait.mean }}" align="right">{{ '%0.3f' % this_trait.mean|float }}</TD>
                             <TD data-export="{{ this_trait.LRS_score_repr }}" align="right">{{ '%0.3f' % this_trait.LRS_score_repr|float }}</TD>
diff --git a/wqflask/wqflask/templates/corr_scatterplot.html b/wqflask/wqflask/templates/corr_scatterplot.html
index f60a7129..545c0b94 100644
--- a/wqflask/wqflask/templates/corr_scatterplot.html
+++ b/wqflask/wqflask/templates/corr_scatterplot.html
@@ -25,7 +25,7 @@
 
   <table>
     <tr>
-      <td style="vertical-align: middle;">Width <input class="chartupdatewh" id="width" type="text" value="800" style="width: 44px; height: 22px;"> px</td>
+      <td style="vertical-align: middle;">Width <input class="chartupdatewh" id="width" type="text" value="800" style="width: 44px; height: 22px;"> px </td>
       <td style="vertical-align: middle;">Height <input class="chartupdatewh" id="height" type="text" value="700" style="width: 44px; height: 22px;"> px</td>
     </tr>
   </table>
@@ -192,6 +192,16 @@
           <a href="{{trait_1.pubmed_link}}">PubMed: {{trait_1.pubmed_text}}</a>
             {{trait_1.description_display}}
         </div>
+        {% elif trait_1.dataset.type == "Geno" %}
+        <div>
+          X axis:
+          <a href="{{url_for('show_trait_page', trait_id = trait_1.name, dataset = trait_1.dataset.name)}}">
+            {{trait_1.dataset.group.species + " " + trait_1.dataset.group.name + " " + trait_1.dataset.name + ": " + trait_1.name|string}}
+          </a>
+        </div>
+        <div>
+          Location: {{trait_1.location_repr}} Mb
+        </div>
         {% endif %}
 
         <br/>
@@ -218,6 +228,16 @@
           <a href="{{trait_2.pubmed_link}}">PubMed: {{trait_2.pubmed_text}}</a>
             {{trait_2.description_display}}
         </div>
+        {% elif trait_2.dataset.type == "Geno" %}
+        <div>
+          Y axis:
+          <a href="{{url_for('show_trait_page', trait_id = trait_2.name, dataset = trait_2.dataset.name)}}">
+            {{trait_2.dataset.group.species + " " + trait_2.dataset.group.name + " " + trait_2.dataset.name + ": " + trait_2.name|string}}
+          </a>
+        </div>
+        <div>
+          Location: {{trait_2.location_repr}} Mb
+        </div>
         {% endif %}
       </div>
       </div>
-- 
cgit 1.4.1