From 79b232f79370a7ad0ba1daf4849a0f0403754ab1 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <antgonza@gmail.com>
Date: Wed, 16 Aug 2017 07:41:21 -0600
Subject: [PATCH 1/2] fix #2229

---
 .../handlers/study_handlers/prep_template.py  |  3 +-
 .../study_ajax/prep_summary_table.html        | 63 +++++++++++--------
 2 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/qiita_pet/handlers/study_handlers/prep_template.py b/qiita_pet/handlers/study_handlers/prep_template.py
index 78bc6dade..401c72986 100644
--- a/qiita_pet/handlers/study_handlers/prep_template.py
+++ b/qiita_pet/handlers/study_handlers/prep_template.py
@@ -48,7 +48,8 @@ def get(self):
         res = prep_template_summary_get_req(prep_id, self.current_user.id)
 
         self.render('study_ajax/prep_summary_table.html', pid=prep_id,
-                    stats=res['summary'], editable=res['editable'])
+                    stats=res['summary'], editable=res['editable'],
+                    num_samples=res['num_samples'])
 
 
 class PrepTemplateAJAX(BaseHandler):
diff --git a/qiita_pet/templates/study_ajax/prep_summary_table.html b/qiita_pet/templates/study_ajax/prep_summary_table.html
index 024dafb57..2a2cac913 100644
--- a/qiita_pet/templates/study_ajax/prep_summary_table.html
+++ b/qiita_pet/templates/study_ajax/prep_summary_table.html
@@ -4,39 +4,48 @@
   });
 </script>
 
-
-{% from future.utils import viewitems %}
 <div class="panel panel-default">
   <div class="panel-heading">
     Information summary
   </div>
   <div id="summary-table-div">
-    <table class="table">
-      {% for i, (category, summary) in enumerate(stats, -1) %}
-        <tr id="row_{{i}}">
-          <td>
-              <a class="btn btn-danger" onclick="delete_prep_column({{pid}}, '{{category}}', {{i}});"><span class="glyphicon glyphicon-trash"></span></a>
-          </td>
-        {% if len(summary) == 1 %}
-          <td colspan="2">
-            <b>{{category}}</b>: <tt>{{summary[0][0]}}</tt> is repeated in all rows.
-          </td>
-        {% elif len(set([row[1] for row in summary])) == 1 %}
-          <td colspan="2">
-            <b>{{category}}</b>: All the values in this category are different.
-          </td>
-        {% else %}
-          <th colspan="2" align="center">{{category}}</th>
-          {% for row in summary %}
-            <tr>
-              <td width="5px">&nbsp;</td>
-              <td>{{row[0]}}</td>
-              <td>{{row[1]}}</td>
+
+        <table class="table">
+          {% for i, (category, summary) in enumerate(stats, -1) %}
+            <tr id="row_{{i}}">
+              <td>
+                {% if editable %}
+                <a class="btn btn-danger" onclick="delete_prep_column({{pid}}, '{{category}}', {{i}});"><span class="glyphicon glyphicon-trash"></span></a>
+                {% else %}
+                  &nbsp;
+                {% end %}
+              </td>
+              <td colspan="2">
+                {% if len(summary) == 1 %}
+                    <b>{{category}}</b>: <tt>{{summary[0][0]}}</tt> is repeated in all rows.
+                </td>
+                {% elif len(summary) == num_samples %}
+                    <b>{{category}}</b>: All the values in this category are different.
+                  </td>
+                {% else %}
+                    <b>{{category}}<b>
+                    &nbsp;&nbsp;&nbsp;&nbsp;
+                    <button type="button" class="btn" data-toggle="collapse" data-target=".{{i}}collapsed">values</button>
+                  </td>
+                  {% for row in summary %}
+                  </tr>
+                  <tr class="collapse {{i}}collapsed">
+                    <td>&nbsp;</td>
+                    <td>{{row[0]}}</td>
+                    <td>{{row[1]}}</td>
+                  {% end %}
+              {% end %}
             </tr>
           {% end %}
-        {% end %}
-        </tr>
-      {% end %}
-    </table>
+        </table>
+
+
+
+
   </div>
 </div>

From 2d48a65907f21371e86a0d9ad312c77b1e1650b2 Mon Sep 17 00:00:00 2001
From: Antonio Gonzalez <antgonza@gmail.com>
Date: Wed, 16 Aug 2017 07:42:17 -0600
Subject: [PATCH 2/2] cleaning html

---
 .../study_ajax/prep_summary_table.html        | 63 +++++++++----------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/qiita_pet/templates/study_ajax/prep_summary_table.html b/qiita_pet/templates/study_ajax/prep_summary_table.html
index 2a2cac913..cb8c19ee6 100644
--- a/qiita_pet/templates/study_ajax/prep_summary_table.html
+++ b/qiita_pet/templates/study_ajax/prep_summary_table.html
@@ -10,42 +10,39 @@
   </div>
   <div id="summary-table-div">
 
-        <table class="table">
-          {% for i, (category, summary) in enumerate(stats, -1) %}
-            <tr id="row_{{i}}">
-              <td>
-                {% if editable %}
-                <a class="btn btn-danger" onclick="delete_prep_column({{pid}}, '{{category}}', {{i}});"><span class="glyphicon glyphicon-trash"></span></a>
-                {% else %}
-                  &nbsp;
-                {% end %}
+    <table class="table">
+      {% for i, (category, summary) in enumerate(stats, -1) %}
+        <tr id="row_{{i}}">
+          <td>
+            {% if editable %}
+            <a class="btn btn-danger" onclick="delete_prep_column({{pid}}, '{{category}}', {{i}});"><span class="glyphicon glyphicon-trash"></span></a>
+            {% else %}
+              &nbsp;
+            {% end %}
+          </td>
+          <td colspan="2">
+            {% if len(summary) == 1 %}
+                <b>{{category}}</b>: <tt>{{summary[0][0]}}</tt> is repeated in all rows.
+            </td>
+            {% elif len(summary) == num_samples %}
+                <b>{{category}}</b>: All the values in this category are different.
               </td>
-              <td colspan="2">
-                {% if len(summary) == 1 %}
-                    <b>{{category}}</b>: <tt>{{summary[0][0]}}</tt> is repeated in all rows.
-                </td>
-                {% elif len(summary) == num_samples %}
-                    <b>{{category}}</b>: All the values in this category are different.
-                  </td>
-                {% else %}
-                    <b>{{category}}<b>
-                    &nbsp;&nbsp;&nbsp;&nbsp;
-                    <button type="button" class="btn" data-toggle="collapse" data-target=".{{i}}collapsed">values</button>
-                  </td>
-                  {% for row in summary %}
-                  </tr>
-                  <tr class="collapse {{i}}collapsed">
-                    <td>&nbsp;</td>
-                    <td>{{row[0]}}</td>
-                    <td>{{row[1]}}</td>
-                  {% end %}
+            {% else %}
+                <b>{{category}}<b>
+                &nbsp;&nbsp;&nbsp;&nbsp;
+                <button type="button" class="btn" data-toggle="collapse" data-target=".{{i}}collapsed">values</button>
+              </td>
+              {% for row in summary %}
+              </tr>
+              <tr class="collapse {{i}}collapsed">
+                <td>&nbsp;</td>
+                <td>{{row[0]}}</td>
+                <td>{{row[1]}}</td>
               {% end %}
-            </tr>
           {% end %}
-        </table>
-
-
-
+        </tr>
+      {% end %}
+    </table>
 
   </div>
 </div>