Qt Metrics 2 (v0.14): Testset flag identification

Added testset flag column for the latest build of
each configuration. Added links to configuration pages.

Change-Id: Id924a5b2ae567a18f24c531856af71a6fb91ff80
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@theqtcompany.com>

3 files changed, 45 insertions, 26 deletions

diff --git a/non-puppet/qtmetrics2/index.php b/non-puppet/qtmetrics2/index.php
index 704960f..411676a 100644
--- a/non-puppet/qtmetrics2/index.php
+++ b/non-puppet/qtmetrics2/index.php
@@ -34,8 +34,8 @@
 
 /**
  * Qt Metrics API
- * @version   0.9
- * @since     21-07-2015
+ * @version   0.10
+ * @since     22-07-2015
  * @author    Juha Sippola
  */
 
@@ -380,14 +380,18 @@ $app->get('/testset/:testset/:project', function($testset, $project) use($app)
 {
     $testset = strip_tags($testset);
     $project = strip_tags($project);
-    $ini = Factory::conf();
-    $breadcrumb = array(
-        array('name' => 'home', 'link' => Slim\Slim::getInstance()->urlFor('root'))
-    );
     if (Factory::checkTestset($testset)) {
+        $ini = Factory::conf();
+        $breadcrumb = array(
+            array('name' => 'home', 'link' => Slim\Slim::getInstance()->urlFor('root'))
+        );
+        $confProjectRoute = str_replace('/:conf/:testsetproject', '', Slim\Slim::getInstance()->urlFor('conf_testsetproject'));
+        $testsetProjectRoute = str_replace('/:project', '', Slim\Slim::getInstance()->urlFor('testsetproject'));
         $app->render('testset.html', array(
             'root' => Slim\Slim::getInstance()->urlFor('root'),
             'breadcrumb' => $breadcrumb,
+            'confProjectRoute' => $confProjectRoute,
+            'testsetProjectRoute' => $testsetProjectRoute,
             'refreshed' => Factory::db()->getDbRefreshed() . ' (GMT)',
             'lastDaysFailures' => $ini['top_failures_last_days'],
             'lastDaysFlaky' => $ini['flaky_testsets_last_days'],
@@ -418,7 +422,6 @@ $app->get('/testset/:testset/:project', function($testset, $project) use($app)
     }
 })->name('testset');
 
-
 $app->run();
 
 
diff --git a/non-puppet/qtmetrics2/templates/about.html b/non-puppet/qtmetrics2/templates/about.html
index 4ec8095..ba94613 100644
--- a/non-puppet/qtmetrics2/templates/about.html
+++ b/non-puppet/qtmetrics2/templates/about.html
@@ -34,8 +34,8 @@
 
 /**
  * About window content
- * @version   0.13
- * @since     21-07-2015
+ * @version   0.14
+ * @since     22-07-2015
  * @author    Juha Sippola
  */
 
@@ -44,4 +44,4 @@
 <p>This is Qt Metrics revision 2 with redesigned UI and database.</p>
 <p>These pages are still <strong>under construction</strong> and therefore the views and functionality is limited.</p>
 <p>See the <a href="https://wiki.qt.io/Qt_Metrics_2_Backlog" target="_blank">backlog</a> for development items currently identified or in progress.</p>
-<p><small>Version 0.13 (21-Jul-2015)</small></p>
+<p><small>Version 0.14 (22-Jul-2015)</small></p>
diff --git a/non-puppet/qtmetrics2/templates/testset.html b/non-puppet/qtmetrics2/templates/testset.html
index 8dd02fa..aa81fbf 100644
--- a/non-puppet/qtmetrics2/templates/testset.html
+++ b/non-puppet/qtmetrics2/templates/testset.html
@@ -34,8 +34,8 @@
 
 /**
  * Testset page
- * @version   0.7
- * @since     10-07-2015
+ * @version   0.8
+ * @since     22-07-2015
  * @author    Juha Sippola
  */
 
@@ -92,21 +92,29 @@
 <div class="well infoWell">
 <span class="glyphicon glyphicon-info-sign"></span> <strong>Testset</strong><br>
 <ul>
-<li><strong>latest result</strong> shows the overall testset status based on the latest
-<strong>{{ masterProject }} {{ masterState }}</strong> builds across all branches
-(shows failed if failed in one or in several).</li>
-<li><strong>failed</strong> count shows the number of <strong>{{ masterProject }} {{ masterState }}</strong>
+<li><strong>Latest Status</strong> shows the overall testset status across all branches
+<ul>
+<li>latest result: overall testset status based on the latest
+<strong>{{ masterProject }} {{ masterState }}</strong> builds
+(shows failed if failed in one or in several)</li>
+<li>failed: number of <strong>{{ masterProject }} {{ masterState }}</strong>
 builds where {{ testset.getName }} failed during the last {{ lastDaysFailures }} days
-(since {{ sinceDateFailures }}).</li>
-<li><strong>flaky</strong> count shows the number of <strong>all</strong> builds where
-{{ testset.getName }} failed on the first run but, when rerun, it passed
-(during the last {{ lastDaysFlaky }} days, since {{ sinceDateFlaky }}).</li>
+(since {{ sinceDateFailures }})</li>
+<li>flaky: number of <strong>all</strong> builds where {{ testset.getName }} failed
+on the first run but, when rerun, it passed (during the last {{ lastDaysFlaky }} days,
+since {{ sinceDateFlaky }})</li>
+</ul>
+</li>
 <li><strong>Results in Branches</strong> shows the {{ testset.getName }} run results by branch
 and their configuration on <strong>{{ masterProject }} {{ masterState }}</strong> builds
-(<span class="glyphicon glyphicon-ok green"></span> = {{ constant('TestsetRun::RESULT_SUCCESS') }},
+<ul>
+<li>flags: <span class="label label-default">i</span> = insignificant flag set for the testset on the latest build of the configuration</li>
+<li>results: <span class="glyphicon glyphicon-ok green"></span> = {{ constant('TestsetRun::RESULT_SUCCESS') }},
 <span class="glyphicon glyphicon-ok-sign green"></span> = {{ constant('TestsetRun::RESULT_SUCCESS') }} as flaky,
-<span class="glyphicon glyphicon-remove red"></span> = {{ constant('TestsetRun::RESULT_FAILURE') }});
-details on the runs are available as tooltip on result icon.</li>
+<span class="glyphicon glyphicon-remove red"></span> = {{ constant('TestsetRun::RESULT_FAILURE') }}</li>
+</ul>
+</li>
+<li>Details on the runs are available as tooltip on result icon</li>
 </ul>
 </div>
 </div>
@@ -145,7 +153,7 @@ details on the runs are available as tooltip on result icon.</li>
 {# Print summary #}
 <tr>
 {# Project name #}
-<td>{{ testset.getProjectName }}</td>
+<td><a href="{{ testsetProjectRoute }}/{{ testset.getProjectName }}">{{ testset.getProjectName }}</a></td>
 
 {# Testset status according to the latest build results #}
 {%      if testset.getStatus == constant('TestsetRun::RESULT_SUCCESS') %}
@@ -252,7 +260,8 @@ details on the runs are available as tooltip on result icon.</li>
 <table class="table table-striped">
 <thead>
 <tr>
-<th class="bold rightBorder">{{ testset.getName }}</th>
+<th class="bold">{{ testset.getName }}</th>
+<th class="bold rightBorder">flags</th>
 {%              for key, buildKey in buildKeys %}
 <th class="center">
 {%                  if buildKey|length > 6 %}
@@ -284,7 +293,14 @@ details on the runs are available as tooltip on result icon.</li>
 </tr>
 {%                      endif %}
 <tr>
-<td class="rightBorder"><small>{{ run.getConfName }}</small></td>
+{%                      set link = confProjectRoute ~ '/' ~ run.getConfName|url_encode ~ '/' ~ testset.getProjectName %}
+<td class="rightBorder"><a href="{{ link }}"><small>{{ run.getConfName }}</small></a></td>
+{# Flags for the latest build #}
+<td class="center rightBorder">
+{%                      if run.getInsignificant %}
+<span class="label label-default">i</span>
+{%                      endif %}
+</td>
 {%                      set buildKeyIndexPrinted = -1 %}
 {%                  endif %}