X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=a760425ed103819c2dbe4d95c2da0a8130fe0de6;hb=3e5a486378702cab1366d377240a6f405d71a078;hp=173ed45982394947560b2a5b9f5c8d8dd4cd2697;hpb=e85ef8224efe5a0a5311262aa3b602f2f92d95b4;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index 173ed45..a760425 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -12,9 +12,12 @@ 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
-from qcg.utils import update_user_data, paginator_context
+from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet
+from qcg.utils import paginator_context
+from qcg.service import update_user_data
 
 
 def index(request):
@@ -54,8 +57,8 @@ def parse_date(string):
 
 @login_required
 def jobs_list(request):
-    # QCG.start()
-    # update_user_data(request.user, request.session['proxy'])
+    QCG.start()
+    update_user_data(request.user, request.session['proxy'])
 
     tasks = request.user.tasks.order_by('-job__submission_time', '-submission_time') \
         .select_related('job').prefetch_related('allocations__nodes')
@@ -115,16 +118,18 @@ def jobs_list(request):
 
     checked_status = {i: widget.is_checked() for i, widget in enumerate(filters['status'])}
 
-    if 'columns' in request.COOKIES:
-        columns = ColumnsForm(QueryDict(request.COOKIES.get('columns')))
+    columns = ColumnsForm(QueryDict(request.COOKIES.get('columns', '')))
 
-    if 'columns' not in request.COOKIES or not columns.is_valid():
-        columns = ColumnsForm(QueryDict('columns=1&columns=2&columns=3&columns=4&columns=5&columns=6'))
-        columns.is_valid()
+    displayed = None
+    if columns.is_valid():
+        displayed = {int(c) for c in columns.cleaned_data['columns']}
+
+    # if invalid or empty
+    if not displayed:
+        displayed = set(columns.fields['columns'].initial)
 
     context = {'filters': filters, 'checked_status': checked_status, 'selected_filters': selected_filters,
-               'columns': ColumnsForm(initial={'columns': columns.cleaned_data['columns']}),
-               'displayed': {int(c) for c in columns.cleaned_data['columns']}}
+               'columns': ColumnsForm(initial={'columns': displayed}), 'displayed': displayed}
 
     context.update(paginator_context(request, tasks))
 
@@ -138,8 +143,68 @@ def job_details(request, job_id):
     return render(request, 'qcg/job.html', {'job': job})
 
 
+@login_required
 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)
 
     return render(request, 'qcg/task.html', {'task': task})
+
+
+@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
+
+        print repr(form.errors)
+        print repr(env_formset.errors)
+    else:
+        form = JobDescriptionForm()
+        env_formset = EnvFormSet()
+
+    errors = form.errors or (env_formset.is_bound and not env_formset.is_valid)
+
+    return render(request, 'qcg/job_new.html', {'form': form, 'env_formset': env_formset, 'errors': errors})
+
+
+@login_required
+def gridftp(request):
+    return render(request, 'qcg/gridftp.html')