From a81a1fef4cf1da8003d5de34b157da9156d5edcb Mon Sep 17 00:00:00 2001
From: Juha Sippola <juhasippola@outlook.com>
Date: Mon, 21 Sep 2015 16:03:00 +0300
Subject: Qt Metrics 2 (v0.26): Testfunction link visibility
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Show the testfunction link on testset's testfunctions
list only if the testfunction has children testrows
(to improve the usability).
Database design changed so that testfunction_run.result
has now separate enum values for calculated testrow
results instead of using the same. The availability
of children testrows is checked from those new values.
The parser changed accordingly.

Change-Id: I456ee4c3915b265a629b1e84e2e008f6001a59af
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>
---
 non-puppet/qtmetrics2/templates/about.html         |  4 ++--
 .../templates/testset_testfunctions.html           | 22 +++++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

(limited to 'non-puppet/qtmetrics2/templates')

diff --git a/non-puppet/qtmetrics2/templates/about.html b/non-puppet/qtmetrics2/templates/about.html
index 55de316..39a63d2 100644
--- a/non-puppet/qtmetrics2/templates/about.html
+++ b/non-puppet/qtmetrics2/templates/about.html
@@ -34,7 +34,7 @@
 
 /**
  * About window content
- * @since     15-09-2015
+ * @since     16-09-2015
  * @author    Juha Sippola
  */
 
@@ -52,4 +52,4 @@ and the global Qt developer community are the target audience. For detailed desc
 <p>See the <strong><a href="https://wiki.qt.io/Qt_Metrics_2_Backlog" target="_blank">backlog</a></strong>
 for development items currently identified or in progress.</p>
 
-<p><small>Version 0.25 (15-Sep-2015)</small></p>
+<p><small>Version 0.26 (16-Sep-2015)</small></p>
diff --git a/non-puppet/qtmetrics2/templates/testset_testfunctions.html b/non-puppet/qtmetrics2/templates/testset_testfunctions.html
index 11bc50f..b15e2d1 100644
--- a/non-puppet/qtmetrics2/templates/testset_testfunctions.html
+++ b/non-puppet/qtmetrics2/templates/testset_testfunctions.html
@@ -34,7 +34,7 @@
 
 /**
  * Testfunctions page
- * @since     08-09-2015
+ * @since     16-09-2015
  * @author    Juha Sippola
  */
 
@@ -97,6 +97,7 @@
 <li><strong>Testfunction Results in Branches</strong> shows the {{ testset.getName }} <strong>failed and skipped</strong> results in configuration
 {{ conf }} by branch on <strong>{{ masterProject }} {{ masterState }}</strong> builds
 <ul>
+<li>testfunction name has link to list of testrows if testrows are available</li>
 <li>flags: <span class="label label-default">b</span> = blacklisted flag set for the testfunction on the latest build shown</li>
 <li>results: <span class="glyphicon glyphicon-remove red"></span> = {{ constant('TestfunctionRun::RESULT_FAILURE') }},
 <span class="glyphicon glyphicon-ok-sign red"></span> = {{ constant('TestfunctionRun::RESULT_SUCCESS_UNEXPECTED') }},
@@ -194,14 +195,20 @@
 </tr>
 {%                      endif %}
 <tr>
-{%                      set link = testfunctionRoute ~ '/' ~ run.getName|url_encode ~ '/' ~ testset.getName|url_encode ~ '/' ~ testset.getProjectName|url_encode ~ '/' ~ run.getConfName|url_encode %}
-<td><a href="{{ link }}"><small>
+<td><small>
+{%                      if run.getChildren %}
+{%                          set link = testfunctionRoute ~ '/' ~ run.getName|url_encode ~ '/' ~ testset.getName|url_encode ~ '/' ~ testset.getProjectName|url_encode ~ '/' ~ run.getConfName|url_encode %}
+<a href="{{ link }}">
+{%                      endif %}
 {%                      if run.getName|length > constant('TestfunctionRun::SHORT_NAME_LENGTH') %}
 <span class="clickOnTouch" data-toggle="tooltip" data-placement="top" title="{{ run.getName }}">{{ run.getShortName }}</span>
 {%                      else %}
 {{ run.getName }}
 {%                      endif %}
-</small></a></td>
+{%                      if run.getChildren %}
+</a>
+{%                      endif %}
+</small></td>
 
 {# Flags for the latest build #}
 <td class="center rightBorder">
@@ -235,13 +242,18 @@
 {%                              else %}
 {%                                   set durationFormatted = '' %}
 {%                              endif %}
+{%                              if run.getChildren %}
+{%                                  set testrowResult = '(in testrows)' %}
+{%                              else %}
+{%                                  set testrowResult = '' %}
+{%                              endif %}
 <td class="center">
 <span class="spaceHorizontal {{ resultIcon }} clickOnTouch" data-toggle="tooltip" data-placement="top" data-html="true"
 title="<table>
 <tr><th>Build key: </th><td>{{ buildKey }}</td></tr>
 <tr><th>Configuration: </th><td>{{ run.getConfName }}</td></tr>
 <tr><th>Timestamp: </th><td>{{ run.getTimestamp }}</td></tr>
-<tr><th>Result: </th><td>{{ run.getResult }}</td></tr>
+<tr><th>Result: </th><td>{{ run.getResult }} {{ testrowResult }}</td></tr>
 <tr><th>Duration: </th><td>{{ run.getDuration / 10 }} s {{ durationFormatted }}</td></tr>
 <tr><th>Blacklisted: </th><td>{% if run.getBlacklisted %}yes{% else %}no{% endif %}</td></tr></table>">
 </span></td>
-- 
cgit v1.2.3