Added closed date column to closed review list. Fixes #2150. Commit ready for merge

- Legacy-Id: 14365
This commit is contained in:
Tero Kivinen 2017-11-11 11:30:00 +00:00
parent 5c1f1dfbd7
commit 7b4727541a
4 changed files with 24 additions and 1 deletions

View file

@ -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:

View file

@ -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'])

View file

@ -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>

View file

@ -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 }}