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

Merged in [13500] from rjsparks@nostrum.com:

Browse source 
Provide assigned dates on review team reviewers page. Fixes #2304. Related to #2305.
 - Legacy-Id: 13518
Note: SVN reference [13500] has been migrated to Git commit e422717f91eb26a0691347beca9380889d8ee890
This commit is contained in:
Henrik Levkowetz 2017-06-04 17:31:25 +00:00
parent d31c58973d
commit 2bacdd3a00
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/group/views_review.py
View file

@ -168,7 +168,7 @@ def reviewer_overview(request, acronym, group_type=None):
latest_reqs = [] latest_reqs = []
for d in req_data: for d in req_data:
if d.state in ["requested", "accepted"] or len(latest_reqs) < MAX_CLOSED_REQS + open_reqs: if d.state in ["requested", "accepted"] or len(latest_reqs) < MAX_CLOSED_REQS + open_reqs:
latest_reqs.append((d.req_pk, d.doc, d.reviewed_rev, d.deadline, latest_reqs.append((d.req_pk, d.doc, d.reviewed_rev, d.assigned_time, d.deadline,
review_state_by_slug.get(d.state), 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)) int(math.ceil(d.assignment_to_closure_days)) if d.assignment_to_closure_days is not None else None))
person.latest_reqs = latest_reqs person.latest_reqs = latest_reqs

6
ietf/review/utils.py
View file

@ -162,7 +162,7 @@ def days_needed_to_fulfill_min_interval_for_reviewers(team):
return res return res
ReviewRequestData = namedtuple("ReviewRequestData", [ ReviewRequestData = namedtuple("ReviewRequestData", [
"req_pk", "doc", "doc_pages", "req_time", "state", "deadline", "reviewed_rev", "result", "team", "reviewer", "req_pk", "doc", "doc_pages", "req_time", "state", "assigned_time", "deadline", "reviewed_rev", "result", "team", "reviewer",
"late_days", "late_days",
"request_to_assignment_days", "assignment_to_closure_days", "request_to_closure_days"]) "request_to_assignment_days", "assignment_to_closure_days", "request_to_closure_days"])
@ -225,7 +225,7 @@ def extract_review_request_data(teams=None, reviewers=None, time_from=None, time
assignment_to_closure_days = positive_days(assigned_time, closed_time) assignment_to_closure_days = positive_days(assigned_time, closed_time)
request_to_closure_days = positive_days(requested_time, closed_time) request_to_closure_days = positive_days(requested_time, closed_time)
d = ReviewRequestData(req_pk, doc, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer, d = ReviewRequestData(req_pk, doc, doc_pages, req_time, state, assigned_time, deadline, reviewed_rev, result, team, reviewer,
late_days, request_to_assignment_days, assignment_to_closure_days, late_days, request_to_assignment_days, assignment_to_closure_days,
request_to_closure_days) request_to_closure_days)
@ -241,7 +241,7 @@ def aggregate_raw_review_request_stats(review_request_data, count=None):
assignment_to_closure_days_list = [] assignment_to_closure_days_list = []
assignment_to_closure_days_count = 0 assignment_to_closure_days_count = 0
for (req_pk, doc, doc_pages, req_time, state, deadline, reviewed_rev, result, team, reviewer, for (req_pk, doc, doc_pages, req_time, state, assigned_time, deadline, reviewed_rev, result, team, reviewer,
late_days, request_to_assignment_days, assignment_to_closure_days, request_to_closure_days) in review_request_data: late_days, request_to_assignment_days, assignment_to_closure_days, request_to_closure_days) in review_request_data:
if count == "pages": if count == "pages":
c = doc_pages c = doc_pages

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

@ -29,7 +29,7 @@
<thead> <thead>
<tr> <tr>
<th>Reviewer</th> <th>Reviewer</th>
<th>Deadline/state/time between assignment and closure for latest assignments</th> <th>Assigned/Deadline/state/time between assignment and closure for latest assignments</th>
<th>Settings</th> <th>Settings</th>
</tr> </tr>
</thead> </thead>
@ -42,8 +42,9 @@
<td>{% if person.settings_url %}<a href="{{ person.settings_url }}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td> <td>{% if person.settings_url %}<a href="{{ person.settings_url }}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td>
<td> <td>
<table class="simple-table"> <table class="simple-table">
{% for req_pk, doc_name, reviewed_rev, deadline, state, assignment_to_closure_days in person.latest_reqs %} {% for req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %}
<tr> <tr>
<td>{{ assigned_time|date }}</td>
<td><a href="{% url "ietf.doc.views_review.review_request" name=doc_name request_id=req_pk %}">{{ deadline|date }}</a></td> <td><a href="{% url "ietf.doc.views_review.review_request" name=doc_name request_id=req_pk %}">{{ deadline|date }}</a></td>
<td> <td>
<span class="label label-{% if state.slug == "completed" or state.slug == "part-completed" %}success{% elif state.slug == "no-response" %}danger{% elif state.slug == "overtaken" %}warning{% elif state.slug == "requested" or state.slug == "accepted" %}primary{% else %}default{% endif %}">{{ state.name }}</span> <span class="label label-{% if state.slug == "completed" or state.slug == "part-completed" %}success{% elif state.slug == "no-response" %}danger{% elif state.slug == "overtaken" %}warning{% elif state.slug == "requested" or state.slug == "accepted" %}primary{% else %}default{% endif %}">{{ state.name }}</span>