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 714445ad45..72b76bbe5b 100644 --- a/awx/ui/static/js/smart-status/smart-status.controller.js +++ b/awx/ui/static/js/smart-status/smart-status.controller.js @@ -4,36 +4,39 @@ * All Rights Reserved *************************************************/ -export default ['$scope', function ($scope) { +export default ['$scope', '$filter', + function ($scope, $filter) { - var recentJobs = $scope.jobs; + var recentJobs = $scope.jobs; - function isFailureState(status) { - return status === 'failed' || status === 'error' || status === 'canceled'; - } + function isFailureState(status) { + return status === 'failed' || status === 'error' || status === 'canceled'; + } - var sparkData = - recentJobs.map(function(job) { + var sparkData = + recentJobs.map(function(job) { - var data = {}; + var data = {}; - if (job.status === 'successful') { - data.value = 1; - } else if (isFailureState(job.status)) { - data.value = -1; - } else { - data.value = 0; - } + if (job.status === 'successful') { + data.value = 1; + } else if (isFailureState(job.status)) { + data.value = -1; + } else { + data.value = 0; + } - data.jobId = job.id; - data.smartStatus = job.status; + data.jobId = job.id; + data.smartStatus = job.status; + data.finished = $filter('longDate')(job.finished); - return data; - }); + return data; + }); - $scope.sparkArray = _.pluck(sparkData, 'value'); - $scope.jobIds = _.pluck(sparkData, 'jobId'); - $scope.smartStatus = _.pluck(sparkData, 'smartStatus'); + $scope.sparkArray = _.pluck(sparkData, 'value'); + $scope.jobIds = _.pluck(sparkData, 'jobId'); + $scope.smartStatus = _.pluck(sparkData, 'smartStatus'); + $scope.finished = _.pluck(sparkData, 'finished'); }]; 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 a36e692f97..d220fa7e86 100644 --- a/awx/ui/static/js/smart-status/smart-status.directive.js +++ b/awx/ui/static/js/smart-status/smart-status.directive.js @@ -13,13 +13,15 @@ export default [ function() { restrict: 'E', link: function (scope, element){ scope.formatter = function(sparklines, options, point){ - var status = options.userOptions.tooltipValueLookups.status[point.offset]; + var status = options.userOptions.tooltipValueLookups.status[point.offset], + finished = options.userOptions.tooltipValueLookups.finished[point.offset]; //capitalize first letter if (status) { status = status.charAt(0).toUpperCase() + status.slice(1); return "
Job ID: " + options.userOptions.tooltipValueLookups.jobs[point.offset] + - "
Status: "+status+"
" ; + "
Status: "+status+ + "
Finished: " + finished +"" ; } }; @@ -36,7 +38,8 @@ export default [ function() { tooltipFormat: '{{value:jobs}}', tooltipValueLookups: { jobs: scope.jobIds, - status: scope.smartStatus + status: scope.smartStatus, + finished: scope.finished } });