Merge pull request #490 from ChillarAnand/dash

Add sort by reviewer votes in votes dashboard

Author: kracekumar

junction/base/constants.py

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

junction/proposals/dashboard.py

@@ -247,15 +247,22 @@ 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_REVIEWER:
+        proposals_qs = sorted(
+            proposals_qs,
+            key=lambda x: x.get_reviewer_vote_value(reviewer=request.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)]
 
-    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))
+    if votes != ProposalVotesFilter.SORT_BY_SUM:
+        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/votes-dashboard.html',
                   {'conference': conference,

junction/proposals/models.py

@@ -187,6 +187,15 @@ 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(

junction/templates/proposals/votes-dashboard.html

@@ -30,17 +30,18 @@ <h2>Proposal Votes Dashboard</h2>
                     {% csrf_token %}
                     {% bootstrap_form form %}
                     <br /><br />
-                </form>
-                    {% buttons %}
+                {% buttons %}
                 <span class="pull-right"></span>
                 <div class="col-sm-offset-5 col-sm-2 text-center">
                     <button type="submit" class="btn btn-primary">
                         Submit
                     </button>
                 </div>
-                    {% endbuttons %}
+                {% endbuttons %}
+                </form>
             </div>
             <br />
+            <hr>
             <div id="#proposals" class="row">
                 {% for section_items in proposals  %}
                     {% if section_items.proposals %}