aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask')
-rwxr-xr-xwqflask/wqflask/templates/search_result_page.html43
-rwxr-xr-xwqflask/wqflask/views.py13
2 files changed, 10 insertions, 46 deletions
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index d7f67f74..7b3df00f 100755
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -62,8 +62,9 @@
</div>
<br />
<br />
--->
{% endif %}
+-->
+
<div id="table_container">
<table class="table table-hover table-striped" id='trait_table' {% if dataset.type == 'Geno' %}width="400px"{% endif %} style="float: left;">
<thead>
@@ -163,39 +164,6 @@
}
- function filtering( oSettings, aData, iDataIndex, column) {
- var iColumn = column;
- if (document.getElementById('min').value){
- var iMin = document.getElementById('min').value * 1;
- } else {
- var iMin = 0
- }
- if (document.getElementById('max').value){
- var iMax = document.getElementById('max').value * 1;
- } else {
- var iMax = 10000
- }
-
- var iVersion = aData[iColumn] == "-" ? 0 : aData[iColumn]*1;
- if ( iMin === "" && iMax === "" )
- {
- return true;
- }
- else if ( iMin === "" && iVersion < iMax )
- {
- return true;
- }
- else if ( iMin < iVersion && "" === iMax )
- {
- return true;
- }
- else if ( iMin < iVersion && iVersion < iMax )
- {
- return true;
- }
- return false;
- }
-
jQuery.fn.dataTableExt.oSort['cust-txt-asc'] = function (a, b) {
var x = getValue(a);
var y = getValue(b);
@@ -310,13 +278,6 @@
table.colReorder.reset()
});
- $('#min').keyup( function() { table.draw(); } );
- $('#max').keyup( function() { table.draw(); } );
-
- $('#open_options').click( function () {
- $('#extra_options').toggle();
- });
-
});
</script>
{% endblock %}
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index dc199ab2..ba96428d 100755
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -42,6 +42,7 @@ from wqflask.show_trait import show_trait
from wqflask.show_trait import export_trait_data
from wqflask.heatmap import heatmap
from wqflask.marker_regression import marker_regression
+#from wqflask.marker_regression import marker_regression_gn1
from wqflask.interval_mapping import interval_mapping
from wqflask.correlation import show_corr_results
from wqflask.correlation_matrix import show_corr_matrix
@@ -132,7 +133,7 @@ def search_page():
else:
return render_template("data_sharing.html", **template_vars.__dict__)
else:
- key = "search_results:v2:" + json.dumps(request.args, sort_keys=True)
+ key = "search_results:v3:" + json.dumps(request.args, sort_keys=True)
print("key is:", pf(key))
with Bench("Loading cache"):
result = Redis.get(key)
@@ -351,7 +352,7 @@ def marker_regression_page():
if key in wanted or key.startswith(('value:')):
start_vars[key] = value
- version = "v3"
+ version = "v4"
key = "marker_regression:{}:".format(version) + json.dumps(start_vars, sort_keys=True)
print("key is:", pf(key))
with Bench("Loading cache"):
@@ -374,14 +375,15 @@ def marker_regression_page():
indent=" ")
result = template_vars.__dict__
-
- print("DATASET:", pf(result['dataset']))
+ print("initial result:", result['qtl_results'])
for item in template_vars.__dict__.keys():
print(" ---**--- {}: {}".format(type(template_vars.__dict__[item]), item))
#causeerror
+ #gn1_template_vars = marker_regression_gn1.MarkerRegression(template_vars)
+
#qtl_length = len(result['js_data']['qtl_results'])
#print("qtl_length:", qtl_length)
pickled_result = pickle.dumps(result, pickle.HIGHEST_PROTOCOL)
@@ -402,7 +404,8 @@ def marker_regression_page():
result['pair_scan_array'] = bytesarray
rendered_template = render_template("pair_scan_results.html", **result)
else:
- rendered_template = render_template("marker_regression.html", **result)
+ #rendered_template = render_template("marker_regression.html", **result)
+ rendered_template = render_template("marker_regression_gn1.html", **result)
return rendered_template