X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjobs.html;h=bc2138e5d9c854f06bf8b01a649dc44bd7928abf;hb=e9fc0805462fd07aeb8897d0be4e972944ae46a0;hp=9f55914a62b0dcdb72765206385046bf77894fe6;hpb=78b4dac5bf3dbd9c6a34db27bf0ce32d10e546a3;p=qcg-portal.git diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html index 9f55914..bc2138e 100644 --- a/qcg/templates/qcg/jobs.html +++ b/qcg/templates/qcg/jobs.html @@ -20,6 +20,7 @@ + {% endblock %} @@ -89,6 +106,9 @@ + + +
- | 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|timesince }} temu | {% 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 %} @@ -179,15 +199,15 @@-{# {{ 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|timesince }} temu | {% 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 › | @@ -196,15 +216,15 @@-{# {{ 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|timesince }} temu | {% 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 %} @@ -308,4 +328,27 @@ + {# Column selection modal #} + + {% endblock container %}
---|