From 7d8baf00153666fbe52aa112aac1d237ad0c568d Mon Sep 17 00:00:00 2001
From: Ole Laursen <olau@iola.dk>
Date: Fri, 25 Nov 2016 10:53:37 +0000
Subject: [PATCH] Add reviewer name and completion date to previous reviews in
 manage review page  - Legacy-Id: 12397

---
 ietf/group/views_review.py                       |  5 ++++-
 ietf/review/utils.py                             |  5 +++++
 ietf/templates/group/manage_review_requests.html | 16 ++++++++++++----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ietf/group/views_review.py b/ietf/group/views_review.py
index c97d7f1c6..894e379ed 100644
--- a/ietf/group/views_review.py
+++ b/ietf/group/views_review.py
@@ -21,7 +21,8 @@ from ietf.review.utils import (can_manage_review_requests_for_team,
                                current_unavailable_periods_for_reviewers,
                                email_reviewer_availability_change,
                                reviewer_rotation_list,
-                               latest_review_requests_for_reviewers)
+                               latest_review_requests_for_reviewers,
+                               augment_review_requests_with_events)
 from ietf.group.models import Role
 from ietf.group.utils import get_group_or_404, construct_group_menu_context
 from ietf.person.fields import PersonEmailChoiceField
@@ -243,6 +244,8 @@ def manage_review_requests(request, acronym, group_type=None, assignment_status=
             else:
                 l = [r]
 
+        augment_review_requests_with_events(l)
+
         req.latest_reqs = l
 
     saving = False
diff --git a/ietf/review/utils.py b/ietf/review/utils.py
index d8d5f82aa..ff499d23d 100644
--- a/ietf/review/utils.py
+++ b/ietf/review/utils.py
@@ -55,6 +55,11 @@ def review_requests_to_list_for_docs(docs):
 
     return extract_revision_ordered_review_requests_for_documents_and_replaced(request_qs, doc_names)
 
+def augment_review_requests_with_events(review_reqs):
+    req_dict = { r.pk: r for r in review_reqs }
+    for e in ReviewRequestDocEvent.objects.filter(review_request__in=review_reqs, type__in=["assigned_review_request", "closed_review_request"]).order_by("time"):
+        setattr(req_dict[e.review_request_id], e.type + "_event", e)
+
 def no_review_from_teams_on_doc(doc, rev):
     return Group.objects.filter(
         reviewrequest__doc=doc,
diff --git a/ietf/templates/group/manage_review_requests.html b/ietf/templates/group/manage_review_requests.html
index 47d5fb538..0712182ee 100644
--- a/ietf/templates/group/manage_review_requests.html
+++ b/ietf/templates/group/manage_review_requests.html
@@ -59,13 +59,21 @@
             <div class="row">
               <div class="col-sm-6">
                 <div class="request-metadata">
-                  {% if r.pk != None %}Requested: <a href="{% url "ietf.doc.views_review.review_request" name=r.doc.name request_id=r.pk %}">{{ r.time|date:"Y-m-d" }}</a>{% else %}Auto-suggested{% endif %}
+                  <p>
+                    {% if r.pk != None %}Requested: <a href="{% url "ietf.doc.views_review.review_request" name=r.doc.name request_id=r.pk %}">{{ r.time|date:"Y-m-d" }}</a>
+                    {% else %}
+                      Auto-suggested
+                    {% endif %}
+                  </p>
 
                   {% if r.latest_reqs %}
                     {% for rlatest in r.latest_reqs %}
-                      - previous review of <a href="{% url "doc_view" name=rlatest.doc_id rev=rlatest.reviewed_rev %}?include_text=1">{% if rlatest.doc_id != r.doc_id %}{{ rlatest.doc_id }}{% endif %}-{{ rlatest.reviewed_rev }}</a>:
-                      <a href="{% url "ietf.doc.views_review.review_request" name=rlatest.doc_id request_id=rlatest.pk %}">{% if rlatest.result %}{{ rlatest.result.name }}{% else %}result unavail.{% endif %}</a>
-                      (<a href="{{ rfcdiff_base_url }}?url1={{ rlatest.doc.name }}-{{ rlatest.reviewed_rev }}&url2={{ r.doc.name }}-{{ r.doc.rev }}">diff</a>){% if not forloop.last %},{% endif %}
+                      <div>
+                        Revious review of <a href="{% url "doc_view" name=rlatest.doc_id rev=rlatest.reviewed_rev %}?include_text=1">{% if rlatest.doc_id != r.doc_id %}{{ rlatest.doc_id }}{% endif %}-{{ rlatest.reviewed_rev }}</a>
+                        (<a href="{{ rfcdiff_base_url }}?url1={{ rlatest.doc.name }}-{{ rlatest.reviewed_rev }}&url2={{ r.doc.name }}-{{ r.doc.rev }}">diff</a>):
+                        <a href="{% url "ietf.doc.views_review.review_request" name=rlatest.doc_id request_id=rlatest.pk %}">{% if rlatest.result %}{{ rlatest.result.name }}{% else %}result unavail.{% endif %}</a>
+                        by {{ rlatest.reviewer.person }}{% if rlatest.closed_review_request_event %} {{ rlatest.closed_review_request_event.time.date|date }}{% endif %}
+                      </div>
                     {% endfor %}
                   {% endif %}
                 </div>