From 2bacdd3a00b29bf645fcb7b5f2a67093845917d1 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Sun, 4 Jun 2017 17:31:25 +0000 Subject: [PATCH] Merged in [13500] from rjsparks@nostrum.com: Provide assigned dates on review team reviewers page. Fixes #2304. Related to #2305. - Legacy-Id: 13518 Note: SVN reference [13500] has been migrated to Git commit e422717f91eb26a0691347beca9380889d8ee890 --- ietf/group/views_review.py | 2 +- ietf/review/utils.py | 6 +++--- ietf/templates/group/reviewer_overview.html | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ietf/group/views_review.py b/ietf/group/views_review.py index c5dff6d4a..7599d7ccc 100644 --- a/ietf/group/views_review.py +++ b/ietf/group/views_review.py @@ -168,7 +168,7 @@ def reviewer_overview(request, acronym, group_type=None): latest_reqs = [] for d in req_data: if d.state in ["requested", "accepted"] or len(latest_reqs) < MAX_CLOSED_REQS + open_reqs: - latest_reqs.append((d.req_pk, d.doc, d.reviewed_rev, d.deadline, + latest_reqs.append((d.req_pk, d.doc, d.reviewed_rev, d.assigned_time, d.deadline, review_state_by_slug.get(d.state), int(math.ceil(d.assignment_to_closure_days)) if d.assignment_to_closure_days is not None else None)) person.latest_reqs = latest_reqs diff --git a/ietf/review/utils.py b/ietf/review/utils.py index d346589c0..848892609 100644 --- a/ietf/review/utils.py +++ b/ietf/review/utils.py @@ -162,7 +162,7 @@ def days_needed_to_fulfill_min_interval_for_reviewers(team): return res ReviewRequestData = namedtuple("ReviewRequestData", [ - "req_pk", "doc", "doc_pages", "req_time", "state", "deadline", "reviewed_rev", "result", "team", "reviewer", + "req_pk", "doc", "doc_pages", "req_time", "state", "assigned_time", "deadline", "reviewed_rev", "result", "team", "reviewer", "late_days", "request_to_assignment_days", "assignment_to_closure_days", "request_to_closure_days"]) @@ -225,7 +225,7 @@ def extract_review_request_data(teams=None, reviewers=None, time_from=None, time assignment_to_closure_days = positive_days(assigned_time, closed_time) request_to_closure_days = positive_days(requested_time, closed_time) - d = ReviewRequestData(req_pk, doc, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer, + d = ReviewRequestData(req_pk, doc, doc_pages, req_time, state, assigned_time, deadline, reviewed_rev, result, team, reviewer, late_days, request_to_assignment_days, assignment_to_closure_days, request_to_closure_days) @@ -241,7 +241,7 @@ def aggregate_raw_review_request_stats(review_request_data, count=None): assignment_to_closure_days_list = [] assignment_to_closure_days_count = 0 - for (req_pk, doc, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer, + for (req_pk, doc, doc_pages, req_time, state, assigned_time, deadline, reviewed_rev, result, team, reviewer, late_days, request_to_assignment_days, assignment_to_closure_days, request_to_closure_days) in review_request_data: if count == "pages": c = doc_pages diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html index d780f9e43..26a21ac9c 100644 --- a/ietf/templates/group/reviewer_overview.html +++ b/ietf/templates/group/reviewer_overview.html @@ -29,7 +29,7 @@ Reviewer - Deadline/state/time between assignment and closure for latest assignments + Assigned/Deadline/state/time between assignment and closure for latest assignments Settings @@ -42,8 +42,9 @@ {% if person.settings_url %}{% endif %}{{ person }}{% if person.settings_url %}{% endif %} - {% for req_pk, doc_name, reviewed_rev, deadline, state, assignment_to_closure_days in person.latest_reqs %} + {% for req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %} +
{{ assigned_time|date }} {{ deadline|date }} {{ state.name }}