aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xwqflask/base/data_set.py6
-rwxr-xr-xwqflask/base/trait.py12
-rwxr-xr-xwqflask/wqflask/collect.py1
-rwxr-xr-xwqflask/wqflask/do_search.py6
-rwxr-xr-xwqflask/wqflask/static/packages/bootstrap/css/bootstrap.css2
-rwxr-xr-xwqflask/wqflask/static/packages/bootstrap/css/docs.css2
-rw-r--r--wqflask/wqflask/static/packages/bootstrap/css/non-responsive.css8
-rwxr-xr-xwqflask/wqflask/templates/collections/view.html2
-rwxr-xr-xwqflask/wqflask/templates/index_page.html171
-rwxr-xr-xwqflask/wqflask/templates/new_security/login_user.html23
-rwxr-xr-xwqflask/wqflask/templates/search_result_page.html16
-rwxr-xr-xwqflask/wqflask/templates/show_trait_calculate_correlations.html28
-rwxr-xr-xwqflask/wqflask/templates/show_trait_mapping_tools.html64
-rwxr-xr-xwqflask/wqflask/views.py2
14 files changed, 173 insertions, 170 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 7e187802..15a8c7cc 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -639,7 +639,8 @@ class PhenotypeDataSet(DataSet):
'Authors',
'Year',
'Max LRS',
- 'Max LRS Location']
+ 'Max LRS Location',
+ 'Add. Effect']
self.type = 'Publish'
@@ -899,7 +900,8 @@ class MrnaAssayDataSet(DataSet):
'Location',
'Mean Expr',
'Max LRS',
- 'Max LRS Location']
+ 'Max LRS Location',
+ 'Add. Effect']
# Todo: Obsolete or rename this field
self.type = 'ProbeSet'
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 6d070d54..58bed865 100755
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -396,7 +396,7 @@ class GeneralTrait(object):
if self.dataset.type == 'ProbeSet' and not self.cellid:
query = """
SELECT
- ProbeSetXRef.Locus, ProbeSetXRef.LRS, ProbeSetXRef.pValue, ProbeSetXRef.mean
+ ProbeSetXRef.Locus, ProbeSetXRef.LRS, ProbeSetXRef.pValue, ProbeSetXRef.mean, ProbeSetXRef.additive
FROM
ProbeSetXRef, ProbeSet
WHERE
@@ -409,7 +409,7 @@ class GeneralTrait(object):
#trait_qtl = self.cursor.fetchone()
if trait_qtl:
print("trait_qtl:", trait_qtl)
- self.locus, self.lrs, self.pvalue, self.mean = trait_qtl
+ self.locus, self.lrs, self.pvalue, self.mean, self.additive= trait_qtl
print("self.locus:", self.locus)
if self.locus:
query = """
@@ -425,13 +425,13 @@ class GeneralTrait(object):
else:
self.locus = self.locus_chr = self.locus_mb = ""
else:
- self.locus = self.locus_chr = self.locus_mb = self.lrs = self.pvalue = self.mean = ""
+ self.locus = self.locus_chr = self.locus_mb = self.lrs = self.pvalue = self.mean = self.additive = ""
if self.dataset.type == 'Publish':
trait_qtl = g.db.execute("""
SELECT
- PublishXRef.Locus, PublishXRef.LRS
+ PublishXRef.Locus, PublishXRef.LRS, PublishXRef.additive
FROM
PublishXRef, PublishFreeze
WHERE
@@ -440,9 +440,9 @@ class GeneralTrait(object):
PublishFreeze.Id =%s
""", (self.name, self.dataset.id)).fetchone()
if trait_qtl:
- self.locus, self.lrs = trait_qtl
+ self.locus, self.lrs, self.additive = trait_qtl
else:
- self.locus = self.lrs = ""
+ self.locus = self.lrs = self.additive = ""
else:
raise KeyError, `self.name`+' information is not found in the database.'
diff --git a/wqflask/wqflask/collect.py b/wqflask/wqflask/collect.py
index 1105543c..df4507fb 100755
--- a/wqflask/wqflask/collect.py
+++ b/wqflask/wqflask/collect.py
@@ -315,6 +315,7 @@ def view_collection():
name, dataset_name = atrait.split(':')
trait_ob = trait.GeneralTrait(name=name, dataset_name=dataset_name)
+ trait_ob.retrieve_info(get_qtl_info=True)
trait_ob.get_info()
trait_obs.append(trait_ob)
diff --git a/wqflask/wqflask/do_search.py b/wqflask/wqflask/do_search.py
index 17fbc535..f9082495 100755
--- a/wqflask/wqflask/do_search.py
+++ b/wqflask/wqflask/do_search.py
@@ -118,7 +118,8 @@ class MrnaAssaySearch(DoSearch):
'Location',
'Mean',
'Max LRS',
- 'Max LRS Location']
+ 'Max LRS Location',
+ 'Additive Effect']
def compile_final_query(self, from_clause = '', where_clause = ''):
"""Generates the final query string"""
@@ -188,7 +189,8 @@ class PhenotypeSearch(DoSearch):
'Authors',
'Year',
'Max LRS',
- 'Max LRS Location']
+ 'Max LRS Location',
+ 'Additive Effect']
def get_fields_clause(self):
"""Generate clause for WHERE portion of query"""
diff --git a/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css b/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css
index 2c93dac8..0bf1f944 100755
--- a/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css
+++ b/wqflask/wqflask/static/packages/bootstrap/css/bootstrap.css
@@ -1215,7 +1215,7 @@ a.bg-danger:hover {
}
.page-header {
padding-bottom: 9px;
- margin: 40px 0 20px;
+ margin: 20px 0 20px;
border-bottom: 1px solid #eee;
}
ul,
diff --git a/wqflask/wqflask/static/packages/bootstrap/css/docs.css b/wqflask/wqflask/static/packages/bootstrap/css/docs.css
index 50710348..ea4d6994 100755
--- a/wqflask/wqflask/static/packages/bootstrap/css/docs.css
+++ b/wqflask/wqflask/static/packages/bootstrap/css/docs.css
@@ -55,7 +55,7 @@ body > .navbar .brand:hover {
/* padding for in-page bookmarks and fixed navbar */
section {
- padding-top: 30px;
+ padding-top: 0px;
}
section > .page-header,
section > .lead {
diff --git a/wqflask/wqflask/static/packages/bootstrap/css/non-responsive.css b/wqflask/wqflask/static/packages/bootstrap/css/non-responsive.css
index 799df47f..c3a11092 100644
--- a/wqflask/wqflask/static/packages/bootstrap/css/non-responsive.css
+++ b/wqflask/wqflask/static/packages/bootstrap/css/non-responsive.css
@@ -6,7 +6,7 @@
/* Account for fixed navbar */
body {
- min-width: 970px;
+ min-width: 1200px;
padding-top: 70px;
padding-bottom: 30px;
}
@@ -28,7 +28,7 @@ body {
/* Reset the container */
.container {
- width: 970px;
+ width: 1200px;
max-width: none !important;
}
@@ -59,10 +59,6 @@ body {
border-top: 0;
}
-.navbar-brand {
- margin-left: -15px;
-}
-
/* Always apply the floated nav */
.navbar-nav {
float: left;
diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html
index 89bccffa..237a0d4e 100755
--- a/wqflask/wqflask/templates/collections/view.html
+++ b/wqflask/wqflask/templates/collections/view.html
@@ -94,6 +94,7 @@
<th>Mean</th>
<th>Max LRS</th>
<th>Max LRS Location</th>
+ <th>Additive Effect</th>
</tr>
</thead>
@@ -118,6 +119,7 @@
<TD>{{ this_trait.mean }}</TD>
<TD>{{ this_trait.LRS_score_repr }}</TD>
<TD>{{ this_trait.LRS_location_repr }}</TD>
+ <TD>{{ this_trait.additive }}</TD>
</TR>
{% endfor %}
diff --git a/wqflask/wqflask/templates/index_page.html b/wqflask/wqflask/templates/index_page.html
index b3fd3f6f..1caca702 100755
--- a/wqflask/wqflask/templates/index_page.html
+++ b/wqflask/wqflask/templates/index_page.html
@@ -3,12 +3,14 @@
{% block content %}
<!-- Start of body -->
+<!--
<header class="jumbotron subhead" id="overview">
<div class="container">
<h1>GeneNetwork</h1>
<p class="lead">Open source bioinformatics for systems genetics</p>
</div>
</header>
+-->
<div class="container-fluid">
@@ -16,7 +18,91 @@
<div class="row" style="width: 1200px !important;">
- <div style="float:right;" class="col-xs-5 col-xs-5" style="width: 600px !important;">
+ <div class="col-xs-5 col-xs-5">
+ <section id="search">
+ <div class="page-header">
+ <h1>Select and search</h1>
+ </div>
+ <form method="get" action="/search" name="SEARCHFORM">
+ <fieldset>
+ <div style="padding: 20px" class="form-horizontal">
+
+ <div class="form-group">
+ <label for="species" class="col-xs-1 control-label" style="width: 65px !important;">Species:</label>
+ <div class="col-xs-4 controls">
+ <select name="species" id="species" class="form-control selectpicker span3" style="width: 300px !important;"></select>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="group" class="col-xs-1 control-label" style="width: 65px !important;">Group:</label>
+ <div class="col-xs-4 controls input-append">
+ <select name="group" id="group" class="form-control selectpicker span3" style="width: 300px !important;"></select>
+ <i class="icon-question-sign"></i>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="tissue" class="col-xs-1 control-label" style="width: 65px !important;">Type:</label>
+ <div class="col-xs-4 controls">
+ <select name="type" id="type" class="form-control selectpicker span3" style="width: 300px !important;"></select>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="dataset" class="col-xs-1 control-label" style="width: 65px !important;">Dataset:</label>
+ <div class="col-xs-4 controls input-append">
+ <select name="dataset" id="dataset" class="form-control selectpicker span5" style="width: 450px !important;"></select>
+ <i class="icon-question-sign"></i>
+ </div>
+ </div>
+
+ <!-- USER HELP -->
+ <!--<p >Databases marked with <b>**</b>-->
+ <!-- suffix are not public yet.<br>-->
+ <!-- Access requires <a href="/account.html" target=-->
+ <!-- "_blank" class="fs14">user login</a>.</p>-->
+ <!-- GET ANY SEARCH -->
+
+ <div class="form-group">
+ <label for="tfor" class="col-xs-1 control-label" style="width: 65px !important;">Search:</label>
+ <div class="col-xs-10 controls">
+ <textarea name="search_terms" rows="2" class="form-control search-query" style="width: 450px !important;" id="tfor"></textarea>
+ </div>
+ </div>
+
+ <!-- GET ANY HELP -->
+
+ <p>Enter terms, genes, ID numbers in the
+ <b>Search</b> field<br>
+ Use <b>*</b> or <b>?</b> wildcards (Cyp*a?,
+ synap*)<br>
+ Use <b>quotes</b> for terms such as <i>"tyrosine
+ kinase"</i></p>
+
+ <!-- SEARCH, MAKE DEFAULT, ADVANCED SEARCH -->
+
+ <div class="form-group">
+
+ <div class="col-xs-3 controls" style="width: 100px !important;">
+ <input id="btsearch" type="submit" class="btn btn-primary form-control" value="Search">
+ </div>
+ <div class="col-xs-4 controls" style="width: 150px !important;">
+ <input id="make_default" type="submit" class="btn btn-default form-control" value="Make Default">
+ </div>
+ <div class="col-xs-5 controls" style="width: 200px !important;">
+ <input type="submit" class="btn btn-default form-control" value="Advanced Search">
+ </div>
+ </div>
+
+ <input type="hidden" name="FormID" value="searchResult" class="form-control">
+ <!--!<input type="hidden" name="RISet" value="BXD">-->
+ </div>
+ </fieldset>
+ </form>
+ </section>
+ </div>
+ <div style="padding-left:120px" class="col-xs-6" style="width: 600px !important;">
<section id="advanced">
<div class="page-header">
<h1>Advanced commands</h1>
@@ -179,89 +265,6 @@
</section>-->
</div>
- <div class="col-xs-5 col-xs-5">
- <section id="search">
- <div class="page-header">
- <h1>Select and search</h1>
- </div>
- <form method="get" action="/search" name="SEARCHFORM">
- <fieldset>
- <div style="padding: 20px" class="form-horizontal">
- <div class="form-group">
- <label for="species" class="col-xs-1 control-label" style="width: 65px !important;">Species:</label>
- <div class="col-xs-4 controls">
- <select name="species" id="species" class="form-control selectpicker span3" style="width: 300px !important;"></select>
- </div>
- </div>
-
- <div class="form-group">
- <label for="group" class="col-xs-1 control-label" style="width: 65px !important;">Group:</label>
- <div class="col-xs-4 controls input-append">
- <select name="group" id="group" class="form-control selectpicker span3" style="width: 300px !important;"></select>
- <i class="icon-question-sign"></i>
- </div>
- </div>
-
- <div class="form-group">
- <label for="tissue" class="col-xs-1 control-label" style="width: 65px !important;">Type:</label>
- <div class="col-xs-4 controls">
- <select name="type" id="type" class="form-control selectpicker span3" style="width: 300px !important;"></select>
- </div>
- </div>
-
- <div class="form-group">
- <label for="dataset" class="col-xs-1 control-label" style="width: 65px !important;">Dataset:</label>
- <div class="col-xs-4 controls input-append">
- <select name="dataset" id="dataset" class="form-control selectpicker span5" style="width: 450px !important;"></select>
- <i class="icon-question-sign"></i>
- </div>
- </div>
-
- <!-- USER HELP -->
- <!--<p >Databases marked with <b>**</b>-->
- <!-- suffix are not public yet.<br>-->
- <!-- Access requires <a href="/account.html" target=-->
- <!-- "_blank" class="fs14">user login</a>.</p>-->
- <!-- GET ANY SEARCH -->
-
- <div class="form-group">
- <label for="tfor" class="col-xs-1 control-label" style="width: 65px !important;">Search:</label>
- <div class="col-xs-10 controls">
- <textarea name="search_terms" rows="2" class="form-control search-query" style="width: 450px !important;" id="tfor"></textarea>
- </div>
- </div>
-
- <!-- GET ANY HELP -->
-
- <p>Enter terms, genes, ID numbers in the
- <b>Search</b> field<br>
- Use <b>*</b> or <b>?</b> wildcards (Cyp*a?,
- synap*)<br>
- Use <b>quotes</b> for terms such as <i>"tyrosine
- kinase"</i></p>
-
- <!-- SEARCH, MAKE DEFAULT, ADVANCED SEARCH -->
-
- <div class="form-group">
-
- <div class="col-xs-3 controls" style="width: 100px !important;">
- <input id="btsearch" type="submit" class="btn btn-primary form-control" value="Search">
- </div>
- <div class="col-xs-4 controls" style="width: 150px !important;">
- <input id="make_default" type="submit" class="btn btn-default form-control" value="Make Default">
- </div>
- <div class="col-xs-5 controls" style="width: 200px !important;">
- <input type="submit" class="btn btn-default form-control" value="Advanced Search">
- </div>
- </div>
-
- <input type="hidden" name="FormID" value="searchResult" class="form-control">
- <!--!<input type="hidden" name="RISet" value="BXD">-->
- </div>
- </fieldset>
- </form>
- </section>
- </div>
</div>
</div>
diff --git a/wqflask/wqflask/templates/new_security/login_user.html b/wqflask/wqflask/templates/new_security/login_user.html
index 3378846a..61df445c 100755
--- a/wqflask/wqflask/templates/new_security/login_user.html
+++ b/wqflask/wqflask/templates/new_security/login_user.html
@@ -2,8 +2,6 @@
{% block title %}Register{% endblock %}
{% block content %}
- {{ header("Sign in", "Gain access to GeneNetwork") }}
-
<div class="container">
<div class="page-header">
<h1>Login</h1>
@@ -20,24 +18,21 @@
<hr />
- <h4>Already have an account?</h4>
-
- <h5>Sign in here</h5>
-
+ <h4>Already have an account? Sign in here.</h4>
<form class="form-horizontal" action="/n/login" method="POST" name="login_user_form">
<fieldset>
<div class="form-group">
- <label class="col-sm-2 control-label" for="email_address">Email&nbsp;Address</label>
- <div class="col-sm-3 controls">
+ <label class="col-xs-2 control-label" for="email_address">Email&nbsp;Address</label>
+ <div class="col-xs-10">
<input id="email_address" class="focused" name="email_address" type="text" value="">
</div>
</div>
<div class="form-group">
- <label class="col-sm-2 control-label" for="password">Password</label>
- <div class="col-sm-3 controls">
+ <label class="col-xs-2 control-label" for="password">Password</label>
+ <div class="col-xs-3 controls">
<input id="password" name="password" type="password" value="">
<br />
<a href="/n/forgot_password">Forgot your password?</a><br/>
@@ -46,8 +41,8 @@
<div class="form-group">
- <label class="col-sm-2 control-label" for="remember"></label>
- <div class="col-sm-3 controls">
+ <label class="col-xs-2 control-label" for="remember"></label>
+ <div class="col-xs-3 controls">
<label class="checkbox">
<input id="remember" name="remember" type="checkbox" value="y"> Remember me
</label>
@@ -55,8 +50,8 @@
</div>
<div class="form-group">
- <label class="col-sm-2 control-label" for="submit"></label>
- <div class="col-sm-3 controls">
+ <label class="col-xs-2 control-label" for="submit"></label>
+ <div class="col-xs-3 controls">
<input id="next" name="next" type="hidden" value="">
<input class="btn btn-primary" id="submit" name="submit" type="submit" value="Sign in">
</div>
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index 4ab4e6e4..5e63a237 100755
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -11,9 +11,6 @@
'GeneNetwork found {}.'.format(numify(results|count, "record", "records"))) }}
<div class="container">
- <div class="page-header">
- <h1>Your Search</h1>
- </div>
<input type="hidden" name="uc_id" id="uc_id" value="{{ uc_id }}">
@@ -71,8 +68,9 @@
<TD>{{ this_trait.description_display }}</TD>
<TD>{{ this_trait.location_repr }}</TD>
<TD>{{ this_trait.mean }}</TD>
- <TD>{{ this_trait.LRS_score_repr }}</TD>
+ <TD align="right">{{ this_trait.LRS_score_repr }}</TD>
<TD>{{ this_trait.LRS_location_repr }}</TD>
+ <TD>{{ this_trait.additive }}</TD>
{% elif dataset.type == 'Publish' %}
<TD>{{ this_trait.description_display }}</TD>
<TD>{{ this_trait.authors }}</TD>
@@ -83,6 +81,7 @@
</TD>
<TD>{{ this_trait.LRS_score_repr }}</TD>
<TD>{{ this_trait.LRS_location_repr }}</TD>
+ <TD>{{ this_trait.additive }}</TD>
{% elif dataset.type == 'Geno' %}
<TD>{{ this_trait.location_repr }}</TD>
{% endif %}
@@ -157,11 +156,14 @@
{ "sType": "natural" },
{ "sType": "natural",
"sWidth": "35%" },
- { "sType": "natural" },
- { "sType": "cust-txt" },
+ { "sType": "natural",
+ "sWidth": "15%" },
{ "sType": "cust-txt" },
{ "sType": "natural",
- "sWidth": "15%" }
+ "sWidth": "10%" },
+ { "sType": "natural",
+ "sWidth": "15%" },
+ { "sType": "cust-txt" }
],
"columns": [
{ "width": "50%" },
diff --git a/wqflask/wqflask/templates/show_trait_calculate_correlations.html b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
index a55a03c7..63bbd7b6 100755
--- a/wqflask/wqflask/templates/show_trait_calculate_correlations.html
+++ b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
@@ -2,8 +2,8 @@
<div style="padding: 20px" class="form-horizontal">
<div class="form-group">
- <label for="corr_method" class="col-sm-1 control-label">Method</label>
- <div class="col-sm-2 controls">
+ <label for="corr_method" class="col-xs-1 control-label">Method</label>
+ <div class="col-xs-2 controls">
<select name="corr_type" class="form-control">
<option value="sample">Sample r</option>
<option value="lit">Literature r</option>
@@ -13,8 +13,8 @@
</div>
<div class="form-group">
- <label for="corr_dataset" class="col-sm-1 control-label">Database</label>
- <div class="col-sm-6 controls">
+ <label for="corr_dataset" class="col-xs-1 control-label">Database</label>
+ <div class="col-xs-6 controls">
<select name="corr_dataset" class="form-control">
{% for tissue in corr_tools.dataset_menu %}
{% if tissue.tissue %}
@@ -37,8 +37,8 @@
</div>
<div class="form-group">
- <label for="corr_return_results" class="col-sm-1 control-label">Return</label>
- <div class="col-sm-2 controls">
+ <label for="corr_return_results" class="col-xs-1 control-label">Return</label>
+ <div class="col-xs-2 controls">
<select name="corr_return_results" class="form-control">
{% for return_result in corr_tools.return_results_menu %}
<option value="{{ return_result }}"
@@ -53,8 +53,8 @@
</div>
<div class="form-group">
- <label for="corr_samples_group" class="col-sm-1 control-label">Samples</label>
- <div class="col-sm-2 controls">
+ <label for="corr_samples_group" class="col-xs-1 control-label">Samples</label>
+ <div class="col-xs-2 controls">
<select name="corr_samples_group" class="form-control">
{% for group, pretty_group in sample_group_types.items() %}
<option value="{{ group }}">{{ pretty_group }}</option>
@@ -64,8 +64,8 @@
</div>
<div class="form-group">
- <label for="corr_sample_method" class="col-sm-1 control-label">Type</label>
- <div class="col-sm-2 controls">
+ <label for="corr_sample_method" class="col-xs-1 control-label">Type</label>
+ <div class="col-xs-2 controls">
<select name="corr_sample_method" class="form-control">
<option value="pearson">Pearson</option>
<option value="spearman">Spearman Rank</option>
@@ -74,8 +74,8 @@
</div>
<div class="form-group">
- <label for="corr_sample_method" class="col-sm-1 control-label"></label>
- <div class="col-sm-4 controls">
+ <label for="corr_sample_method" class="col-xs-1 control-label"></label>
+ <div class="col-xs-4 controls">
<button class="btn submit_special btn-primary" data-url="/corr_compute" title="Compute Correlation">
<i class="icon-ok-circle icon-white"></i> Compute
</button>
@@ -83,8 +83,8 @@
</div>
<div class="form-group">
- <label for="descriptions" class="col-sm-1 control-label"></label>
- <div class="col-sm-6 controls">
+ <label for="descriptions" class="col-xs-1 control-label"></label>
+ <div class="col-xs-6 controls">
<span id="sample_r_desc" class="correlation_desc fs12">
The <a href="/correlationAnnotation.html#sample_r" target="_blank">Sample Correlation</a>
is computed
diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html
index 625de172..84ddfd53 100755
--- a/wqflask/wqflask/templates/show_trait_mapping_tools.html
+++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html
@@ -27,22 +27,22 @@
<div class="tab-pane active" id="interval_mapping">
<div style="padding: 20px" class="form-horizontal">
<div class="mapping_method_fields form-group">
- <label for="mapping_permutations" class="col-sm-1 control-label">Permutations</label>
- <div style="margin-left: 20px;" class="col-sm-1 controls">
+ <label for="mapping_permutations" class="col-xs-1 control-label">Permutations</label>
+ <div style="margin-left: 20px;" class="col-xs-2 controls">
<input name="num_perm_reaper" value="2000" type="text" class="form-control">
</div>
</div>
<div class="mapping_method_fields form-group">
- <label for="mapping_bootstraps" class="col-sm-1 control-label" title="Bootstrapping Resamples">Bootstrap</label>
- <div style="margin-left: 20px;" class="col-sm-1 controls">
+ <label for="mapping_bootstraps" class="col-xs-1 control-label" title="Bootstrapping Resamples">Bootstrap</label>
+ <div style="margin-left: 20px;" class="col-xs-2 controls">
<input name="mapping_bootstraps" value="2000" type="text" class="form-control">
</div>
</div>
<div class="mapping_method_fields form-group">
- <label class="col-sm-2 control-label">Display Additive Effect</label>
- <div class="col-sm-4 controls" id="display_additive_effect">
+ <label class="col-xs-2 control-label">Display Additive Effect</label>
+ <div class="col-xs-4 controls" id="display_additive_effect">
<label class="radio-inline">
<input type="radio" name="display_additive" id="display_additive" value="yes" checked="">
Yes
@@ -55,8 +55,8 @@
</div>
<div class="mapping_method_fields form-group">
- <label class="col-sm-2 control-label">Manhattan Plot</label>
- <div class="col-sm-4 controls">
+ <label class="col-xs-2 control-label">Manhattan Plot</label>
+ <div class="col-xs-4 controls">
<label class="radio-inline">
<input type="radio" name="manhattan_plot_reaper" value="true">
Yes
@@ -69,8 +69,8 @@
</div>
</div>
<div class="form-group">
- <label for="interval_mapping_submit" class="col-sm-1 control-label"></label>
- <div style="margin-left:35px;" class="col-sm-4 controls">
+ <label for="interval_mapping_submit" class="col-xs-1 control-label"></label>
+ <div style="margin-left:35px;" class="col-xs-4 controls">
<button id="interval_mapping_compute" class="btn submit_special btn-primary" data-url="/interval_mapping" title="Compute Interval Mapping">
<i class="icon-ok-circle icon-white"></i> Compute
</button>
@@ -82,8 +82,8 @@
<div class="tab-pane" id="pylmm">
<div style="padding: 20px" class="form-horizontal">
<div class="mapping_method_fields form-group">
- <label for="mapping_permutations" class="col-sm-1 control-label">Permutations</label>
- <div style="margin-left: 20px;" class="col-sm-1 controls">
+ <label for="mapping_permutations" class="col-xs-1 control-label">Permutations</label>
+ <div style="margin-left: 20px;" class="col-xs-2 controls">
<input name="num_perm_pylmm" value="2000" type="text" class="form-control">
</div>
</div>
@@ -91,8 +91,8 @@
Please be aware that permutations can take a very long time (~20 minutes for 500 permutations)
</div>
<div class="mapping_method_fields form-group">
- <label class="col-sm-1 control-label">Manhattan Plot</label>
- <div style="margin-left:20px;" class="col-sm-4 controls">
+ <label class="col-xs-1 control-label">Manhattan Plot</label>
+ <div style="margin-left:20px;" class="col-xs-4 controls">
<label class="radio-inline">
<input type="radio" name="manhattan_plot_pylmm" value="true">
Yes
@@ -112,8 +112,8 @@
</div>
<div class="form-group">
- <label for="marker_regression_submit" class="col-sm-1 control-label"></label>
- <div style="margin-left:20px;" class="col-sm-4 controls">
+ <label for="marker_regression_submit" class="col-xs-1 control-label"></label>
+ <div style="margin-left:20px;" class="col-xs-4 controls">
<button id="pylmm_compute" class="btn submit_special btn-primary" data-url="/marker_regression" title="Compute Marker Regression">
Compute
</button>
@@ -126,8 +126,8 @@
<div style="padding: 20px" class="form-horizontal">
<div class="mapping_method_fields form-group">
- <label for="mapping_permutations" class="col-sm-1 control-label">Permutations</label>
- <div style="margin-left: 20px;" class="col-sm-1 controls">
+ <label for="mapping_permutations" class="col-xs-1 control-label">Permutations</label>
+ <div style="margin-left: 20px;" class="col-xs-2 controls">
<input name="num_perm_rqtl_geno" value="500" type="text" class="form-control">
</div>
</div>
@@ -135,8 +135,8 @@
Please be aware that permutations can take a very long time (~20 minutes for 500 permutations)
</div>
<div class="mapping_method_fields form-group">
- <label for="mapping_permutations" class="col-sm-1 control-label">Control&nbsp;for</label>
- <div style="margin-left: 20px;" class="col-sm-2 controls">
+ <label for="mapping_permutations" class="col-xs-1 control-label">Control&nbsp;for</label>
+ <div style="margin-left: 20px;" class="col-xs-2 controls">
{% if dataset.type == 'ProbeSet' and this_trait.locus_chr != "" %}
<input name="control_rqtl_geno" value="{{ nearest_marker1+","+nearest_marker2 }}" type="text" />
{% else %}
@@ -145,8 +145,8 @@
</div>
</div>
<div class="mapping_method_fields form-group">
- <label class="col-sm-1 control-label">Manhattan&nbsp;Plot</label>
- <div style="margin-left:20px;" class="col-sm-4 controls">
+ <label class="col-xs-1 control-label">Manhattan&nbsp;Plot</label>
+ <div style="margin-left:35px;" class="col-xs-4 controls">
<label class="radio-inline">
<input type="radio" name="manhattan_plot_rqtl" value="true">
Yes
@@ -160,8 +160,8 @@
</div>
<div class="form-group">
- <label for="marker_regression_submit" class="col-sm-1 control-label"></label>
- <div style="margin-left:20px;" class="col-sm-4 controls">
+ <label for="marker_regression_submit" class="col-xs-1 control-label"></label>
+ <div style="margin-left:20px;" class="col-xs-4 controls">
<button id="rqtl_geno_compute" class="btn submit_special btn-primary" data-url="/marker_regression" title="Compute Marker Regression">
<i class="icon-ok-circle icon-white"></i> Compute
</button>
@@ -175,16 +175,16 @@
<div class="tab-pane" id="plink">
<div style="padding: 20px" class="form-horizontal">
<div class="mapping_method_fields form-group">
- <label for="maf_plink" class="col-sm-2 control-label">Minor allele threshold</label>
- <div style="margin-left: 20px;" class="col-sm-1 controls">
+ <label for="maf_plink" class="col-xs-2 control-label">Minor allele threshold</label>
+ <div style="margin-left: 20px;" class="col-xs-1 controls">
<input name="maf_plink" value="0.01" type="text" class="form-control">
</div>
</div>
</div>
<div class="form-group">
- <label for="gemma_compute" class="col-sm-1 control-label"></label>
- <div style="margin-left:20px;" class="col-sm-4 controls">
+ <label for="gemma_compute" class="col-xs-1 control-label"></label>
+ <div style="margin-left:20px;" class="col-xs-4 controls">
<button id="gemma_compute" class="btn submit_special btn-primary" data-url="/marker_regression" title="Compute Marker Regression">
Compute
</button>
@@ -197,16 +197,16 @@
<div class="tab-pane" id="gemma">
<div style="padding: 20px" class="form-horizontal">
<div class="mapping_method_fields form-group">
- <label for="maf_gemma" class="col-sm-2 control-label">Minor allele threshold</label>
- <div style="margin-left: 20px;" class="col-sm-1 controls">
+ <label for="maf_gemma" class="col-xs-2 control-label">Minor allele threshold</label>
+ <div style="margin-left: 20px;" class="col-xs-1 controls">
<input name="maf_gemma" value="0.01" type="text" class="form-control">
</div>
</div>
</div>
<div class="form-group">
- <label for="plink_compute" class="col-sm-1 control-label"></label>
- <div style="margin-left:20px;" class="col-sm-4 controls">
+ <label for="plink_compute" class="col-xs-1 control-label"></label>
+ <div style="margin-left:20px;" class="col-xs-4 controls">
<button id="plink_compute" class="btn submit_special btn-primary" data-url="/marker_regression" title="Compute Marker Regression">
Compute
</button>
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index b89b2aeb..cdf93147 100755
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -110,7 +110,7 @@ def search_page():
else:
return render_template("data_sharing.html", **template_vars.__dict__)
else:
- key = "search_results:v5:" + json.dumps(request.args, sort_keys=True)
+ key = "search_results:v1:" + json.dumps(request.args, sort_keys=True)
print("key is:", pf(key))
with Bench("Loading cache"):
result = Redis.get(key)