Merge remote-tracking branch 'upstream/master'

RishabhJain2018 · RishabhJain2018 · commit 930af31937e3 · 2016-07-14T18:46:15.000+05:30
diff --git a/README.md b/README.md
@@ -78,6 +78,11 @@ Contributing
 [new-issue]: https://github.com/pythonindia/junction/issues/new
 [guidelines]: https://github.com/pythonindia/junction/blob/master/CONTRIBUTING.md
 
+### API
+
+- HTTP API documentation is [here](https://github.com/pythonindia/junction/blob/master/docs/api.md).
+- Python Client for junction is [here](https://github.com/pythonindia/junction-client).
+
 ## Contributors
 
 <table>
diff --git a/junction/proposals/admin.py b/junction/proposals/admin.py
@@ -103,7 +103,7 @@ def get_queryset(self, request):
 @admin.register(models.ProposalComment)
 class ProposalCommentAdmin(TimeAuditAdmin):
     list_display = ('comment', 'proposal', 'commenter', 'private', 'reviewer') + TimeAuditAdmin.list_display
-    list_filter = ['private', 'reviewer']
+    list_filter = ['private', 'reviewer', 'commenter']
 
     def get_queryset(self, request):
         qs = super(ProposalCommentAdmin, self).get_queryset(request)
diff --git a/junction/proposals/dashboard.py b/junction/proposals/dashboard.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 from __future__ import absolute_import, unicode_literals
 
 # Standard Library
@@ -15,10 +16,16 @@
 from xlsxwriter.workbook import Workbook
 
 # Junction Stuff
-from junction.base.constants import ProposalReviewVote, ProposalStatus, ProposalVotesFilter
+from junction.base.constants import (
+    ProposalReviewVote,
+    ProposalStatus,
+    ProposalVotesFilter
+)
 from junction.conferences.models import Conference, ConferenceProposalReviewer
 
 from .forms import ProposalVotesFilterForm
+from .permissions import is_conference_moderator
+
 from .models import (
     Proposal,
     ProposalComment,
@@ -27,13 +34,15 @@
     ProposalSectionReviewerVoteValue
 )
 
+from . import services
+
 
 @login_required
 @require_http_methods(['GET'])
 def proposals_dashboard(request, conference_slug):
     conference = get_object_or_404(Conference, slug=conference_slug)
 
-    if not request.user.is_superuser:
+    if not is_conference_moderator(user=request.user, conference=conference):
         raise PermissionDenied
 
     proposals_qs = Proposal.objects.filter(
@@ -128,7 +137,7 @@ def proposals_dashboard(request, conference_slug):
 def reviewer_comments_dashboard(request, conference_slug):
     conference = get_object_or_404(Conference, slug=conference_slug)
 
-    if not request.user.is_superuser:
+    if not is_conference_moderator(user=request.user, conference=conference):
         raise PermissionDenied
     conference_reviewers = ConferenceProposalReviewer.objects.filter(
         conference=conference, active=True)
@@ -142,7 +151,9 @@ def reviewer_comments_dashboard(request, conference_slug):
         by_conference.setdefault(id, [reviewers.reviewer, 0])
         by_conference[id][1] = ProposalComment.objects.filter(
             commenter=reviewers.reviewer,
-            deleted=False, private=True).count()
+            deleted=False, private=True,
+            proposal__status=ProposalStatus.PUBLIC,
+            proposal__conference=conference).distinct('proposal').count()
         # by_section is dict with
         # find each reviewers section and their comments
         # Need to rework on this code section to make it 1-2 loops
@@ -181,11 +192,11 @@ 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)
 
-    if not request.user.is_superuser:
+    if not is_conference_moderator(user=request.user, conference=conference):
         raise PermissionDenied
 
-    conference = get_object_or_404(Conference, slug=conference_slug)
     proposal_sections = conference.proposal_sections.all()
     proposals_qs = Proposal.objects.select_related(
         'proposal_type', 'proposal_section', 'conference', 'author',
@@ -238,7 +249,8 @@ def reviewer_votes_dashboard(request, conference_slug):
             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)
+            proposals_qs, key=lambda x: x.get_reviewer_votes_sum(),
+            reverse=True)
 
     for section in proposal_sections:
         section_proposals = [
@@ -256,10 +268,11 @@ def export_reviewer_votes(request, conference_slug):
     """
     Write reviewer votes to a spreadsheet.
     """
-    if not request.user.is_superuser:
+    conference = get_object_or_404(Conference, slug=conference_slug)
+
+    if not is_conference_moderator(user=request.user, conference=conference):
         raise PermissionDenied
 
-    conference = get_object_or_404(Conference, slug=conference_slug)
     proposal_sections = conference.proposal_sections.all()
     proposals_qs = Proposal.objects.select_related(
         'proposal_type', 'proposal_section', 'conference', 'author',
@@ -293,10 +306,12 @@ def export_reviewer_votes(request, conference_slug):
                        p.get_reviewer_votes_count(),) + \
                     vote_details + (p.get_votes_count(), vote_comment,)
                 if p.get_reviewer_votes_count_by_value(
-                        ProposalSectionReviewerVoteValue.objects.get(vote_value=ProposalReviewVote.NOT_ALLOWED)) > 0:
+                        ProposalSectionReviewerVoteValue.objects.get(
+                            vote_value=ProposalReviewVote.NOT_ALLOWED)) > 0:
                     cell_format = book.add_format({'bg_color': 'red'})
                 elif p.get_reviewer_votes_count_by_value(
-                        ProposalSectionReviewerVoteValue.objects.get(vote_value=ProposalReviewVote.MUST_HAVE)) > 2:
+                        ProposalSectionReviewerVoteValue.objects.get(
+                            vote_value=ProposalReviewVote.MUST_HAVE)) > 2:
                     cell_format = book.add_format({'bg_color': 'green'})
                 elif p.get_reviewer_votes_count() < 2:
                     cell_format = book.add_format({'bg_color': 'yellow'})
