X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=5e8f0a001b9760cf8e84718d876941238779937e;hb=bb22ef5ff00541b1e6c248b780bad42d591d2382;hp=2dc5e8f09da2fab9c07344623f97a842d4e106b9;hpb=dd8e6b0785c78c42c3866f161dd853a54e47275a;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index 2dc5e8f..5e8f0a0 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -22,9 +22,12 @@ 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, 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 +# for Debugging +from pprint import pprint def index(request): return render(request, 'qcg/base.html') @@ -154,9 +157,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,10 +165,38 @@ 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', ())] + + 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)}) - return render(request, 'qcg/task.html', {'task': task}) + 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} + +def generate_mremd_inputfile(params, mremd_input): + mremd_input = list() + opis=params['note'] + mremd_input.append(opis[:73]) + mremd_input.append('SEED=-3059743 PDBREF MD EXTCONF RESCALE_MODE=2') + + + + + return mremd_input @login_required def job_submit(request, template_id=None): @@ -185,11 +214,20 @@ def job_submit(request, template_id=None): 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() and (not save_template or template_form.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']] + # tu wygenerować plik inputowy i go uploadować? + mremd_input=list() + print generate_mremd_inputfile(params,mremd_input) + + + params['persistent'] = True + # Debugging parametrów + pprint(params) + job_desc = to_job_desc(params, request.session['proxy']) if save_template: @@ -201,12 +239,14 @@ def job_submit(request, template_id=None): return redirect(template) + # wyłączenie wysyłania zadania + ''' job = job_desc.submit() messages.success(request, format_html(' ' - 'Zlecono zadanie {}.', job.job_id)) - + u'Zlecono zadanie {}.', job.job_id)) + ''' return redirect('jobs') else: form = JobDescriptionForm(initial=form_data) @@ -307,6 +347,25 @@ def template_delete(request, template_id): template.delete() messages.success(request, format_html(' ' - 'Usunięto szablon {}.', template.name)) + 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)