X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjobs.html;h=34e9ce5ae13cf01fc4a8e73960fd4f04310c6a85;hb=ddd692a2e77eadd9c7956d8094f36c5381b9b140;hp=ef0c801b0fb0775a7a1d25fa070cacba2c31026b;hpb=063e6b5a3e9c75e43c93bbcf06424181dd4ad894;p=qcg-portal.git diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html index ef0c801..34e9ce5 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 %} +
+- | 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 }} | -{{ task.finish_time }} | -{{ 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 +189,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 }} | -{{ 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 +206,16 @@-{# {{ task }}#} + {% if columns.JOB_ID in displayed %}{{ task }}{% endif %} | -{{ task.note }} | -{{ task.submission_time|timesince }} temu | -{{ task.start_time }} | -{{ task.finish_time }} | -{{ 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 +223,25 @@
---|