Merge lp:~sil2100/bileto/dashboard_add_qa_colors into lp:bileto

[Łukasz Zemczak]

Make sure that the dashboard silo status color also changes basing on QA status, informing the trainguards of when a silo is rejected or signed-off.

Make sure that the dashboard silo status color also changes basing on QA status, informing the trainguards of when a silo is rejected or signed-off.

[Łukasz Zemczak (sil2100)]

Still need to actually test it somewhere.

[Robert Bruce Park (robru)]

Oh haha, I didn't even see this. I fixed this already in a recent commit I did.

Also, "somewhere" is the staging area, branches can be configured the same way as for jenkins, as per the instructions:

https://wiki.canonical.com/UbuntuEngineering/CI/Playbook/StagingTrain

Unmerged revisions

201. By Łukasz Zemczak on 2015-07-31

Add QA status to have effect on silo colors in the dashboard.

=== modified file 'tickets/static/dashboard.html'
--- tickets/static/dashboard.html	2015-07-10 22:06:58 +0000
+++ tickets/static/dashboard.html	2015-07-31 17:28:43 +0000
@@ -105,7 +105,7 @@
         </ul>
       </div>
     </div>
-    <div class="status" style="color: {{getSiloColor(siloname)}};">
+    <div class="status" style="color: {{getSiloColor(siloname, bileto.reqs[silos[siloname].requestid].qa_signoff)}};">
       <div class="jenkins_status">
         <p ng-repeat="status in silos[siloname].longStatus"
            ng-bind-html="status"></p>

=== modified file 'tickets/static/dashboard.js'
--- tickets/static/dashboard.js	2015-07-10 22:00:45 +0000
+++ tickets/static/dashboard.js	2015-07-31 17:28:43 +0000
@@ -44,9 +44,18 @@
     'silo dirty': 'olive',
 };
 
+QA_STATE_COLORS = {
+    'qa granted': 'blue',
+    'qa failed': 'red',
+};
+
 
 function getStatusColor(status) {
-    return STATUS_COLORS[nWords(status, 2).toLowerCase()] || 'black';
+    return STATUS_COLORS[nWords(status, 2).toLowerCase()];
+};
+
+function getQAStateColor(qa_state) {
+    return QA_STATE_COLORS[qa_state.toLowerCase()];
 };
 
 var app = angular.module('CITrainWeb', ['ngSanitize']);
@@ -258,9 +267,10 @@
         }
     })
 
-    $scope.getSiloColor = function(siloname) {
-        var siloColor = ($scope.silos[siloname] || {}).statusColor || '';
-        return siloColor || 'black';
+    $scope.getSiloColor = function(siloname, qa_state) {
+        var qaColor = getQAStateColor(qa_state);
+        var siloColor = ($scope.silos[siloname] || {}).statusColor;
+        return siloColor || qaColor || 'black';
     };
 
     function getQuery() {