\d{4})/requirements/$', views.requirements),
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
index 28172df7f..b311c070a 100644
--- a/ietf/nomcom/utils.py
+++ b/ietf/nomcom/utils.py
@@ -38,6 +38,7 @@ NOMINEE_ACCEPT_REMINDER_TEMPLATE = 'email/nomination_accept_reminder.txt'
NOMINEE_QUESTIONNAIRE_REMINDER_TEMPLATE = 'email/questionnaire_reminder.txt'
NOMINATION_RECEIPT_TEMPLATE = 'email/nomination_receipt.txt'
FEEDBACK_RECEIPT_TEMPLATE = 'email/feedback_receipt.txt'
+DESCRIPTION_TEMPLATE = 'topic/description'
DEFAULT_NOMCOM_TEMPLATES = [HOME_TEMPLATE,
INEXISTENT_PERSON_TEMPLATE,
@@ -133,6 +134,16 @@ def initialize_requirements_for_position(position):
type_id=template.type_id,
content=template.content)
+def initialize_description_for_topic(topic):
+ description_path = MAIN_NOMCOM_TEMPLATE_PATH + DESCRIPTION_TEMPLATE
+ template = DBTemplate.objects.get(path=description_path)
+ return DBTemplate.objects.create(
+ group=topic.nomcom.group,
+ title=template.title + ' [%s]' % topic.subject,
+ path='/nomcom/' + topic.nomcom.group.acronym + '/topic/' + str(topic.id) + '/' + DESCRIPTION_TEMPLATE,
+ variables=template.variables,
+ type_id=template.type_id,
+ content=template.content)
def delete_nomcom_templates(nomcom):
nomcom_template_path = '/nomcom/' + nomcom.group.acronym
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index 12e3754ec..428170503 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -24,8 +24,9 @@ from ietf.nomcom.forms import (NominateForm, NominateNewPersonForm, FeedbackForm
MergeNomineeForm, MergePersonForm, NomComTemplateForm, PositionForm,
PrivateKeyForm, EditNomcomForm, EditNomineeForm,
PendingFeedbackForm, ReminderDatesForm, FullFeedbackFormSet,
- FeedbackEmailForm, NominationResponseCommentForm)
-from ietf.nomcom.models import Position, NomineePosition, Nominee, Feedback, NomCom, ReminderDates, FeedbackLastSeen
+ FeedbackEmailForm, NominationResponseCommentForm, TopicForm)
+from ietf.nomcom.models import (Position, NomineePosition, Nominee, Feedback, NomCom, ReminderDates,
+ FeedbackLastSeen, Topic, TopicFeedbackLastSeen, )
from ietf.nomcom.utils import (get_nomcom_by_year, store_nomcom_private_key,
get_hash_nominee_position, send_reminder_to_nominees,
HOME_TEMPLATE, NOMINEE_ACCEPT_REMINDER_TEMPLATE,NOMINEE_QUESTIONNAIRE_REMINDER_TEMPLATE)
@@ -415,17 +416,23 @@ def feedback(request, year, public):
has_publickey = nomcom.public_key and True or False
nominee = None
position = None
+ topic = None
if nomcom.group.state_id != 'conclude':
selected_nominee = request.GET.get('nominee')
selected_position = request.GET.get('position')
if selected_nominee and selected_position:
nominee = get_object_or_404(Nominee, id=selected_nominee)
position = get_object_or_404(Position, id=selected_position)
+ selected_topic = request.GET.get('topic')
+ if selected_topic:
+ topic = get_object_or_404(Topic,id=selected_topic)
if public:
positions = Position.objects.get_by_nomcom(nomcom=nomcom).filter(is_open=True,accepting_feedback=True)
+ topics = Topic.objects.filter(nomcom=nomcom,accepting_feedback=True)
else:
positions = Position.objects.get_by_nomcom(nomcom=nomcom).filter(is_open=True)
+ topics = Topic.objects.filter(nomcom=nomcom)
user_comments = Feedback.objects.filter(nomcom=nomcom,
type='comment',
@@ -434,6 +441,9 @@ def feedback(request, year, public):
counts = dict()
for pos,nom in counter:
counts.setdefault(pos,dict())[nom] = counter[(pos,nom)]
+
+ topic_counts = Counter(user_comments.values_list('topics',flat=True))
+
if public:
base_template = "nomcom/nomcom_public_base.html"
else:
@@ -457,25 +467,56 @@ def feedback(request, year, public):
'year': year,
'selected': 'feedback',
'positions': positions,
+ 'topics': topics,
'counts' : counts,
+ 'topic_counts' : topic_counts,
'base_template': base_template
})
- if nominee and position and request.method == 'POST':
- form = FeedbackForm(data=request.POST,
- nomcom=nomcom, user=request.user,
- public=public, position=position, nominee=nominee)
- if form.is_valid():
+ if public and topic and not topic.accepting_feedback:
+ messages.warning(request, "This Nomcom is not currently accepting feedback for "+topic.subject)
+ return render(request, 'nomcom/feedback.html', {
+ 'form': None,
+ 'nomcom': nomcom,
+ 'year': year,
+ 'selected': 'feedback',
+ 'positions': positions,
+ 'topics': topics,
+ 'counts' : counts,
+ 'topic_counts' : topic_counts,
+ 'base_template': base_template
+ })
+ if request.method == 'POST':
+ if nominee and position:
+ form = FeedbackForm(data=request.POST,
+ nomcom=nomcom, user=request.user,
+ public=public, position=position, nominee=nominee)
+ elif topic:
+ form = FeedbackForm(data=request.POST,
+ nomcom=nomcom, user=request.user,
+ topic=topic)
+ else:
+ form = None
+ if form and form.is_valid():
form.save()
messages.success(request, 'Your feedback has been registered.')
form = None
- counts.setdefault(position.pk,dict())
- counts[position.pk].setdefault(nominee.pk,0)
- counts[position.pk][nominee.pk] += 1
+ if position:
+ counts.setdefault(position.pk,dict())
+ counts[position.pk].setdefault(nominee.pk,0)
+ counts[position.pk][nominee.pk] += 1
+ elif topic:
+ topic_counts.setdefault(topic.pk,0)
+ topic_counts[topic.pk] += 1
+ else:
+ pass
else:
if nominee and position:
form = FeedbackForm(nomcom=nomcom, user=request.user, public=public,
position=position, nominee=nominee)
+ elif topic:
+ form = FeedbackForm(nomcom=nomcom, user=request.user, public=public,
+ topic=topic)
else:
form = None
@@ -484,8 +525,10 @@ def feedback(request, year, public):
'nomcom': nomcom,
'year': year,
'positions': positions,
+ 'topics': topics,
'selected': 'feedback',
'counts': counts,
+ 'topic_counts': topic_counts,
'base_template': base_template
})
@@ -633,13 +676,15 @@ def view_feedback(request, year):
nomcom = get_nomcom_by_year(year)
nominees = Nominee.objects.get_by_nomcom(nomcom).not_duplicated().distinct()
independent_feedback_types = []
- feedback_types = []
+ nominee_feedback_types = []
for ft in FeedbackTypeName.objects.all():
if ft.slug in settings.NOMINEE_FEEDBACK_TYPES:
- feedback_types.append(ft)
+ nominee_feedback_types.append(ft)
else:
independent_feedback_types.append(ft)
+ topic_feedback_types=FeedbackTypeName.objects.filter(slug='comment')
nominees_feedback = []
+ topics_feedback = []
def nominee_staterank(nominee):
states=nominee.nomineeposition_set.values_list('state_id',flat=True)
@@ -658,7 +703,7 @@ def view_feedback(request, year):
for nominee in sorted_nominees:
last_seen = FeedbackLastSeen.objects.filter(reviewer=request.user.person,nominee=nominee).first()
nominee_feedback = []
- for ft in feedback_types:
+ for ft in nominee_feedback_types:
qs = nominee.feedback_set.by_type(ft.slug)
count = qs.count()
if not count:
@@ -670,13 +715,29 @@ def view_feedback(request, year):
nominee_feedback.append( (ft.name,count,newflag) )
nominees_feedback.append( {'nominee':nominee, 'feedback':nominee_feedback} )
independent_feedback = [ft.feedback_set.get_by_nomcom(nomcom).count() for ft in independent_feedback_types]
+ for topic in nomcom.topic_set.all():
+ last_seen = TopicFeedbackLastSeen.objects.filter(reviewer=request.user.person,topic=topic).first()
+ topic_feedback = []
+ for ft in topic_feedback_types:
+ qs = topic.feedback_set.by_type(ft.slug)
+ count = qs.count()
+ if not count:
+ newflag = False
+ elif not last_seen:
+ newflag = True
+ else:
+ newflag = qs.filter(time__gt=last_seen.time).exists()
+ topic_feedback.append( (ft.name,count,newflag) )
+ topics_feedback.append ( {'topic':topic, 'feedback':topic_feedback} )
return render(request, 'nomcom/view_feedback.html',
{'year': year,
'selected': 'view_feedback',
'nominees': nominees,
- 'feedback_types': feedback_types,
+ 'nominee_feedback_types': nominee_feedback_types,
'independent_feedback_types': independent_feedback_types,
+ 'topic_feedback_types': topic_feedback_types,
+ 'topics_feedback': topics_feedback,
'independent_feedback': independent_feedback,
'nominees_feedback': nominees_feedback,
'nomcom': nomcom})
@@ -796,6 +857,27 @@ def view_feedback_unrelated(request, year):
'feedback_types': feedback_types,
'nomcom': nomcom})
+@role_required("Nomcom")
+@nomcom_private_key_required
+def view_feedback_topic(request, year, topic_id):
+ nomcom = get_nomcom_by_year(year)
+ topic = get_object_or_404(Topic, id=topic_id)
+ feedback_types = FeedbackTypeName.objects.filter(slug__in=['comment',])
+
+ last_seen = TopicFeedbackLastSeen.objects.filter(reviewer=request.user.person,topic=topic).first()
+ last_seen_time = (last_seen and last_seen.time) or datetime.datetime(year=1,month=1,day=1)
+ if last_seen:
+ last_seen.save()
+ else:
+ TopicFeedbackLastSeen.objects.create(reviewer=request.user.person,topic=topic)
+
+ return render(request, 'nomcom/view_feedback_topic.html',
+ {'year': year,
+ 'selected': 'view_feedback',
+ 'topic': topic,
+ 'feedback_types': feedback_types,
+ 'last_seen_time' : last_seen_time,
+ 'nomcom': nomcom})
@role_required("Nomcom")
@nomcom_private_key_required
@@ -884,12 +966,10 @@ def edit_nomcom(request, year):
@role_required("Nomcom Chair", "Nomcom Advisor")
def list_templates(request, year):
nomcom = get_nomcom_by_year(year)
- positions = nomcom.position_set.all()
- template_list = DBTemplate.objects.filter(group=nomcom.group).exclude(path__contains='/position/')
+ template_list = DBTemplate.objects.filter(group=nomcom.group).exclude(path__contains='/position/').exclude(path__contains='/topic/')
return render(request, 'nomcom/list_templates.html',
{'template_list': template_list,
- 'positions': positions,
'year': year,
'selected': 'edit_templates',
'nomcom': nomcom,
@@ -987,6 +1067,73 @@ def edit_position(request, year, position_id=None):
'is_chair_task' : True,
})
+
+@role_required("Nomcom Chair", "Nomcom Advisor")
+def list_topics(request, year):
+ nomcom = get_nomcom_by_year(year)
+ topics = nomcom.topic_set.all()
+
+ return render(request, 'nomcom/list_topics.html',
+ {'topics': topics,
+ 'year': year,
+ 'selected': 'edit_topics',
+ 'nomcom': nomcom,
+ 'is_chair_task' : True,
+ })
+
+
+@role_required("Nomcom Chair", "Nomcom Advisor")
+def remove_topic(request, year, topic_id):
+ nomcom = get_nomcom_by_year(year)
+ if nomcom.group.state_id=='conclude':
+ return HttpResponseForbidden('This nomcom is closed.')
+ try:
+ topic = nomcom.topic_set.get(id=topic_id)
+ except Topic.DoesNotExist:
+ raise Http404
+
+ if request.POST.get('remove', None):
+ topic.delete()
+ return redirect('ietf.nomcom.views.list_topics', year=year)
+ return render(request, 'nomcom/remove_topic.html',
+ {'year': year,
+ 'topic': topic,
+ 'nomcom': nomcom,
+ 'is_chair_task' : True,
+ })
+
+
+@role_required("Nomcom Chair", "Nomcom Advisor")
+def edit_topic(request, year, topic_id=None):
+ nomcom = get_nomcom_by_year(year)
+
+ if nomcom.group.state_id=='conclude':
+ return HttpResponseForbidden('This nomcom is closed.')
+
+ if topic_id:
+ try:
+ topic = nomcom.topic_set.get(id=topic_id)
+ except Topic.DoesNotExist:
+ raise Http404
+ else:
+ topic = None
+
+ if request.method == 'POST':
+ form = TopicForm(request.POST, instance=topic, nomcom=nomcom)
+ if form.is_valid():
+ form.save()
+ return redirect('ietf.nomcom.views.list_topics', year=year)
+ else:
+ form = TopicForm(instance=topic, nomcom=nomcom,initial={'accepting_feedback':True,'audience':'general'} if not topic else {})
+
+ return render(request, 'nomcom/edit_topic.html',
+ {'form': form,
+ 'topic': topic,
+ 'year': year,
+ 'nomcom': nomcom,
+ 'is_chair_task' : True,
+ })
+
@role_required("Nomcom Chair", "Nomcom Advisor")
def configuration_help(request, year):
return render(request,'nomcom/chair_help.html',{'year':year})
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index 982ac9c2f..fcb56126f 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -77,6 +77,9 @@ class SubmitRequestCase(TestCase):
group = Group.objects.get(acronym='ames')
ad = group.parent.role_set.filter(name='ad').first().person
resource = ResourceAssociation.objects.first()
+ # Bit of a test data hack - the fixture now has no used resources to pick from
+ resource.name.used=True
+ resource.name.save()
url = reverse('ietf.secr.sreq.views.new',kwargs={'acronym':group.acronym})
confirm_url = reverse('ietf.secr.sreq.views.confirm',kwargs={'acronym':group.acronym})
len_before = len(outbox)
diff --git a/ietf/templates/nomcom/edit_topic.html b/ietf/templates/nomcom/edit_topic.html
new file mode 100644
index 000000000..d9ea3cee3
--- /dev/null
+++ b/ietf/templates/nomcom/edit_topic.html
@@ -0,0 +1,32 @@
+{% extends "nomcom/nomcom_private_base.html" %}
+{# Copyright The IETF Trust 2017, All Rights Reserved #}
+{% load origin %}
+{% load staticfiles %}
+{% block pagehead %}
+ {% if topic %}Edit{% else %}Add{% endif %} topic
+
+
+{% endblock %}
+
+{% block content_end %}
+
+
+{% endblock %}
diff --git a/ietf/templates/nomcom/feedback.html b/ietf/templates/nomcom/feedback.html
index 5759f09e7..7f36c0aac 100644
--- a/ietf/templates/nomcom/feedback.html
+++ b/ietf/templates/nomcom/feedback.html
@@ -87,18 +87,35 @@
the badge, for more information about this
nominee.
+
+ Topics
+
{% if form %}
-
Provide feedback
- {% if form.position %}
- about {{form.nominee.email.person.name}} ({{form.nominee.email.address}}) for the {{form.position.name}} position.
- {% if nomcom.show_nominee_pictures and form.nominee.email.person.photo_thumb %}
-
+ {% if form.position %}
+
Provide feedback about {{form.nominee.email.person.name}} ({{form.nominee.email.address}}) for the {{form.position.name}} position.
+ {% if nomcom.show_nominee_pictures and form.nominee.email.person.photo_thumb %}
+
+ {% elif form.topic %}
+
Provide feedback about "{{form.topic.subject}}"
+
A description of this topic is at the end of the page.
+ {% endif %}
This feedback will only be available to NomCom {{year}} .
You may have the feedback mailed back to you by selecting the option below.
@@ -108,8 +125,14 @@
{% buttons %}
{% endbuttons %}
-
+
+ {% if form.topic %}
+
+
Description: {{form.topic.subject}}
+
{{form.topic.get_description|safe}}
+
{% endif %}
+ {% endif %}
Defined templates for positions
- {% if positions %}
- {% for position in positions %}
+ {% for position in nomcom.position_set.all %}
{{ position.name }}
{% for template in position.get_templates %}
{{ template }}
- {% endfor %}
- {% else %}
+ {% empty %}
There are no positions defined.
- {% endif %}
+ {% endfor %}
+
+ Defined templates for topics
+ {% for topic in nomcom.topic_set.all %}
+ {{ topic.subject }}
+
+ {% empty %}
+ There are no topics defined.
+ {% endfor %}
{% endblock nomcom_content %}
diff --git a/ietf/templates/nomcom/list_topics.html b/ietf/templates/nomcom/list_topics.html
new file mode 100644
index 000000000..c3f468807
--- /dev/null
+++ b/ietf/templates/nomcom/list_topics.html
@@ -0,0 +1,41 @@
+{% extends "nomcom/nomcom_private_base.html" %}
+{# Copyright The IETF Trust 2017, All Rights Reserved #}
+{% load origin %}
+
+{% block subtitle %} - Topics{% endblock %}
+
+{% block nomcom_content %}
+ {% origin %}
+ Topics in {{ nomcom.group }}
+
+ {% if nomcom.group.state_id == 'active' %}
+ Add new topic
+ {% endif %}
+
+ {% if topics %}
+
+ {% for topic in topics %}
+
{{ topic.subject }}
+
+ Accepting feedback
+ {{topic.accepting_feedback|yesno}}
+ Description
+
+ {{ topic.description }}
+ Audience
+ {{topic.audience}}
+ {% if nomcom.group.state_id == 'active' %}
+ Actions
+
+ Edit
+ Remove
+
+ {% endif %}
+
+ {% endfor %}
+
There are no topics defined.
+ {% endif %}
+{% endblock nomcom_content %}
diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
index 4b93d362f..2f7bdc021 100644
--- a/ietf/templates/nomcom/nomcom_private_base.html
+++ b/ietf/templates/nomcom/nomcom_private_base.html
@@ -40,6 +40,7 @@
Edit Settings Edit Pages Edit Positions Edit Topics Edit Members Position: {{ topic }}
+
+ This topic has {{topic.feedback_set.count|default:"no"}} feedback objects associated with it.
+ {% if topic.feedback_set.count %}
+
+ Unless this is a topic created only for testing, deleting it is likely to be harmful. All of the feedback will also be deleted.
+
+
+ If you are just wanting the topic to disappear from the lists available to the community for providing feedback, instead of deleting the topic, edit the topic and change accepting_feedback to False.
+
+ If this is just a test topic, it is ok to delete it.
+ {% else %}
+ This topic is safe to delete.
+ {% endif %}
+
+
+
+{% endblock nomcom_content %}
diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html
index bf6853cd5..4b33721cc 100644
--- a/ietf/templates/nomcom/view_feedback.html
+++ b/ietf/templates/nomcom/view_feedback.html
@@ -27,7 +27,7 @@
Nominee
- {% for ft in feedback_types %}
+ {% for ft in nominee_feedback_types %}
{{ ft.name }}
{% endfor %}
@@ -53,6 +53,38 @@
{% endfor %}
+ Feedback related to topics
+
+
+
+
+
+
+ Topic
+ {% for ft in topic_feedback_types %}
+ {{ ft.name }}
+ {% endfor %}
+
+
+
+ {% for fb_dict in topics_feedback %}
+
+
+ {{ fb_dict.topic.subject }}
+
+ {% for fbtype_name, fbtype_count, fbtype_newflag in fb_dict.feedback %}
+
+ {% if fbtype_newflag %}New {% endif %}
+ {{ fbtype_count }}
+
+ {% endfor %}
+
+ {% endfor %}
+
+
+
+
Feedback not related to Nominees
diff --git a/ietf/templates/nomcom/view_feedback_pending.html b/ietf/templates/nomcom/view_feedback_pending.html
index 960860718..9d3196549 100644
--- a/ietf/templates/nomcom/view_feedback_pending.html
+++ b/ietf/templates/nomcom/view_feedback_pending.html
@@ -33,7 +33,7 @@
{% bootstrap_form formset.management_form %}
{% if extra_step %}
- Please, provide the following information about nominees to complete the classification of this feedback.
+ Please indicate which nominees and/or topics this feedback should be associated with.
{% for form in formset.forms %}
diff --git a/ietf/templates/nomcom/view_feedback_topic.html b/ietf/templates/nomcom/view_feedback_topic.html
new file mode 100644
index 000000000..22a6d88a3
--- /dev/null
+++ b/ietf/templates/nomcom/view_feedback_topic.html
@@ -0,0 +1,42 @@
+{% extends "nomcom/nomcom_private_base.html" %}
+{# Copyright The IETF Trust 2017, All Rights Reserved #}
+{% load origin %}{% origin %}
+
+{% load nomcom_tags %}
+
+{% block subtitle %} - View feedback about {{ topic.subject }}{% endblock %}
+
+{% block nomcom_content %}
+
+ Feedback about {{ topic.subject }}
+
+
+ {% for ft in feedback_types %}
+ {{ ft.name }}
+
+
+ {% for ft in feedback_types %}
+
+ {% for feedback in topic.feedback_set.all %}
+ {% if feedback.type.slug == ft.slug %}
+ {% if forloop.first %}
{% else %}
{% endif %}
+
+ {% if feedback.time > last_seen_time %}New {% endif %}From
+ {{ feedback.author|formatted_email|default:"Anonymous" }}
+
+ Date
+ {{ feedback.time|date:"Y-m-d" }}
+ Body
+ {% decrypt feedback.comments request year 1 %}
+
+ {% endif %}
+ {% endfor %}
+
+ {% endfor %}
+
Back
+
+{% endblock %}
- {% endif %}
- {% endif %}
-