From cb4a288ab65210fdd5ff182ed2c6aaad83b55a41 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Wed, 30 Mar 2022 16:42:29 -0500
Subject: [PATCH] fix: separate tables on team review page. Fixes #3679.
 (#3770)

---
 ietf/templates/group/review_requests.html | 69 ++++++++++++++---------
 1 file changed, 42 insertions(+), 27 deletions(-)

diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index d54ec29ba..e7ac1891b 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -24,12 +24,10 @@
                 <th data-sort="type">Type</th>
                 <th data-sort="date">Requested</th>
                 <th data-sort="date">Deadline</th>
-                <th data-sort="reviewer">Reviewer</th>
                 <th data-sort="state">Document state</th>
                 <th data-sort="date">IESG Telechat</th>
             </tr>
         </thead>
-        {% if unassigned_review_requests %}
             <tbody>
                 <tr class="table-info" id="unassigned-review-requests">
                     <th colspan="7">Unassigned review requests</th>
@@ -60,13 +58,6 @@
                                           title="{{ r.due }} day{{ r.due|pluralize }} past deadline">{{ r.due }} day{{ r.due|pluralize }}</span>
                                 {% endif %}
                             </td>
-                            <td>
-                                {% if r.reviewer %}
-                                    {% person_link r.reviewer.person %}
-                                    {% if r.state_id == "accepted" %}<span class="badge bg-success">Accepted</span>{% endif %}
-                                    {% if r.reviewer_unavailable %}<span class="badge bg-danger">Unavailable</span>{% endif %}
-                                {% endif %}
-                            </td>
                             <td>{{ r.doc.friendly_state }}</td>
                             <td>
                                 {% if r.doc.telechat_date %}{{ r.doc.telechat_date }}{% endif %}
@@ -74,8 +65,19 @@
                         </tr>
                     {% endfor %}
                 </tbody>
-            {% endif %}
-            {% if open_review_assignments %}
+            </table>
+            <table class="table table-sm table-striped tablesorter">
+                <thead>
+                    <tr>
+                        <th data-sort="request">Request</th>
+                        <th data-sort="type">Type</th>
+                        <th data-sort="date">Requested</th>
+                        <th data-sort="date">Deadline</th>
+                        <th data-sort="reviewer">Reviewer</th>
+                        <th data-sort="state">Document state</th>
+                        <th data-sort="date">IESG Telechat</th>
+                    </tr>
+                </thead>
                 <tbody>
                     <tr class="table-info" id="open_review_assignments">
                         <th colspan="7">Open review requests</th>
@@ -111,7 +113,6 @@
                     {% endfor %}
                 </tbody>
             </table>
-        {% endif %}
         <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignments</h2>
         <form class="closed-review-filter" action="#closed-review-requests">
             Past:
@@ -133,7 +134,7 @@
                         Type
                     </th>
                     <th data-sort="date">
-                        Requested/Assigned
+                        Requested
                     </th>
                     <th data-sort="date">
                         Deadline
@@ -141,18 +142,11 @@
                     <th data-sort="date">
                         Closed
                     </th>
-                    <th data-sort="reviewer">
-                        Reviewer
-                    </th>
                     <th data-sort="state">
                         State
                     </th>
-                    <th data-sort="result">
-                        Result
-                    </th>
                 </tr>
             </thead>
-            {% if closed_review_requests %}
                 <tbody>
                     <tr class="table-info">
                         <th colspan="8">
@@ -180,18 +174,40 @@
                             <td>
                                 {{ r.request_closed_time|date:"Y-m-d" }}
                             </td>
-                            <td>
-                            </td>
                             <td>
                                 {{ r.state.name }}
                             </td>
-                            <td>
-                            </td>
                         </tr>
                     {% endfor %}
                 </tbody>
-            {% endif %}
-            {% if closed_review_assignments %}
+            </table>
+            <table class="table table-sm table-striped tablesorter">
+                <thead>
+                    <tr>
+                        <th data-sort="request">Request</th>
+                        <th data-sort="type">
+                            Type
+                        </th>
+                        <th data-sort="date">
+                            Assigned
+                        </th>
+                        <th data-sort="date">
+                            Deadline
+                        </th>
+                        <th data-sort="date">
+                            Closed
+                        </th>
+                        <th data-sort="reviewer">
+                            Reviewer
+                        </th>
+                        <th data-sort="state">
+                            State
+                        </th>
+                        <th data-sort="result">
+                            Result
+                        </th>
+                    </tr>
+                </thead>
                 <tbody>
                     <tr class="table-info">
                         <th colspan="8">
@@ -231,7 +247,6 @@
                         </tr>
                     {% endfor %}
                 </tbody>
-            {% endif %}
         </table>
     {% endblock %}
     {% block js %}