aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
Diffstat (limited to 'wqflask')
-rwxr-xr-xwqflask/wqflask/show_trait/DataEditingPage.py24
-rw-r--r--wqflask/wqflask/templates/trait_data_and_analysis.html11
-rw-r--r--wqflask/wqflask/views.py24
3 files changed, 42 insertions, 17 deletions
diff --git a/wqflask/wqflask/show_trait/DataEditingPage.py b/wqflask/wqflask/show_trait/DataEditingPage.py
index b1cf5a32..81bb3a92 100755
--- a/wqflask/wqflask/show_trait/DataEditingPage.py
+++ b/wqflask/wqflask/show_trait/DataEditingPage.py
@@ -6,6 +6,8 @@ import cPickle
from collections import OrderedDict
#import pyXLWriter as xl
+import yaml
+
from htmlgen import HTMLgen2 as HT
from base import webqtlConfig
@@ -210,6 +212,28 @@ class DataEditingPage(templatePage):
self.thisTrait = thisTrait
self.hddn = hddn
+ self.basic_table = {}
+ self.basic_table['rows'] = yaml.load("""
+ - N of Samples
+ - Mean
+ - Median
+ - Standard Error (SE)
+ - Standard Deviation (SD)
+ - Minimum
+ - Maximum
+ - Range (log2)
+ - Range (fold)
+ - Interquartile Range
+ """)
+
+ self.basic_table['columns'] = yaml.load("""
+ - All Cases
+ - BXD Only
+ - Non-BXD Only
+ """)
+
+ print(pf(self.basic_table))
+
##########################################
## Function to display header
##########################################
diff --git a/wqflask/wqflask/templates/trait_data_and_analysis.html b/wqflask/wqflask/templates/trait_data_and_analysis.html
index 1916a10c..0304aa03 100644
--- a/wqflask/wqflask/templates/trait_data_and_analysis.html
+++ b/wqflask/wqflask/templates/trait_data_and_analysis.html
@@ -258,6 +258,8 @@
//-->
</script>
+ <table cellpadding="0" cellspacing="0" border="0" class="display" id="stats_dyn"></table>
+
<table class="target2" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td>
@@ -3109,13 +3111,10 @@
</table>
</td>
</tr>
- <script>
- console.log("test inline")
- </script>
+
+ <script type="text/javascript" src="/static/new/packages/DataTables/js/trait_data_and_analysis.js"></script>
<script type="text/javascript" src="/static/new/javascript/trait_data_and_analysis.js"></script>
- <script>
- console.log("test inline - after")
- </script>
+
<!-- End of body -->
{% endblock %}
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 55d6ffe2..caad811f 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -22,12 +22,22 @@ def index_page():
return render_template("index_page.html")
+@app.route("/data_sharing")
+def data_sharing():
+ print("In data_sharing")
+ fd = webqtlFormData.webqtlFormData(request.args)
+ print("1Have fd")
+ template_vars = SharingInfoPage.SharingInfoPage(fd)
+ print("1 Made it to rendering")
+ return template_vars
+
@app.route("/search")
def search():
if 'info_database' in request.args:
print("Going to sharing_info_page")
template_vars = sharing_info_page()
if template_vars.redirect_url:
+ print("Going to redirect")
return flask.redirect(template_vars.redirect_url)
else:
return render_template("data_sharing.html", **template_vars.__dict__)
@@ -35,14 +45,7 @@ def search():
the_search = search_results.SearchResultPage(request.args)
return render_template("search_result_page.html", **the_search.__dict__)
-@app.route("/data_sharing")
-def data_sharing():
- print("In data_sharing")
- fd = webqtlFormData.webqtlFormData(request.args)
- print("Have fd")
- template_vars = SharingInfoPage.SharingInfoPage(fd)
- print("Made it to rendering")
- return template_vars
+
@app.route("/showDatabaseBXD")
@@ -59,8 +62,7 @@ def showDatabaseBXD():
def sharing_info_page():
print("In sharing_info_page")
fd = webqtlFormData.webqtlFormData(request.args)
- print("Have fd")
- print("SharingInfoPage is:", SharingInfoPage)
+ print("2Have fd")
template_vars = SharingInfoPage.SharingInfoPage(fd)
- print("Made it to rendering")
+ print("2 Made it to rendering")
return template_vars