X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Fviews.py;h=973247bce96ef3c441a740a3c6c0c112c07b256f;hb=1e5f6a4eb788300f3c71f87a2702a23f670948b8;hp=adc4676854a6b80b474802b0dac090862a453b66;hpb=d0df2c3b90c52193545c6fa6a1a128cb1c61ff5e;p=qcg-portal.git

diff --git a/qcg/views.py b/qcg/views.py
index adc4676..973247b 100644
--- a/qcg/views.py
+++ b/qcg/views.py
@@ -13,13 +13,17 @@ 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.views.decorators.http import require_POST
 from django_openid_auth.views import make_consumer
 from openid.extensions import ax
+from pyqcg.utils.qcg_types import PyqcgException
 
 from filex.forms import HostPathNameForm, RenameForm, ArchiveForm, HostPathForm
+from filex.ftp import FTPOperation, FTPError
+from filex.views import make_url
 from qcg.forms import FiltersForm, ColumnsForm, JobDescriptionForm, EnvFormSet
 from qcg.utils import paginator_context
-from qcg.service import update_user_data, submit_job
+from qcg.service import update_user_data, submit_job, update_job, cancel, clean
 
 
 def index(request):
@@ -70,6 +74,7 @@ def jobs_list(request):
         keywords = filters.cleaned_data['keywords']
         status = filters.cleaned_data['status']
         host = filters.cleaned_data['host']
+        purged = filters.cleaned_data['purged']
         submission = filters.cleaned_data['submission']
         finish = filters.cleaned_data['finish']
 
@@ -101,6 +106,14 @@ def jobs_list(request):
             for h in host:
                 selected_filters.append((host_dict[h], 'host', h))
 
+        if isinstance(purged, bool):
+            tasks = tasks.filter(purged=purged)
+
+            if purged:
+                selected_filters.append((u"Usunięty katalog roboczy", 'purged', '1'))
+            else:
+                selected_filters.append((u"Istniejący katalog roboczy", 'purged', '0'))
+
         if submission:
             start, end = submission.split('-')
 
@@ -141,6 +154,8 @@ def jobs_list(request):
 def job_details(request, job_id):
     job = get_object_or_404(request.user.jobs.prefetch_related('tasks'), job_id=job_id)
 
+    update_job(job, request.session['proxy'])
+
     return render(request, 'qcg/job.html', {'job': job})
 
 
@@ -149,11 +164,13 @@ 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)
 
+    update_job(task.job, request.session['proxy'])
+
     return render(request, 'qcg/task.html', {'task': task})
 
 
 @login_required
-def job_new(request):
+def job_submit(request):
     if request.method == 'POST':
         form = JobDescriptionForm(request.POST)
         env_formset = EnvFormSet(request.POST)
@@ -179,13 +196,63 @@ def job_new(request):
 
     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})
+    return render(request, 'qcg/job_submit.html', {'form': form, 'env_formset': env_formset, 'errors': errors})
+
+
+@require_POST
+@login_required
+def job_cancel(request, job_id):
+    return obj_cancel(request, get_object_or_404(request.user.jobs, job_id=job_id))
+
+
+@require_POST
+@login_required
+def task_cancel(request, job_id, task_id):
+    return obj_cancel(request, get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id))
+
+
+def obj_cancel(request, obj):
+    try:
+        cancel(obj, request.session['proxy'])
+    except PyqcgException as e:
+        messages.error(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}',
+                                            e.message))
+    else:
+        messages.success(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+                                              'Zadanie anulowano.'))
+
+    return redirect(obj)
+
+
+@require_POST
+@login_required
+def job_clean(request, job_id):
+    return obj_clean(request, get_object_or_404(request.user.jobs, job_id=job_id))
+
+
+@require_POST
+@login_required
+def task_clean(request, job_id, task_id):
+    return obj_clean(request, get_object_or_404(request.user.tasks, job__job_id=job_id, task_id=task_id))
+
+
+def obj_clean(request, obj):
+    try:
+        clean(obj, request.session['proxy'])
+    except PyqcgException as e:
+        messages.error(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> {}',
+                                            e.message))
+    else:
+        messages.success(request, format_html('<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span> '
+                                              'Usunięto katalog roboczy.'))
+
+    return redirect(obj)
 
 
 @login_required
 def gridftp(request):
     return render(request, 'qcg/gridftp.html',
-                  {'new_dir_form': HostPathNameForm(), 'rename_form': RenameForm(),  'archive_form': ArchiveForm()})
+                  {'new_dir_form': HostPathNameForm(), 'rename_form': RenameForm(), 'archive_form': ArchiveForm()})
 
 
 @login_required
@@ -195,7 +262,18 @@ def gridftp_upload(request):
     if not form.is_valid():
         raise SuspiciousOperation('Invalid parameters for `gridftp_upload`!')
 
+    error = None
+    try:
+        FTPOperation(request.session['proxy']).info(make_url(form.cleaned_data, 'path'))
+    except FTPError as e:
+        error = e.message
+
     return render(request, 'qcg/gridftp_upload.html',
-                  {'url': reverse('filex:upload') + '?' + urlencode(form.cleaned_data),
+                  {'error': error, 'url': reverse('filex:upload') + '?' + urlencode(form.cleaned_data),
                    'host': form.cleaned_data['host'], 'path': form.cleaned_data['path'],
                    'sep': '/' if form.cleaned_data['path'].startswith('~') else ''})
+
+
+@login_required
+def job_templates(request):
+    return render(request, 'qcg/job_templates.html', {'templates': request.user.templates.all()})