Merged in [16647] from rjsparks@nostrum.com:

    Corrected a view that was looking at review assignment ids when it should have been looking at request review ids. Fixes ietf-tools#2776.
 - Legacy-Id: 16708
Note: SVN reference [16647] has been migrated to Git commit 87de06c

Author: levkowetz

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"]:

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 positive_days(time_from, time_to):
 
     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 positive_days(time_from, time_to):
         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

ietf/templates/group/reviewer_overview.html

@@ -49,7 +49,7 @@ <h2>Reviewers</h2>
             <td>{% if person.settings_url %}<a href="{{ person.settings_url }}" title="{{person.settings.expertise}}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td>
             <td>
               <table class="simple-table">
-                {% 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 %}
                   <tr>
                     <td><span style="display:none">X</span>{{ assigned_time|date }}</td>
                     <td><a href="{% url "ietf.doc.views_review.review_request" name=doc_name request_id=req_pk %}">{{ deadline|date }}</a></td>