Updated secondary vote phase

Author: ChillarAnand

junction/base/constants.py

@@ -98,7 +98,13 @@ class ConferenceSettingConstants:
                                      "description": "Allow +0 vote in reviewer votes"}
 
 
+@choices
+class PSRVotePhase:
+    _PRIMARY = [0, 'Initial voting']
+    _SECONDARY = [1, 'Second phase voting']
+
+
 @choices
 class ProposalCommentType:
-    _GENERAL = [0, 'Unclassified']
-    _SECOND_PHASE_VOTING = [1, 'Second phase voting']
+    _GENERAL = [0, 'All general comments']
+    _SECONDARY_VOTING = [1, 'Second phase voting']

junction/proposals/migrations/0018_auto_20160806_1727.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/models.py

@@ -17,7 +17,7 @@
 # Junction Stuff
 from junction.base.constants import (
     ProposalReviewStatus, ProposalStatus, ProposalTargetAudience, ProposalUserVoteRole,
-    ProposalCommentType
+    PSRVotePhase, ProposalCommentType,
 )
 from junction.base.models import AuditModel, TimeAuditModel
 from junction.conferences.models import Conference, ConferenceProposalReviewer
@@ -124,6 +124,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])
@@ -250,6 +254,8 @@ 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):
@@ -260,6 +266,7 @@ class Meta:
         verbose_name = 'ProposalSectionReviewerVote'
 
 
+#FIXME: Need to move private, reviewer, vote to type
 @python_2_unicode_compatible
 class ProposalComment(TimeAuditModel):
 
@@ -271,7 +278,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?")
-    type = models.PositiveSmallIntegerField(choices=ProposalCommentType.CHOICES, default=ProposalCommentType.GENERAL)
+    comment_type = models.PositiveSmallIntegerField(
+        choices=ProposalCommentType.CHOICES, default=ProposalCommentType.GENERAL)
     objects = ProposalCommentQuerySet.as_manager()
 
     def __str__(self):

junction/proposals/urls.py

@@ -34,8 +34,10 @@
     url(r'^comment/', include(comment_urls)),
 
     # Voting
-    url(r'^(?P<proposal_slug>[\w-]+)/vote/$', votes_views.proposal_reviewer_vote, name='proposal-reviewer-vote'),
     url(r'^(?P<proposal_slug>[\w-]+)/down-vote/$', votes_views.proposal_vote_down, name='proposal-vote-down'),
     url(r'^(?P<proposal_slug>[\w-]+)/up-vote/$', votes_views.proposal_vote_up, name='proposal-vote-up'),
     url(r'^(?P<proposal_slug>[\w-]+)/remove-vote/$', votes_views.proposal_vote_remove, name='proposal-vote-remove'),
+    url(r'^(?P<proposal_slug>[\w-]+)/vote/$', votes_views.proposal_reviewer_vote, name='proposal-reviewer-vote'),
+    url(r'^(?P<proposal_slug>[\w-]+)/second-vote/$', votes_views.proposal_reviewer_secondary_vote,
+        name='proposal-reviewer-secondary-vote'),
 )

junction/proposals/votes_views.py

@@ -18,11 +18,13 @@
 from .models import (
     Proposal,
     ProposalComment,
+    ProposalCommentType,
     ProposalCommentVote,
     ProposalSectionReviewer,
     ProposalSectionReviewerVote,
     ProposalSectionReviewerVoteValue,
-    ProposalVote
+    ProposalVote,
+    PSRVotePhase,
 )
 
 
@@ -111,7 +113,14 @@ def proposal_comment_down_vote(request, conference_slug, proposal_slug,
 
 @login_required
 @require_http_methods(['GET', 'POST'])
-def proposal_reviewer_vote(request, conference_slug, proposal_slug):
+def proposal_reviewer_vote(request, conference_slug, proposal_slug, vote_phase=None):
+    if not vote_phase:
+        vote_phase = PSRVotePhase.PRIMARY
+        comment_type = ProposalCommentType.GENERAL
+    elif vote_phase == PSRVotePhase.SECONDARY:
+        print('aaaaaaaaaaaaaaaaaaaaa')
+        comment_type = ProposalCommentType.SECONDARY_VOTING
+
     conference = get_object_or_404(Conference, slug=conference_slug)
     proposal = get_object_or_404(Proposal, slug=proposal_slug,
                                  conference=conference)
@@ -130,6 +139,7 @@ def proposal_reviewer_vote(request, conference_slug, proposal_slug):
                 conference_reviewer__reviewer=request.user,
                 conference_reviewer__conference=conference,
                 proposal_section=proposal.proposal_section),
+            phase=vote_phase,
         )
         vote_value = vote.vote_value.vote_value
     except ProposalSectionReviewerVote.DoesNotExist:
@@ -141,6 +151,7 @@ def proposal_reviewer_vote(request, conference_slug, proposal_slug):
             commenter=request.user,
             vote=True,
             deleted=False,
+            comment_type=comment_type,
         )
     except:
         vote_comment = None
@@ -182,6 +193,7 @@ def proposal_reviewer_vote(request, conference_slug, proposal_slug):
                 proposal_section=proposal.proposal_section)[0],
             vote_value=ProposalSectionReviewerVoteValue.objects.filter(
                 vote_value=vote_value)[0],
+            phase=vote_phase,
         )
     else:
         vote.vote_value = ProposalSectionReviewerVoteValue.objects.filter(
@@ -193,9 +205,15 @@ def proposal_reviewer_vote(request, conference_slug, proposal_slug):
             commenter=request.user,
             comment=comment,
             vote=True,
+            comment_type=comment_type,
         )
     else:
         vote_comment.comment = comment
         vote_comment.save()
     return HttpResponseRedirect(reverse('proposals-to-review',
                                         args=[conference.slug]))
+
+
+def proposal_reviewer_secondary_vote(request, conference_slug, proposal_slug):
+    vote_phase = PSRVotePhase.SECONDARY
+    return proposal_reviewer_vote(request, conference_slug, proposal_slug, vote_phase=vote_phase)

junction/templates/proposals/detail/base.html

@@ -173,9 +173,8 @@ <h4 class='heading'><b>Speaker Links:</b></h4>
           {% if is_section_reviewer or user.is_authenticated and user.is_superuser %}
               <div class="proposal-writeup--section">
                   <h4 class='heading'><b>Reviewer Actions:</b></h4>
-                  <a class='btn btn-primary btn-success' href="{{ proposal.get_vote_url }}">
-                      Vote for proposal
-                  </a>
+                  <a class='btn btn-primary btn-success' href="{{ proposal.get_vote_url }}">Vote for proposal</a>
+                  <a class='btn btn-primary btn-success' href="{{ proposal.get_secondary_vote_url }}">Second phase voting</a>
               </div>
           {% endif %}