Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: separate tables on team review page. Fixes #3679. #3770

Merged
merged 1 commit into from Mar 30, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 42 additions & 27 deletions ietf/templates/group/review_requests.html
Expand Up @@ -24,12 +24,10 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
<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>
Expand Down Expand Up @@ -60,22 +58,26 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
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 %}
</td>
</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>
Expand Down Expand Up @@ -111,7 +113,6 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
{% 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:
Expand All @@ -133,26 +134,19 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
Type
</th>
<th data-sort="date">
Requested/Assigned
Requested
</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>
{% if closed_review_requests %}
<tbody>
<tr class="table-info">
<th colspan="8">
Expand Down Expand Up @@ -180,18 +174,40 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
<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">
Expand Down Expand Up @@ -231,7 +247,6 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
</tr>
{% endfor %}
</tbody>
{% endif %}
</table>
{% endblock %}
{% block js %}
Expand Down