Merge branch 'master' into voting

Author: ChillarAnand

.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:

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/proposals/dashboard.py

@@ -26,11 +26,10 @@
 
 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
 )
@@ -194,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
 
@@ -227,36 +226,8 @@ 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,

junction/proposals/models.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,11 +12,9 @@
 from hashids import Hashids
 from simple_history.models import HistoricalRecords
 
-# Junction Stuff
-from junction.base.constants import (
-    ProposalReviewStatus, ProposalStatus, ProposalTargetAudience, ProposalUserVoteRole,
-    PSRVotePhase, ProposalCommentType,
-)
+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
 
@@ -184,7 +180,7 @@ def get_reviewer_votes_count(self):
     def get_reviewer_votes_count_by_value(self, vote_value):
         """ Show sum of reviewer votes for given vote value. """
         return ProposalSectionReviewerVote.objects.filter(
-            proposal=self, vote_value=vote_value
+            proposal=self, vote_value__vote_value=vote_value
         ).count()
 
     def get_reviewer_votes_sum(self):
@@ -194,12 +190,27 @@ def get_reviewer_votes_sum(self):
         sum_of_votes = sum((v.vote_value.vote_value for v in votes))
         return sum_of_votes
 
+    def get_reviewer_vote_value(self, reviewer):
+        try:
+            vote = ProposalSectionReviewerVote.objects.get(
+                proposal=self, voter__conference_reviewer__reviewer=reviewer,
+            )
+            return vote.vote_value.vote_value
+        except ProposalSectionReviewerVote.DoesNotExist:
+            return 0
+
     def get_reviewers_count(self):
         """ Count of reviewers for given proposal section """
         return ProposalSectionReviewer.objects.filter(
             proposal_section=self.proposal_section
         ).count()
 
+    def has_negative_votes(self):
+        """ Show sum of reviewer votes for given vote value. """
+        return ProposalSectionReviewerVote.objects.filter(
+            proposal=self, vote_value__vote_value=ProposalReviewVote.NOT_ALLOWED,
+        ).count() > 0
+
     class Meta:
         unique_together = ("conference", "slug")
 

junction/proposals/templatetags/proposal_filters.py

@@ -79,7 +79,7 @@ def get_reviewers_vote_details(proposal, user):
 
         vc_qs = ProposalComment.objects.filter(
             proposal=proposal,
-            commenter=reviewer,
+            commenter=reviewer.conference_reviewer.reviewer,
             vote=True)
         if vc_qs:
             vote_comment = vc_qs[0].comment

junction/proposals/utils.py

@@ -1,9 +1,13 @@
+import collections
+
 from django.core.exceptions import PermissionDenied
 
-from junction.base.constants import PSRVotePhase, ProposalCommentType
+from junction.base.constants import PSRVotePhase, ProposalCommentType, \
+    ProposalReviewVote, ProposalVotesFilter
 from junction.proposals import permissions
-from junction.proposals.models import ProposalComment, ProposalSectionReviewer, \
-    ProposalSectionReviewerVote, ProposalSectionReviewerVoteValue
+from junction.proposals.models import ProposalComment, ProposalSection, \
+    ProposalSectionReviewer, ProposalSectionReviewerVote, \
+    ProposalSectionReviewerVoteValue
 
 
 def get_reviewer_vote_info(user, conference, proposal, vote_phase):
@@ -67,3 +71,81 @@ def update_reviewer_vote_info(user, psr_vote, vote_value, comment, phase, propos
     )
 
     return psr_vote, p_comment
