From 87de06c97c5ed38da3ef320614fb41da2991ef51 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Tue, 13 Aug 2019 18:13:50 +0000 Subject: [PATCH] Corrected a view that was looking at review assignment ids when it should have been looking at request review ids. Fixes #2776. Commit ready for merge. - Legacy-Id: 16647 --- ietf/group/views.py | 5 ++--- ietf/review/utils.py | 10 +++++----- ietf/templates/group/reviewer_overview.html | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/ietf/group/views.py b/ietf/group/views.py index 46ddee796..96543902c 100644 --- a/ietf/group/views.py +++ b/ietf/group/views.py @@ -1407,15 +1407,14 @@ def reviewer_overview(request, acronym, group_type=None): person.busy = person.id in days_needed - # TODO - What is this MAX_CLOSED_REQS trying to accomplish? - MAX_CLOSED_REQS = 10 + MAX_CLOSED_REQS = 10 # This keeps the overview page with being filled with too many closed requests, since the focus should be on open or recently closed per reviewer days_since = 9999 req_data = req_data_for_reviewers.get(person.pk, []) open_reqs = sum(1 for d in req_data if d.state in ["assigned", "accepted"]) latest_reqs = [] for d in req_data: if d.state in ["assigned", "accepted"] or len(latest_reqs) < MAX_CLOSED_REQS + open_reqs: - latest_reqs.append((d.assignment_pk, d.doc_name, d.reviewed_rev, d.assigned_time, d.deadline, + latest_reqs.append((d.assignment_pk, d.request_pk, d.doc_name, d.reviewed_rev, d.assigned_time, d.deadline, assignment_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)) if d.state in ["completed", "completed_in_time", "completed_late"]: diff --git a/ietf/review/utils.py b/ietf/review/utils.py index cfff82e8c..df17fa84d 100644 --- a/ietf/review/utils.py +++ b/ietf/review/utils.py @@ -172,7 +172,7 @@ def days_needed_to_fulfill_min_interval_for_reviewers(team): return res ReviewAssignmentData = namedtuple("ReviewAssignmentData", [ - "assignment_pk", "doc_name", "doc_pages", "req_time", "state", "assigned_time", "deadline", "reviewed_rev", "result", "team", "reviewer", + "assignment_pk", "request_pk", "doc_name", "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"]) @@ -199,7 +199,7 @@ def extract_review_assignment_data(teams=None, reviewers=None, time_from=None, t event_qs = ReviewAssignment.objects.filter(filters) event_qs = event_qs.values_list( - "pk", "review_request__doc__name", "review_request__doc__pages", "review_request__time", "state", "review_request__deadline", "reviewed_rev", "result", "review_request__team", + "pk", "review_request__pk", "review_request__doc__name", "review_request__doc__pages", "review_request__time", "state", "review_request__deadline", "reviewed_rev", "result", "review_request__team", "reviewer__person", "assigned_on", "completed_on" ) @@ -220,7 +220,7 @@ def extract_review_assignment_data(teams=None, reviewers=None, time_from=None, t for assignment in event_qs: - assignment_pk, doc_name, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer, assigned_on, completed_on = assignment + assignment_pk, request_pk, doc_name, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer, assigned_on, completed_on = assignment requested_time = req_time assigned_time = assigned_on @@ -231,7 +231,7 @@ def extract_review_assignment_data(teams=None, reviewers=None, time_from=None, t assignment_to_closure_days = positive_days(assigned_time, closed_time) request_to_closure_days = positive_days(requested_time, closed_time) - d = ReviewAssignmentData(assignment_pk, doc_name, doc_pages, req_time, state, assigned_time, deadline, reviewed_rev, result, team, reviewer, + d = ReviewAssignmentData(assignment_pk, request_pk, doc_name, 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) @@ -248,7 +248,7 @@ def aggregate_raw_period_review_assignment_stats(review_assignment_data, count=N assignment_to_closure_days_list = [] assignment_to_closure_days_count = 0 - for (assignment_pk, doc, doc_pages, req_time, state, assigned_time, deadline, reviewed_rev, result, team, reviewer, + for (assignment_pk, request_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_assignment_data: if count == "pages": c = doc_pages diff --git a/ietf/templates/group/reviewer_overview.html b/ietf/templates/group/reviewer_overview.html index b0339b83d..2cb16ee2b 100644 --- a/ietf/templates/group/reviewer_overview.html +++ b/ietf/templates/group/reviewer_overview.html @@ -49,7 +49,7 @@ {% if person.settings_url %}{% endif %}{{ person }}{% if person.settings_url %}{% endif %} - {% for req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %} + {% for assn_pk, req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %}
X{{ assigned_time|date }} {{ deadline|date }}