From 30676926ef79a0e6b9bade2ad277c82a322f5f3d Mon Sep 17 00:00:00 2001
From: Maciej Tronowski <mtro@man.poznan.pl>
Date: Tue, 24 Mar 2015 17:34:25 +0100
Subject: [PATCH] enhancements in selecting file from gridftp & moved
 submitting jobs to separate file

---
 qcg/forms.py                   |   16 +++++++----
 qcg/service.py                 |   43 +++++++++++++++++++++++++++++-
 qcg/templates/qcg/job_new.html |   56 ++++++++++++++++++++++++++++++++-------
 qcg/views.py                   |   57 +++++++++++-----------------------------
 4 files changed, 115 insertions(+), 57 deletions(-)

diff --git a/qcg/forms.py b/qcg/forms.py
index 33eeeaf..74eec37 100644
--- a/qcg/forms.py
+++ b/qcg/forms.py
@@ -136,9 +136,9 @@ class JobDescriptionForm(forms.Form):
     reservation = forms.CharField(label=u"Rezerwacja", max_length=100, required=False)
 
     # TODO grid ftp
-    input = forms.CharField(label=u"Standardowe wejście", max_length=500, required=False)
-    stage_in = forms.CharField(label=u"Stage in", max_length=500, required=False)
-    stage_out = forms.CharField(label=u"Stage out", max_length=500, required=False)
+    input = forms.MultipleChoiceField(label=u"Standardowe wejście", required=False)
+    stage_in = forms.MultipleChoiceField(label=u"Stage in", required=False)
+    # stage_out = forms.MultipleChoiceField(label=u"Stage out", required=False)
 
     monitoring = forms.BooleanField(label=u"Portal QCG-Monitoring", required=False)
     notify_type = forms.ChoiceField(label=u"Monitorowanie stanu", choices=PROTOCOL_CHOICES, required=False, initial='',
@@ -169,6 +169,9 @@ class JobDescriptionForm(forms.Form):
             self.fields['arguments'].choices += ((v, v) for v in data.getlist('arguments'))
             self.fields['properties'].choices += ((v, v) for v in data.getlist('properties'))
             self.fields['native'].choices += ((v, v) for v in data.getlist('native'))
+            self.fields['input'].choices += ((v, v) for v in data.getlist('input'))
+            self.fields['stage_in'].choices += ((v, v) for v in data.getlist('stage_in'))
+            # self.fields['stage_out'].choices += ((v, v) for v in data.getlist('stage_out'))
 
     def clean(self):
         data = super(JobDescriptionForm, self).clean()
@@ -196,10 +199,13 @@ class JobDescriptionForm(forms.Form):
             data['postprocess'] = ''
 
     def clean_application(self):
-        return self.cleaned_data['application'].split('/', 1)
+        return self.cleaned_data['application'].split('/', 1) if self.cleaned_data['application'] else ''
+
+    def clean_executable(self):
+        return 'gsiftp://' + self.cleaned_data['executable'] if self.cleaned_data['executable'] else ''
 
     def clean_nodes(self):
-        return map(int, self.cleaned_data['nodes'].split(':', 2)) if self.cleaned_data['nodes'] else None
+        return map(int, self.cleaned_data['nodes'].split(':', 2)) if self.cleaned_data['nodes'] else ''
 
 
 class EnvForm(forms.Form):
diff --git a/qcg/service.py b/qcg/service.py
index fb312c7..6f44f49 100644
--- a/qcg/service.py
+++ b/qcg/service.py
@@ -3,7 +3,8 @@ import time
 
 from django.db import transaction
 from django.utils.timezone import now
-
+from pyqcg import QCG
+from pyqcg.description import JobDescription
 from pyqcg.service import Registry
 from pyqcg.utils import Credential, TimePeriod
 
@@ -14,6 +15,7 @@ logger = logging.getLogger(__name__)
 @transaction.atomic
 def update_user_data(user, proxy):
     ts = time.time()
+    QCG.start()
     from qcg.models import User, Job, Task, Allocation, NodeInfo
 
     credential = Credential(proxy)
@@ -75,3 +77,42 @@ def update_user_data(user, proxy):
     elapsed_py = elapsed - elapsed_jobs - elapsed_tasks
     logger.info('(%.3f) USER = %s, JOBS = %s (%.3f), TASKS = %s (%.3f), TIME = %.3f',
                 elapsed, user, jobs_count, elapsed_jobs, task_count, elapsed_tasks, elapsed_py)
+
+
+def submit_job(params, proxy):
+    # print params
+
+    QCG.start()
+    desc = JobDescription(Credential(proxy))
+
+    direct_map = ('env_variables', 'executable', 'arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs',
+                  'wall_time', 'memory', 'memory_per_slot', 'modules', 'native', 'notify', 'preprocess', 'postprocess',
+                  'persistent')
+
+    for name in direct_map:
+        if params[name]:
+            setattr(desc, name, params[name])
+
+    if params['application']:
+        desc.set_application(*params['application'])
+    if params['nodes']:
+        desc.set_nodes(*params['nodes'])
+    if params['reservation']:
+        desc.set_reservation(params['reservation'])
+    if params['watch_output']:
+        desc.set_watch_output(params['watch_output'], params['watch_output_pattern'])
+    # TODO script
+    # TODO executable
+    # TODO input
+    # TODO stage_in
+    # TODO stage_out
+    # TODO monitoring
+
+    # for prop in direct_map + ('application', 'nodes', 'env_variables', 'reservation', 'watch_output'):
+    #     print prop, type(getattr(desc, prop)), repr(getattr(desc, prop))
+
+    # print desc.xml_description
+
+    # job = desc.submit()
+
+    # return job.job_id
diff --git a/qcg/templates/qcg/job_new.html b/qcg/templates/qcg/job_new.html
index eb3d973..cac10a6 100644
--- a/qcg/templates/qcg/job_new.html
+++ b/qcg/templates/qcg/job_new.html
@@ -13,20 +13,52 @@
 
     <script>
         $(function() {
-            $('#id_master_file,#id_executable,#id_input,#id_stage_in,#id_preprocess_script,#id_postprocess_script').before(function() {
+            var gridftpButton = $('<button/>', {
+                'type': 'button',
+                'class': 'btn btn-default pull-right',
+                'text': 'Wybierz',
+                'data-toggle': 'modal',
+                'data-target': '#gridftp'
+            });
+
+            $('#id_master_file,#id_executable,#id_preprocess_script,#id_postprocess_script').before(function() {
                 var target = this;
-                return $('<button/>', {
-                    'type': 'button',
-                    'class': 'btn btn-default pull-right',
-                    'text': 'Wybierz',
-                    'data-toggle': 'modal',
-                    'data-target': '#gridftp'
-                }).click(function() {
-                    filex.once('selected:file', function(file) {
+                return gridftpButton.clone().click(function() {
+                    $('#select-btn').off().click(function() {
+                        var selected = filex.selectedFiles();
+
+                        if (selected.length != 1 || !selected[0].isFile()) {
+                            alert('Wybierz dokładnie jeden plik.');
+                            return;
+                        }
+
+                        var file = filex.host + filex.path.full() + '/' + selected[0].get('name');
                         target.selectize.addOption({value: file, text: file});
                         target.selectize.addItem(file);
                         target.selectize.refreshItems();
+
+                        $('#gridftp').modal('hide');
+                        filex.clearSelection();
+                    });
+                });
+            }).wrap('<div style="margin-right: 80px"></div>');
+
+            $('#id_input,#id_stage_in').before(function() {
+                var target = this;
+                return gridftpButton.clone().click(function() {
+                    $('#select-btn').off().click(function() {
+                        var path = filex.host + filex.path.full() + '/';
+
+                        _.each(filex.selectedFiles(), function(item) {
+                            console.log(arguments);
+                            var file = path + item.get('name');
+                            target.selectize.addOption({value: file, text: file});
+                            target.selectize.addItem(file);
+                        });
+                        target.selectize.refreshItems();
+
                         $('#gridftp').modal('hide');
+                        filex.clearSelection();
                     });
                 });
             }).wrap('<div style="margin-right: 80px"></div>');
@@ -134,7 +166,7 @@
             <fieldset id="files" class="tab-pane" role="tabpanel">
                 {% bootstrap_field form.input layout="horizontal" %}
                 {% bootstrap_field form.stage_in layout="horizontal" %}
-                {% bootstrap_field form.stage_out layout="horizontal" form_group_class="form-group collapse" %}
+{#                {% bootstrap_field form.stage_out layout="horizontal" form_group_class="form-group collapse" %}#}
             </fieldset>
 
             <fieldset id="environment" class="tab-pane" role="tabpanel">
@@ -290,6 +322,10 @@
                 <div class="modal-body">
                     {% include 'filex/source.html' %}
                 </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">Anuluj</button>
+                    <button id="select-btn" type="button" class="btn btn-primary">Wybierz</button>
+                </div>
             </div>
         </div>
     </div>
diff --git a/qcg/views.py b/qcg/views.py
index a760425..3551a43 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -1,23 +1,23 @@
 # coding=utf-8
 from datetime import datetime, timedelta
+
 from django.conf import settings
+from django.contrib import messages
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth.decorators import login_required
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, QueryDict
-from django.shortcuts import render, get_object_or_404
+from django.shortcuts import render, get_object_or_404, redirect
+from django.utils.html import format_html
 from django.utils.http import urlencode
 from django.utils.timezone import UTC
 from django_openid_auth.views import make_consumer
 from openid.extensions import ax
-from pyqcg import QCG
-from pyqcg.description import JobDescription
-from pyqcg.utils import Credential
 
 from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet
 from qcg.utils import paginator_context
-from qcg.service import update_user_data
+from qcg.service import update_user_data, submit_job
 
 
 def index(request):
@@ -57,7 +57,6 @@ def parse_date(string):
 
 @login_required
 def jobs_list(request):
-    QCG.start()
     update_user_data(request.user, request.session['proxy'])
 
     tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \
@@ -154,45 +153,21 @@ def task_details(request, job_id, task_id):
 @login_required
 def job_new(request):
     if request.method == 'POST':
-        QCG.start()
-
         form = JobDescriptionForm(request.POST)
         env_formset = EnvFormSet(request.POST)
 
         if form.is_valid() and env_formset.is_valid():
-            print form.cleaned_data
-            print env_formset.cleaned_data
-
-            desc = JobDescription(Credential(request.session['proxy']))
-
-            direct_map = ('arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs', 'wall_time', 'memory',
-                          'memory_per_slot', 'modules', 'native', 'notify', 'preprocess', 'postprocess', 'persistent')
-
-            for name in direct_map:
-                if form.cleaned_data[name]:
-                    setattr(desc, name, form.cleaned_data[name])
-
-            if form.cleaned_data['application']:
-                desc.set_application(*form.cleaned_data['application'])
-            if form.cleaned_data['nodes']:
-                desc.set_nodes(*form.cleaned_data['nodes'])
-            if form.cleaned_data['reservation']:
-                desc.set_reservation(form.cleaned_data['reservation'])
-            if form.cleaned_data['watch_output']:
-                desc.set_watch_output(form.cleaned_data['watch_output'], form.cleaned_data['watch_output_pattern'])
-            desc.env_variables += [(env['name'], env['value'])
-                                   for env in env_formset.cleaned_data if env and not env['DELETE']]
-            # TODO script
-            # TODO executable
-            # TODO input
-            # TODO stage_in
-            # TODO stage_out
-            # TODO monitoring
-
-            for prop in direct_map + ('application', 'nodes', 'env_variables', 'reservation', 'watch_output'):
-                print prop, type(getattr(desc, prop)), repr(getattr(desc, prop))
-
-            print desc.xml_description
+            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'])
+
+            messages.success(request,
+                             format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+                                         'Zlecono zadanie <em>{}</em>.', job_id))
+
+            return redirect('jobs')
 
         print repr(form.errors)
         print repr(env_formset.errors)
-- 
1.7.9.5