Merge pull request #503 from ChillarAnand/voting

Second Phase Voting

Author: kracekumar

junction/base/constants.py

@@ -98,3 +98,15 @@ class ConferenceSettingConstants:
     ALLOW_PLUS_ZERO_REVIEWER_VOTE = {"name": "allow_plus_zero_reviewer_vote",
                                      "value": True,
                                      "description": "Allow +0 vote in reviewer votes"}
+
+
+@choices
+class PSRVotePhase:
+    _PRIMARY = [0, 'Initial voting']
+    _SECONDARY = [1, 'Second phase voting']
+
+
+@choices
+class ProposalCommentType:
+    _GENERAL = [0, 'All general comments']
+    _SECONDARY_VOTING = [1, 'Second phase voting']

junction/profiles/admin.py

@@ -19,6 +19,7 @@
 from junction.base.constants import (
     ProposalReviewVote,
     ProposalStatus,
+    ProposalReviewStatus,
 )
 from junction.conferences.models import Conference, ConferenceProposalReviewer
 
@@ -233,6 +234,54 @@ def reviewer_votes_dashboard(request, conference_slug):
                    'form': form})
 
 
+@require_http_methods(['GET', 'POST'])
+def second_phase_voting(request, conference_slug):
+    conference = get_object_or_404(Conference, slug=conference_slug)
+    user = request.user
+
+    if not is_conference_moderator(user=request.user, conference=conference):
+        raise PermissionDenied
+
+    proposal_sections = conference.proposal_sections.all()
+    proposals_qs = Proposal.objects.select_related(
+        'proposal_type', 'proposal_section', 'conference', 'author',
+    ).filter(
+        conference=conference,
+        review_status=ProposalReviewStatus.SELECTED
+    )
+
+    proposals = []
+    s_items = collections.namedtuple('section_items', 'section proposals')
+    form = ProposalVotesFilterForm(conference=conference)
+
+    if request.method == 'GET':
+        for section in proposal_sections:
+            section_proposals = [
+                p for p in proposals_qs if p.proposal_section == section]
+            proposals.append(s_items(section, section_proposals))
+
+        return render(request, 'proposals/second_phase_voting.html',
+                      {'conference': conference,
+                       'proposals': proposals,
+                       'form': form})
+
+    form = ProposalVotesFilterForm(conference=conference, data=request.POST)
+
+    if not form.is_valid():
+        return render(request, 'proposals/votes-dashboard.html',
+                      {'form': form,
+                       'conference': conference,
+                       'errors': form.errors})
+
+    # Valid form
+    proposals = _sort_proposals_for_dashboard(conference, proposals_qs, user, form)
+
+    return render(request, 'proposals/second_phase_voting.html',
+                  {'conference': conference,
+                   'proposals': proposals,
+                   'form': form})
+
+
 @require_http_methods(['GET', 'POST'])
 def export_reviewer_votes(request, conference_slug):
     """

junction/proposals/dashboard.py

@@ -152,7 +152,6 @@ class ProposalReviewForm(forms.Form):
 
 
 class ProposalReviewerVoteForm(forms.Form):
-
     """
     Used by ProposalSectionReviewers to vote on proposals.
     """

junction/proposals/forms.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0016_auto_20160221_0240'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='proposalcomment',
+            name='type',
+            field=models.PositiveSmallIntegerField(default=0, choices=[(0, 'Unclassified'), (1, 'Second phase voting')]),
+            preserve_default=True,
+        ),
+    ]

junction/proposals/migrations/0017_proposalcomment_type.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0017_proposalcomment_type'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='proposalcomment',
+            name='type',
+        ),
+        migrations.AddField(
+            model_name='historicalproposalsectionreviewervote',
+            name='phase',
+            field=models.PositiveSmallIntegerField(default=0, choices=[(0, 'Initial voting'), (1, 'Second phase voting')]),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='proposalsectionreviewervote',
+            name='phase',
+            field=models.PositiveSmallIntegerField(default=0, choices=[(0, 'Initial voting'), (1, 'Second phase voting')]),
+            preserve_default=True,
+        ),
+    ]

junction/proposals/migrations/0018_auto_20160806_1727.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0018_auto_20160806_1727'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='proposalcomment',
+            name='comment_type',
+            field=models.PositiveSmallIntegerField(default=0, choices=[(0, 'All general comments'), (1, 'Second phase voting')]),
+            preserve_default=True,
+        ),
+    ]

junction/proposals/migrations/0019_proposalcomment_comment_type.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0019_proposalcomment_comment_type'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='proposalsectionreviewervote',
+            unique_together=set([]),
+        ),
+    ]

junction/proposals/migrations/0020_auto_20160806_2023.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
-# Standard Library
 from datetime import datetime
 
-# Third Party Stuff
 from django.contrib.auth.models import User
 from django.core.urlresolvers import reverse
 from django.db import models
@@ -14,9 +12,9 @@
 from hashids import Hashids
 from simple_history.models import HistoricalRecords
 
-# Junction Stuff
-from junction.base.constants import ProposalReviewStatus, ProposalStatus, ProposalTargetAudience, \
-    ProposalUserVoteRole, ProposalReviewVote
+from junction.base.constants import PSRVotePhase, ProposalCommentType, \
+    ProposalReviewStatus, ProposalReviewVote, ProposalStatus, \
+    ProposalTargetAudience, ProposalUserVoteRole
 from junction.base.models import AuditModel, TimeAuditModel
 from junction.conferences.models import Conference, ConferenceProposalReviewer
 
@@ -122,6 +120,10 @@ def get_vote_url(self):
         return reverse('proposal-reviewer-vote',
                        args=[self.conference.slug, self.slug])
 
+    def get_secondary_vote_url(self):
+        return reverse('proposal-reviewer-secondary-vote',
+                       args=[self.conference.slug, self.slug])
+
     def get_delete_url(self):
         return reverse('proposal-delete',
                        args=[self.conference.slug, self.slug])
@@ -263,16 +265,18 @@ class ProposalSectionReviewerVote(TimeAuditModel):
     role = models.PositiveSmallIntegerField(
         choices=ProposalUserVoteRole.CHOICES, default=ProposalUserVoteRole.REVIEWER)
     vote_value = models.ForeignKey(ProposalSectionReviewerVoteValue)
+    phase = models.PositiveSmallIntegerField(choices=PSRVotePhase.CHOICES, default=PSRVotePhase.PRIMARY)
+
     history = HistoricalRecords()
 
     def __str__(self):
         return "[{}] {}".format(self.vote_value, self.proposal)
 
     class Meta:
-        unique_together = ("proposal", "voter")
         verbose_name = 'ProposalSectionReviewerVote'
 
 
+# FIXME: Need to move private, reviewer, vote to type
 @python_2_unicode_compatible
 class ProposalComment(TimeAuditModel):
 
@@ -284,7 +288,8 @@ class ProposalComment(TimeAuditModel):
     vote = models.BooleanField(default=False, verbose_name="What is the reason?")
     comment = models.TextField()
     deleted = models.BooleanField(default=False, verbose_name="Is Deleted?")
-
+    comment_type = models.PositiveSmallIntegerField(
+        choices=ProposalCommentType.CHOICES, default=ProposalCommentType.GENERAL)
     objects = ProposalCommentQuerySet.as_manager()
 
     def __str__(self):

junction/proposals/models.py

@@ -1,15 +1,14 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
 
-# Standard Library
 import collections
 import re
 
-# Third Party Stuff
 from django import template
+from junction.base.constants import PSRVotePhase
+from junction.proposals.models import ProposalComment, ProposalSectionReviewer, \
+    ProposalSectionReviewerVote
 
-# Junction Stuff
-from junction.proposals.models import ProposalComment, ProposalSectionReviewer, ProposalSectionReviewerVote
 
 register = template.Library()
 
@@ -20,14 +19,17 @@ def reviewer_comments(proposal, user):
 
 
 @register.filter(name='is_reviewer_voted')
-def is_reviewer_voted(proposal, user):
+def is_reviewer_voted(proposal, user, phase=None):
+    if not phase:
+        phase = PSRVotePhase.PRIMARY
     try:
         vote = ProposalSectionReviewerVote.objects.get(
             proposal=proposal,
             voter=ProposalSectionReviewer.objects.get(
                 conference_reviewer__reviewer=user,
                 conference_reviewer__conference=proposal.conference,
                 proposal_section=proposal.proposal_section),
+            phase=phase,
         )
     except ProposalSectionReviewerVote.DoesNotExist:
         vote = None