Skip to content

Commit 7b47275

Browse files
committed
Added closed date column to closed review list. Fixes ietf-tools#2150. Commit ready for merge
- Legacy-Id: 14365
1 parent 5c1f1df commit 7b47275

4 files changed

Lines changed: 24 additions & 1 deletion

File tree

ietf/doc/models.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,10 @@ def previous_telechat_date(self):
663663
e = self.latest_event(TelechatDocEvent, type="scheduled_for_telechat", telechat_date__lt=datetime.datetime.now())
664664
return e.telechat_date if e else None
665665

666+
def request_closed_time(self, review_req):
667+
e = self.latest_event(ReviewRequestDocEvent, type="closed_review_request", review_request=review_req)
668+
return e.time if e and e.time else None
669+
666670
def area_acronym(self):
667671
g = self.group
668672
if g:

ietf/review/models.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,15 @@ def other_requests(self):
138138
def other_completed_requests(self):
139139
return self.other_requests().filter(state_id__in=['completed','part-completed'])
140140

141+
def review_done_time(self):
142+
# First check if this is completed review having review and if so take time from there.
143+
if self.review and self.review.time:
144+
return self.review.time
145+
# If not, then it is closed review, so it either has event in doc or if not then take
146+
# time from the request.
147+
time = self.doc.request_closed_time(self)
148+
return time if time else self.time
149+
141150
def get_default_review_types():
142151
return ReviewTypeName.objects.filter(slug__in=['early','lc','telechat'])
143152

ietf/templates/doc/review/request_info.html

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,18 @@
183183
{% if doc.time %}
184184
<tr>
185185
<th></th>
186-
<th>Last updated</th>
186+
<th>Draft last updated</th>
187187
<td>{{ doc.time|date:"Y-m-d" }}</td>
188188
</tr>
189189
{% endif %}
190+
191+
{% if review_req.review_done_time %}
192+
<tr>
193+
<th></th>
194+
<th>Review closed:</th>
195+
<td>{{ review_req.review_done_time|date:"Y-m-d" }}</td>
196+
</tr>
197+
{% endif %}
190198

191199
</tbody>
192200
</table>

ietf/templates/group/review_requests.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ <h2 id="closed-review-requests">Closed review requests</h2>
9090
<th>Type</th>
9191
<th>Requested</th>
9292
<th>Deadline</th>
93+
<th>Closed</th>
9394
<th>Reviewer</th>
9495
<th>State</th>
9596
<th>Result</th>
@@ -102,6 +103,7 @@ <h2 id="closed-review-requests">Closed review requests</h2>
102103
<td>{{ r.type }}</td>
103104
<td>{{ r.time|date:"Y-m-d" }} by {{ r.requested_by.plain_name }}</td>
104105
<td>{{ r.deadline|date:"Y-m-d" }}</td>
106+
<td>{{ r.review_done_time|date:"Y-m-d" }}</td>
105107
<td>
106108
{% if r.reviewer %}
107109
{{ r.reviewer.person }}

0 commit comments

Comments
 (0)