Merge branch 'devel'

[qcg-portal.git] / qcg / views.py

diff --git a/qcg/views.py b/qcg/views.py
index dfeebd3..91016c1 100644 (file)
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -23,9 +23,16 @@ 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
 
@@ -188,6 +195,9 @@ def process_details(request, job, task=None):
     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):
     save_template = 'save-template' in request.POST
@@ -209,14 +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']]
 
-            # tu wygenerować plik inputowy i go uploadować?
-
+            # 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
-            # Debugging parametrów
-            pprint(params)
 
             job_desc = to_job_desc(params, request.session['proxy'])
 
+
             if save_template:
                 template = template_form.save(commit=False)
 
@@ -225,15 +245,13 @@ def job_submit(request, template_id=None):
                 template.save()
 
                 return redirect(template)
-
-            # wyłączenie wysyłania zadania
-            '''
+            
             job = job_desc.submit()
 
             messages.success(request,
                              format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
                                          u'Zlecono zadanie <em>{}</em>.', job.job_id))
-            '''
+            
             return redirect('jobs')
     else:
         form = JobDescriptionForm(initial=form_data)