Merged in [16094] from magnus.westerlund@ericsson.com:
Added sortable columns to Review Team Reviewers page. Partially addresses issue #2656
- Legacy-Id: 16112
Note: SVN reference [16094] has been migrated to Git commit 0c0e75861e
This commit is contained in:
Henrik Levkowetz
parent
175c75cfaf
commit
6a159ebdfd
|
|
@ -167,6 +167,12 @@ if [ "$REPLY" != "" ]; then
|
|||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
note "Writing commit script"
|
||||
echo -e "#!/bin/bash\n\nsvn commit -m \"Merged in [$rev] from $who:\n ${comment//\"/\'} ${fix//\"/\'}\"" > ../cicmd/commit-${rev}-merge.sh
|
||||
chmod +x ../cicmd/commit-${rev}-merge.sh
|
||||
|
||||
|
||||
read -p "Continue with the merge? [Y/n] "
|
||||
[ "$REPLY" = "Y" -o "$REPLY" = "y" -o "$REPLY" = "" ] || exit
|
||||
|
||||
|
|
@ -179,10 +185,6 @@ else
|
|||
svn merge -c $rev ${repo}/$branch ."
|
||||
fi
|
||||
|
||||
note "Writing commit script"
|
||||
echo -e "#!/bin/bash\n\nsvn commit -m \"Merged in [$rev] from $who:\n ${comment//\"/\'} ${fix//\"/\'}\"" > ../cicmd/commit-${rev}-merge.sh
|
||||
chmod +x ../cicmd/commit-${rev}-merge.sh
|
||||
|
||||
M=$(svn st | cut -c 1-7 | grep -oh 'M' | head -n 1)
|
||||
C=$(svn st | cut -c 1-7 | grep -oh 'C' | head -n 1)
|
||||
G=$(svn st | cut -c 1-7 | grep -oh 'G' | head -n 1)
|
||||
|
|
|
|||
|
|
@ -323,6 +323,7 @@ class EndUnavailablePeriodForm(forms.Form):
|
|||
class ReviewSecretarySettingsForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = ReviewSecretarySettings
|
||||
fields = ['remind_days_before_deadline']
|
||||
fields = ['remind_days_before_deadline', 'max_items_to_show_in_reviewer_list',
|
||||
'days_to_show_in_reviewer_list']
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -519,11 +519,15 @@ class ReviewTests(TestCase):
|
|||
|
||||
# set settings
|
||||
r = self.client.post(url, {
|
||||
"remind_days_before_deadline": "6"
|
||||
"remind_days_before_deadline": "6",
|
||||
"max_items_to_show_in_reviewer_list": 10,
|
||||
"days_to_show_in_reviewer_list": 365
|
||||
})
|
||||
self.assertEqual(r.status_code, 302)
|
||||
settings = ReviewSecretarySettings.objects.get(person=secretary, team=review_req.team)
|
||||
self.assertEqual(settings.remind_days_before_deadline, 6)
|
||||
self.assertEqual(settings.max_items_to_show_in_reviewer_list, 10)
|
||||
self.assertEqual(settings.days_to_show_in_reviewer_list, 365)
|
||||
|
||||
def test_review_reminders(self):
|
||||
review_req = ReviewRequestFactory()
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ from __future__ import unicode_literals, print_function
|
|||
|
||||
import os
|
||||
import re
|
||||
import sys
|
||||
import json
|
||||
import math
|
||||
import itertools
|
||||
|
|
@ -1388,6 +1389,7 @@ def reviewer_overview(request, acronym, group_type=None):
|
|||
|
||||
|
||||
MAX_CLOSED_REQS = 10
|
||||
days_since = sys.maxsize
|
||||
req_data = req_data_for_reviewers.get(person.pk, [])
|
||||
open_reqs = sum(1 for d in req_data if d.state in ["requested", "accepted"])
|
||||
latest_reqs = []
|
||||
|
|
@ -1396,7 +1398,17 @@ def reviewer_overview(request, acronym, group_type=None):
|
|||
latest_reqs.append((d.req_pk, d.doc, d.reviewed_rev, d.assigned_time, 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))
|
||||
if d.state in ["completed", "completed_in_time", "completed_late"]:
|
||||
if d.assigned_time is not None:
|
||||
delta = datetime.datetime.now() - d.assigned_time
|
||||
if d.assignment_to_closure_days is not None:
|
||||
days = int(delta.days - d.assignment_to_closure_days)
|
||||
if days_since > days: days_since = days
|
||||
|
||||
if days_since == sys.maxsize:
|
||||
days_since = None
|
||||
person.latest_reqs = latest_reqs
|
||||
person.days_since_completed_review = days_since
|
||||
|
||||
return render(request, 'group/reviewer_overview.html',
|
||||
construct_group_menu_context(request, group, "reviewers", group_type, {
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ class ReviewerSettingsAdmin(simple_history.admin.SimpleHistoryAdmin):
|
|||
admin.site.register(ReviewerSettings, ReviewerSettingsAdmin)
|
||||
|
||||
class ReviewSecretarySettingsAdmin(admin.ModelAdmin):
|
||||
list_display = [u'id', 'team', 'person', 'remind_days_before_deadline']
|
||||
list_display = [u'id', 'team', 'person', 'remind_days_before_deadline', 'max_items_to_show_in_reviewer_list', 'days_to_show_in_reviewer_list']
|
||||
raw_id_fields = ['team', 'person']
|
||||
admin.site.register(ReviewSecretarySettings, ReviewSecretarySettingsAdmin)
|
||||
|
||||
|
|
|
|||
|
|
@ -42,6 +42,8 @@ class ReviewSecretarySettings(models.Model):
|
|||
team = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
|
||||
person = ForeignKey(Person)
|
||||
remind_days_before_deadline = models.IntegerField(null=True, blank=True, help_text="To get an email reminder in case a reviewer forgets to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.")
|
||||
max_items_to_show_in_reviewer_list = models.IntegerField(null=True, blank=True, help_text="Maximum number of completed items to show for one reviewer in the reviewer list view, the list is also filtered by the days to show in reviews list setting.")
|
||||
days_to_show_in_reviewer_list = models.IntegerField(null=True, blank=True, help_text="Maximum number of days to show in reviewer list for completed items.")
|
||||
|
||||
def __unicode__(self):
|
||||
return u"{} in {}".format(self.person, self.team)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,10 @@
|
|||
{% block group_content %}
|
||||
{% origin %}
|
||||
|
||||
{% block pagehead %}
|
||||
<link rel="stylesheet" href="{% static "jquery.tablesorter/css/theme.bootstrap.min.css" %}">
|
||||
{% endblock %}
|
||||
|
||||
{% if can_access_stats %}
|
||||
<h1 class="pull-right"><a href="{% url "ietf.stats.views.review_stats" stats_type="completion" acronym=group.acronym %}" class="icon-link"> <span class="small fa fa-bar-chart"> </span></a></h1>
|
||||
{% endif %}
|
||||
|
|
@ -25,11 +29,13 @@
|
|||
</div>
|
||||
|
||||
{% if reviewers %}
|
||||
<table class="table reviewer-overview">
|
||||
<table class="table reviewer-overview tablesorter">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Next</th>
|
||||
<th>Reviewer</th>
|
||||
<th>Assigned/Deadline/state/time between assignment and closure for latest assignments</th>
|
||||
<th>Days Since Completed</th>
|
||||
<th>Settings</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -39,12 +45,13 @@
|
|||
{% elif person.busy %}class="busy"
|
||||
{% elif person.settings.skip_next %}class="skip-next"
|
||||
{% endif %}>
|
||||
<td>{{ forloop.counter }}</td>
|
||||
<td>{% if person.settings_url %}<a href="{{ person.settings_url }}" title="{{person.settings.expertise}}">{% endif %}{{ person }}{% if person.settings_url %}</a>{% endif %}</td>
|
||||
<td>
|
||||
<table class="simple-table">
|
||||
{% for req_pk, doc_name, reviewed_rev, assigned_time, deadline, state, assignment_to_closure_days in person.latest_reqs %}
|
||||
<tr>
|
||||
<td>{{ assigned_time|date }}</td>
|
||||
<td><span style="display:none">X</span>{{ 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>
|
||||
<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>
|
||||
|
|
@ -57,6 +64,7 @@
|
|||
{% endfor %}
|
||||
</table>
|
||||
</td>
|
||||
<td> {% if person.days_since_completed_review %} {{ person.days_since_completed_review }} {% else %} <span style="display:none">99999{% endif %} </td>
|
||||
<td>
|
||||
{% if person.settings.min_interval %}
|
||||
{{ person.settings.get_min_interval_display }}<br>
|
||||
|
|
@ -84,3 +92,7 @@
|
|||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
||||
{% block js %}
|
||||
<script src="{% static "jquery.tablesorter/js/jquery.tablesorter.combined.min.js" %}"></script>
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@
|
|||
|
||||
# --- Add entries at the top ---
|
||||
|
||||
/personal/fenton/6.94.2.dev0@16108
|
||||
|
||||
/personal/housley/6.87.4.dev0@15683
|
||||
|
||||
/personal/rcross/6.81.3.dev0@15265
|
||||
|
|
|
|||
Loading…
Reference in a new issue