aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2017-09-07 16:51:10 +0000
committerzsloan2017-09-07 16:51:10 +0000
commitc0188f02830dace2fc82392788f987e3c46ee12a (patch)
tree29b650d9b60eebc6ff9fdc3d5805410d355c411b /wqflask
parent425f0e9d8977f8cf741f596315a56c91b750988a (diff)
downloadgenenetwork2-c0188f02830dace2fc82392788f987e3c46ee12a.tar.gz
Updated show trait page to correctly show GEMMA options for certain data sets
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/templates/show_trait_mapping_tools.html14
1 files changed, 6 insertions, 8 deletions
diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html
index 1151c74b..c24a5853 100644
--- a/wqflask/wqflask/templates/show_trait_mapping_tools.html
+++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html
@@ -4,7 +4,6 @@
<div class="tabbable"> <!-- Only required for left/right tabs -->
<ul class="nav nav-pills">
- {# if use_pylmm_rqtl and not use_plink_gemma and dataset.group.species != "human" #}
{% if dataset.group.mapping_id == "1" %}
<li class="active">
<a href="#interval_mapping" data-toggle="tab">Interval Mapping</a>
@@ -19,11 +18,10 @@
<a href="#gemma" data-toggle="tab">GEMMA</a>
</li>
{% endif %}
- {# if use_plink_gemma #}
{% for mapping_method in dataset.group.mapping_names %}
{% if mapping_method == "GEMMA" %}
<li class="active">
- <a href="#gemma" data-toggle="tab">GEMMA</a>
+ <a href="#gemma_plink" data-toggle="tab">GEMMA</a>
</li>
{% elif mapping_method == "PLINK" %}
<li>
@@ -326,9 +324,9 @@
</div>
</div>
{% endif %}
- {# if use_plink_gemma #}
- {% if dataset.group.mapping_id == "2" or dataset.group.mapping_id == "4" %}
- <div class="tab-pane" id="gemma">
+ {% for mapping_method in dataset.group.mapping_names %}
+ {% if mapping_method == "GEMMA" %}
+ <div class="tab-pane active" id="gemma_plink">
<div style="padding-top: 10px;" class="form-horizontal">
<div class="mapping_method_fields form-group">
<label for="maf_gemma" class="col-xs-5 control-label">Minor allele threshold</label>
@@ -357,7 +355,7 @@
</div>
</div>
</div>
- {% if dataset.group.mapping_id == "4" %}
+ {% elif mapping_method == "PLINK" %}
<div class="tab-pane" id="plink">
<div style="padding: 20px" class="form-horizontal">
<div class="mapping_method_fields form-group">
@@ -378,7 +376,7 @@
</div>
</div>
{% endif %}
- {% endif %}
+ {% endfor %}
</div>
</div>
</div>