merging upstream

Author: RishabhJain2018

.travis.yml

@@ -3,6 +3,7 @@ sudo: false
 python:
 - '2.7'
 - '3.4'
+- '3.5'
 addons:
   postgresql: "9.3"
 
@@ -11,7 +12,8 @@ cache:
   - $HOME/.pip-cache/
 
 install:
-  - pip install -r requirements-dev.txt --allow-all-external --download-cache $HOME/.pip-cache
+  - pip install pip==8.1.2
+  - pip install -r requirements-dev.txt --allow-all-external
   - pip install coveralls
 
 env:

junction/base/constants.py

@@ -80,7 +80,9 @@ class ProposalReviewerComment:
 class ProposalVotesFilter:
     _NO_VOTES = [0, "No votes"]
     _MIN_ONE_VOTE = [1, "Minimum 1 vote"]
-    _SORT = [2, "Sort by vote value"]
+    _SORT_BY_SUM = [2, "Sort by total votes"]
+    _SORT_BY_REVIEWER = [3, "Sort by your votes"]
+    _SORT_BY_SELECTION = [4, "Sort by selection"]
 
 
 class ConferenceSettingConstants:
@@ -96,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/feedback/service.py

@@ -56,7 +56,7 @@ def get_choice_feedback_questions(conference_id):
     schedule item type.
     """
     qs = ChoiceFeedbackQuestion.objects.filter(
-        conference_id=conference_id).select_related('allowed_values')
+        conference_id=conference_id).prefetch_related('allowed_values')
     return _get_question_oragnized_by_type(qs)
 
 

junction/profiles/admin.py

@@ -19,22 +19,22 @@
 from junction.base.constants import (
     ProposalReviewVote,
     ProposalStatus,
-    ProposalVotesFilter
+    ProposalReviewStatus,
 )
 from junction.conferences.models import Conference, ConferenceProposalReviewer
 
 from .forms import ProposalVotesFilterForm
 from .permissions import is_conference_moderator
-
+from .utils import _sort_proposals_for_dashboard
 from .models import (
     Proposal,
     ProposalComment,
-    ProposalSection,
     ProposalSectionReviewer,
     ProposalSectionReviewerVoteValue
 )
 
 from . import services
+from . import permissions
 
 
 @login_required
@@ -193,7 +193,7 @@ def reviewer_comments_dashboard(request, conference_slug):
 @require_http_methods(['GET', 'POST'])
 def reviewer_votes_dashboard(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
 
@@ -226,43 +226,63 @@ def reviewer_votes_dashboard(request, conference_slug):
                        'errors': form.errors})
 
     # Valid form
-    cps = form.cleaned_data['proposal_section']
-    cpt = form.cleaned_data['proposal_type']
-    votes = form.cleaned_data['votes']
-    review_status = form.cleaned_data['review_status']
-    proposal_sections = conference.proposal_sections.all()
 
-    if cps != 'all':
-        proposal_sections = ProposalSection.objects.filter(pk=cps)
-    if cpt != 'all':
-        proposals_qs = proposals_qs.filter(proposal_type__id__in=cpt)
-    if votes != 'all':
-        votes = int(votes)
-    if review_status != 'all':
-        proposals_qs = proposals_qs.filter(review_status=review_status)
-
-    if votes == ProposalVotesFilter.NO_VOTES:
-        proposals_qs = [
-            p for p in proposals_qs if p.get_reviewer_votes_count() == votes]
-    elif votes == ProposalVotesFilter.MIN_ONE_VOTE:
-        proposals_qs = [
-            p for p in proposals_qs if p.get_reviewer_votes_count() >= votes]
-    elif votes == ProposalVotesFilter.SORT:
-        proposals_qs = sorted(
-            proposals_qs, key=lambda x: x.get_reviewer_votes_sum(),
-            reverse=True)
-
-    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))
+    proposals = _sort_proposals_for_dashboard(conference, proposals_qs, user, form)
 
     return render(request, 'proposals/votes-dashboard.html',
                   {'conference': conference,
                    'proposals': proposals,
                    '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 permissions.is_proposal_reviewer(request.user, 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([]),
+        ),
+    ]