From 7c9b6f5269c619cf3386659c6046b11aa298f657 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@ansible.com>
Date: Tue, 10 Mar 2015 12:04:14 -0400
Subject: [PATCH] Making the status even smarter

Incorporating the true status for each bar
---
 .../js/smart-status/smart-status.controller.js   |  4 +++-
 .../js/smart-status/smart-status.directive.js    | 16 +++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/awx/ui/static/js/smart-status/smart-status.controller.js b/awx/ui/static/js/smart-status/smart-status.controller.js
index 06108efa3f..790c25d0c1 100644
--- a/awx/ui/static/js/smart-status/smart-status.controller.js
+++ b/awx/ui/static/js/smart-status/smart-status.controller.js
@@ -5,7 +5,8 @@ export default ['$scope', function ($scope) {
     $scope[str] = {
         id: $scope.job_template.id,
         sparkArray: [],
-        jobIds: {}
+        jobIds: {},
+        smartStatus: []
     };
     for(var i=0; i<recentJobs.length; i++){
         if(recentJobs[i].status==='successful'){
@@ -18,6 +19,7 @@ export default ['$scope', function ($scope) {
             $scope[str].sparkArray[i] = 0;
         }
         $scope[str].jobIds[i] = recentJobs[i].id;
+        $scope[str].smartStatus[i] = recentJobs[i].status;
     }
 }];
 
diff --git a/awx/ui/static/js/smart-status/smart-status.directive.js b/awx/ui/static/js/smart-status/smart-status.directive.js
index 7d291f5cc5..d68b4f7d87 100644
--- a/awx/ui/static/js/smart-status/smart-status.directive.js
+++ b/awx/ui/static/js/smart-status/smart-status.directive.js
@@ -6,16 +6,9 @@ export default [  function() {
             var str = scope.job_template.id+'_smart';
 
             scope[str].formatter = function(sparklines, options, point){
-                var status;
-                if(point.value === 1){
-                  status = "Successful";
-                }
-                else if(point.value === -1){
-                  status = "Failed";
-                }
-                else if(isNaN(point.value)){
-                  status = "Running";
-                }
+                var status = options.userOptions.tooltipValueLookups.status[point.offset];
+                //capitalize first letter
+                status = status.charAt(0).toUpperCase() + status.slice(1);
                 return "<div class=\"smart-status-tooltip\">Job ID: " +
                   options.userOptions.tooltipValueLookups.jobs[point.offset] +
                   "<br>Status: <span style=\"color: " + point.color + "\">&#9679;</span>"+status+"</div>" ;
@@ -33,7 +26,8 @@ export default [  function() {
                 tooltipFormatter: scope[str].formatter,
                 tooltipFormat: '{{value:jobs}}',
                 tooltipValueLookups: {
-                    jobs: scope[str].jobIds
+                    jobs: scope[str].jobIds,
+                    status: scope[str].smartStatus
                 }
             });