now you can see new feedback types

See #973
 - Legacy-Id: 5726

ietf/nomcom/models.py

@@ -101,7 +101,10 @@ class Nominee(models.Model):
         unique_together = ('email', 'nomcom')
 
     def __unicode__(self):
-        return u'%s' % self.email.formatted_email()
+        if self.email.person and self.email.person.name:
+            return u'%s <%s>' % (self.email.person.plain_name(), self.email.address)
+        else:
+            return self.email.address
 
 
 class NomineePosition(models.Model):

ietf/nomcom/views.py

@@ -386,11 +386,18 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h
 def view_feedback(request, year):
     nomcom = get_nomcom_by_year(year)
     nominees = Nominee.objects.get_by_nomcom(nomcom).not_duplicated().distinct()
+    feedback_types = FeedbackType.objects.all()
+    nominees_feedback = {}
+    for nominee in nominees:
+        nominee_feedback = [(ft.name, nominee.feedback_set.by_type(ft.slug).count()) for ft in feedback_types]
+        nominees_feedback.update({nominee: nominee_feedback})
 
     return render_to_response('nomcom/view_feedback.html',
                               {'year': year,
                                'selected': 'view_feedback',
                                'nominees': nominees,
+                               'feedback_types': feedback_types,
+                               'nominees_feedback': nominees_feedback,
                                'nomcom': nomcom}, RequestContext(request))
 
 

ietf/templates/nomcom/view_feedback.html

@@ -15,16 +15,16 @@
 <table class="ietf-table ietf-doctable">
 <tr>
   <th>Nominee</th>
-  <th>Nominations</th>
-  <th>Comments</th>
-  <th>Questionnaire response</th>
+  {% for ft in feedback_types %}
+      <th>{{ ft.name }}</th>
+  {% endfor %}
 </tr>
-{% for nominee in nominees %}
+{% for nominee, feedback in nominees_feedback.items %}
 <tr class="{{ forloop.counter|divisibleby:2|yesno:"oddrow,evenrow" }}">
   <td><a href="{% url nomcom_view_feedback_nominee year nominee.id %}#comment">{{ nominee }}</td>
-  <td>{{ nominee.feedback_set.nominations.count }}</td>
-  <td>{{ nominee.feedback_set.comments.count }}</td>
-  <td>{{ nominee.feedback_set.questionnaires.count }}</td>
+  {% for f in feedback %}
+    <td>{{ f.1 }}</td>
+  {% endfor %}
 </tr>
 {% endfor %}
 </table>

ietf/templates/nomcom/view_feedback_nominee.html

@@ -27,15 +27,6 @@
   <div class="yui-content">
     {% for ft in feedback_types %}
       <div id="#{{ ft.slug }}">
-        {% ifequal ft.slug "comment" %}
-          <b>Number of comments: {{ nominee.feedback_set.comments.count|default:"0" }}</b>
-        {% endifequal %}
-        {% ifequal ft.slug "questio" %}
-          <b>Number of questionnaires: {{ nominee.feedback_set.questionnaires.count|default:"0" }}</b>
-        {% endifequal %}
-        {% ifequal ft.slug "nomina" %}
-          <b>Number of nominations: {{ nominee.feedback_set.nominations.count|default:"0" }}</b>
-        {% endifequal %}
         {% for feedback in nominee.feedback_set.all %}
           {% ifequal feedback.type.slug ft.slug %}
             <div>