@@ -314,3 +329,19 @@ def export_reviewer_votes(request, conference_slug):
     response['Content-Disposition'] = "attachment; filename=junction-{}.xlsx".format(file_name)
 
     return response
+
+
+@login_required
+@require_http_methods(['GET'])
+def proposal_state(request, conference_slug):
+    conf = get_object_or_404(Conference, slug=conference_slug)
+
+    if not is_conference_moderator(user=request.user, conference=conf):
+        raise PermissionDenied
+
+    state = request.GET.get('q', 'unreviewed')
+    proposals = services.group_proposals_by_reveiew_state(conf=conf, state=state)
+    return render(request, 'proposals/review_state.html',
+                  {'conference': conf,
+                   'proposals': dict(proposals),
+                   'state': state.title()})
diff --git a/junction/proposals/permissions.py b/junction/proposals/permissions.py
@@ -49,3 +49,11 @@ def is_proposal_author_or_permisson_denied(user, proposal):
     if is_proposal_author(user, proposal):
         return True
     raise PermissionDenied
+
+
+def is_conference_moderator(user, conference):
+    if user.is_superuser:
+        return True
+
+    users = [mod.moderator for mod in conference.moderators.all()]
+    return user in users
diff --git a/junction/proposals/services.py b/junction/proposals/services.py
@@ -1,15 +1,18 @@
 # -*- coding: utf-8 -*-
+
 from __future__ import absolute_import, unicode_literals
 
 # Standard Library
 import logging
+import collections
 
 # Third Party Stuff
 from django.conf import settings
 from markdown2 import markdown
 
 # Junction Stuff
 from junction.base.emailer import send_email
+from junction.base.constants import ProposalStatus
 
 from .models import ProposalSection, ProposalSectionReviewer
 
@@ -111,4 +114,30 @@ def send_mail_for_proposal_content(conference, proposal, host):
         'proposal': proposal,
         'author_name': author_name,
     }
-    return send_email(to=author, template_dir='proposals/email/upload_content', context=context)
+    return send_email(to=author, template_dir='proposals/email/upload_content',
+                      context=context)
+
+
+def group_proposals_by_reveiew_state(conf, state='reviewed'):
+    reviewed_qs = conf.proposal_set.filter(
+        status=ProposalStatus.PUBLIC).select_related(
+            'proposal_type', 'proposal_section',
+            'proposalsection').filter(proposalcomment__private=True,
+                                      proposalcomment__deleted=False)
+    if state == 'reviewed':
+        proposal_qs = reviewed_qs.distinct()
+        return _arrange_proposals_by_section(proposal_qs)
+    else:
+        ids = reviewed_qs.values_list('id').distinct()
+        qs = conf.proposal_set.filter(
+            status=ProposalStatus.PUBLIC).select_related(
+                'proposal_type', 'proposal_section',
+                'proposalsection').exclude(pk__in=ids)
+        return _arrange_proposals_by_section(qs)
+
+
+def _arrange_proposals_by_section(proposal_qs):
+    res = collections.defaultdict(list)
+    for proposal in proposal_qs:
+        res[proposal.proposal_section.name].append(proposal)
+    return res
diff --git a/junction/templates/proposals/dashboard.html b/junction/templates/proposals/dashboard.html
@@ -72,8 +72,10 @@
                             <tr>
                                 <td></td>
                                 <td>{{total}}</td>
