X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjobs.html;h=34e9ce5ae13cf01fc4a8e73960fd4f04310c6a85;hb=ddd692a2e77eadd9c7956d8094f36c5381b9b140;hp=9f184e7c8a0a3d2d3b4cfb5d33a5e7e45a3f554e;hpb=cc19da48b2818c23cd4643ea62405a47da02037a;p=qcg-portal.git

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index 9f184e7..34e9ce5 100644
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -4,23 +4,13 @@
 {% block extra_css %}
     <link href="{% static 'qcg/treegrid/css/jquery.treegrid.css' %}" rel="stylesheet">
     <link href="{% static 'qcg/daterangepicker/daterangepicker-bs3.css' %}" rel="stylesheet" />
-
-    <style>
-        .treegrid-expander {
-            opacity: 0.5;
-        }
-
-        .treegrid-expander:hover {
-            opacity: 1;
-        }
-    </style>
 {% endblock %}
 
 {% block extra_js %}
     <script src="{% static 'qcg/treegrid/js/jquery.treegrid.js' %}"></script>
     <script src="{% static 'qcg/moment/moment.min.js' %}"></script>
     <script src="{% static 'qcg/daterangepicker/daterangepicker.js' %}"></script>
-    <script src="{% static 'qcg/jquery.cookie.js' %}"></script>
+    <script src="{% static 'qcg/cookie/jquery.cookie.min.js' %}"></script>
 
     <script>
         $(function() {
@@ -161,7 +151,7 @@
     <table class="table table-hover tree">
         <thead>
             <tr>
-                <th style="width: 80px"></th>
+                <th{% if columns.JOB_ID not in displayed %} style="width: 80px"{% endif %}></th>
                 {% if columns.DESCRIPTION in displayed %}<th>Opis</th>{% endif %}
                 {% if columns.SUBMISSION in displayed %}<th>Wysłane</th>{% endif %}
                 {% if columns.START in displayed %}<th>Start</th>{% endif %}
@@ -186,7 +176,7 @@
                                 </a>
                             </td>
                             {% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
-                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|timesince }} temu</td>{% endif %}
+                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.START in displayed %}<td>{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.END in displayed %}<td>{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.STATUS in displayed %}<td>{{ task.get_status_display }}</td>{% endif %}
@@ -203,7 +193,7 @@
                             </a>
                         </td>
                         {% if columns.DESCRIPTION in displayed %}<td>{{ job.grouper.note }}</td>{% endif %}
-                        {% if columns.SUBMISSION in displayed %}<td>{{ job.grouper.submission_time|timesince  }} temu</td>{% endif %}
+                        {% if columns.SUBMISSION in displayed %}<td>{{ job.grouper.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                         {% if columns.START in displayed %}<td>-</td>{% endif %}
                         {% if columns.END in displayed %}<td>{{ job.grouper.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                         {% if columns.STATUS in displayed %}<td>{{ job.grouper.get_status_display }}</td>{% endif %}
@@ -220,7 +210,7 @@
                                 </a>
                             </td>
                             {% if columns.DESCRIPTION in displayed %}<td>{{ task.note }}</td>{% endif %}
-                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|timesince  }} temu</td>{% endif %}
+                            {% if columns.SUBMISSION in displayed %}<td>{{ task.submission_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.START in displayed %}<td>{{ task.start_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.END in displayed %}<td>{{ task.finish_time|date:"CUSTOM_DATETIME_FORMAT" }}</td>{% endif %}
                             {% if columns.STATUS in displayed %}<td>{{ task.get_status_display }}</td>{% endif %}