X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=e996da0e89f5ef2cf3d45212df8902c3c46b45c4;hb=a61eb3abb3a9fc2746c48c26eb6d5f775bb06117;hp=0e637e5b94f9962fffa471c29142f35e2e566211;hpb=1e4d91a02e314709d4ec1425f814996ff042a2d8;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index 0e637e5..e996da0 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -1,3 +1,4 @@
+# coding=utf-8
 from datetime import datetime, timedelta
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
@@ -60,26 +61,14 @@ def jobs_list(request):
         .select_related('job').prefetch_related('allocations__nodes')
 
     filters = FiltersForm(request.GET)
-    advanced = False
+    selected_filters = []
     if filters.is_valid():
         keywords = filters.cleaned_data['keywords']
         status = filters.cleaned_data['status']
         host = filters.cleaned_data['host']
-        status_exact = filters.cleaned_data['status_exact']
         submission = filters.cleaned_data['submission']
         finish = filters.cleaned_data['finish']
 
-        if status:
-            statuses = []
-            for s in status:
-                statuses.extend(FiltersForm.STATUS_MAP[int(s)])
-
-            print statuses
-
-            tasks = tasks.filter(status__in=statuses)
-        if host:
-            tasks = tasks.filter(allocations__host_name__in=host)
-
         if keywords:
             and_query = Q()
 
@@ -90,22 +79,43 @@ def jobs_list(request):
                 and_query &= or_query
 
             tasks = tasks.filter(and_query)
-        if status_exact:
-            tasks = tasks.filter(status=status_exact)
+            selected_filters.append((keywords, 'keywords', keywords))
+
+        if status:
+            statuses = []
+            for s in status:
+                si = int(s)
+                statuses.extend(FiltersForm.STATUS_MAP[si])
+                selected_filters.append((FiltersForm.STATUS_CHOICES_DICT[si], 'status', s))
+
+            tasks = tasks.filter(status__in=statuses)
+
+        if host:
+            tasks = tasks.filter(allocations__host_name__in=host)
+
+            host_dict = dict(filters.fields['host'].choices)
+            for h in host:
+                selected_filters.append((host_dict[h], 'host', h))
+
         if submission:
             start, end = submission.split('-')
 
             tasks = tasks.filter(submission_time__gte=parse_date(start),
                                  submission_time__lte=parse_date(end) + timedelta(days=1))
+            selected_filters.append((u'Data zlecenia: ' + submission, 'submission', submission))
+
         if finish:
             start, end = finish.split('-')
 
             tasks = tasks.filter(finish_time__gte=parse_date(start),
                                  finish_time__lte=parse_date(end) + timedelta(days=1))
+            selected_filters.append((u'Data zakończenia: ' + finish, 'finish', finish))
+
+        tasks = tasks.distinct()
 
-        advanced = bool(keywords or status_exact or submission or finish)
+    checked_status = {i: widget.is_checked() for i, widget in enumerate(filters['status'])}
 
-    context = {'filters': filters, 'advanced': advanced}
+    context = {'filters': filters, 'checked_status': checked_status, 'selected_filters': selected_filters}
     context.update(paginator_context(request, tasks))
 
     return render(request, 'qcg/jobs.html', context)