-                                <td>{{reviewed}}</td>
-                                <td>{{unreviewed}}</td>
+                                <td><a href="{% url 'proposal-state' conference.slug%}?q=reviewed">
+                                  {{reviewed}}</a></td>
+                                <td><a href="{% url 'proposal-state' conference.slug%}?q=unreviewed">
+                                  {{unreviewed}}</a></td>
                             </tr>
                         </table>
                     </div>
diff --git a/junction/templates/proposals/review_state.html b/junction/templates/proposals/review_state.html
@@ -0,0 +1,79 @@
+{% extends 'base.html' %}
+
+{% load django_markdown %}
+{% load static from staticfiles %}
+{% load django_bootstrap_breadcrumbs %}
+
+{% block head_title %} {{ conference.name }} Reviewers dashbaord {% endblock %}
+{% block og_title %} {{ conference.name }} Reviewers dashboard {% endblock %}
+{% block og_description %} {{ conference.description|markdown|safe|striptags}} {% endblock %}
+{% block page_description %} {{ conference.description|markdown|safe|striptags}} {% endblock %}
+
+{% block endhead %}
+<!-- Custom CSS -->
+<link href="{% static 'css/list.css' %}" rel="stylesheet">
+{% endblock %}
+
+{% block breadcrumbs %}
+{{ block.super }}
+{% breadcrumb conference.name "conference-detail" conference.slug %}
+{% breadcrumb "Dashboard" "proposals-dashoboard" conference.slug %}
+{% endblock %}
+
+
+{% block navbar_logo %}
+{% if conference.logo %}
+<a href="{% url "conference-detail" conference.slug %}">
+  <img src="{{ conference.logo.url }}">
+</a>
+{% else %}
+<a href="#" class="navbar-brand">{{ conference.name }}</a>
+{% endif %}
+{% endblock navbar_logo %}
+
+{% block page_classes %}{{ block.super}} page-proposals{% endblock page_classes %}
+
+{% block content %}
+<section class="content custom-container proposal-list">
+  <div class="push-4-bottom push-1-top">
+    <div class="row">
+      <div class="col-xs -12 col-sm-12 ">
+        <p class="meta">
+          <b class="text-muted">
+            <span class="start_date">{{ conference.start_date }}</span> –
+            <span class="end_date">{{ conference.end_date }}</span>
+          </b>
+          <span class="status status-{{conference.status}}">
+            {{ conference.get_status_display }}
+          </span>
+        </p>
+        <hr>
+      </div>
+    </div>
+  </div>
+
+  <section class="content custom-container proposal-list">
+    <div class="push-4-bottom push-1-top">
+      <div class="row">
+        <div class="col-xs -12 col-sm-12 ">
+          <p class="meta">
+            <h2 class="panel-heading">{{ state }} proposals</h2>
+          </p>
+          <hr>
+          <div class="#proposals" class="row"">
+            {% for section, proposal_list in proposals.items %}
+            <h3 class="section-title">{{ section }}</h3>
+            {% for proposal in proposal_list %}
+            <h4 class="proposal--title">
+              <a href='{{ proposal.get_absolute_url }}'>{{ forloop.counter}}. {{ proposal.title|capfirst }}</a>
+              - {{ proposal.proposal_type }}
+            </h4>
+            {% endfor %}
+            <hr>
+            {% endfor %}
+          </div>
+        </div>
+      </div>
+    </div>
+</section>
+{% endblock %}
diff --git a/junction/urls.py b/junction/urls.py
@@ -52,6 +52,9 @@
     url(r'^(?P<conference_slug>[\w-]+)/dashboard/reviewers/',
         'junction.proposals.dashboard.reviewer_comments_dashboard',
         name='proposal-reviewers-dashboard'),
+    url(r'^(?P<conference_slug>[\w-]+)/dashboard/proposal_state/$',
+        'junction.proposals.dashboard.proposal_state',
+        name='proposal-state'),
     url(r'^(?P<conference_slug>[\w-]+)/dashboard/$',
         'junction.proposals.dashboard.proposals_dashboard', name='proposal-dashboard'),
     url(r'^(?P<conference_slug>[\w-]+)/dashboard/votes/$',
