aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2019-06-09 13:21:22 -0500
committerzsloan2019-06-09 13:21:22 -0500
commitdca78fcaa95dbbd2cb2f5e51461525b0f9f1b3e6 (patch)
tree9f5a1c18455d7f8ae647176a817ac94aea502250 /wqflask
parentf92100ca1eceb1a5440fc08d950a4001ed3b6b73 (diff)
downloadgenenetwork2-dca78fcaa95dbbd2cb2f5e51461525b0f9f1b3e6.tar.gz
Fixed issue that caused heatmap to not work (needed to tell it to use reaper for generating genotype object)
Fixed issue that caused *all* collection page functions to not load correctly (datatables wasn't loading correctly due to a new column being added)
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/heatmap/heatmap.py2
-rw-r--r--wqflask/wqflask/templates/collections/view.html1
2 files changed, 2 insertions, 1 deletions
diff --git a/wqflask/wqflask/heatmap/heatmap.py b/wqflask/wqflask/heatmap/heatmap.py
index 9d33961c..28c5ce12 100644
--- a/wqflask/wqflask/heatmap/heatmap.py
+++ b/wqflask/wqflask/heatmap/heatmap.py
@@ -120,7 +120,7 @@ class Heatmap(object):
self.dataset.group.get_markers()
this_trait = trait_db[0]
#this_db = trait_db[1]
- genotype = self.dataset.group.read_genotype_file()
+ genotype = self.dataset.group.read_genotype_file(use_reaper=True)
samples, values, variances, sample_aliases = this_trait.export_informative()
trimmed_samples = []
diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html
index 7e1001fc..268bbe1f 100644
--- a/wqflask/wqflask/templates/collections/view.html
+++ b/wqflask/wqflask/templates/collections/view.html
@@ -182,6 +182,7 @@
{ "type": "natural", "width": 50 },
{ "type": "natural" },
{ "type": "natural", "width": 120 },
+ { "type": "natural", "width": 120 },
{ "type": "natural" },
{ "type": "natural", "width": 130 },
{ "type": "natural", "width": 35 },