Feedback refactor:

 * Now Feedback have manytomany to posotions, so a feedback email can be associated to few positions.
 * Add user and time field to nomination model
 * Delete feedbacks and questionnaires field from nomineeposition model, now feedback model has all information about nominations, feedback and quiestionnaires
 * Add user field to Feedback model to know the nomcom meber who made the nomination, regardless of the real author
 * Add nomcom field to Feedback and refactor EncryptedTextField, it's necessary to encrypt the comments with the nomcom public key.
 * Template tag to decrypt feedback has been improved, now It isn't necessary the view context has the private key variable.
 * Add skel view to view feedback
 * Delete hidden fields from private and public feedback form
 * Refactor private index view to show total number of questionnaires and to show if the nomienee has questionnaires or not
See ietf-tools#970
 - Legacy-Id: 5571

Author: ejimenez

ietf/nomcom/admin.py

@@ -28,7 +28,7 @@ class PositionAdmin(admin.ModelAdmin):
 
 
 class FeedbackAdmin(admin.ModelAdmin):
-    list_display = ('nominee', 'author', 'position', 'type')
+    list_display = ('nominee', 'author', 'type')
     list_filter = ('type',)
 
 admin.site.register(NomCom, NomComAdmin)

ietf/nomcom/fields.py

@@ -15,8 +15,8 @@ class EncryptedTextField(models.TextField):
     def pre_save(self, instance, add):
         if add:
             comments = getattr(instance, 'comments')
-            position = getattr(instance, 'position')
-            cert_file = position.nomcom.public_key.path
+            nomcom = getattr(instance, 'nomcom')
+            cert_file = nomcom.public_key.path
             comments_file = tempfile.NamedTemporaryFile(delete=False)
             comments_file.write(comments)
             comments_file.close()

ietf/nomcom/forms.py

@@ -302,8 +302,7 @@ def __init__(self, *args, **kwargs):
 
         super(NominateForm, self).__init__(*args, **kwargs)
 
-        fieldset = ['nominator_email',
-                    'position',
+        fieldset = ['position',
                     'candidate_name',
                     'candidate_email', 'candidate_phone',
                     'comments']
@@ -312,6 +311,7 @@ def __init__(self, *args, **kwargs):
             self.fields['position'].queryset = Position.objects.get_by_nomcom(self.nomcom).opened()
 
         if not self.public:
+            fieldset = ['nominator_email'] + fieldset
             author = get_user_email(self.user)
             if author:
                 self.fields['nominator_email'].initial = author.address
@@ -350,10 +350,11 @@ def save(self, commit=True):
         nominee_position, nominee_position_created = NomineePosition.objects.get_or_create(position=position, nominee=nominee)
 
         # Complete nomination data
-        feedback = Feedback.objects.create(position=position,
+        feedback = Feedback.objects.create(nomcom=self.nomcom,
                                            nominee=nominee,
                                            comments=comments,
                                            type=FeedbackType.objects.get(slug='nomina'))
+        feedback.positions.add(position)
         author = None
         if self.public:
             author = get_user_email(self.user)
@@ -369,6 +370,7 @@ def save(self, commit=True):
 
         nomination.nominee = nominee
         nomination.comments = feedback
+        nomination.user = self.user
 
         if commit:
             nomination.save()
@@ -480,10 +482,7 @@ def __init__(self, *args, **kwargs):
                     'nominee_email',
                     'nominator_name',
                     'nominator_email',
-                    'comments',
-                    'position',
-                    'type',
-                    'nominee']
+                    'comments']
 
         if self.public:
             readonly_fields += ['nominator_name', 'nominator_email']
