X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=27fdf87ed100f30e3569c125d3128b2e57895a91;hb=a0070644fd09063d4222ca3142f3e920924c0bea;hp=0e637e5b94f9962fffa471c29142f35e2e566211;hpb=1e4d91a02e314709d4ec1425f814996ff042a2d8;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index 0e637e5..27fdf87 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -1,19 +1,23 @@ +# coding=utf-8 from datetime import datetime, timedelta + from django.conf import settings +from django.contrib import messages 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, get_object_or_404 +from django.http import HttpResponse, QueryDict +from django.shortcuts import render, get_object_or_404, redirect +from django.utils.html import format_html 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.forms import FiltersForm -from qcg.utils import update_user_data, paginator_context +from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet +from qcg.utils import paginator_context +from qcg.service import update_user_data, submit_job def index(request): @@ -53,33 +57,20 @@ def parse_date(string): @login_required def jobs_list(request): - # QCG.start() - # update_user_data(request.user, request.session['proxy']) + update_user_data(request.user, request.session['proxy']) tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \ .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 +81,55 @@ 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)) - advanced = bool(keywords or status_exact or submission or finish) + tasks = tasks.distinct() + + checked_status = {i: widget.is_checked() for i, widget in enumerate(filters['status'])} + + columns = ColumnsForm(QueryDict(request.COOKIES.get('columns', ''))) + + displayed = None + if columns.is_valid(): + displayed = {int(c) for c in columns.cleaned_data['columns']} + + # if invalid or empty + if not displayed: + displayed = set(columns.fields['columns'].initial) + + context = {'filters': filters, 'checked_status': checked_status, 'selected_filters': selected_filters, + 'columns': ColumnsForm(initial={'columns': displayed}), 'displayed': displayed} - context = {'filters': filters, 'advanced': advanced} context.update(paginator_context(request, tasks)) return render(request, 'qcg/jobs.html', context) @@ -118,8 +142,51 @@ def job_details(request, job_id): return render(request, 'qcg/job.html', {'job': job}) +@login_required 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}) + + +@login_required +def job_new(request): + if request.method == 'POST': + form = JobDescriptionForm(request.POST) + env_formset = EnvFormSet(request.POST) + + if form.is_valid() and env_formset.is_valid(): + params = form.cleaned_data + params['env_variables'] = [(env['name'], env['value']) + for env in env_formset.cleaned_data if env and not env['DELETE']] + + job_id = submit_job(params, request.session['proxy']) + + messages.success(request, + format_html(' ' + 'Zlecono zadanie {}.', job_id)) + + return redirect('jobs') + + print repr(form.errors) + print repr(env_formset.errors) + else: + form = JobDescriptionForm() + env_formset = EnvFormSet() + + errors = form.errors or (env_formset.is_bound and not env_formset.is_valid) + + return render(request, 'qcg/job_new.html', {'form': form, 'env_formset': env_formset, 'errors': errors}) + + +@login_required +def gridftp(request): + return render(request, 'qcg/gridftp.html') + + +def gridftp_upload(request): + # TODO GET data validation + return render(request, 'qcg/gridftp_upload.html', + {'url': reverse('filex:upload') + '?' + request.GET.urlencode(safe='/'), + 'host': request.GET.get('host'), 'path': request.GET.get('path')})