X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=qcg%2Ftemplates%2Fqcg%2Fjobs.html;fp=qcg%2Ftemplates%2Fqcg%2Fjobs.html;h=b599429e4d8b3ee18501ad5a4ef2db43a00f6d82;hb=b9bcd422c66e0cd9b0f20a0c037dbc2d811bb59f;hp=3bb81a08b19c01f4f5d03847dd956234408159ec;hpb=be46fb1b43775f35da8b49ad28110d16c8692777;p=qcg-portal.git

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index 3bb81a0..b599429 100644
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -41,39 +41,39 @@
         {% block title %}Lista zadań{% endblock %}
     </h1>
 
-    <form class="row form-inline">
-        <div class="col-md-9 col-md-offset-1">
-            <div class="form-group">
-                <label class="sr-only" for="search">Szukaj w opisie lub uwagach</label>
-                <input type="text" class="form-control" id="search" placeholder="Szukaj w opisie lub uwagach">
-            </div>
-            <div class="form-group">
-                <label class="sr-only" for="status">Status</label>
-                <select class="form-control" id="status">
-                  <option>Wybierz stan</option>
-                  <option>PENDING</option>
-                  <option>RUNNING</option>
-                  <option>FAILED</option>
-                  <option>FINISHED</option>
-                </select>
-            </div>
-            <div class="form-group">
-                <label class="sr-only" for="cluster">Klaster</label>
-                <select class="form-control" id="cluster">
-                  <option>Wybierz klaster</option>
-                  <option>Inula</option>
-                  <option>Galera</option>
-                  <option>Hydra</option>
-                  <option>Zeus</option>
-                </select>
-            </div>
-        </div>
-        <div class="col-md-1">
-            <button type="submit" class="btn btn-default">Filtruj</button>
-        </div>
-    </form>
-
-    <hr />
+{#    <form class="row form-inline">#}
+{#        <div class="col-md-9 col-md-offset-1">#}
+{#            <div class="form-group">#}
+{#                <label class="sr-only" for="search">Szukaj w opisie lub uwagach</label>#}
+{#                <input type="text" class="form-control" id="search" placeholder="Szukaj w opisie lub uwagach">#}
+{#            </div>#}
+{#            <div class="form-group">#}
+{#                <label class="sr-only" for="status">Status</label>#}
+{#                <select class="form-control" id="status">#}
+{#                  <option>Wybierz stan</option>#}
+{#                  <option>PENDING</option>#}
+{#                  <option>RUNNING</option>#}
+{#                  <option>FAILED</option>#}
+{#                  <option>FINISHED</option>#}
+{#                </select>#}
+{#            </div>#}
+{#            <div class="form-group">#}
+{#                <label class="sr-only" for="cluster">Klaster</label>#}
+{#                <select class="form-control" id="cluster">#}
+{#                  <option>Wybierz klaster</option>#}
+{#                  <option>Inula</option>#}
+{#                  <option>Galera</option>#}
+{#                  <option>Hydra</option>#}
+{#                  <option>Zeus</option>#}
+{#                </select>#}
+{#            </div>#}
+{#        </div>#}
+{#        <div class="col-md-1">#}
+{#            <button type="submit" class="btn btn-default">Filtruj</button>#}
+{#        </div>#}
+{#    </form>#}
+{##}
+{#    <hr />#}
 
 
     <nav class="text-center" style="margin-bottom: 15px">
@@ -126,13 +126,13 @@
                     {% with job.list.0 as task %}
                         <tr class="treegrid-{{ forloop.counter }}">
                             <td>
-                                <a href="{% url 'job' %}">
+                                <a href="{{ task.get_absolute_url }}">
                                     <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
 {#                                    {{ task }}#}
                                 </a>
                             </td>
                             <td>{{ task.note }}</td>
-                            <td>{{ task.submission_time }}</td>
+                            <td>{{ task.submission_time|timesince }} temu</td>
                             <td>{{ task.start_time }}</td>
                             <td>{{ task.finish_time }}</td>
                             <td>{{ task.get_status_display }}</td>
@@ -142,13 +142,13 @@
                 {% else %}
                     <tr class="treegrid-{{ forloop.counter }}">
                         <td>
-                            <a href="{% url 'job' %}">
+                            <a href="{{ job.grouper.get_absolute_url }}">
                                 <span class="glyphicon glyphicon-folder-close" aria-hidden="true"></span>
 {#                                {{ job.grouper }}#}
                             </a>
                         </td>
                         <td>{{ job.grouper.note }}</td>
-                        <td>{{ job.grouper.submission_time }}</td>
+                        <td>{{ job.grouper.submission_time|timesince  }} temu</td>
                         <td>-</td>
                         <td>{{ job.grouper.finish_time }}</td>
                         <td>{{ job.grouper.get_status_display }}</td>
@@ -158,13 +158,13 @@
                     {% for task in job.list %}
                         <tr class="treegrid-{{ forloop.parentloop.counter }}-{{ forloop.counter }} treegrid-parent-{{ forloop.parentloop.counter }}">
                             <td>
-                                <a href="{% url 'job' %}">
+                                <a href="{{ task.get_absolute_url }}">
                                     <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
 {#                                    {{ task }}#}
                                 </a>
                             </td>
                             <td>{{ task.note }}</td>
-                            <td>{{ task.submission_time }}</td>
+                            <td>{{ task.submission_time|timesince  }} temu</td>
                             <td>{{ task.start_time }}</td>
                             <td>{{ task.finish_time }}</td>
                             <td>{{ task.get_status_display }}</td>