diff --git a/ietf/doc/models.py b/ietf/doc/models.py index ed15d15c0..d9b4c2fd9 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -663,6 +663,10 @@ class Document(DocumentInfo): e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat", telechat_date__lt=datetime.datetime.now()) return e.telechat_date if e else None + def request_closed_time(self, review_req): + e = self.latest_event(ReviewRequestDocEvent, type="closed_review_request", review_request=review_req) + return e.time if e and e.time else None + def area_acronym(self): g = self.group if g: diff --git a/ietf/review/models.py b/ietf/review/models.py index c5a32e5c7..d124b6e97 100644 --- a/ietf/review/models.py +++ b/ietf/review/models.py @@ -138,6 +138,15 @@ class ReviewRequest(models.Model): def other_completed_requests(self): return self.other_requests().filter(state_id__in=['completed','part-completed']) + def review_done_time(self): + # First check if this is completed review having review and if so take time from there. + if self.review and self.review.time: + return self.review.time + # If not, then it is closed review, so it either has event in doc or if not then take + # time from the request. + time = self.doc.request_closed_time(self) + return time if time else self.time + def get_default_review_types(): return ReviewTypeName.objects.filter(slug__in=['early','lc','telechat']) diff --git a/ietf/templates/doc/review/request_info.html b/ietf/templates/doc/review/request_info.html index 5ca3cb17b..47665276c 100644 --- a/ietf/templates/doc/review/request_info.html +++ b/ietf/templates/doc/review/request_info.html @@ -183,10 +183,18 @@ {% if doc.time %} <tr> <th></th> - <th>Last updated</th> + <th>Draft last updated</th> <td>{{ doc.time|date:"Y-m-d" }}</td> </tr> {% endif %} + + {% if review_req.review_done_time %} + <tr> + <th></th> + <th>Review closed:</th> + <td>{{ review_req.review_done_time|date:"Y-m-d" }}</td> + </tr> + {% endif %} </tbody> </table> diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html index 96fd74f79..c9814f10f 100644 --- a/ietf/templates/group/review_requests.html +++ b/ietf/templates/group/review_requests.html @@ -90,6 +90,7 @@ <th>Type</th> <th>Requested</th> <th>Deadline</th> + <th>Closed</th> <th>Reviewer</th> <th>State</th> <th>Result</th> @@ -102,6 +103,7 @@ <td>{{ r.type }}</td> <td>{{ r.time|date:"Y-m-d" }} by {{ r.requested_by.plain_name }}</td> <td>{{ r.deadline|date:"Y-m-d" }}</td> + <td>{{ r.review_done_time|date:"Y-m-d" }}</td> <td> {% if r.reviewer %} {{ r.reviewer.person }}