aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLei Yan2014-08-25 18:36:07 +0000
committerLei Yan2014-08-25 18:36:07 +0000
commit26942b2ffde093d70863384e8c13275506ac25a7 (patch)
treebaa2f0447db5c260b312ca0f0529672de0a022d0
parente7d484a2705a122894e438c8310b6727e7e292a6 (diff)
downloadgenenetwork2-26942b2ffde093d70863384e8c13275506ac25a7.tar.gz
Committer: Lei Yan <lei@penguin.uthsc.edu>
On branch master
-rwxr-xr-xwqflask/wqflask/correlation/show_corr_results.py4
-rwxr-xr-xwqflask/wqflask/templates/correlation_page.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py
index f35fe075..ade2d242 100755
--- a/wqflask/wqflask/correlation/show_corr_results.py
+++ b/wqflask/wqflask/correlation/show_corr_results.py
@@ -187,10 +187,10 @@ class CorrelationResults(object):
trait_object.lit_corr = lit_corr_data[trait][1]
self.correlation_results.append(trait_object)
- if self.corr_type != "lit" and self.dataset.type == "ProbeSet":
+ if self.corr_type != "lit" and self.dataset.type == "ProbeSet" and self.target_dataset.type == "ProbeSet":
self.do_lit_correlation_for_trait_list()
- if self.corr_type != "tissue" and self.dataset.type == "ProbeSet":
+ if self.corr_type != "tissue" and self.dataset.type == "ProbeSet" and self.target_dataset.type == "ProbeSet":
self.do_tissue_correlation_for_trait_list()
#print("self.correlation_results: ", pf(self.correlation_results))
diff --git a/wqflask/wqflask/templates/correlation_page.html b/wqflask/wqflask/templates/correlation_page.html
index 35b98c8e..169371be 100755
--- a/wqflask/wqflask/templates/correlation_page.html
+++ b/wqflask/wqflask/templates/correlation_page.html
@@ -83,7 +83,7 @@
<td><a href="/show_trait?trait_id={{trait.name}}&amp;dataset={{trait.dataset.name}}">{{ trait.name }}</a></td>
<td>{{ trait.symbol }}</td>
<td>{{ trait.description }} <br><br> <b>Aliases</b>: {{ trait.alias }}</td>
- <td>Chr{{ trait.chr }}: {{'%0.6f'|format(trait.mb) }}</td>
+ <td>Chr{{ trait.chr }}: {{'%0.6f'|format(trait.mb) if trait.mb != None }}</td>
<td>{{'%0.3f'|format(trait.mean)}}</td>
<td>{{'%0.3f'|format(trait.lrs)}}</td>
<td>Chr{{ trait.locus_chr }}: {{'%0.3f'|format(trait.locus_mb) }}</td>