From 9f2303face15822aae00c95993e76dad0c1d3bff Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Thu, 12 Nov 2015 14:49:19 -0800
Subject: [PATCH 1/3] [Time Conductor] Fix date picker toggle

nasa/openmctweb#297; avoid flag toggled to display date-time
picker becoming lost in a child scope.
---
 .../general/res/templates/controls/datetime-field.html      | 6 +++---
 .../general/src/controllers/DateTimeFieldController.js      | 3 +++
 .../general/test/controllers/DateTimeFieldControllerSpec.js | 4 ++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/platform/commonUI/general/res/templates/controls/datetime-field.html b/platform/commonUI/general/res/templates/controls/datetime-field.html
index 6ba8cbf901..2c0423c32b 100644
--- a/platform/commonUI/general/res/templates/controls/datetime-field.html
+++ b/platform/commonUI/general/res/templates/controls/datetime-field.html
@@ -6,10 +6,10 @@
     </input>
     <a class="ui-symbol icon icon-calendar"
        ng-if="structure.format === 'utc' || !structure.format"
-       ng-click="pickerActive = !pickerActive">
+       ng-click="picker.active = !picker.active">
     </a>
-    <mct-popup ng-if="pickerActive">
-        <div mct-click-elsewhere="pickerActive = false">
+    <mct-popup ng-if="picker.active">
+        <div mct-click-elsewhere="picker.active = false">
             <mct-control key="'datetime-picker'"
                          ng-model="ngModel"
                          field="field"
diff --git a/platform/commonUI/general/src/controllers/DateTimeFieldController.js b/platform/commonUI/general/src/controllers/DateTimeFieldController.js
index b87268dc5a..325a112e13 100644
--- a/platform/commonUI/general/src/controllers/DateTimeFieldController.js
+++ b/platform/commonUI/general/src/controllers/DateTimeFieldController.js
@@ -69,9 +69,12 @@ define(
                 updateFromModel($scope.ngModel[$scope.field]);
             }
 
+            $scope.picker = { active: false };
+
             $scope.$watch('structure.format', setFormat);
             $scope.$watch('ngModel[field]', updateFromModel);
             $scope.$watch('textValue', updateFromView);
+
         }
 
         return DateTimeFieldController;
diff --git a/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js b/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js
index 8f516ece5d..714c7d072e 100644
--- a/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js
+++ b/platform/commonUI/general/test/controllers/DateTimeFieldControllerSpec.js
@@ -91,6 +91,10 @@ define(
                 expect(mockScope.textValue).toEqual("1977-05-25 17:30:00");
             });
 
+            it("exposes toggle state for date-time picker", function () {
+                expect(mockScope.picker.active).toBe(false);
+            });
+
             describe("when user input is invalid", function () {
                 var newText, oldValue;
 

From 4ad007f882b79f98edea4b72ac0450704c2b430c Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Thu, 12 Nov 2015 14:52:09 -0800
Subject: [PATCH 2/3] [Common UI] Add z-index to popups

Temporary workaround for nasa/openmctweb#298
---
 platform/commonUI/general/src/directives/MCTPopup.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/commonUI/general/src/directives/MCTPopup.js b/platform/commonUI/general/src/directives/MCTPopup.js
index d5ced4129e..2d20317f7a 100644
--- a/platform/commonUI/general/src/directives/MCTPopup.js
+++ b/platform/commonUI/general/src/directives/MCTPopup.js
@@ -51,6 +51,8 @@ define(
                     position = [ rect.left, rect.top ],
                     popup = popupService.display(div, position);
 
+                div.css('z-index', 75);
+
                 transclude(function (clone) {
                     div.append(clone);
                 });

From 46b110e12f4eb53516689ef1cace513583fd5002 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Thu, 12 Nov 2015 16:38:01 -0800
Subject: [PATCH 3/3] [Common UI] Add note about TODO item

Add note about temporary work around, per code review
from nasa/openmctweb#299
---
 platform/commonUI/general/src/directives/MCTPopup.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/commonUI/general/src/directives/MCTPopup.js b/platform/commonUI/general/src/directives/MCTPopup.js
index 2d20317f7a..254a41d1eb 100644
--- a/platform/commonUI/general/src/directives/MCTPopup.js
+++ b/platform/commonUI/general/src/directives/MCTPopup.js
@@ -51,6 +51,8 @@ define(
                     position = [ rect.left, rect.top ],
                     popup = popupService.display(div, position);
 
+                // TODO: Handle in CSS;
+                //       https://github.com/nasa/openmctweb/issues/298
                 div.css('z-index', 75);
 
                 transclude(function (clone) {