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

diff --git a/qcg/views.py b/qcg/views.py
index 173ed45..27fdf87 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -1,20 +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 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, submit_job
 
 
 def index(request):
@@ -54,8 +57,7 @@ def parse_date(string):
 
 @login_required
 def jobs_list(request):
-    # QCG.start()
-    # update_user_data(request.user, request.session['proxy'])
+    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 +117,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', '')))
+
+    displayed = None
+    if columns.is_valid():
+        displayed = {int(c) for c in columns.cleaned_data['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()
+    # 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 +142,51 @@ 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':
+        form = JobDescriptionForm(request.POST)
+        env_formset = EnvFormSet(request.POST)
+
+        if form.is_valid() and env_formset.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']]
+
+            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)
+    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')
+
+
+def gridftp_upload(request):
+    # TODO GET data validation
+    return render(request, 'qcg/gridftp_upload.html',
+                  {'url': reverse('filex:upload') + '?' + request.GET.urlencode(safe='/'),
+                   'host': request.GET.get('host'), 'path': request.GET.get('path')})