From 1f32d6a71beec407ffdf0ef5b17240ee07d68939 Mon Sep 17 00:00:00 2001
From: DannyArends
Date: Thu, 24 Mar 2016 20:33:46 +0100
Subject: Working on the output template of CTL

---
 wqflask/wqflask/templates/ctl_results.html | 25 +++++++++++++++++++++++--
 wqflask/wqflask/templates/ctl_setup.html   |  2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/wqflask/wqflask/templates/ctl_results.html b/wqflask/wqflask/templates/ctl_results.html
index e2adbdfe..914c1d43 100644
--- a/wqflask/wqflask/templates/ctl_results.html
+++ b/wqflask/wqflask/templates/ctl_results.html
@@ -4,14 +4,35 @@
 {% block content %} <!-- Start of body -->
 <div class="container">
   <h1>CTL Results</h1>
-  {{request.form['trait_list'].split(',')|length}} phenotypes as input
-
+  {{(request.form['trait_list'].split(',')|length -1)}} phenotypes as input<br>
+  <h3>Figure</h3>
   <a href="/tmp/{{ results['imgurl'] }}">
       <img alt="Embedded Image" src="data:image/png;base64,
       {% for elem in results['imgdata'] -%}
       {% print("%c"|format(elem)) %}
       {%- endfor %}
       " /></a>
+  <h3>Tabular results</h3>
+  <table width="80%">
+  <tr><th>trait</th><th>marker</th><th>trait</th><th>LOD</th><th>dCor</th></tr>
+  significant CTL:<br>
+  {% for r in range(results['ctlresult'][0]|length) %}
+    <tr>
+    {% for c in range(results['ctlresult']|length) %}
+      <td>
+      {% if c > 2 %}
+      {{results['ctlresult'][c][r]|float|round(2)}}
+      {% else %}
+      {{results['ctlresult'][c][r]}}
+      {% endif %}
+      </td>
+    {% endfor %}
+    </tr>
+  {% endfor %}
+  </table>
+
+
+
 
 </div>
 {% endblock %}
diff --git a/wqflask/wqflask/templates/ctl_setup.html b/wqflask/wqflask/templates/ctl_setup.html
index 070a97b4..0ba281c6 100644
--- a/wqflask/wqflask/templates/ctl_setup.html
+++ b/wqflask/wqflask/templates/ctl_setup.html
@@ -4,7 +4,7 @@
 {% block content %} <!-- Start of body -->
 <div class="container">
   <h1>CTL analysis parameters</h1>
-  {{request.form['trait_list'].split(',')|length}} phenotypes as input
+  {{(request.form['trait_list'].split(',')|length -1)}} phenotypes as input
 
 <form action="/ctl_results" method="post" class="form-horizontal">
 	<input type="hidden" name="trait_list" id="trait_list" value= "{{request.form['trait_list']}}">
-- 
cgit v1.2.3