Merge pull request #483 from pythonindia/issue_481

Add proposal state view

Author: kracekumar

junction/proposals/dashboard.py

@@ -34,6 +34,8 @@
     ProposalSectionReviewerVoteValue
 )
 
+from . import services
+
 
 @login_required
 @require_http_methods(['GET'])
@@ -327,3 +329,20 @@ 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': proposals,
+                   'state': state.title()})

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

junction/templates/proposals/dashboard.html

@@ -88,8 +88,10 @@
                             <tr>
                                 <th>Type Name</th>
                                 <th>Total</th>
-                                <th>Reviewed</th>
-                                <th>UnReviewed</th>
+                                <th><a href="{% url 'proposal-state' conference.slug%}?q='reviewed' %}">
+                                  Reviewed</a></th>
+                                <th><a href="{% url 'proposal-state' conference.slug%}?q='unreviewed' %}">
+                                  UnReviewed</a></th>
                             </tr>
                             {% for group,count in group_by_type.items %}
                             <tr>

junction/templates/proposals/review_state.html

@@ -0,0 +1,76 @@
+{% 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>
+
+  <div class="row">
+    <div class="col-xs -6 col-sm-6 ">
+      <div class="panel panel-primary">
+        <div class="panel-heading"> {{ state }} proposals</div>
+        <div class="panel-body">
+          {% for section, proposal_list in proposals.items %}
+          <h2 class="section-title">{{ section }}</h2>
+          {% for proposal in proposal_list %}
+          <h3 class="proposal--title">
+            <a href='{{ proposal.get_absolute_url }}'>{{ forloop.counter}}. {{ proposal.title|capfirst }}</a>
+            - {{ proposal.proposal_type }}
+          </h3>
+          {% endfor %}
+          {% endfor %}
+        </div>
+      </div>
+    </div>
+  </div>
+
+  </div>
+</section>
+{% endblock %}

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/$',