bitbake: toaster: extend Tasks to include Time, Disk IO, and CPU Usage

Update the All Tasks page to also cover the Time, Disk I/O, and
CPU Usage pages. Add filter count header support, and fix minor column
enablements.

[YOCTO #4387]

(Bitbake rev: 7e78836ebbddf0240094fd79a18cb057d6c4f322)

Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

3 files changed, 50 insertions, 49 deletions

diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html
index 9a8bacb..fe53461 100644
--- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html
+++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html
@@ -31,7 +31,7 @@
     <div class="navbar-inner">
         <form class="navbar-search input-append pull-left" id="searchform">
 	<div class="input-append" style="padding-right:1em">
-            <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {{objectname}}" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on"><i class="icon-remove"></i></a>{%endif%}
+            <input class="input-xxlarge" id="search" name="search" type="text" placeholder="Search {%if object_search_display %}{{object_search_display}}{%else%}{{objectname}}{%endif%}" value="{{request.GET.search}}"/>{% if request.GET.search %}<a href="javascript:$('#search').val('');searchform.submit()" class="add-on"><i class="icon-remove"></i></a>{%endif%}
 	</div>
 	    <input type="hidden" name="orderby" value="{{request.GET.orderby}}">
 	    <input type="hidden" name="page" value="1">
diff --git a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
index 4626ffe..2a23c27 100644
--- a/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
+++ b/bitbake/lib/toaster/toastergui/templates/filtersnippet.html
@@ -4,12 +4,12 @@
         <input type="hidden" name="search" value="{{request.GET.search}}"/>
         <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">x</button>
-            <h3>Filter {{objectname|title}} by '{{tc.name}}'</h3>
+            <h3>Filter {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%} by '{{tc.name}}'</h3>
         </div>
         <div class="modal-body">
             <p>{{f.label}}</p>
             <label class="radio">
-                <input type="radio" name="filter" {%if request.GET.filter%}{{f.options|check_filter_status:request.GET.filter}} {%else%} checked {%endif%} value="">  All {{objectname}}
+                <input type="radio" name="filter" {%if request.GET.filter%}{{f.options|check_filter_status:request.GET.filter}} {%else%} checked {%endif%} value="">  All {%if filter_search_display%}{{filter_search_display|title}}{%else%}{{objectname|title}}{%endif%}
             </label>
             {% for option in f.options %}
                 <label class="radio">
diff --git a/bitbake/lib/toaster/toastergui/templates/tasks.html b/bitbake/lib/toaster/toastergui/templates/tasks.html
index 3479e7e..7dc2c38 100644
--- a/bitbake/lib/toaster/toastergui/templates/tasks.html
+++ b/bitbake/lib/toaster/toastergui/templates/tasks.html
@@ -1,60 +1,61 @@
 {% extends "basebuildpage.html" %}
 {% load projecttags %}
 {% block localbreadcrumb %}
-<li>All tasks</li>
+<li>{{title}}</li>
 {% endblock %}
 
 {% block buildinfomain %}
 <div class="span10">
 <div class="page-header">
-<h1> Tasks </h1>
+<h1>
+  {% if request.GET.filter or request.GET.search and objects.count > 0  %}
+      {{objects.paginator.count}} task{{objects.paginator.count|pluralize}} found
+  {%elif objects.paginator.count == 0%}
+      No tasks
+  {%else%}
+      {{title}}
+  {%endif%}
+ </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%} ">{{task.get_executed_display}}</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 %}
+    {% 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%} ">{{task.get_executed_display}}</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|floatformat:2}}
+            </td>
+            <td class="cpu_used">
+                {{task.cpu_usage|format_none_and_zero|floatformat:2}}{% if task.cpu_usage %}%{% endif %}
+            </td>
+            <td class="disk_io">
+                {{task.disk_io|format_none_and_zero}}
+            </td>
+            <td class="task_log">
+                {{task.logfile}}
+            </td>
+        </tr>
+    {% endfor %}
 
 {% include "basetable_bottom.html" %}
 </div>