reworked filters in jobs list view

[qcg-portal.git] / qcg / views.py

diff --git a/qcg/views.py b/qcg/views.py
index 0590810..e996da0 100644 (file)
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -1,15 +1,19 @@
+# coding=utf-8
+from datetime import datetime, timedelta
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
+from django.db.models import Q
 from django.http import HttpResponse
-from django.shortcuts import render
+from django.shortcuts import render, get_object_or_404
 from django.utils.http import urlencode
+from django.utils.timezone import UTC
 from django_openid_auth.views import make_consumer
 from openid.extensions import ax
 from pyqcg import QCG
 
-from qcg.models import Task
+from qcg.forms import FiltersForm
 from qcg.utils import update_user_data, paginator_context
 
 
@@ -40,19 +44,92 @@ def openid_begin(request):
     return HttpResponse(openid_request.htmlMarkup(request.build_absolute_uri('/'), return_to))
 
 
+search_fields = ('status_description', 'type', 'note', 'task_id', 'job__note', 'job__project', 'job__job_id',
+                 'allocations__status_description', 'allocations__processes_group_id', 'allocations__comment')
+
+
+def parse_date(string):
+    return datetime.strptime(string.strip(), "%d.%m.%Y").replace(tzinfo=UTC())
+
+
 @login_required
 def jobs_list(request):
     # QCG.start()
     # update_user_data(request.user, request.session['proxy'])
 
-    tasks = Task.objects.filter(job__owner=request.user) \
-                        .select_related('job').prefetch_related('allocations__nodes') \
-                        .order_by('-job__submission_time', '-submission_time')
+    tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \
+        .select_related('job').prefetch_related('allocations__nodes')
+
+    filters = FiltersForm(request.GET)
+    selected_filters = []
+    if filters.is_valid():
+        keywords = filters.cleaned_data['keywords']
+        status = filters.cleaned_data['status']
+        host = filters.cleaned_data['host']
+        submission = filters.cleaned_data['submission']
+        finish = filters.cleaned_data['finish']
+
+        if keywords:
+            and_query = Q()
+
+            for q in keywords.split():
+                or_query = Q()
+                for field in search_fields:
+                    or_query |= Q(**{field + '__icontains': q})
+                and_query &= or_query
+
+            tasks = tasks.filter(and_query)
+            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))
 
-    context = paginator_context(request, tasks)
+        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()
+
+    checked_status = {i: widget.is_checked() for i, widget in enumerate(filters['status'])}
+
+    context = {'filters': filters, 'checked_status': checked_status, 'selected_filters': selected_filters}
+    context.update(paginator_context(request, tasks))
 
     return render(request, 'qcg/jobs.html', context)
 
 
-def job_details(request):
-    return render(request, 'qcg/job.html')
+@login_required
+def job_details(request, job_id):
+    job = get_object_or_404(request.user.jobs.prefetch_related('tasks'), job_id=job_id)
+
+    return render(request, 'qcg/job.html', {'job': job})
+
+
+def task_details(request, job_id, task_id):
+    task = get_object_or_404(request.user.tasks.select_related('job').prefetch_related('allocations'),
+                             job__job_id=job_id, task_id=task_id)
+
+    return render(request, 'qcg/task.html', {'task': task})