enhancements in selecting file from gridftp & moved submitting jobs to separate file

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

diff --git a/qcg/views.py b/qcg/views.py
index a760425..3551a43 100644 (file)
--- 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)