From a5321179acd2e784b438070682dfca02d25221cd Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Mon, 28 Aug 2017 15:06:58 -0400
Subject: [PATCH] fix stdout ordering missing event issue

---
 awx/ui/client/src/job-results/event-queue.service.js    | 1 +
 awx/ui/client/src/job-results/job-results.controller.js | 4 ++--
 awx/ui/client/src/job-results/parse-stdout.service.js   | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/awx/ui/client/src/job-results/event-queue.service.js b/awx/ui/client/src/job-results/event-queue.service.js
index 1f4fe874da..c97861ac6b 100644
--- a/awx/ui/client/src/job-results/event-queue.service.js
+++ b/awx/ui/client/src/job-results/event-queue.service.js
@@ -28,6 +28,7 @@ export default ['jobResultsService', 'parseStdoutService', function(jobResultsSe
                 mungedEvent.stdout = parseStdoutService.parseStdout(event);
                 mungedEvent.start_line = event.start_line + 1;
                 mungedEvent.end_line = event.end_line + 1;
+                mungedEvent.actual_end_line = parseStdoutService.actualEndLine(event) + 1;
                 mungedEvent.changes.push('stdout');
             }
 
diff --git a/awx/ui/client/src/job-results/job-results.controller.js b/awx/ui/client/src/job-results/job-results.controller.js
index 15cf662a7b..b85bdbc8f9 100644
--- a/awx/ui/client/src/job-results/job-results.controller.js
+++ b/awx/ui/client/src/job-results/job-results.controller.js
@@ -288,7 +288,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
     var linesInPane = [];
 
     function addToLinesInPane(event) {
-        var arr = _.range(event.start_line, event.end_line);
+        var arr = _.range(event.start_line, event.actual_end_line);
         linesInPane = linesInPane.concat(arr);
         linesInPane = linesInPane.sort(function(a, b) {
             return a - b;
@@ -313,7 +313,7 @@ function(jobData, jobDataOptions, jobLabels, jobFinished, count, $scope, ParseTy
             .append($compile(event
                 .stdout)($scope.events[event
                     .counter]));
-    };
+    }
 
     function putInCorrectPlace(event) {
         if (linesInPane.length) {
diff --git a/awx/ui/client/src/job-results/parse-stdout.service.js b/awx/ui/client/src/job-results/parse-stdout.service.js
index a60ba2e5b1..66c969b9c4 100644
--- a/awx/ui/client/src/job-results/parse-stdout.service.js
+++ b/awx/ui/client/src/job-results/parse-stdout.service.js
@@ -258,6 +258,9 @@ export default ['$log', 'moment', 'i18n', function($log, moment, i18n){
 
             return _.zip(lineNums, lines).slice(0, -1);
         },
+        actualEndLine: function(event) {
+            return event.start_line + this.getLineArr(event).length;
+        },
         // public function that provides the parsed stdout line, given a
         // job_event
         parseStdout: function(event){