From fc2860810b3f5e8a17bdd47c9731888f2d2f7e65 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Thu, 3 Sep 2015 11:03:17 -0700
Subject: [PATCH] [Time Controller] Allow manual date entry

WTD-1515
---
 .../templates/controls/time-controller.html   |  8 +++-
 .../controllers/TimeConductorController.js    | 43 ++++++++++++-------
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html
index 90e9510865..5f60741672 100644
--- a/platform/commonUI/general/res/templates/controls/time-controller.html
+++ b/platform/commonUI/general/res/templates/controls/time-controller.html
@@ -24,8 +24,12 @@ properly on the range left and right bounds.
 
 <div class="l-time-controller" ng-controller="TimeConductorController">
     <div class="l-time-range-inputs-holder">
-        Start: <input type="date" ng-model="startOuterDate"/>
-        End: <input type="date" ng-model="endOuterDate"/>
+        Start: <input type="textfield"
+                      placeholder="YYYY-MM-DD HH:mm:ss"
+                      ng-model="startOuterDate"/>
+        End: <input type="textfield"
+                      placeholder="YYYY-MM-DD HH:mm:ss"
+                      ng-model="endOuterDate"/>
     </div>
 
     <div class="l-time-range-slider-holder">
diff --git a/platform/commonUI/general/src/controllers/TimeConductorController.js b/platform/commonUI/general/src/controllers/TimeConductorController.js
index ea978a10c3..26f120c7b0 100644
--- a/platform/commonUI/general/src/controllers/TimeConductorController.js
+++ b/platform/commonUI/general/src/controllers/TimeConductorController.js
@@ -36,12 +36,15 @@ define(
             var tickCount = 2,
                 initialDragValue;
 
-
-
             function formatTimestamp(ts) {
                 return moment.utc(ts).format(DATE_FORMAT);
             }
 
+            function parseTimestamp(text, fallback) {
+                var m = moment.utc(text, DATE_FORMAT);
+                return m.isValid() ? m.valueOf() : fallback;
+            }
+
             // From 0.0-1.0 to "0%"-"1%"
             function toPercent(p) {
                 return (100 * p) + "%";
@@ -66,17 +69,16 @@ define(
                 updateTicks();
             }
 
-            function updateFromParameters(ngModel) {
+            function updateViewFromModel(ngModel) {
                 var t = now(), span;
 
-                ngModel = ngModel || {
-                    outer: [ t - 24 * 3600 * 1000, t ],
-                    inner: [ t - 24 * 3600 * 1000, t ]
-                };
+                ngModel = ngModel || {};
+                ngModel.outer = ngModel.outer || [ t - 24 * 3600 * 1000, t ];
+                ngModel.inner = ngModel.inner || [ t - 24 * 3600 * 1000, t ];
 
                 // First, dates for the date pickers for outer bounds
-                $scope.startOuterDate = new Date(ngModel.outer[0]);
-                $scope.endOuterDate = new Date(ngModel.outer[1]);
+                $scope.startOuterDate = formatTimestamp(ngModel.outer[0]);
+                $scope.endOuterDate = formatTimestamp(ngModel.outer[1]);
 
                 // Then readable dates for the knobs
                 $scope.startInnerText = formatTimestamp(ngModel.inner[0]);
@@ -126,7 +128,7 @@ define(
                     $scope.ngModel.outer[0],
                     $scope.ngModel.inner[1]
                 );
-                updateFromParameters($scope.ngModel);
+                updateViewFromModel($scope.ngModel);
             }
 
             function rightDrag(pixels) {
@@ -136,7 +138,7 @@ define(
                     $scope.ngModel.inner[0],
                     $scope.ngModel.outer[1]
                 );
-                updateFromParameters($scope.ngModel);
+                updateViewFromModel($scope.ngModel);
             }
 
             function middleDrag(pixels) {
@@ -154,7 +156,17 @@ define(
                 $scope.ngModel.inner[opposite] = $scope.ngModel.inner[index] +
                     initialDragValue[opposite] - initialDragValue[index];
 
-                updateFromParameters($scope.ngModel);
+                updateViewFromModel($scope.ngModel);
+            }
+
+            function updateOuterStart(text) {
+                var ngModel = $scope.ngModel;
+                ngModel.outer[0] = parseTimestamp(text, ngModel.outer[0]);
+            }
+
+            function updateOuterEnd(text) {
+                var ngModel = $scope.ngModel;
+                ngModel.outer[1] = parseTimestamp(text, ngModel.outer[1]);
             }
 
             $scope.startLeftDrag = startLeftDrag;
@@ -168,11 +180,12 @@ define(
             $scope.ticks = [];
 
             // Initialize scope to defaults
-            updateFromParameters();
+            updateViewFromModel($scope.ngModel);
 
-            $scope.$watchCollection("ngModel", updateFromParameters);
+            $scope.$watchCollection("ngModel", updateViewFromModel);
             $scope.$watch("spanWidth", updateSpanWidth);
-
+            $scope.$watch("startOuterDate", updateOuterStart);
+            $scope.$watch("endOuterDate", updateOuterEnd);
         }
 
         return TimeConductorController;