Qt Metrics 2 (v0.2): Show actual parent for testset

Show the testset and its actual parent project instead of
the project where the build was run (Qt5 state).

Parser (old-CI) changed to get the actual parent project
and save it to the database.
UI changed to separate testset project (e.g. QtBase) and
the 'master' build project (Qt5 state). Testset and top
failures pages changed to show data based on Qt5 state
builds, and then to show the testsets by their parent
project.

Change-Id: I6295176c99597fde24726459ab3d11968c5e475b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

3 files changed, 23 insertions, 16 deletions

diff --git a/non-puppet/qtmetrics2/templates/about.php b/non-puppet/qtmetrics2/templates/about.php
index 5cf863a..b1dfb4d 100644
--- a/non-puppet/qtmetrics2/templates/about.php
+++ b/non-puppet/qtmetrics2/templates/about.php
@@ -34,8 +34,8 @@
 
 /**
  * About window content
- * @version   0.1
- * @since     08-06-2015
+ * @version   0.2
+ * @since     16-06-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.1 (8-Jun-2015)</small></p>
+<p><small>Version 0.2 (16-Jun-2015)</small></p>
diff --git a/non-puppet/qtmetrics2/templates/testset.php b/non-puppet/qtmetrics2/templates/testset.php
index 7e2befa..e26a06a 100644
--- a/non-puppet/qtmetrics2/templates/testset.php
+++ b/non-puppet/qtmetrics2/templates/testset.php
@@ -34,8 +34,8 @@
 
 /**
  * Testset page
- * @version   0.1
- * @since     03-06-2015
+ * @version   0.2
+ * @since     11-06-2015
  * @author    Juha Sippola
  */
 
@@ -46,6 +46,8 @@ $breadcrumb = $this->data['breadcrumb'];
 $refreshed = $this->data['refreshed'];
 $lastDaysFailures = $this->data['lastDaysFailures'];
 $lastDaysFlaky = $this->data['lastDaysFlaky'];
+$masterProject = $this->data['masterProject'];
+$masterState = $this->data['masterState'];
 /**
  * @var Testset[] $testsets
  */
@@ -82,12 +84,14 @@ $testsets = $this->data['testset'];
                 <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 project configuration
-                            <strong>state</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>state</strong> builds where
-                            <?php echo $testset->getName() ?> failed during the last <?php echo $lastDaysFailures ?> days.</li>
+                        <li><strong>latest result</strong> shows the overall testset status based on the latest
+                            <strong><?php echo "$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><?php echo "$masterProject $masterState" ?></strong>
+                            builds where <?php echo $testset->getName() ?> failed during the last <?php echo $lastDaysFailures ?> days.</li>
                         <li><strong>flaky</strong> count shows the number of <strong>all</strong> builds where
-                            <?php echo $testset->getName() ?> failed on the first run but, when rerun, it passed (during the last <?php echo $lastDaysFlaky ?> days).</li>
+                            <?php echo $testset->getName() ?> failed on the first run but, when rerun, it passed
+                            (during the last <?php echo $lastDaysFlaky ?> days).</li>
                     </ul>
                 </div>
             </div>
diff --git a/non-puppet/qtmetrics2/templates/testsets_top.php b/non-puppet/qtmetrics2/templates/testsets_top.php
index 0eb96cf..1f37e4e 100644
--- a/non-puppet/qtmetrics2/templates/testsets_top.php
+++ b/non-puppet/qtmetrics2/templates/testsets_top.php
@@ -34,8 +34,8 @@
 
 /**
  * Top failures (testsets) page
- * @version   0.1
- * @since     03-06-2015
+ * @version   0.2
+ * @since     11-06-2015
  * @author    Juha Sippola
  */
 
@@ -51,6 +51,8 @@ $refreshed = $this->data['refreshed'];
 $topN = $this->data['topN'];
 $lastDays = $this->data['lastDays'];
 $sinceDate = $this->data['sinceDate'];
+$masterProject = $this->data['masterProject'];
+$masterState = $this->data['masterState'];
 /**
  * @var Testset[] $testsets
  */
@@ -85,10 +87,11 @@ $testsets = $this->data['testsets'];
                 <div class="well infoWell">
                     <span class="glyphicon glyphicon-info-sign"></span> <strong>Top failures</strong><br>
                     <ul>
-                        <li>Lists testsets by number of <strong>state</strong> builds where it failed during the last
-                            <?php echo $lastDays ?> days.</li>
-                        <li><strong>latest result</strong> shows the overall testset status based on the latest project
-                            <strong>state</strong> builds across all branches (shows failed if failed in one or in several).</li>
+                        <li>Lists testsets by number of <strong><?php echo "$masterProject $masterState" ?></strong>
+                            builds where it failed during the last <?php echo $lastDays ?> days.</li>
+                        <li><strong>latest result</strong> shows the overall testset status based on the latest
+                            <strong><?php echo "$masterProject $masterState" ?></strong> builds across all branches
+                            (shows failed if failed in one or in several).</li>
                     </ul>
                 </div>
             </div>