Add support for filtering by Unassigned engagements/tests

Author: patriknordlen

dojo/engagement/views.py

@@ -2,6 +2,7 @@
 import logging
 import os
 from datetime import datetime, timedelta
+import operator
 
 from django.contrib.auth.models import User
 from django.conf import settings
@@ -43,10 +44,17 @@
 @user_passes_test(lambda u: u.is_staff)
 @cache_page(60 * 5)  # cache for 5 minutes
 def engagement_calendar(request):
-    if not 'lead' in request.GET or '*' in request.GET.getlist('lead'):
+    if not 'lead' in request.GET or '0' in request.GET.getlist('lead'):
         engagements = Engagement.objects.all()
     else:
-        engagements = Engagement.objects.filter(lead__username__in=request.GET.getlist('lead', ''))
+        filters = []
+        leads = request.GET.getlist('lead','')
+        if '-1' in request.GET.getlist('lead'):
+            leads.remove('-1')
+            filters.append(Q(lead__isnull=True))
+        filters.append(Q(lead__in=leads))
+        engagements = Engagement.objects.filter(reduce(operator.or_, filters))
+
     add_breadcrumb(title="Calendar", top_level=True, request=request)
     return render(request, 'dojo/calendar.html', {
         'caltype': 'engagements',

dojo/templates/dojo/calendar.html

@@ -15,9 +15,10 @@
                 </div>
                 <div class="col-lg-6" style="width:400px;">
                     <select data-placeholder="All users" multiple id="lead" name="lead" class="chosen-select">
-                        <option value="*">All users</option>
+                        <option value="0">All users</option>
+                        <option value="-1">Unassigned</option>
                         {% for u in users %}
-                            <option value="{{ u.username }}">{{ u.username }}</option>
+                            <option value="{{ u.id }}">{{ u.username }}</option>
                         {% endfor %}
                     </select>
                 </div>

dojo/test/views.py

@@ -2,12 +2,14 @@
 
 import logging
 import sys
+import operator
 from datetime import datetime
 
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import user_passes_test
 from django.core.urlresolvers import reverse
+from django.db.models import Q
 from django.http import HttpResponseRedirect, HttpResponseForbidden, Http404, HttpResponse
 from django.shortcuts import render, get_object_or_404
 from django.views.decorators.cache import cache_page
@@ -161,10 +163,16 @@ def delete_test_note(request, tid, nid):
 @user_passes_test(lambda u: u.is_staff)
 @cache_page(60 * 5)  # cache for 5 minutes
 def test_calendar(request):
-    if not 'lead' in request.GET or '*' in request.GET.getlist('lead'):
+    if not 'lead' in request.GET or '0' in request.GET.getlist('lead'):
         tests = Test.objects.all()
     else:
-        tests = Test.objects.filter(engagement__lead__username__in=request.GET.getlist('lead', ''))
+        filters = []
+        leads = request.GET.getlist('lead','')
+        if '-1' in request.GET.getlist('lead'):
+            leads.remove('-1')
+            filters.append(Q(lead__isnull=True))
+        filters.append(Q(lead__in=leads))
+        tests = Test.objects.filter(reduce(operator.or_, filters))
     add_breadcrumb(title="Calendar", top_level=True, request=request)
     return render(request, 'dojo/calendar.html', {
         'caltype': 'tests',