Values of record {{ this_trait.name }} in the {{ dataset.fullname }}
@@ -59,6 +59,10 @@
WebGestalt
+
+
diff --git a/wqflask/wqflask/templates/geneweaver_page.html b/wqflask/wqflask/templates/geneweaver_page.html
new file mode 100644
index 00000000..91fca85b
--- /dev/null
+++ b/wqflask/wqflask/templates/geneweaver_page.html
@@ -0,0 +1,35 @@
+{% extends "base.html" %}
+{% block title %}{% if wrong_input == "True" %}WebGestalt Error{% else %}Opening WebGestalt{% endif %}{% endblock %}
+{% block content %}
+ {% if wrong_input == "True" %}
+ {{ header("Error") }}
+
+
+ {% if chip_name == "mixed" %}
+
Sorry, the analysis was interrupted because your selections from GeneNetwork apparently include data from more than one array platform (i.e., Affymetrix U74A and M430 2.0). Most WebGestalt analyses assume that you are using a single array type and compute statistical values on the basis of that particular array. Please reselect traits from a signle platform and submit again.
+ {% elif chip_name == "not_microarray" %}
+ You need to select at least one microarray trait to submit.
+ {% elif '_NA' in chip_name %}
+ Sorry, the analysis was interrupted because your selections from GeneNetwork apparently include data from platform {{ chip_name }} which is unknown by GeneWeaver. Please reselect traits and submit again.
+ {% else %}
+ Sorry, an error occurred while submitting your traits to GeneWeaver.
+ {% endif %}
+
+ {% else %}
+
+
Opening GeneWeaver...
+
+
+ {% endif %}
+{% endblock %}
+{% block js %}
+{% if wrong_input == "False" %}
+
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/wqflask/wqflask/templates/gsearch_gene.html b/wqflask/wqflask/templates/gsearch_gene.html
index 66073555..ebebd044 100644
--- a/wqflask/wqflask/templates/gsearch_gene.html
+++ b/wqflask/wqflask/templates/gsearch_gene.html
@@ -62,6 +62,13 @@
} );
};
+ $.fn.dataTable.ext.order['dom-inner-text'] = function ( settings, col )
+ {
+ return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) {
+ return $(td).text();
+ } );
+ }
+
$(document).ready( function () {
$('#trait_table tr').click(function(event) {
@@ -115,6 +122,7 @@
'title': "Record",
'type': "natural",
'data': null,
+ 'orderDataType': "dom-inner-text",
'render': function(data, type, row, meta) {
return '
' + data.name + ''
}
diff --git a/wqflask/wqflask/templates/gsearch_pheno.html b/wqflask/wqflask/templates/gsearch_pheno.html
index 168b2846..96a5d71a 100644
--- a/wqflask/wqflask/templates/gsearch_pheno.html
+++ b/wqflask/wqflask/templates/gsearch_pheno.html
@@ -62,6 +62,13 @@
} );
};
+ $.fn.dataTable.ext.order['dom-inner-text'] = function ( settings, col )
+ {
+ return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) {
+ return $(td).text();
+ } );
+ }
+
$(document).ready( function () {
$('#trait_table tr').click(function(event) {
@@ -144,6 +151,7 @@
'title': "Year",
'type': "natural",
'data': null,
+ 'orderDataType': "dom-inner-text",
'render': function(data, type, row, meta) {
if (data.pubmed_id != "N/A"){
return '
' + data.pubmed_text + ''
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index db6bc15d..36a25665 100644
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -44,6 +44,9 @@
To study a record click on its ID below, and to view the whole description {% if dataset.type == "Publish" %}or list of authors {% endif %} hover over the table cell. Check records below and click Add button to add to selection.
+
+
+
@@ -86,6 +89,10 @@
WebGestalt
+
+
@@ -149,6 +156,13 @@
} );
};
+ $.fn.dataTable.ext.order['dom-inner-text'] = function ( settings, col )
+ {
+ return this.api().column( col, {order:'index'} ).nodes().map( function ( td, i ) {
+ return $(td).text();
+ } );
+ }
+
$(document).ready( function () {
$('#trait_table tr').click(function(event) {
@@ -261,6 +275,7 @@
'title': "Record",
'type': "natural",
'data': null,
+ 'orderDataType': "dom-inner-text",
'render': function(data, type, row, meta) {
return '
' + data.name + ''
}
@@ -316,6 +331,7 @@
{
'title': "Year",
'type': "natural",
+ 'orderDataType': "dom-inner-text",
'data': null,
'render': function(data, type, row, meta) {
if (data.pubmed_id != "N/A"){
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 7c2ed80d..cd2e047b 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -43,7 +43,7 @@ from base.data_set import DataSet # Used by YAML in marker_regression
from wqflask.show_trait import show_trait
from wqflask.show_trait import export_trait_data
from wqflask.heatmap import heatmap
-from wqflask.external_tools import send_to_bnw, send_to_webgestalt
+from wqflask.external_tools import send_to_bnw, send_to_webgestalt, send_to_geneweaver
from wqflask.comparison_bar_chart import comparison_bar_chart
from wqflask.marker_regression import run_mapping
from wqflask.marker_regression import display_mapping_results
@@ -499,7 +499,25 @@ def webgestalt_page():
result = template_vars.__dict__
rendered_template = render_template("webgestalt_page.html", **result)
else:
- rendered_template = render_template("empty_collection.html", **{'tool':'BNW'})
+ rendered_template = render_template("empty_collection.html", **{'tool':'WebGestalt'})
+
+ return rendered_template
+
+@app.route("/geneweaver_page", methods=('POST',))
+def geneweaver_page():
+ logger.info("In run WebGestalt, request.form is:", pf(request.form))
+ logger.info(request.url)
+
+ start_vars = request.form
+
+ traits = [trait.strip() for trait in start_vars['trait_list'].split(',')]
+ if traits[0] != "":
+ template_vars = send_to_geneweaver.SendToGeneWeaver(request.form)
+
+ result = template_vars.__dict__
+ rendered_template = render_template("geneweaver_page.html", **result)
+ else:
+ rendered_template = render_template("empty_collection.html", **{'tool':'GeneWeaver'})
return rendered_template
--
cgit v1.2.3