about summary refs log tree commit diff
path: root/wqflask/base
diff options
context:
space:
mode:
authorzsloan2018-10-01 16:09:47 +0000
committerzsloan2018-10-01 16:09:47 +0000
commita3365dae23f204e489939d3defc55edc1b4872d8 (patch)
treed4b06818cd0af291cfa34a484e25a6c07621f1ea /wqflask/base
parentee8e1eacd88399609f530a33e2d91cf7895da5b0 (diff)
downloadgenenetwork2-a3365dae23f204e489939d3defc55edc1b4872d8.tar.gz
- Can now remove cofactors from correlation scatterplot and select them by just clicking their row in collection
- Cofactor color picker now works in Safari/Macs

- Displays N for relevant samples in trait page sample table

- Don't show bar chart when N>256

- Mapping loading page contents better centered

- Anonymous collections timeout correctly listed as 30 days now

- Minor allele frequency can actually be changed for GEMMA now (previously didn't work)

- Fixed transcript position marker location for mapping results

- Notifies user if their e-mail isn't associated with an account when they attempt to request forgotten password

- Users can now map with submitted traits

- Histogram width changes depending upon number of bins (need to improve this still)

- Improved Q-q plot (previously called "probability plot")
Diffstat (limited to 'wqflask/base')
-rw-r--r--wqflask/base/trait.py3
-rw-r--r--wqflask/base/webqtlCaseData.py7
2 files changed, 9 insertions, 1 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 3daf9ea9..e57d4176 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -189,7 +189,8 @@ def get_sample_data():
         trait_dict['symbol'] = trait_ob.symbol
         trait_dict['location'] = trait_ob.location_repr
     elif trait_ob.dataset.type == "Publish":
-        trait_dict['pubmed_link'] = trait_ob.pubmed_link
+        if trait_ob.pubmed_id:
+            trait_dict['pubmed_link'] = trait_ob.pubmed_link
         trait_dict['pubmed_text'] = trait_ob.pubmed_text
 
     return json.dumps([trait_dict, {key: value.value for key, value in trait_ob.data.iteritems() }])
diff --git a/wqflask/base/webqtlCaseData.py b/wqflask/base/webqtlCaseData.py
index 24de8dcb..76f06cc6 100644
--- a/wqflask/base/webqtlCaseData.py
+++ b/wqflask/base/webqtlCaseData.py
@@ -77,3 +77,10 @@ class webqtlCaseData(object):
             return "%2.3f" % self.variance
         else:
             return "x"
+
+    @property
+    def display_num_cases(self):
+        if self.num_cases != None:
+            return "%d" % self.num_cases
+        else:
+            return "x"