@@ -494,18 +493,13 @@ def __init__(self, *args, **kwargs):
                             and the address will also be captured as part of the registered nomination.)"""
             self.fields['nominator_email'].help_text = help_text
 
-        hidden_fields = ['position', 'type', 'nominee']
-
         author = get_user_email(self.user)
         if author:
             self.fields['nominator_email'].initial = author.address
             self.fields['nominator_name'].initial = author.person.name
 
         if self.position and self.nominee:
-            self.fields['type'].initial = "comment"
-            self.fields['position'].initial = self.position
             self.fields['position_name'].initial = self.position.name
-            self.fields['nominee'].initial = self.nominee
             self.fields['nominee_name'].initial = self.nominee.email.person.name
             self.fields['nominee_email'].initial = self.nominee.email.address
         else:
@@ -520,16 +514,11 @@ def __init__(self, *args, **kwargs):
         for field in readonly_fields:
             self.fields[field].widget.attrs['readonly'] = True
 
-        for field in hidden_fields:
-            self.fields[field].widget = forms.HiddenInput()
-
         self.fieldsets = [('Provide comments', fieldset)]
 
     def save(self, commit=True):
         feedback = super(FeedbackForm, self).save(commit=False)
         confirmation = self.cleaned_data['confirmation']
-        nominee = self.cleaned_data['nominee']
-        position = self.cleaned_data['position']
         comments = self.cleaned_data['comments']
         nominator_email = self.cleaned_data['nominator_email']
         nomcom_template_path = '/nomcom/%s/' % self.nomcom.group.acronym
@@ -544,32 +533,35 @@ def save(self, commit=True):
 
         if author:
             feedback.author = author
-            feedback.save()
+
+        feedback.nomcom = self.nomcom
+        feedback.nominee = self.nominee
+        feedback.user = self.user
+        feedback.type = FeedbackType.objects.get(slug='comment')
+        feedback.save()
+        feedback.positions.add(self.position)
 
         # send receipt email to feedback author
         if confirmation or not self.public:
             if author:
                 subject = "NomCom comment confirmation"
                 from_email = settings.NOMCOM_FROM_EMAIL
                 to_email = author.address
-                context = {'nominee': nominee.email.person.name,
+                context = {'nominee': self.nominee.email.person.name,
                            'comments': comments,
-                           'position': position.name}
+                           'position': self.position.name}
                 path = nomcom_template_path + FEEDBACK_RECEIPT_TEMPLATE
                 send_mail(None, to_email, from_email, subject, path, context)
 
     class Meta:
         model = Feedback
         fields = ('author',
-                  'position',
-                  'nominee',
                   'nominee_name',
                   'nominee_email',
                   'nominator_name',
                   'nominator_email',
                   'confirmation',
-                  'comments',
-                  'type')
+                  'comments')
 
     class Media:
         js = ("/js/jquery-1.5.1.min.js",

ietf/nomcom/migrations/0001_initial.py

@@ -27,6 +27,8 @@ def forwards(self, orm):
             ('nominee', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['nomcom.Nominee'])),
             ('comments', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['nomcom.Feedback'])),
             ('nominator_email', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+            ('time', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
         ))
         db.send_create_signal('nomcom', ['Nomination'])
 
@@ -51,22 +53,6 @@ def forwards(self, orm):
         # Adding unique constraint on 'NomineePosition', fields ['position', 'nominee']
         db.create_unique('nomcom_nomineeposition', ['position_id', 'nominee_id'])
 
-        # Adding M2M table for field questionnaires on 'NomineePosition'
-        db.create_table('nomcom_nomineeposition_questionnaires', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('nomineeposition', models.ForeignKey(orm['nomcom.nomineeposition'], null=False)),
-            ('feedback', models.ForeignKey(orm['nomcom.feedback'], null=False))
-        ))
-        db.create_unique('nomcom_nomineeposition_questionnaires', ['nomineeposition_id', 'feedback_id'])
-
-        # Adding M2M table for field feedback on 'NomineePosition'
-        db.create_table('nomcom_nomineeposition_feedback', (
-            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
-            ('nomineeposition', models.ForeignKey(orm['nomcom.nomineeposition'], null=False)),
-            ('feedback', models.ForeignKey(orm['nomcom.feedback'], null=False))
-        ))
-        db.create_unique('nomcom_nomineeposition_feedback', ['nomineeposition_id', 'feedback_id'])
-
         # Adding model 'Position'
         db.create_table('nomcom_position', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
@@ -84,15 +70,24 @@ def forwards(self, orm):
         # Adding model 'Feedback'
         db.create_table('nomcom_feedback', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('nomcom', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['nomcom.NomCom'])),
             ('author', self.gf('django.db.models.fields.EmailField')(max_length=75, blank=True)),
-            ('position', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['nomcom.Position'])),
             ('nominee', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['nomcom.Nominee'])),
             ('comments', self.gf('ietf.nomcom.fields.EncryptedTextField')()),
             ('type', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['name.FeedbackType'])),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'], null=True, blank=True)),
             ('time', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
         ))
         db.send_create_signal('nomcom', ['Feedback'])
 
+        # Adding M2M table for field positions on 'Feedback'
+        db.create_table('nomcom_feedback_positions', (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('feedback', models.ForeignKey(orm['nomcom.feedback'], null=False)),
+            ('position', models.ForeignKey(orm['nomcom.position'], null=False))
+        ))
+        db.create_unique('nomcom_feedback_positions', ['feedback_id', 'position_id'])
+
 
     def backwards(self, orm):
 
@@ -111,18 +106,15 @@ def backwards(self, orm):
         # Deleting model 'NomineePosition'
         db.delete_table('nomcom_nomineeposition')
 
-        # Removing M2M table for field questionnaires on 'NomineePosition'
-        db.delete_table('nomcom_nomineeposition_questionnaires')
-
-        # Removing M2M table for field feedback on 'NomineePosition'
-        db.delete_table('nomcom_nomineeposition_feedback')
-
         # Deleting model 'Position'
         db.delete_table('nomcom_position')
 
         # Deleting model 'Feedback'
         db.delete_table('nomcom_feedback')
 
+        # Removing M2M table for field positions on 'Feedback'
+        db.delete_table('nomcom_feedback_positions')
+
 
     models = {
         'auth.group': {
@@ -344,10 +336,12 @@ def backwards(self, orm):
             'author': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'comments': ('ietf.nomcom.fields.EncryptedTextField', [], {}),
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'nomcom': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.NomCom']"}),
             'nominee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Nominee']"}),
-            'position': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Position']"}),
+            'positions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['nomcom.Position']", 'null': 'True', 'blank': 'True'}),
             'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.FeedbackType']"})
+            'type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.FeedbackType']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'})
         },
         'nomcom.nomcom': {
             'Meta': {'object_name': 'NomCom'},
@@ -365,7 +359,9 @@ def backwards(self, orm):
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'nominator_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
             'nominee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Nominee']"}),
-            'position': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Position']"})
+            'position': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Position']"}),
+            'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
         },
         'nomcom.nominee': {
             'Meta': {'object_name': 'Nominee'},
@@ -375,12 +371,10 @@ def backwards(self, orm):
             'nominee_position': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['nomcom.Position']", 'through': "orm['nomcom.NomineePosition']", 'symmetrical': 'False'})
         },
         'nomcom.nomineeposition': {
-            'Meta': {'unique_together': "(('position', 'nominee'),)", 'object_name': 'NomineePosition'},
-            'feedback': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['nomcom.Feedback']", 'null': 'True', 'blank': 'True'}),
+            'Meta': {'ordering': "['nominee']", 'unique_together': "(('position', 'nominee'),)", 'object_name': 'NomineePosition'},
             'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'nominee': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Nominee']"}),
             'position': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['nomcom.Position']"}),
-            'questionnaires': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'questionnaires'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['nomcom.Feedback']"}),
             'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['name.NomineePositionState']"}),
             'time': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'})
         },

ietf/nomcom/models.py

@@ -3,6 +3,7 @@
 from django.db import models
 from django.conf import settings
 from django.core.files.storage import FileSystemStorage
+from django.contrib.auth.models import User
 
 from south.modelsinspector import add_introspection_rules
 
@@ -52,6 +53,8 @@ class Nomination(models.Model):
     nominee = models.ForeignKey('Nominee')
     comments = models.ForeignKey('Feedback')
     nominator_email = models.EmailField(verbose_name='Nominator Email', blank=True)
+    user = models.ForeignKey(User)
+    time = models.DateTimeField(auto_now_add=True)
 
     class Meta:
         verbose_name_plural = 'Nominations'
@@ -80,10 +83,6 @@ class NomineePosition(models.Model):
     position = models.ForeignKey('Position')
     nominee = models.ForeignKey('Nominee')
     state = models.ForeignKey(NomineePositionState)
-    questionnaires = models.ManyToManyField('Feedback',
-                                           related_name='questionnaires',
-                                           blank=True, null=True)
-    feedback = models.ManyToManyField('Feedback', blank=True, null=True)
     time = models.DateTimeField(auto_now_add=True)
 
     objects = NomineePositionManager()
@@ -102,6 +101,12 @@ def save(self, **kwargs):
     def __unicode__(self):
         return u"%s - %s" % (self.nominee, self.position)
 
+    @property
+    def questionnaires(self):
+        return Feedback.objects.filter(type='questio',
+                                       positions=self.position,
+                                       nominee=self.nominee)
+
 
 class Position(models.Model):
     nomcom = models.ForeignKey('NomCom')
@@ -144,11 +149,13 @@ def get_templates(self):
 
 
 class Feedback(models.Model):
+    nomcom = models.ForeignKey('NomCom')
     author = models.EmailField(verbose_name='Author', blank=True)
-    position = models.ForeignKey('Position')
+    positions = models.ManyToManyField('Position', blank=True, null=True)
     nominee = models.ForeignKey('Nominee')
     comments = EncryptedTextField(verbose_name='Comments')
     type = models.ForeignKey(FeedbackType)
+    user = models.ForeignKey(User, blank=True, null=True)
     time = models.DateTimeField(auto_now_add=True)
 
     def __unicode__(self):

ietf/nomcom/templatetags/nomcom_tags.py

@@ -8,7 +8,7 @@
 from ietf.ietfauth.decorators import has_role
 
 from ietf.nomcom.models import Feedback
-from ietf.nomcom.utils import get_nomcom_by_year, get_user_email
+from ietf.nomcom.utils import get_nomcom_by_year, get_user_email, retrieve_nomcom_private_key
 
 
 register = template.Library()
@@ -27,7 +27,8 @@ def is_chair(user, year):
 @register.simple_tag
 def add_num_nominations(user, position, nominee):
     author = get_user_email(user)
-    count = Feedback.objects.filter(position=position,
+
+    count = Feedback.objects.filter(positions__in=[position],
                                     nominee=nominee,
                                     author=author,
                                     type='comment').count()
@@ -39,8 +40,10 @@ def add_num_nominations(user, position, nominee):
     return '<span title="%d earlier comments from you on %s as %s">%s</span>&nbsp;' % (count, nominee, position, mark)
 
 
-@register.filter
-def decrypt(string, key=None):
+@register.simple_tag
+def decrypt(string, request, year):
+    key = retrieve_nomcom_private_key(request, year)
+
     if not key:
         return '<-Encripted text [No private key provided]->'