From 04df7973d8bd673e23fd3cfa97708f21e87b4751 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Thu, 27 Jul 2023 17:48:51 +0300 Subject: [PATCH] fix: Make review table more responsive (#6053) * fix: Improve layout of review table * Progress * Progress * Final changes * Fix tests * Remove fluff * Undo commits --- ietf/group/tests_review.py | 4 +- ietf/templates/group/reviewer_overview.html | 143 ++++++++++--------- ietf/templates/ietfauth/review_overview.html | 8 +- ietf/templates/review/unavailable_table.html | 51 +++++-- 4 files changed, 124 insertions(+), 82 deletions(-) diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py index 0e56c9f46..af374f676 100644 --- a/ietf/group/tests_review.py +++ b/ietf/group/tests_review.py @@ -212,13 +212,13 @@ class ReviewTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) # review team members can see reason for being unavailable - self.assertContains(r, "Availability") + self.assertContains(r, "Available") self.client.login(username="secretary", password="secretary+password") r = self.client.get(url) self.assertEqual(r.status_code, 200) # secretariat can see reason for being unavailable - self.assertContains(r, "Availability") + self.assertContains(r, "Available") # add one closed review with no response and see it is visible review_req2 = ReviewRequestFactory(state_id='completed',team=team) diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html index 39ba7606a..b4b1b6e3d 100644 --- a/ietf/templates/group/reviewer_overview.html +++ b/ietf/templates/group/reviewer_overview.html @@ -24,7 +24,7 @@ rotation with the next reviewer in the rotation at the top. Rows with darker backgrounds have the following meaning:

-

+

Has already been assigned a document within the given interval.

@@ -44,89 +44,102 @@

{% endif %} {% if reviewers %} - +
- + - - - + + + {% for person in reviewers %} - + + + - - + {% endfor %} diff --git a/ietf/templates/ietfauth/review_overview.html b/ietf/templates/ietfauth/review_overview.html index 65a451c7a..b33e75421 100644 --- a/ietf/templates/ietfauth/review_overview.html +++ b/ietf/templates/ietfauth/review_overview.html @@ -101,7 +101,7 @@ {% if r.due %}{{ r.due }} day{{ r.due|pluralize }}{% endif %}
NextNext ReviewerRecent historyDays since completedSettings +
+
Assigned
+
Deadline
+
State
+
Days for review
+
Document
+
+ 		Days since reviewSettings
{{ forloop.counter }} - {% person_link person %} - {% if person.settings_url %} - Edit - - {% endif %} + {% person_link person with_email=False %} + +
+ {% if person.settings_url %} + + + + {% endif %} + +
{% if person.latest_reqs %} - - - - - - - - - - - - {% for assn_pk, req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %} - - - - - - - - {% endfor %} - -
AssignedDeadlineStateReview timeDocument
- {{ assigned_time|date }} - - {{ deadline|date }} - - {{ state.name }} - - {% if assignment_to_closure_days != None %} - {{ assignment_to_closure_days }} day{{ assignment_to_closure_days|pluralize }} - {% endif %} - - {{ doc_name }} - {% if reviewed_rev %}-{{ reviewed_rev }}{% endif %} -
+ {% for assn_pk, req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %} +
+
+ {{ assigned_time|date|split:"-"|join:"-" }} +
+
+ {{ deadline|date|split:"-"|join:"-" }} +
+
+ {{ state.name }} +
+
+ {% if assignment_to_closure_days != None %} + {{ assignment_to_closure_days }} + {% endif %} +
+
+ {{ doc_name }}{% if reviewed_rev %}-{{ reviewed_rev }}{% endif %} +
+
+ {% endfor %} {% endif %} 		+ + {% if person.days_since_completed_review != 9999 %} {{ person.days_since_completed_review }} {% endif %} - {% if person.settings.min_interval %} - {{ person.settings.get_min_interval_display }} -
- {% endif %} - {% if person.settings.skip_next %} - Skip: {{ person.settings.skip_next }} -
- {% endif %} - {% if person.settings.filter_re %} - Filter: {{ person.settings.filter_re|truncatechars:15 }} -
- {% endif %} - {% if person.unavailable_periods %} - {% include "review/unavailable_table.html" with unavailable_periods=person.unavailable_periods %} - {% endif %} + + 		+ {% include "review/unavailable_table.html" with person=person unavailable_periods=person.unavailable_periods %} +
- {{ r.state.name }} + {{ r.state.name }} {% if r.result %}{{ r.result.name }}{% endif %} @@ -186,10 +186,10 @@ - - @@ -208,7 +208,7 @@ Skip next assignments diff --git a/ietf/templates/review/unavailable_table.html b/ietf/templates/review/unavailable_table.html index ea34bf2cb..573f1c3ff 100644 --- a/ietf/templates/review/unavailable_table.html +++ b/ietf/templates/review/unavailable_table.html @@ -1,25 +1,54 @@ -
+ Setting + Value
- {{ t.reviewer_settings.skip_next }} + {{ t.reviewer_settings.skip_next|yesno }}
+{% load origin %} +{% origin %} +
+ + + + + + + {% if person %} + {% if person.settings.min_interval %} + + + + + {% endif %} + {% if person.settings.skip_next %} + + + + + {% endif %} + {% if person.settings.filter_re %} + + + + + {% endif %} + {% endif %} {% for p in unavailable_periods %} - - + + - - + - - + + + {% if p.reason %} - - + + + {% endif %} {% endfor %}
Can review:{{ person.settings.get_min_interval_display }}
Skip next:{{ person.settings.skip_next|yesno }}
Filter:{{ person.settings.filter_re }}
Period:{{ p.state }}Period:{{ p.state }}
Dates: - {% if p.start_date or p.end_date %}{{ p.start_date|default:"∞" }} -{% endif %} - {{ p.end_date|default:"∞" }} + Dates: + {% if p.start_date or p.end_date %}{{ p.start_date|default:"∞" }}-{% endif %}{{ p.end_date|default:"∞" }}
Availability:{{ p.get_availability_display }}Available:{{ p.get_availability_display }}
Reason:{{ p.reason }}Reason:{{ p.reason }}
\ No newline at end of file