From 7303dc04e7d129d6751d2875f5841da102bf6fd8 Mon Sep 17 00:00:00 2001
From: DannyArends
Date: Fri, 11 Sep 2015 17:49:02 +0200
Subject: Adding a custom wgcna route in gn2, and adding a button to the
 collections/view.html

---
 wqflask/wqflask/templates/collections/view.html | 12 ++++++++++++
 wqflask/wqflask/templates/wcgna_results.html    |  9 ---------
 wqflask/wqflask/templates/wgcna_results.html    |  9 +++++++++
 wqflask/wqflask/views.py                        |  4 ++++
 4 files changed, 25 insertions(+), 9 deletions(-)
 delete mode 100644 wqflask/wqflask/templates/wcgna_results.html
 create mode 100644 wqflask/wqflask/templates/wgcna_results.html

(limited to 'wqflask')

diff --git a/wqflask/wqflask/templates/collections/view.html b/wqflask/wqflask/templates/collections/view.html
index 29c65058..f3e9f1b9 100755
--- a/wqflask/wqflask/templates/collections/view.html
+++ b/wqflask/wqflask/templates/collections/view.html
@@ -38,6 +38,18 @@
                     <input type="submit" class="btn btn-primary" value="Correlation Matrix" />
                 </div>
             </form>
+            <form action="/wgcna" method="post">
+                {% if uc %}
+                <input type="hidden" name="uc_id" id="uc_id" value="{{ uc.id }}" />
+                {% endif %}
+                <input type="hidden" name="trait_list" id="trait_list" value= "
+                {% for this_trait in trait_obs %}
+                    {{ this_trait.name }}:{{ this_trait.dataset.name }},
+                {% endfor %}" >
+                <div class="col-xs-2 controls">
+                    <input type="submit" class="btn btn-primary" value="WGCNA Analysis" />
+                </div>
+            </form>
             <form action="/heatmap" method="post">
                 {% if uc %}
                 <input type="hidden" name="uc_id" id="uc_id" value="{{ uc.id }}" />
diff --git a/wqflask/wqflask/templates/wcgna_results.html b/wqflask/wqflask/templates/wcgna_results.html
deleted file mode 100644
index b74b84ae..00000000
--- a/wqflask/wqflask/templates/wcgna_results.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "base.html" %}
-{% block title %}WCGNA results{% endblock %}
-
-{% block content %} <!-- Start of body -->
-  <div>
-    <h1>WCGNA results</h1>
-  </div>
-{% endblock %}
-
diff --git a/wqflask/wqflask/templates/wgcna_results.html b/wqflask/wqflask/templates/wgcna_results.html
new file mode 100644
index 00000000..b74b84ae
--- /dev/null
+++ b/wqflask/wqflask/templates/wgcna_results.html
@@ -0,0 +1,9 @@
+{% extends "base.html" %}
+{% block title %}WCGNA results{% endblock %}
+
+{% block content %} <!-- Start of body -->
+  <div>
+    <h1>WCGNA results</h1>
+  </div>
+{% endblock %}
+
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 3cff9a0c..acbbf203 100755
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -174,6 +174,10 @@ def help():
     doc = docs.Docs("help")
     return render_template("docs.html", **doc.__dict__)
 
+@app.route("/wgcna", methods=('POST',))
+def wcgna():
+    return render_template("wgcna_results.html")
+
 @app.route("/news")
 def news_route():
     newsobject = news.News()
-- 
cgit v1.2.3