Skip to content

Commit

Permalink
Add sort by reviewer votes in votes dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
ChillarAnand committed Jul 17, 2016
1 parent 0d0bfcc commit 7d27bb8
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
3 changes: 2 additions & 1 deletion junction/base/constants.py
Expand Up @@ -80,7 +80,8 @@ 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"]


class ConferenceSettingConstants:
Expand Down
8 changes: 7 additions & 1 deletion junction/proposals/dashboard.py
Expand Up @@ -247,10 +247,16 @@ def reviewer_votes_dashboard(request, conference_slug):
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:
elif votes == ProposalVotesFilter.SORT_BY_SUM:
proposals_qs = sorted(
proposals_qs, key=lambda x: x.get_reviewer_votes_sum(),
reverse=True)
elif votes == ProposalVotesFilter.SORT_BY_REVIEWER:
proposals_qs = sorted(
proposals_qs,
key=lambda x: x.get_reviewer_vote_value(reviewer=request.user),
reverse=True,
)

for section in proposal_sections:
section_proposals = [
Expand Down
10 changes: 10 additions & 0 deletions junction/proposals/models.py
Expand Up @@ -187,6 +187,16 @@ 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 as e:
print('{}'.format(e))
return 0

def get_reviewers_count(self):
""" Count of reviewers for given proposal section """
return ProposalSectionReviewer.objects.filter(
Expand Down

0 comments on commit 7d27bb8

Please sign in to comment.