synchronizing user jobs & basic task list view

[qcg-portal.git] / qcg / templates / qcg / jobs.html

diff --git a/qcg/templates/qcg/jobs.html b/qcg/templates/qcg/jobs.html
index 747d382..78e3dd2 100644 (file)
--- a/qcg/templates/qcg/jobs.html
+++ b/qcg/templates/qcg/jobs.html
@@ -85,66 +85,64 @@
                 <th>Koniec</th>
                 <th>Status</th>
                 <th>Host</th>
-                <th>Uwagi</th>
+{#                <th>Uwagi</th>#}
             </tr>
         </thead>
         <tbody>
-            <tr class="treegrid-1">
-                <td>
-                    <a href="{% url 'job' %}">
-                        <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-                    </a>
-                </td>
-                <td>urban</td>
-                <td>04.07.13 17:03</td>
-                <td></td>
-                <td></td>
-                <td>PENDING</td>
-                <td>hydra</td>
-                <td></td>
-            </tr>
-            <tr class="treegrid-2">
-                <td>
-                    <a href="{% url 'job' %}">
-                        <span class="glyphicon glyphicon-folder-close" aria-hidden="true"></span>
-                    </a>
-                </td>
-                <td>urban</td>
-                <td>04.07.13 17:03</td>
-                <td></td>
-                <td></td>
-                <td>RUNNING</td>
-                <td>inula</td>
-                <td></td>
-            </tr>
-            <tr class="treegrid-3 treegrid-parent-2">
-                <td>
-                    <a href="{% url 'job' %}">
-                        <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-                    </a>
-                </td>
-                <td>urban</td>
-                <td>04.07.13 17:03</td>
-                <td></td>
-                <td></td>
-                <td>FINISHED</td>
-                <td>inula</td>
-                <td></td>
-            </tr>
-            <tr class="treegrid-4">
-                <td>
-                    <a href="{% url 'job' %}">
-                        <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
-                    </a>
-                </td>
-                <td>urban</td>
-                <td>04.07.13 17:03</td>
-                <td></td>
-                <td></td>
-                <td>CANCELED</td>
-                <td>inula</td>
-                <td></td>
-            </tr>
+            {% regroup tasks by job as jobs %}
+
+            {% for job in jobs %}
+                {% ifequal job.list|length 1 %}
+                    {% with job.list.0 as task %}
+                        <tr class="treegrid-{{ forloop.counter }}">
+                            <td>
+                                <a href="{% url 'job' %}">
+                                    <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
+{#                                    {{ task }}#}
+                                </a>
+                            </td>
+                            <td>{{ task.note }}</td>
+                            <td>{{ task.submission_time }}</td>
+                            <td>{{ task.start_time }}</td>
+                            <td>{{ task.finish_time }}</td>
+                            <td>{{ task.get_status_display }}</td>
+                            <td>{{ task.hosts|join:', ' }}</td>
+                        </tr>
+                    {% endwith %}
+                {% else %}
+                    <tr class="treegrid-{{ forloop.counter }}">
+                        <td>
+                            <a href="{% url 'job' %}">
+                                <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>-</td>
+                        <td>{{ job.grouper.finish_time }}</td>
+                        <td>{{ job.grouper.get_status_display }}</td>
+                        <td>-</td>
+                    </tr>
+
+                    {% for task in job.list %}
+                        <tr class="treegrid-{{ forloop.parentloop.counter }}-{{ forloop.counter }} treegrid-parent-{{ forloop.parentloop.counter }}">
+                            <td>
+                                <a href="{% url 'job' %}">
+                                    <span class="glyphicon glyphicon-file" aria-hidden="true"></span>
+{#                                    {{ task }}#}
+                                </a>
+                            </td>
+                            <td>{{ task.note }}</td>
+                            <td>{{ task.submission_time }}</td>
+                            <td>{{ task.start_time }}</td>
+                            <td>{{ task.finish_time }}</td>
+                            <td>{{ task.get_status_display }}</td>
+                            <td>{{ task.hosts|join:', ' }}</td>
+                        </tr>
+                    {% endfor %}
+                {% endifequal %}
+            {% endfor %}
         </tbody>
     </table>