From 368ebd66507c4d45cbc6e77cb3d45624172d0995 Mon Sep 17 00:00:00 2001 From: Maciej Tronowski Date: Wed, 6 May 2015 16:27:35 +0200 Subject: [PATCH] presenting job description as form --- qcg/service.py | 3 - qcg/static/qcg/selectize/selectize.bootstrap3.css | 5 +- qcg/templates/qcg/details_base.html | 39 +++++ qcg/templates/qcg/job.html | 34 +--- qcg/templates/qcg/job_description.html | 40 +++++ qcg/templates/qcg/job_submit.html | 175 +------------------- qcg/templates/qcg/job_submit_form.html | 116 +++++++++++++ qcg/templates/qcg/tags/bootstrap_button_group.html | 16 ++ qcg/templates/qcg/tags/bootstrap_checkbox.html | 3 +- qcg/templates/qcg/task.html | 11 +- qcg/templatetags/qcg_utils.py | 9 + qcg/views.py | 28 +++- 12 files changed, 257 insertions(+), 222 deletions(-) create mode 100644 qcg/templates/qcg/details_base.html create mode 100644 qcg/templates/qcg/job_description.html create mode 100644 qcg/templates/qcg/job_submit_form.html create mode 100644 qcg/templates/qcg/tags/bootstrap_button_group.html diff --git a/qcg/service.py b/qcg/service.py index c69eee0..787ea38 100644 --- a/qcg/service.py +++ b/qcg/service.py @@ -84,9 +84,6 @@ def update_user_data(user, proxy): @transaction.atomic def update_job(job, proxy): - if job.terminated and job.purged: - return - ts = time.time() QCG.start() diff --git a/qcg/static/qcg/selectize/selectize.bootstrap3.css b/qcg/static/qcg/selectize/selectize.bootstrap3.css index b898ef6..3b91599 100644 --- a/qcg/static/qcg/selectize/selectize.bootstrap3.css +++ b/qcg/static/qcg/selectize/selectize.bootstrap3.css @@ -311,8 +311,9 @@ margin: 0 4px 0 -2px !important; } .selectize-control .selectize-input.disabled { - opacity: 0.5; - background-color: #ffffff; + /*opacity: 0.5;*/ + /*background-color: #ffffff;*/ + background-color: #eee; } .selectize-dropdown, .selectize-dropdown.form-control { diff --git a/qcg/templates/qcg/details_base.html b/qcg/templates/qcg/details_base.html new file mode 100644 index 0000000..265cb17 --- /dev/null +++ b/qcg/templates/qcg/details_base.html @@ -0,0 +1,39 @@ +{% extends 'qcg/base.html' %} +{% load staticfiles %} + +{% block extra_css %} + + + +{% endblock %} + +{% block extra_js %} + +{% endblock extra_js %} diff --git a/qcg/templates/qcg/job.html b/qcg/templates/qcg/job.html index d3c3922..4f44a3a 100644 --- a/qcg/templates/qcg/job.html +++ b/qcg/templates/qcg/job.html @@ -1,5 +1,5 @@ -{% extends 'qcg/base.html' %} -{% load qcg_utils bootstrap3 %} +{% extends 'qcg/details_base.html' %} +{% load qcg_utils %} {% block container %}
    @@ -69,37 +69,9 @@
    - - - {% if job.get_description_type_display != 'QCG' %} -

    Opis użytkownika

    - 
    {{ job.description }}
    - {% endif %} - -

    Opis QCG

    - 
    {{ job.qcg_description|format_xml }}
    + {% include 'qcg/job_description.html' %}
    - - {% endblock container %} diff --git a/qcg/templates/qcg/job_description.html b/qcg/templates/qcg/job_description.html new file mode 100644 index 0000000..4fc3afa --- /dev/null +++ b/qcg/templates/qcg/job_description.html @@ -0,0 +1,40 @@ +{% load qcg_utils bootstrap3 %} + +
    + {% include 'qcg/job_submit_form.html' %} +
    +
    +
    +
    + + Pokaż zaawansowane +
    +
    + +{% if job.get_description_type_display != 'QCG' %} +

    Opis użytkownika

    + 
    {{ job.description }}
    +{% endif %} + +

    Opis QCG

    +
    {{ job.qcg_description|format_xml }}
    + + diff --git a/qcg/templates/qcg/job_submit.html b/qcg/templates/qcg/job_submit.html index 87b8a2c..83e9025 100644 --- a/qcg/templates/qcg/job_submit.html +++ b/qcg/templates/qcg/job_submit.html @@ -1,5 +1,5 @@ {% extends 'qcg/base.html' %} -{% load staticfiles bootstrap3 qcg_utils %} +{% load staticfiles bootstrap3 %} {% block extra_css %} @@ -114,8 +114,6 @@ $('input[name="notify_type"],input[name="watch_output_type"],input[name="preprocess_type"],input[name="postprocess_type"]').on('change', function () { $(this).tab('show'); }).each(function() { - $(this).parent().toggleClass('active', this.checked); - if (this.checked) $(this).tab('show'); }); @@ -168,176 +166,7 @@
    {% csrf_token %} - - - -
    -
    - {% bootstrap_field form.application layout="horizontal" %} - {% bootstrap_field form.master_file layout="horizontal" %} - {% bootstrap_field form.executable layout="horizontal" form_group_class="form-group collapse" %} - {% bootstrap_field form.script layout="horizontal" form_group_class="form-group collapse" %} - {% bootstrap_field form.arguments layout="horizontal" %} - {% bootstrap_field form.note layout="horizontal" %} - {% bootstrap_field form.grant layout="horizontal" form_group_class="form-group collapse" %} -
    - -
    - {% bootstrap_field form.hosts layout="horizontal" %} - {% bootstrap_field form.queue layout="horizontal" %} - {% bootstrap_field form.properties layout="horizontal" form_group_class="form-group collapse" %} - {% bootstrap_field form.modules layout="horizontal" form_group_class="form-group collapse" %} - {% bootstrap_field form.procs layout="horizontal" %} - {% bootstrap_field form.nodes layout="horizontal" form_group_class="form-group collapse" %} - {% bootstrap_field form.wall_time layout="horizontal" form_group_class="form-group timerange" %} - {% bootstrap_field form.memory layout="horizontal" form_group_class="form-group collapse" %} - {% bootstrap_field form.memory_per_slot layout="horizontal" form_group_class="form-group collapse" %} - {% bootstrap_field form.reservation layout="horizontal" form_group_class="form-group collapse" %} -
    - -
    - {% bootstrap_field form.input layout="horizontal" %} - {% bootstrap_field form.stage_in layout="horizontal" %} -
    - -
    - {{ env_formset.management_form }} - -
    - -
    -
    - {% for env_form in env_formset %} -
    {% bootstrap_form env_form layout='inline' %}
    - {% endfor %} -
    -
    - -
    -
    -
    - -
    - {% bootstrap_checkbox form.monitoring %} - -
    - -
    -
    - {% for option in form.notify_type %} - - {% endfor %} -
    -
    -
    - -
    -
    - -
    - {% bootstrap_field form.notify_address layout="horizontal" %} -
    -
    - -
    -
    - -
    -
    - {% for option in form.watch_output_type %} - - {% endfor %} -
    -
    -
    - -
    -
    - -
    - {% bootstrap_field form.watch_output_address layout="horizontal" %} - {% bootstrap_field form.watch_output_pattern layout="horizontal" %} -
    -
    -
    -
    - -
    -
    - -
    -
    - {% for option in form.preprocess_type %} - - {% endfor %} -
    -
    -
    - -
    -
    - -
    - {% bootstrap_field form.preprocess_cmd layout="horizontal" %} -
    - -
    - {% bootstrap_field form.preprocess_script layout="horizontal" %} -
    -
    - -
    - -
    -
    - {% for option in form.postprocess_type %} - - {% endfor %} -
    -
    -
    - -
    -
    - -
    - {% bootstrap_field form.postprocess_cmd layout="horizontal" %} -
    - -
    - {% bootstrap_field form.postprocess_script layout="horizontal" %} -
    -
    - - {% bootstrap_field form.native layout="horizontal" %} - {% bootstrap_checkbox form.persistent %} -
    -
    + {% include 'qcg/job_submit_form.html' %}
    diff --git a/qcg/templates/qcg/job_submit_form.html b/qcg/templates/qcg/job_submit_form.html new file mode 100644 index 0000000..e9b5289 --- /dev/null +++ b/qcg/templates/qcg/job_submit_form.html @@ -0,0 +1,116 @@ +{% load bootstrap3 qcg_utils %} + + + + +
    +
    + {% bootstrap_field form.application layout="horizontal" %} + {% bootstrap_field form.master_file layout="horizontal" %} + {% bootstrap_field form.executable layout="horizontal" form_group_class="form-group collapse" %} + {% bootstrap_field form.script layout="horizontal" form_group_class="form-group collapse" %} + {% bootstrap_field form.arguments layout="horizontal" %} + {% bootstrap_field form.note layout="horizontal" %} + {% bootstrap_field form.grant layout="horizontal" form_group_class="form-group collapse" %} +
    + +
    + {% bootstrap_field form.hosts layout="horizontal" %} + {% bootstrap_field form.queue layout="horizontal" %} + {% bootstrap_field form.properties layout="horizontal" form_group_class="form-group collapse" %} + {% bootstrap_field form.modules layout="horizontal" form_group_class="form-group collapse" %} + {% bootstrap_field form.procs layout="horizontal" %} + {% bootstrap_field form.nodes layout="horizontal" form_group_class="form-group collapse" %} + {% bootstrap_field form.wall_time layout="horizontal" form_group_class="form-group timerange" %} + {% bootstrap_field form.memory layout="horizontal" form_group_class="form-group collapse" %} + {% bootstrap_field form.memory_per_slot layout="horizontal" form_group_class="form-group collapse" %} + {% bootstrap_field form.reservation layout="horizontal" form_group_class="form-group collapse" %} +
    + +
    + {% bootstrap_field form.input layout="horizontal" %} + {% bootstrap_field form.stage_in layout="horizontal" %} +
    + +
    + {{ env_formset.management_form }} + +
    + +
    +
    + {% for env_form in env_formset %} +
    {% bootstrap_form env_form layout='inline' %}
    + {% endfor %} +
    +
    + +
    +
    +
    + +
    + {% bootstrap_checkbox form.monitoring %} + + {% bootstrap_button_group form.notify_type %} +
    +
    + +
    + {% bootstrap_field form.notify_address layout="horizontal" %} +
    +
    + +
    + {% bootstrap_button_group form.watch_output_type %} +
    +
    + +
    + {% bootstrap_field form.watch_output_address layout="horizontal" %} + {% bootstrap_field form.watch_output_pattern layout="horizontal" %} +
    +
    +
    +
    + +
    + {% bootstrap_button_group form.preprocess_type %} +
    +
    + +
    + {% bootstrap_field form.preprocess_cmd layout="horizontal" %} +
    + +
    + {% bootstrap_field form.preprocess_script layout="horizontal" %} +
    +
    + + {% bootstrap_button_group form.postprocess_type %} +
    +
    + +
    + {% bootstrap_field form.postprocess_cmd layout="horizontal" %} +
    + +
    + {% bootstrap_field form.postprocess_script layout="horizontal" %} +
    +
    + + {% bootstrap_field form.native layout="horizontal" %} + {% bootstrap_checkbox form.persistent %} +
    +
    diff --git a/qcg/templates/qcg/tags/bootstrap_button_group.html b/qcg/templates/qcg/tags/bootstrap_button_group.html new file mode 100644 index 0000000..8bc03ae --- /dev/null +++ b/qcg/templates/qcg/tags/bootstrap_button_group.html @@ -0,0 +1,16 @@ +{% load qcg_utils %} + +
    + +
    +
    + {% for option in field %} + + {% endfor %} +
    +
    +
    diff --git a/qcg/templates/qcg/tags/bootstrap_checkbox.html b/qcg/templates/qcg/tags/bootstrap_checkbox.html index a0b9926..e5a9178 100644 --- a/qcg/templates/qcg/tags/bootstrap_checkbox.html +++ b/qcg/templates/qcg/tags/bootstrap_checkbox.html @@ -1,6 +1,7 @@
    - +
    diff --git a/qcg/templates/qcg/task.html b/qcg/templates/qcg/task.html index e4fcf11..584fa63 100644 --- a/qcg/templates/qcg/task.html +++ b/qcg/templates/qcg/task.html @@ -1,8 +1,9 @@ -{% extends 'qcg/base.html' %} +{% extends 'qcg/details_base.html' %} {% load qcg_utils staticfiles %} {% block extra_js %} {% include 'filex/source.js.html' %} + {{ block.super }}