+
+
+def _sort_proposals_for_dashboard(conference, proposals_qs, user, 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()
+    s_items = collections.namedtuple('section_items', 'section proposals')
+    proposals = []
+
+    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_BY_REVIEWER:
+        proposals_qs = sorted(
+            proposals_qs,
+            key=lambda x: x.get_reviewer_vote_value(reviewer=user),
+            reverse=True,
+        )
+    elif votes == ProposalVotesFilter.SORT_BY_SUM:
+        proposals_qs = sorted(
+            proposals_qs, key=lambda x: x.get_reviewer_votes_sum(),
+            reverse=True)
+        proposals = [s_items('', proposals_qs)]
+
+    elif votes == ProposalVotesFilter.SORT_BY_SELECTION:
+        # Selection of proposal is based on conference guidelines.
+        # More info is available at http://tiny.cc/qzo5cy
+
+        proposals_qs = [p for p in proposals_qs if not p.has_negative_votes()]
+        proposals_qs = sorted(proposals_qs, key=lambda x: x.get_reviewer_votes_sum(), reverse=True)
+
+        selected = [p for p in proposals_qs if p.get_reviewer_votes_count_by_value(ProposalReviewVote.MUST_HAVE) >= 2]
+        proposals.append(s_items('Selected', selected))
+
+        batch1 = [p for p in proposals_qs
+                  if p.get_reviewer_votes_count_by_value(ProposalReviewVote.MUST_HAVE) == 1 and
+                  p.get_reviewer_votes_count_by_value(ProposalReviewVote.GOOD) > 2]
+        proposals.append(s_items('1 Must Have & 2+ Good Votes', batch1))
+
+        batch2 = [p for p in proposals_qs
+                  if p.get_reviewer_votes_count_by_value(ProposalReviewVote.MUST_HAVE) == 1 and
+                  p.get_reviewer_votes_count_by_value(ProposalReviewVote.GOOD) == 1]
+        proposals.append(s_items('1 Must Have & 1 Good Vote', batch2))
+
+        batch3 = [p for p in proposals_qs
+                  if p.get_reviewer_votes_count_by_value(ProposalReviewVote.GOOD) > 2 and
+                  p not in batch1]
+        proposals.append(s_items('2+ Good Votes', batch3))
+
+        batch4 = [p for p in proposals_qs
+                  if p.get_reviewer_votes_count_by_value(ProposalReviewVote.GOOD) == 1 and
+                  p.get_reviewer_votes_count_by_value(ProposalReviewVote.NOT_BAD) > 2 and
+                  p not in batch2]
+        proposals.append(s_items('1 Good & 2+ Not Bad votes', batch4))
+
+    if votes not in (ProposalVotesFilter.SORT_BY_SUM, ProposalVotesFilter.SORT_BY_SELECTION):
+        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 proposals

junction/proposals/views.py

@@ -285,6 +285,7 @@ def proposals_to_review(request, conference_slug):
 
         context = {
             'proposals_to_review': proposals_to_review,
+            'proposal_reviewer_sections': proposal_reviewer_sections,
             'proposal_sections': proposal_sections,
             'proposal_types': proposal_types,
             'conference': conference,

junction/templates/proposals/email/comment/message.html

@@ -14,7 +14,7 @@ <h1 style="padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;color:#
         There is a new <b>{{comment_type}}</b> comment on
         "<a href="{{host}}{{proposal.get_absolute_url}}" style="font-family:'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-size:100%;line-height:1.6em;margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;color:#348eda;" >{{proposal.title}}</a>"
         by <b style="font-family:'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif;font-size:100%;line-height:1.6em;margin-top:0;margin-bottom:0;margin-right:0;margin-left:0;padding-top:0;padding-bottom:0;padding-right:0;padding-left:0;" >
-        {% if comment.private %}
+        {% if comment.private or comment.reviewer %}
             {% if by_author %}
                 Author
             {% else %}

junction/templates/proposals/email/comment/message.txt

@@ -1,4 +1,4 @@
-There is a new comment on {{host}}{{proposal.get_absolute_url}} by {% if comment.private %}one of the reviewer{% else %}*{{comment.commenter}}*{% endif %}:
+There is a new comment on {{host}}{{proposal.get_absolute_url}} by {% if comment.private or comment.reviewer %}{% if by_author %}Author{% else %}{{comment.get_reviewer_nick}}{% endif  %}{% else %}{{comment.commenter}}{% endif  %}:
 
 "{{comment.comment}}"