From cf8b4c21d81efaa01d347478dc126e6d9b53f7a9 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 16 Apr 2020 14:39:39 -0500
Subject: Fixed issue that caused submitted traits to not open properly when
 submitted to a group with case attributes + fixed a link to GN1

---
 wqflask/wqflask/show_trait/show_trait.py    | 4 +++-
 wqflask/wqflask/templates/submit_trait.html | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py
index 64deb942..d35ba749 100644
--- a/wqflask/wqflask/show_trait/show_trait.py
+++ b/wqflask/wqflask/show_trait/show_trait.py
@@ -159,7 +159,9 @@ class ShowTrait(object):
             self.sample_group_types['samples_primary'] = self.dataset.group.name
         sample_lists = [group.sample_list for group in self.sample_groups]
 
-        categorical_var_list = get_categorical_variables(self.this_trait, self.sample_groups[0]) #ZS: Only using first samplelist, since I think mapping only uses those samples
+        categorical_var_list = []
+        if not self.temp_trait:
+            categorical_var_list = get_categorical_variables(self.this_trait, self.sample_groups[0]) #ZS: Only using first samplelist, since I think mapping only uses those samples
 
         #ZS: Get list of chromosomes to select for mapping
         self.chr_list = [["All", -1]]
diff --git a/wqflask/wqflask/templates/submit_trait.html b/wqflask/wqflask/templates/submit_trait.html
index 0dd38fe5..68b06f55 100644
--- a/wqflask/wqflask/templates/submit_trait.html
+++ b/wqflask/wqflask/templates/submit_trait.html
@@ -32,7 +32,7 @@
                     <div class="form-group">
                         <h2 style="color: #5a5a5a;">Trait Submission Form</h2>
                         <hr>
-                        <div style="padding-bottom: 50px;" class="form-horizontal">
+                        <div style="margin-bottom: 150px;" class="form-horizontal">
                           <h3>1. Choose Species and Group:</h3>
                           <br>
                           <div class="col-xs-2" style="min-height: 15vh; display: flex; align-items: center;">
@@ -57,7 +57,7 @@
                           <h3>2. Enter Trait Data:</h3>
                           <h4 style="color:red;">File uploading isn't enabled yet, but is coming soon.</h4>
                           <br>
-                          <div class="col-xs-2" style="min-height: 100vh; display: flex; align-items: center;">
+                          <div class="col-xs-2" style="min-height: 50vh; max-height: 100vh; display: flex; align-items: center;">
                             <img src="/static/new/images/step2.gif">
                           </div>
                           <div class="col-xs-10">
@@ -79,7 +79,7 @@
                                  The values can be on one line separated by spaces or tabs, or they can be on separate lines. Include one value for each individual 
                                  or line. Use an "x" for missing values. If you have chosen a set of inbred strains, then your data will be displayed in a form in 
                                  which you can confirm and/or edit. If you enter a file name in the previous section, 
-                                 any data that you paste here will be ignored. Check <a href="http://genenetwork.org/RIsample.html">sample data</a> for the correct format. 
+                                 any data that you paste here will be ignored. Check <a href="http://gn1.genenetwork.org/RIsample.html">sample data</a> for the correct format.
                               </p>
                               <textarea name="trait_paste" rows="6" cols="70"></textarea>
                             </div>
-- 
cgit v1.2.3