Filter the views with submission to review and have been revied to only...

Filter the views with submission to review and have been revied to only submissions with active statuses.

opentech/apply/dashboard/templates/dashboard/dashboard.html

@@ -23,7 +23,7 @@
 <div class="wrapper wrapper--large wrapper--inner-space-medium">
 
     <div class="wrapper wrapper--bottom-space">
-        {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more %}
+        {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more active_statuses_filter=active_statuses_filter %}
     </div>
 
     {% if closed_rounds or open_rounds %}

opentech/apply/dashboard/templates/dashboard/includes/waiting-for-review.html

@@ -9,7 +9,7 @@
 
     {% if display_more %}
         <div class="all-submissions-table__more">
-            <a href="{% url 'apply:submissions:list' %}?reviewers={{ request.user.pk }}">Show all</a>
+            <a href="{% url 'apply:submissions:list' %}?reviewers={{ request.user.pk }}{{ active_statuses_filter }}">Show all</a>
         </div>
     {% endif %}
 
@@ -21,4 +21,4 @@
     {# TODO Fill in data and update styles in future ticket #}
     <div>{# Since you last logged in #}</div>
 
-{% endif %}
+{% endif %}
\ No newline at end of file

opentech/apply/dashboard/templates/dashboard/reviewer_dashboard.html

@@ -20,7 +20,7 @@
 <div class="wrapper wrapper--large wrapper--inner-space-medium">
 
     <div class="wrapper wrapper--bottom-space">
-        {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more %}
+        {% include "dashboard/includes/waiting-for-review.html" with in_review_count=in_review_count my_review=my_review display_more=display_more active_statuses_filter=active_statuses_filter %}
     </div>
 
     <div class="wrapper wrapper--bottom-space">
@@ -46,4 +46,3 @@
     <script src="{% static 'js/apply/submission-filters.js' %}"></script>
     <script src="{% static 'js/apply/submission-tooltips.js' %}"></script>
 {% endblock %}
-

opentech/apply/dashboard/views.py

@@ -12,6 +12,7 @@ from opentech.apply.funds.tables import (
     SubmissionsTable,
     SummarySubmissionsTable,
     SummarySubmissionsTableWithRole,
+    STATUSES_ACTIVE_FILTER_LIST,
 )
 from opentech.apply.utils.views import ViewDispatcher
 
@@ -42,7 +43,10 @@ class AdminDashboardView(TemplateView):
         # Staff reviewer's reviewed submissions for 'Previous reviews' block
         filterset, my_reviewed_qs, my_reviewed, display_more_reviewed = self.get_my_reviewed(request, qs)
 
-        return render(request, 'dashboard/dashboard.html', {
+        # Filter for all active statuses.
+        active_statuses_filter = '&status=' + '&status='.join(STATUSES_ACTIVE_FILTER_LIST)
+
+        context = {
             'open_rounds': open_rounds,
             'open_query': open_query,
             'closed_rounds': closed_rounds,
@@ -54,7 +58,10 @@ class AdminDashboardView(TemplateView):
             'my_reviewed': my_reviewed,
             'display_more_reviewed': display_more_reviewed,
             'filter': filterset,
-        })
+            'active_statuses_filter': active_statuses_filter,
+        }
+
+        return render(request, 'dashboard/dashboard.html', context)
 
     def get_my_reviews(self, user, qs):
         my_review_qs = qs.in_review_for(user).order_by('-submit_time')
@@ -98,6 +105,9 @@ class ReviewerDashboardView(TemplateView):
         # Reviewer's reviewed submissions and filters for 'Previous reviews' block
         filterset, my_reviewed_qs, my_reviewed, display_more_reviewed = self.get_my_reviewed(request, qs)
 
+        # Filter for all active statuses.
+        active_statuses_filter = '&status=' + '&status='.join(STATUSES_ACTIVE_FILTER_LIST)
+
         context = {
             'my_review': my_review,
             'in_review_count': my_review_qs.count(),
@@ -105,6 +115,7 @@ class ReviewerDashboardView(TemplateView):
             'my_reviewed': my_reviewed,
             'display_more_reviewed': display_more_reviewed,
             'filter': filterset,
+            'active_statuses_filter': active_statuses_filter,
         }
 
         return render(request, 'dashboard/reviewer_dashboard.html', context)

opentech/apply/funds/models/submissions.py

@@ -30,7 +30,7 @@ from ..blocks import ApplicationCustomFormFieldsBlock, NAMED_BLOCKS
 from ..workflow import (
     active_statuses,
     DETERMINATION_RESPONSE_PHASES,
-    get_review_statuses,
+    get_review_activ_statuses,
     INITIAL_STATE,
     PHASES,
     review_statuses,
@@ -81,7 +81,7 @@ class ApplicationSubmissionQueryset(JSONOrderable):
         return self.filter(status__in=review_statuses)
 
     def in_review_for(self, user, assigned=True):
-        user_review_statuses = get_review_statuses(user)
+        user_review_statuses = get_review_activ_statuses(user)
         qs = self.filter(Q(status__in=user_review_statuses), ~Q(reviews__author=user) | Q(reviews__is_draft=True))
         if assigned:
             qs = qs.filter(reviewers=user)

opentech/apply/funds/tables.py

@@ -15,7 +15,7 @@ from django_tables2.utils import A
 from wagtail.core.models import Page
 
 from opentech.apply.funds.models import ApplicationSubmission, Round, ScreeningStatus
-from opentech.apply.funds.workflow import STATUSES
+from opentech.apply.funds.workflow import STATUSES, STATUSES_ACTIVE
 from opentech.apply.users.groups import STAFF_GROUP_NAME
 from opentech.apply.utils.image import generate_image_url
 from opentech.images.models import CustomImage
@@ -23,6 +23,12 @@ from opentech.images.models import CustomImage
 from .widgets import Select2MultiCheckboxesWidget
 
 
+STATUSES_ACTIVE_FILTER_LIST = [
+    slugify(name)
+    for name, _ in STATUSES_ACTIVE.items()
+]
+
+
 def make_row_class(record):
     css_class = 'submission-meta__row' if record.next else 'all-submissions-table__parent'
     css_class += '' if record.active else ' is-inactive'

opentech/apply/funds/workflow.py

@@ -697,6 +697,24 @@ active_statuses = [
     if 'accepted' not in status and 'rejected' not in status and 'invited' not in status
 ]
 
+STATUSES_ACTIVE = defaultdict(set)
+
+for key, value in PHASES:
+    if 'accepted' not in value.display_name.lower() and 'dismissed' not in value.display_name.lower() and 'invited' not in value.display_name.lower():
+        STATUSES_ACTIVE[value.display_name].add(key)
+
+
+def get_review_activ_statuses(user=None):
+    reviews = set()
+
+    for phase_name, phase in PHASES:
+        if phase_name in active_statuses:
+            if user is None:
+                reviews.add(phase_name)
+            elif phase.permissions.can_review(user):
+                reviews.add(phase_name)
+    return reviews
+
 
 def get_review_statuses(user=None):
     reviews = set()