X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=dab0a2428b1fb2bf318d20765086e99eb47c263b;hb=a58466aa69d7c78bb740d90a446bcc71898deb08;hp=2dc5e8f09da2fab9c07344623f97a842d4e106b9;hpb=dd8e6b0785c78c42c3866f161dd853a54e47275a;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index 2dc5e8f..dab0a24 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -22,10 +22,24 @@ 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.utils import paginator_context, to_job_desc, to_form_data
+from qcg.models import JobTemplate
+<<<<<<< HEAD
+from qcg.utils import paginator_context, to_job_desc, to_form_data, generate_md_inputfile
+=======
+from qcg.utils import paginator_context, to_job_desc, to_form_data, restricted
+>>>>>>> 4a588e0... set Cache-Control header for restricted views
 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')
 
@@ -61,7 +75,7 @@ def parse_date(string):
     return datetime.strptime(string.strip(), "%d.%m.%Y").replace(tzinfo=UTC())
 
 
-@login_required
+@restricted
 def jobs_list(request):
     update_user_data(request.user, request.session['proxy'])
 
@@ -150,26 +164,45 @@ def jobs_list(request):
     return render(request, 'qcg/jobs.html', context)
 
 
-@login_required
+@restricted
 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'])
+    job = get_object_or_404(request.user.jobs.select_related('owner').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
+@restricted
 def task_details(request, job_id, task_id):
-    task = get_object_or_404(request.user.tasks.select_related('job').prefetch_related('allocations'),
+    task = get_object_or_404(request.user.tasks.select_related('job__owner').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))
 
-    return render(request, 'qcg/task.html', {'task': task})
 
+def process_details(request, job, task=None):
+    if not job.terminated or not job.purged:
+        update_job(job, request.session['proxy'])
 
-@login_required
+    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}
+
+
+def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
+    return ''.join(random.choice(chars) for _ in range(size))
+
+@restricted
 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
@@ -185,13 +218,29 @@ 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']]
 
+            # 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)
 
@@ -201,12 +250,14 @@ def job_submit(request, template_id=None):
 
                 return redirect(template)
 
+            # wyłączenie wysyłania zadania - zakomentować poniżej
+            
             job = job_desc.submit()
 
             messages.success(request,
                              format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
-                                         'Zlecono zadanie <em>{}</em>.', job.job_id))
-
+                                         u'Zlecono zadanie <em>{}</em>.', job.job_id))
+            
             return redirect('jobs')
     else:
         form = JobDescriptionForm(initial=form_data)
@@ -270,13 +321,13 @@ def obj_clean(request, obj):
     return redirect(obj)
 
 
-@login_required
+@restricted
 def gridftp(request):
     return render(request, 'qcg/gridftp.html',
                   {'new_dir_form': HostPathNameForm(), 'rename_form': RenameForm(), 'archive_form': ArchiveForm()})
 
 
-@login_required
+@restricted
 def gridftp_upload(request):
     form = HostPathForm(request.GET)
 
@@ -295,7 +346,7 @@ def gridftp_upload(request):
                    'sep': '/' if form.cleaned_data['path'].startswith('~') else ''})
 
 
-@login_required
+@restricted
 def job_templates(request):
     return render(request, 'qcg/job_templates.html', {'templates': request.user.templates.all()})
 
@@ -307,6 +358,25 @@ def template_delete(request, template_id):
     template.delete()
 
     messages.success(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
-                                          'Usunięto szablon <em>{}</em>.', template.name))
+                                          u'Usunięto szablon <em>{}</em>.', 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('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}'
+                                        'Nie udało się zapisać szablonu!', template_form.errors))
+
+    return redirect(job)