X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=b8947b37ca7ed9073c26a035fe9c504a94be6ee3;hb=0898eeafb0687d5cfb97f1b5038e665a7d01ec60;hp=f3fd38959333a1a51b3d278ab92add07f149105d;hpb=c4f84f905b8dffb3856a097c180668ded6173fec;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index f3fd389..b8947b3 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -1,18 +1,21 @@ +# 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.http import HttpResponse, QueryDict 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 pyqcg.description import JobDescription +from pyqcg.utils import Credential -from qcg.forms import FiltersForm +from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet from qcg.utils import update_user_data, paginator_context @@ -60,24 +63,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)]) - - tasks = tasks.filter(status__in=statuses) - if host: - tasks = tasks.filter(allocations__host_name__in=host) - if keywords: and_query = Q() @@ -88,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)) + + 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'])} + + 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) @@ -116,8 +142,67 @@ 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': + QCG.start() + + form = JobDescriptionForm(request.POST) + env_formset = EnvFormSet(request.POST) + + if form.is_valid() and env_formset.is_valid(): + print form.cleaned_data + print env_formset.cleaned_data + + desc = JobDescription(Credential(request.session['proxy'])) + + direct_map = ('arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs', 'wall_time', 'memory', + 'memory_per_slot', 'modules', 'native', 'notify', 'preprocess', 'postprocess', 'persistent') + + for name in direct_map: + if form.cleaned_data[name]: + setattr(desc, name, form.cleaned_data[name]) + + if form.cleaned_data['application']: + desc.set_application(*form.cleaned_data['application']) + if form.cleaned_data['nodes']: + desc.set_nodes(*form.cleaned_data['nodes']) + if form.cleaned_data['reservation']: + desc.set_reservation(form.cleaned_data['reservation']) + if form.cleaned_data['watch_output']: + desc.set_watch_output(form.cleaned_data['watch_output'], form.cleaned_data['watch_output_pattern']) + desc.env_variables += [(env['name'], env['value']) + for env in env_formset.cleaned_data if env and not env['DELETE']] + # TODO script + # TODO executable + # TODO input + # TODO stage_in + # TODO stage_out + # TODO monitoring + + for prop in direct_map + ('application', 'nodes', 'env_variables', 'reservation', 'watch_output'): + print prop, type(getattr(desc, prop)), repr(getattr(desc, prop)) + + print desc.xml_description + + 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}) + + +def gridftp(request): + return render(request, 'qcg/gridftp.html')