X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=qcg%2Fviews.py;h=e5ff70f902f3bf0d5252b8670ecaf3ff46594473;hb=368ebd66507c4d45cbc6e77cb3d45624172d0995;hp=adc4676854a6b80b474802b0dac090862a453b66;hpb=d0df2c3b90c52193545c6fa6a1a128cb1c61ff5e;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index adc4676..e5ff70f 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -13,13 +13,18 @@ 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.views.decorators.http import require_POST from django_openid_auth.views import make_consumer from openid.extensions import ax +from pyqcg.utils import PyqcgException from filex.forms import HostPathNameForm, RenameForm, ArchiveForm, HostPathForm -from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet -from qcg.utils import paginator_context -from qcg.service import update_user_data, submit_job +from filex.ftp import FTPOperation, FTPError +from filex.views import make_url +from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet, JobTemplateForm +from qcg.models import JobTemplate +from qcg.utils import paginator_context, to_job_desc, to_form_data +from qcg.service import update_user_data, update_job, cancel, clean def index(request): @@ -70,6 +75,7 @@ def jobs_list(request): keywords = filters.cleaned_data['keywords'] status = filters.cleaned_data['status'] host = filters.cleaned_data['host'] + purged = filters.cleaned_data['purged'] submission = filters.cleaned_data['submission'] finish = filters.cleaned_data['finish'] @@ -101,6 +107,14 @@ def jobs_list(request): for h in host: selected_filters.append((host_dict[h], 'host', h)) + if isinstance(purged, bool): + tasks = tasks.filter(purged=purged) + + if purged: + selected_filters.append((u"Usunięty katalog roboczy", 'purged', '1')) + else: + selected_filters.append((u"Istniejący katalog roboczy", 'purged', '0')) + if submission: start, end = submission.split('-') @@ -141,7 +155,7 @@ def jobs_list(request): 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}) + return render(request, 'qcg/job.html', process_details(request, job)) @login_required @@ -149,43 +163,134 @@ 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}) + return render(request, 'qcg/task.html', process_details(request, task.job, task)) + + +def process_details(request, job, task=None): + if not job.terminated or not job.purged: + update_job(job, request.session['proxy']) + + form_data = to_form_data(job.qcg_description) + env_formset_data = [{'name': name, 'value': value} for name, value in form_data.pop('env_variables', ())] + + form = JobDescriptionForm(initial=form_data) + env_formset = EnvFormSet(initial=env_formset_data) + template_form = JobTemplateForm(initial={'name': (task and task.note) or u'Szablon z {}'.format(job.job_id)}) + + for field in form: + field.field.widget.attrs['disabled'] = 'True' + for env_form in env_formset: + for field in env_form: + field.field.widget.attrs['disabled'] = 'True' + + return {'job': job, 'task': task, 'form': form, 'env_formset': env_formset, 'template_form': template_form} @login_required -def job_new(request): +def job_submit(request, template_id=None): + save_template = 'save-template' in request.POST + template = get_object_or_404(request.user.templates, id=template_id) if template_id is not None else None + + if template is not None: + form_data = to_form_data(template.description) + env_formset_data = [{'name': name, 'value': value} for name, value in form_data.pop('env_variables', ())] + else: + form_data, env_formset_data = None, None + if request.method == 'POST': - form = JobDescriptionForm(request.POST) - env_formset = EnvFormSet(request.POST) + form = JobDescriptionForm(request.POST, initial=form_data) + env_formset = EnvFormSet(request.POST, initial=env_formset_data) + template_form = JobTemplateForm(request.POST, prefix='template', instance=template) - if form.is_valid() and env_formset.is_valid(): + if form.is_valid() and env_formset.is_valid() and (not save_template or template_form.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']) + job_desc = to_job_desc(params, request.session['proxy']) + + if save_template: + template = template_form.save(commit=False) + + template.owner = request.user + template.description = job_desc.xml_description + template.save() + + return redirect(template) + + job = job_desc.submit() messages.success(request, format_html(' ' - 'Zlecono zadanie {}.', job_id)) + u'Zlecono zadanie {}.', job.job_id)) return redirect('jobs') + else: + form = JobDescriptionForm(initial=form_data) + env_formset = EnvFormSet(initial=env_formset_data) + template_form = JobTemplateForm(prefix='template', instance=template) + + errors = form.errors or (env_formset.is_bound and not env_formset.is_valid) or ( + save_template and template_form.errors) - print repr(form.errors) - print repr(env_formset.errors) + return render(request, 'qcg/job_submit.html', {'form': form, 'env_formset': env_formset, 'errors': errors, + 'template_form': template_form, 'template': template}) + + +@require_POST +@login_required +def job_cancel(request, job_id): + return obj_cancel(request, get_object_or_404(request.user.jobs, job_id=job_id)) + + +@require_POST +@login_required +def task_cancel(request, job_id, task_id): + return obj_cancel(request, get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id)) + + +def obj_cancel(request, obj): + try: + cancel(obj, request.session['proxy']) + except PyqcgException as e: + messages.error(request, format_html(' {}', + e.message)) else: - form = JobDescriptionForm() - env_formset = EnvFormSet() + messages.success(request, format_html(' ' + 'Zadanie anulowano.')) - errors = form.errors or (env_formset.is_bound and not env_formset.is_valid) + return redirect(obj) - return render(request, 'qcg/job_new.html', {'form': form, 'env_formset': env_formset, 'errors': errors}) + +@require_POST +@login_required +def job_clean(request, job_id): + return obj_clean(request, get_object_or_404(request.user.jobs, job_id=job_id)) + + +@require_POST +@login_required +def task_clean(request, job_id, task_id): + return obj_clean(request, get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id)) + + +def obj_clean(request, obj): + try: + clean(obj, request.session['proxy']) + except PyqcgException as e: + messages.error(request, format_html(' {}', + e.message)) + else: + messages.success(request, format_html(' ' + 'Usunięto katalog roboczy.')) + + return redirect(obj) @login_required def gridftp(request): return render(request, 'qcg/gridftp.html', - {'new_dir_form': HostPathNameForm(), 'rename_form': RenameForm(), 'archive_form': ArchiveForm()}) + {'new_dir_form': HostPathNameForm(), 'rename_form': RenameForm(), 'archive_form': ArchiveForm()}) @login_required @@ -195,7 +300,49 @@ def gridftp_upload(request): if not form.is_valid(): raise SuspiciousOperation('Invalid parameters for `gridftp_upload`!') + error = None + try: + FTPOperation(request.session['proxy']).info(make_url(form.cleaned_data, 'path')) + except FTPError as e: + error = e.message + return render(request, 'qcg/gridftp_upload.html', - {'url': reverse('filex:upload') + '?' + urlencode(form.cleaned_data), + {'error': error, 'url': reverse('filex:upload') + '?' + urlencode(form.cleaned_data), 'host': form.cleaned_data['host'], 'path': form.cleaned_data['path'], 'sep': '/' if form.cleaned_data['path'].startswith('~') else ''}) + + +@login_required +def job_templates(request): + return render(request, 'qcg/job_templates.html', {'templates': request.user.templates.all()}) + + +@require_POST +@login_required +def template_delete(request, template_id): + template = get_object_or_404(request.user.templates, id=template_id) + template.delete() + + messages.success(request, format_html(' ' + u'Usunięto szablon {}.', template.name)) + + return redirect('job_templates') + + +@require_POST +@login_required +def job_save_template(request, job_id): + job = get_object_or_404(request.user.jobs, job_id=job_id) + + template_form = JobTemplateForm(request.POST, + instance=JobTemplate(owner=request.user, description=job.qcg_description)) + + if template_form.is_valid(): + template = template_form.save() + + return redirect(template) + + messages.error(request, format_html(' {}' + 'Nie udało się zapisać szablonu!', template_form.errors)) + + return redirect(job)