From 47d19237ef6c492f7c2226952f8094d853893754 Mon Sep 17 00:00:00 2001
From: Ravi Chintakunta <ravi.chintakunta@timesys.com>
Date: Fri, 10 Jan 2014 16:43:24 -0500
Subject: bitbake: toaster: All Tasks Feature with sorting and filtering

- Fixed the all tasks view and template  to match the UI design and use
the new basetable code.

- Added a method to views to add sort order icon to the view context.

- Default sort order when the page is loaded is displayed with the sort icon

- Filtering of columns

(Bitbake rev: b2f8de082c3ae41eb44e6ccdc283849b64d0b0f2)

Signed-off-by: Ravi Chintakunta <ravi.chintakunta@timesys.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/lib/toaster/toastergui/templates/task.html | 74 ----------------------
 .../lib/toaster/toastergui/templates/tasks.html    | 67 ++++++++++++++++++++
 2 files changed, 67 insertions(+), 74 deletions(-)
 delete mode 100644 bitbake/lib/toaster/toastergui/templates/task.html
 create mode 100644 bitbake/lib/toaster/toastergui/templates/tasks.html

(limited to 'bitbake/lib/toaster/toastergui/templates')

diff --git a/bitbake/lib/toaster/toastergui/templates/task.html b/bitbake/lib/toaster/toastergui/templates/task.html
deleted file mode 100644
index 6af2c51277..0000000000
--- a/bitbake/lib/toaster/toastergui/templates/task.html
+++ /dev/null
@@ -1,74 +0,0 @@
-{% extends "basebuildpage.html" %}
-
-{% block localbreadcrumb %}
-<li>Tasks</li>
-{% endblock %}
-
-{% block buildinfomain %}
-{% include "basetable_top.html" %}
-
-
-    {% if not objects %}
-        <p>No tasks were executed in this build!</p>
-    {% else %}
-
-            <tr>
-            <th>Order</th>
-            <th>Task</th>
-            <th>Recipe Version</th>
-            <th>Task Type</th>
-            <th>Checksum</th>
-            <th>Outcome</th>
-            <th>Message</th>
-            <th>Time</th>
-            <th>CPU usage</th>
-            <th>Disk I/O</th>
-            <th>Script type</th>
-            <th>Filesystem</th>
-            <th>Depends</th>
-            </tr>
-
-            {% for task in objects %}
-
-            <tr class="data">
-                <td>{{task.order}}</td>
-                <td><a name="{{task.recipe.name}}.{{task.task_name}}">
-                <a href="{% url "layer_versions_recipes" task.recipe.layer_version_id %}#{{task.recipe.name}}">{{task.recipe.name}}</a>.{{task.task_name}}</a></td>
-                <td>{{task.recipe.version}}</td>
-
-                {% if task.task_executed %}
-                <td>Executed</td>
-                {% else %}
-                <td>Prebuilt</td>
-                {% endif %}
-
-                <td>{{task.sstate_checksum}}</td>
-                <td>{{task.get_outcome_display}}{% if task.provider %}</br>(by <a href="#{{task.provider.recipe.name}}.{{task.provider.task_name}}">{{task.provider.recipe.name}}.{{task.provider.task_name}}</a>){% endif %}</td>
-                <td><p>{{task.message}}</td>
-                <td>{{task.elapsed_time}}</td>
-                <td>{{task.cpu_usage}}</td>
-                <td>{{task.disk_io}}</td>
-                <td>{{task.get_script_type_display}}</td>
-                <td> <table>
-<tr><td>                Recipe</td><td><a target="_fileview" href="file:///{{task.recipe.file_path}}">{{task.recipe.file_path}}</a></td></tr>
-<tr><td>                Source</td><td><a target="_fileview" href="file:///{{task.file_name}}">{{task.file_name}}:{{task.line_number}}</a></td></tr>
-<tr><td>                Workdir</td><td><a target="_fileview" href="file:///{{task.work_directory}}">{{task.work_directory}}</a></td></tr>
-<tr><td>                Log</td><td><a target="_fileview" href="file:///{{task.logfile}}">{{task.logfile}}</a><br/></td></tr>
-</table>
-                </td>
-                <td>
-            <div style="height: 3em; overflow:auto">
-                {% for tt in task.task_dependencies_task.all %}
-                    <a href="#{{tt.depends_on.recipe.name}}.{{tt.depends_on.task_name}}">
-                    {{tt.depends_on.recipe.name}}.{{tt.depends_on.task_name}}</a><br/>
-                {% endfor %}
-            </div>
-                </td>
-                </tr>
-
-            {% endfor %}
-
-    {% endif %}
-
-{% include "basetable_bottom.html" %}
-{% endblock %}
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
new file mode 100644
index 0000000000..6831f106c0
--- /dev/null
+++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
@@ -0,0 +1,67 @@
+{% extends "basebuildpage.html" %}
+{% load projecttags %}
+{% block localbreadcrumb %}
+<li>All tasks</li>
+{% endblock %}
+
+{% block buildinfomain %}
+<div class="span10">
+<div class="page-header">
+<h1> Tasks </h1>
+</div>
+{% include "basetable_top.html" %}
+
+
+    {% if not objects %}
+        <p>No tasks were executed in this build!</p>
+    {% else %}
+            {% for task in objects %}
+            <tr {{ task|task_color }} >
+                <td class="order">
+                    <a href="{%url "task" build.pk task.pk%} ">{{task.order}}</a>
+                </td>
+                <td class="recipe_name" >
+                    <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.name}}</a>
+                </td>
+                <td class="recipe_version">
+                    <a href="{% url "recipe" build.pk task.recipe.pk %}">{{task.recipe.version}}</a>
+                </td>
+                <td class="task_name">
+                    <a href="{%url "task" build.pk task.pk%} ">{{task.task_name}}</a>
+                </td>
+                <td class="executed">
+                    <a href="{%url "task" build.pk task.pk%} ">
+                    {% if task.task_executed %}
+                        Executed
+                    {% else %}
+                        Not executed
+                    {% endif %}
+                    </a>
+                </td>
+                <td class="outcome">
+                    <a href="{%url "task" build.pk task.pk%} ">{{task.get_outcome_display}}</a>
+                </td>
+                <td    class="cache_attempt">
+                    <a href="{%url "task" build.pk task.pk%} ">{{task.get_sstate_result_display|format_none_and_zero}}</a>
+                </td>
+                <td class="time_taken">
+                    {{task.elapsed_time|format_none_and_zero}}
+                </td>
+                <td class="cpu_used">
+                    {{task.cpu_usage|format_none_and_zero}}
+                </td>
+                <td class="disk_io">
+                    {{task.disk_io|format_none_and_zero}}
+                </td>
+                <td class="task_log">
+                    {{task.logfile}}
+                </td>
+            </tr>
+
+        {% endfor %}
+
+    {% endif %}
+
+{% include "basetable_bottom.html" %}
+</div>
+{% endblock %}
-- 
cgit v1.2.3-54-g00ecf