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 update_user_data, paginator_context
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))
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):
- return render(request, 'qcg/job_new.html', {'form': JobDescriptionForm(), 'env_formset': EnvFormSet()})
+ 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
+
+ desc = JobDescription(Credential(request.session['proxy']))
+
+ direct_map = ('application', 'arguments', 'note', 'grant', 'hosts', 'properties', 'queue', 'procs', 'nodes',
+ '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])
+
+ desc.reservation = ('LOCAL', form.cleaned_data['reservation'])
+ desc.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 not env['DELETE']]
+ # TODO script
+ # TODO executable
+ # TODO input
+ # TODO stage_in
+ # TODO stage_out
+ # TODO monitoring
+
+ for prop in direct_map + ('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})