X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjobs.html;h=52698aaa258cbfcbe0f4b875202a478a459ad4f1;hb=592985946dcdfd3ad3cd60fbe2d33b06b794bd70;hp=c7ae8554cf1a75df1c8795bac43624c8fee7de7b;hpb=1fd3869b808683dc35606315f1dc4492c38596b6;p=qcg-portal.git diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html index c7ae855..52698aa 100644 --- a/qcg/templates/qcg/jobs.html +++ b/qcg/templates/qcg/jobs.html @@ -1,23 +1,16 @@ {% extends 'qcg/base.html' %} - -{% load staticfiles %} +{% load staticfiles bootstrap3 query_string qcg_utils %} {% block extra_css %} - - + {% endblock %} {% block extra_js %} + + + {% endblock %} {% block container %} + {% for message in messages %} +
+ {% endfor %} + + +- | Opis | -WysÅane | -Start | -Koniec | -Status | -Host | ++ {% if columns.DESCRIPTION in displayed %} | Opis | {% endif %} + {% if columns.SUBMISSION in displayed %}WysÅane | {% endif %} + {% if columns.START in displayed %}Start | {% endif %} + {% if columns.END in displayed %}Koniec | {% endif %} + {% if columns.STATUS in displayed %}Status | {% endif %} + {% if columns.HOST in displayed %}Host | {% endif %} +{# | Uwagi | #}-{# {{ task }}#} + {% if columns.JOB_ID in displayed %}{{ task }}{% endif %} | -{{ task.note }} | -{{ task.submission_time|timesince }} temu | -{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }} | -{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }} | -{{ task.get_status_display }} | -{{ task.short_host_names|join:', ' }} | + {% if columns.DESCRIPTION in displayed %}{{ task.note }} | {% endif %} + {% if columns.SUBMISSION in displayed %}{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }} | {% endif %} + {% if columns.START in displayed %}{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }} | {% endif %} + {% if columns.END in displayed %}{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }} | {% endif %} + {% if columns.STATUS in displayed %}{{ task.get_status_display }} | {% endif %} + {% if columns.HOST in displayed %}{{ task.short_host_names|join:', ' }} | {% endif %} +szczegóÅy › | {% endwith %} {% else %} @@ -144,15 +193,16 @@-{# {{ job.grouper }}#} + {% if columns.JOB_ID in displayed %}{{ job.grouper }}{% endif %} | -{{ job.grouper.note }} | -{{ job.grouper.submission_time|timesince }} temu | -- | -{{ job.grouper.finish_time|date:"CUSTOM_DATETIME_FORMAT" }} | -{{ job.grouper.get_status_display }} | -- | + {% if columns.DESCRIPTION in displayed %}{{ job.grouper.note }} | {% endif %} + {% if columns.SUBMISSION in displayed %}{{ job.grouper.submission_time|date:"CUSTOM_DATETIME_FORMAT" }} | {% endif %} + {% if columns.START in displayed %}- | {% endif %} + {% if columns.END in displayed %}{{ job.grouper.finish_time|date:"CUSTOM_DATETIME_FORMAT" }} | {% endif %} + {% if columns.STATUS in displayed %}{{ job.grouper.get_status_display }} | {% endif %} + {% if columns.HOST in displayed %}- | {% endif %} +szczegóÅy › | {% for task in job.list %} @@ -160,15 +210,16 @@-{# {{ task }}#} + {% if columns.JOB_ID in displayed %}{{ task }}{% endif %} | -{{ task.note }} | -{{ task.submission_time|timesince }} temu | -{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }} | -{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }} | -{{ task.get_status_display }} | -{{ task.short_host_names|join:', ' }} | + {% if columns.DESCRIPTION in displayed %}{{ task.note }} | {% endif %} + {% if columns.SUBMISSION in displayed %}{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }} | {% endif %} + {% if columns.START in displayed %}{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }} | {% endif %} + {% if columns.END in displayed %}{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }} | {% endif %} + {% if columns.STATUS in displayed %}{{ task.get_status_display }} | {% endif %} + {% if columns.HOST in displayed %}{{ task.short_host_names|join:', ' }} | {% endif %} +szczegóÅy › | {% endfor %} {% endifequal %} @@ -176,18 +227,25 @@
---|