diff options
author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2014-01-16 12:22:21 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-27 21:01:04 +0000 |
commit | b0b1acbe623c1c126af2abc1cc332d993dcaf15c (patch) | |
tree | 594c00eebae09944d4f52f23d6b36cbe09ff5640 /bitbake/lib/toaster/toastergui/templates/build.html | |
parent | d27c7f26d39b66c41c1b09d6b5875e957045355d (diff) | |
download | poky-b0b1acbe623c1c126af2abc1cc332d993dcaf15c.tar.gz |
bitbake: toaster: Toaster GUI Build and Dashboard pages fixes
THis is a large set of fixes for the generic table, Build and
Dashboard pages.
Among the fixes:
* the table remembers which columns to show across refreshes,
based on saving the settings in a cookie
* added column timespent for a build which is a denormalization
of the completed_on - started_on information due to limits in
computing datetime differences in the SQL engine
* fixed formatting of the time differences
* various sorting header links fixed
* correct error and warning CSS classes applied to the
respective rows
* fixes multiple divide-by-zero error in displaying duration
estimations
(Bitbake rev: 61e3dee55ac577fce1c0ae0fe7e0d3cf644e8ae6)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates/build.html')
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/build.html | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/build.html b/bitbake/lib/toaster/toastergui/templates/build.html index eb7e03c951..a15702463b 100644 --- a/bitbake/lib/toaster/toastergui/templates/build.html +++ b/bitbake/lib/toaster/toastergui/templates/build.html | |||
@@ -18,9 +18,13 @@ | |||
18 | <div class="row-fluid"> | 18 | <div class="row-fluid"> |
19 | <div class="lead span5"> | 19 | <div class="lead span5"> |
20 | {%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%} | 20 | {%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%} |
21 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | ||
21 | <a href="{%url 'builddashboard' build.pk%}"> | 22 | <a href="{%url 'builddashboard' build.pk%}"> |
23 | {% endif %} | ||
22 | <span data-toggle="tooltip" {%if build.target_set.all.count > 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}})</span> | 24 | <span data-toggle="tooltip" {%if build.target_set.all.count > 1%}title="Targets: {%for target in build.target_set.all%}{{target.target}} {%endfor%}"{%endif%}>{{build.target_set.all.0.target}} {%if build.target_set.all.count > 1%}(+ {{build.target_set.all.count|add:"-1"}}){%endif%} {{build.machine}} ({{build.completed_on|naturaltime}})</span> |
25 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | ||
23 | </a> | 26 | </a> |
27 | {% endif %} | ||
24 | </div> | 28 | </div> |
25 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} | 29 | {%if build.outcome == build.SUCCEEDED or build.outcome == build.FAILED %} |
26 | <div class="span2 lead"> | 30 | <div class="span2 lead"> |
@@ -34,7 +38,7 @@ | |||
34 | {% endif %} | 38 | {% endif %} |
35 | </div> | 39 | </div> |
36 | <div class="lead pull-right"> | 40 | <div class="lead pull-right"> |
37 | Build time: <a href="build-time.html">{{ build|timespent }}</a> | 41 | Build time: <a href="build-time.html">{{ build.timespent|sectohms }}</a> |
38 | </div> | 42 | </div> |
39 | {%endif%}{%if build.outcome == build.IN_PROGRESS %} | 43 | {%endif%}{%if build.outcome == build.IN_PROGRESS %} |
40 | <div class="span4"> | 44 | <div class="span4"> |
@@ -81,14 +85,14 @@ | |||
81 | {% for build in objects %} | 85 | {% for build in objects %} |
82 | <tr class="data"> | 86 | <tr class="data"> |
83 | <td class="outcome"><a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a></td> | 87 | <td class="outcome"><a href="{% url "builddashboard" build.id %}">{%if build.outcome == build.SUCCEEDED%}<i class="icon-ok-sign success"></i>{%elif build.outcome == build.FAILED%}<i class="icon-minus-sign error"></i>{%else%}{%endif%}</a></td> |
84 | <td class="target">{% for t in build.target_set.all %}{%if t.is_image %}<a href="{% url "target" build.id t.id %}">{% endif %}{{t.target}}{% if t.is_image %}</a>{% endif %}<br/>{% endfor %}</td> | 88 | <td class="target">{% for t in build.target_set.all %}{%if t.is_image %}<a href="{% url "builddashboard" build.id %}">{% endif %}{{t.target}}{% if t.is_image %}</a>{% endif %}<br/>{% endfor %}</td> |
85 | <td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td> | 89 | <td class="machine"><a href="{% url "builddashboard" build.id %}">{{build.machine}}</a></td> |
86 | <td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on}}</a></td> | 90 | <td class="started_on"><a href="{% url "builddashboard" build.id %}">{{build.started_on|date:"d/m/y H:i"}}</a></td> |
87 | <td class="completed_on"><a href="{% url "builddashboard" build.id %}">{{build.completed_on}}</a></td> | 91 | <td class="completed_on"><a href="{% url "builddashboard" build.id %}">{{build.completed_on|date:"d/m/y H:i"}}</a></td> |
88 | <td class="failed_tasks">{% query build.task_build outcome=4 order__gt=0 as exectask%}{% if exectask.count == 1 %}{{exectask.0.recipe.name}}.{{exectask.0.task_name}}{% elif exectask.count > 1%}{{exectask.count}}{%endif%}</td> | 92 | <td class="failed_tasks error">{% query build.task_build outcome=4 order__gt=0 as exectask%}{% if exectask.count == 1 %}{{exectask.0.recipe.name}}.{{exectask.0.task_name}}{% elif exectask.count > 1%}{{exectask.count}}{%endif%}</td> |
89 | <td class="errors_no">{% if build.errors_no %}<a class="errors_no" href="{% url "builddashboard" build.id %}#errors">{{build.errors_no}} error{{build.errors_no|pluralize}}</a>{%endif%}</td> | 93 | <td class="errors_no">{% if build.errors_no %}<a class="errors_no error" href="{% url "builddashboard" build.id %}#errors">{{build.errors_no}} error{{build.errors_no|pluralize}}</a>{%endif%}</td> |
90 | <td class="warnings_no">{% if build.warnings_no %}<a class="warnings_no" href="{% url "builddashboard" build.id %}#warnings">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a>{%endif%}</td> | 94 | <td class="warnings_no">{% if build.warnings_no %}<a class="warnings_no warning" href="{% url "builddashboard" build.id %}#warnings">{{build.warnings_no}} warning{{build.warnings_no|pluralize}}</a>{%endif%}</td> |
91 | <td class="time"><a href="{% url "buildtime" build.id %}">{{build|timespent}}</a></td> | 95 | <td class="time"><a href="{% url "buildtime" build.id %}">{{build.timespent|sectohms}}</a></td> |
92 | <td class="log">{{build.cooker_log_path}}</td> | 96 | <td class="log">{{build.cooker_log_path}}</td> |
93 | <td class="output">{% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}<a href="{%url "builddashboard" build.id%}#images">{{build.image_fstypes}}</a>{% endif %}{% endfor %}{% endif %}</td> | 97 | <td class="output">{% if build.outcome == 0 %}{% for t in build.target_set.all %}{% if t.is_image %}<a href="{%url "builddashboard" build.id%}#images">{{build.image_fstypes}}</a>{% endif %}{% endfor %}{% endif %}</td> |
94 | </tr> | 98 | </tr> |