X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=qcg%2Fviews.py;h=e5ff70f902f3bf0d5252b8670ecaf3ff46594473;hb=169ad8dc3e17a7637808f402cba0fa5667b721c3;hp=12827a9d1d3ba54b537ef486077dafc61aaf150f;hpb=a106596addd10217af2c01f895b931ff04762b8b;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index 12827a9..e5ff70f 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -16,14 +16,15 @@ 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.qcg_types import PyqcgException +from pyqcg.utils import PyqcgException from filex.forms import HostPathNameForm, RenameForm, ArchiveForm, HostPathForm from filex.ftp import FTPOperation, FTPError from filex.views import make_url -from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet -from qcg.utils import paginator_context -from qcg.service import update_user_data, submit_job, update_job, cancel, clean +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): @@ -154,9 +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) - update_job(job, request.session['proxy']) - - return render(request, 'qcg/job.html', {'job': job}) + return render(request, 'qcg/job.html', process_details(request, job)) @login_required @@ -164,39 +163,78 @@ 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) - update_job(task.job, request.session['proxy']) + 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', ())] - return render(request, 'qcg/task.html', {'task': task}) + 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_submit(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') - - print repr(form.errors) - print repr(env_formset.errors) else: - form = JobDescriptionForm() - env_formset = EnvFormSet() + 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) + errors = form.errors or (env_formset.is_bound and not env_formset.is_valid) or ( + save_template and template_form.errors) - return render(request, 'qcg/job_submit.html', {'form': form, 'env_formset': env_formset, 'errors': errors}) + return render(request, 'qcg/job_submit.html', {'form': form, 'env_formset': env_formset, 'errors': errors, + 'template_form': template_form, 'template': template}) @require_POST @@ -272,3 +310,39 @@ def gridftp_upload(request): {'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)