altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Display the reviewed revision in reviewer overview page

Browse source 
- Legacy-Id: 12245
This commit is contained in:
Ole Laursen 2016-11-02 11:33:25 +00:00
parent 70dfb760cb
commit b9d5352afd
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/group/views_review.py
View file

@ -137,7 +137,7 @@ def reviewer_overview(request, acronym, group_type=None):
for d in req_data:
# any open requests pushes the others out
if ((d.state in ("requested", "accepted") and len(latest_reqs) < MAX_REQS) or (len(latest_reqs) + open_reqs < MAX_REQS)):
latest_reqs.append((d.req_pk, d.doc, d.deadline,
latest_reqs.append((d.req_pk, d.doc, d.reviewed_rev, d.deadline,
review_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))
person.latest_reqs = latest_reqs

10
ietf/review/utils.py
View file

@ -151,7 +151,7 @@ def days_needed_to_fulfill_min_interval_for_reviewers(team):
return res
ReviewRequestData = namedtuple("ReviewRequestData", [
"req_pk", "doc", "doc_pages", "req_time", "state", "deadline", "result", "team", "reviewer",
"req_pk", "doc", "doc_pages", "req_time", "state", "deadline", "reviewed_rev", "result", "team", "reviewer",
"late_days",
"request_to_assignment_days", "assignment_to_closure_days", "request_to_closure_days"])
@ -179,7 +179,7 @@ def extract_review_request_data(teams=None, reviewers=None, time_from=None, time
# left outer join with RequestRequestDocEvent for request/assign/close time
event_qs = event_qs.values_list(
"pk", "doc", "doc__pages", "time", "state", "deadline", "result", "team",
"pk", "doc", "doc__pages", "time", "state", "deadline", "reviewed_rev", "result", "team",
"reviewer__person", "reviewrequestdocevent__time", "reviewrequestdocevent__type"
)
@ -200,7 +200,7 @@ def extract_review_request_data(teams=None, reviewers=None, time_from=None, time
requested_time = assigned_time = closed_time = None
for e in events:
req_pk, doc, doc_pages, req_time, state, deadline, result, team, reviewer, event_time, event_type = e
req_pk, doc, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer, event_time, event_type = e
if event_type == "requested_review" and requested_time is None:
requested_time = event_time
@ -214,7 +214,7 @@ def extract_review_request_data(teams=None, reviewers=None, time_from=None, time
assignment_to_closure_days = positive_days(assigned_time, closed_time)
request_to_closure_days = positive_days(requested_time, closed_time)
d = ReviewRequestData(req_pk, doc, doc_pages, req_time, state, deadline, result, team, reviewer,
d = ReviewRequestData(req_pk, doc, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer,
late_days, request_to_assignment_days, assignment_to_closure_days,
request_to_closure_days)
@ -230,7 +230,7 @@ def aggregate_raw_review_request_stats(review_request_data, count=None):
assignment_to_closure_days_list = []
assignment_to_closure_days_count = 0
for (req_pk, doc, doc_pages, req_time, state, deadline, result, team, reviewer,
for (req_pk, doc, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer,
late_days, request_to_assignment_days, assignment_to_closure_days, request_to_closure_days) in review_request_data:
if count == "pages":
c = doc_pages

4
ietf/templates/group/reviewer_overview.html
View file

@ -33,7 +33,7 @@
<td>{% if person.settings_url %}<a href="{{ person.settings_url }}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td>
<td>
<table class="simple-table">
{% for req_pk, doc_name, deadline, state, assignment_to_closure_days in person.latest_reqs %}
{% for req_pk, doc_name, reviewed_rev, deadline, state, assignment_to_closure_days in person.latest_reqs %}
<tr>
<td><a href="{% url "ietf.doc.views_review.review_request" name=doc_name request_id=req_pk %}">{{ deadline|date }}</a></td>
<td>
@ -42,7 +42,7 @@
<td>
{% if assignment_to_closure_days != None %}{{ assignment_to_closure_days }}&nbsp;day{{ assignment_to_closure_days|pluralize }}{% endif %}
</td>
<td>{{ doc_name }}</td>
<td>{{ doc_name }}{% if reviewed_rev %}-{{ reviewed_rev }}{% endif %}</td>
</div>
{% endfor %}
</table>