X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=91016c169dac0cb267eebc0b7ee2d85291b67d58;hb=5575cf9ec295e93b76668b3e7849c84b384b15a5;hp=8a14c2f991e3c00e7e461da7f560f6d12a02e83f;hpb=1459b7887e4f4c9bae86a37c80ab9c0b030c08f2;p=qcg-portal.git diff --git a/qcg/views.py b/qcg/views.py index 8a14c2f..91016c1 100644 --- a/qcg/views.py +++ b/qcg/views.py @@ -23,10 +23,19 @@ 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.utils import paginator_context, to_job_desc, to_form_data, generate_md_inputfile from qcg.service import update_user_data, update_job, cancel, clean +from django.utils import encoding +import string +import random +import os +from qcg import constants +from qcg.utils import chunks +# for Debugging +from pprint import pprint + def index(request): return render(request, 'qcg/base.html') @@ -155,11 +164,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']) - - template_form = JobTemplateForm(initial={'name': job.note or u'Szablon z {}'.format(job.job_id)}) - - return render(request, 'qcg/job.html', {'job': job, 'template_form': template_form}) + return render(request, 'qcg/job.html', process_details(request, job)) @login_required @@ -167,10 +172,31 @@ 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 id_generator(size=6, chars=string.ascii_uppercase + string.digits): + return ''.join(random.choice(chars) for _ in range(size)) @login_required def job_submit(request, template_id=None): @@ -193,8 +219,24 @@ def job_submit(request, template_id=None): params['env_variables'] = [(env['name'], env['value']) for env in env_formset.cleaned_data if env and not env['DELETE']] + # Generowanie pliku inputowego + md_input=generate_md_inputfile(params) + url=os.path.splitext(params['pdb_file'])[0]+'_MD_genarated.inp' + params['master_file']=url + params['stage_in'].append(params['pdb_file']) + # Upload + ftp = FTPOperation(request.session['proxy']) + ftp.put(url) + for chunk in chunks('\n'.join([str(i) for i in md_input] ), 4096): + ftp.stream.put(chunk) + ftp.stream.put(None) + ftp.wait() + + params['persistent'] = True + job_desc = to_job_desc(params, request.session['proxy']) + if save_template: template = template_form.save(commit=False) @@ -203,13 +245,13 @@ def job_submit(request, template_id=None): template.save() return redirect(template) - + 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) @@ -310,7 +352,7 @@ 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')