From 4a9ce25dff1dc046e16cd14bef66473144b86563 Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Mon, 18 Aug 2014 13:20:37 -0400
Subject: [PATCH] Job detail page Fixed
 https://trello.com/c/3AIlW5Hy/335-elapsed-time-disappears-when-job-is-completed

---
 awx/ui/static/js/controllers/JobDetail.js | 18 +++++++++---------
 awx/ui/static/js/helpers/JobDetail.js     |  8 ++++----
 awx/ui/static/partials/job_detail.html    |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js
index 97312e5550..e27a82247a 100644
--- a/awx/ui/static/js/controllers/JobDetail.js
+++ b/awx/ui/static/js/controllers/JobDetail.js
@@ -348,9 +348,9 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
                                 play.hostCount = (event.host_count) ? event.host_count : 0;
                             }
 
-                            if (idx < data.length - 1) {
+                            if (idx < data.results.length - 1) {
                                 // end date = starting date of the next event
-                                end = data[idx + 1].created;
+                                end = data.results[idx + 1].created;
                             }
                             else {
                                 // no next event (task), get the end time of the play
@@ -466,9 +466,9 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
                     status_text = (event.failed) ? 'Failed' : (event.changed) ? 'Changed' : 'OK';
                     start = event.started;
 
-                    if (idx < data.length - 1) {
+                    if (idx < data.results.length - 1) {
                         // end date = starting date of the next event
-                        end = data[idx + 1].started;
+                        end = data.results[idx + 1].started;
                     }
                     else if (JobIsFinished(scope)) {
                         // this is the last play and the job already finished
@@ -627,7 +627,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
                 scope.job_status.explanation = data.job_explanation;
 
                 if (data.status === 'successful' || data.status === 'failed' || data.status === 'error' || data.status === 'canceled') {
-                    scope.job_status.finished = data.finsished;
+                    scope.job_status.finished = data.finished;
                     scope.liveEventProcessing = false;
                     scope.pauseLiveEvents = false;
                     scope.waiting = false;
@@ -1011,9 +1011,9 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
                         status_text = (event.failed) ? 'Failed' : (event.changed) ? 'Changed' : 'OK';
                         start = event.started;
 
-                        if (idx < data.length - 1) {
+                        if (idx < data.results.length - 1) {
                             // end date = starting date of the next event
-                            end = data[idx + 1].started;
+                            end = data.results[idx + 1].started;
                         }
                         else if (JobIsFinished(scope)) {
                             // this is the last play and the job already finished
@@ -1072,9 +1072,9 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
                     scope.next_tasks = data.next;
                     data.results.forEach(function(event, idx) {
                         var end, elapsed, status, status_text;
-                        if (idx < data.length - 1) {
+                        if (idx < data.results.length - 1) {
                             // end date = starting date of the next event
-                            end = data[idx + 1].created;
+                            end = data.results[idx + 1].created;
                         }
                         else {
                             // no next event (task), get the end time of the play
diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js
index 7d9c1dca9b..d96a766aec 100644
--- a/awx/ui/static/js/helpers/JobDetail.js
+++ b/awx/ui/static/js/helpers/JobDetail.js
@@ -720,9 +720,9 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
                     status_text = (event.failed) ? 'Failed' : (event.changed) ? 'Changed' : 'OK';
                     start = event.started;
 
-                    if (idx < data.length - 1) {
+                    if (idx < data.results.length - 1) {
                         // end date = starting date of the next event
-                        end = data[idx + 1].started;
+                        end = data.results[idx + 1].started;
                     }
                     else if (JobIsFinished(scope)) {
                         // this is the last play and the job already finished
@@ -832,9 +832,9 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
                             play.hostCount = (event.host_count) ? event.host_count : 0;
                         }
 
-                        if (idx < data.length - 1) {
+                        if (idx < data.results.length - 1) {
                             // end date = starting date of the next event
-                            end = data[idx + 1].created;
+                            end = data.resuls[idx + 1].created;
                         }
                         else {
                             // no next event (task), get the end time of the play
diff --git a/awx/ui/static/partials/job_detail.html b/awx/ui/static/partials/job_detail.html
index 450fdba65c..965b86555a 100644
--- a/awx/ui/static/partials/job_detail.html
+++ b/awx/ui/static/partials/job_detail.html
@@ -36,9 +36,9 @@
                         </div>
 
                         <div class="form-group">
-                            <label class="col-lg-2 col-md-2 col-sm-2 col-xs-3 control-label">Started</label>
+                            <label class="col-lg-2 col-md-2 col-sm-2 col-xs-3 control-label">Timing</label>
                             <div class="col-lg-10 col-md-10 col-sm-10 col-xs-9">
-                                <div ng-show="job_status.started" id="started-time">{{ job_status.started | date:'MM/dd/yy HH:mm:ss' }}</div>
+                                <div ng-show="job_status.started" id="started-time">Started &nbsp;{{ job_status.started | date:'MM/dd/yy HH:mm:ss' }}</div>
                                 <div ng-show="job_status.finished" id="finished-time">Finished &nbsp;{{ job_status.finished | date:'MM/dd/yy HH:mm:ss' }}</div>
                                 <div ng-show="job_status.finished" id="elapsed-time">Elapsed &nbsp;{{ job_status.elapsed }}</div>
                             </div>