From 5b0c0e12784e100de06c90c5281f66ca1d8ecd85 Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Mon, 11 Jan 2016 15:08:56 -0800
Subject: [PATCH] [Time Conductor] Validate start/end times

---
 .../res/templates/controls/time-controller.html       |  4 ++--
 .../general/src/controllers/TimeRangeController.js    | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html
index 335dee61c3..bd07659f8e 100644
--- a/platform/commonUI/general/res/templates/controls/time-controller.html
+++ b/platform/commonUI/general/res/templates/controls/time-controller.html
@@ -25,7 +25,7 @@
         <span class="l-time-range-inputs-elem ui-symbol type-icon">&#x43;</span>
         <span class="l-time-range-input">
             <mct-control key="'datetime-field'"
-                         structure="{ format: parameters.format }"
+                         structure="{ format: parameters.format, validate: validateStart }"
                          ng-model="formModel"
                          ng-blur="updateBoundsFromForm()"
                          field="'start'"
@@ -37,7 +37,7 @@
 
         <span class="l-time-range-input" ng-controller="ToggleController as t2">
             <mct-control key="'datetime-field'"
-                         structure="{ format: parameters.format }"
+                         structure="{ format: parameters.format, validate: validateEnd }"
                          ng-model="formModel"
                          ng-blur="updateBoundsFromForm()"
                          field="'end'"
diff --git a/platform/commonUI/general/src/controllers/TimeRangeController.js b/platform/commonUI/general/src/controllers/TimeRangeController.js
index b036bd3fc7..13db6313ef 100644
--- a/platform/commonUI/general/src/controllers/TimeRangeController.js
+++ b/platform/commonUI/general/src/controllers/TimeRangeController.js
@@ -240,6 +240,14 @@ define(
                 };
             }
 
+            function validateStart(startValue) {
+                return startValue <= $scope.ngModel.outer.end - outerMinimumSpan;
+            }
+
+            function validateEnd(endValue) {
+                return endValue >= $scope.ngModel.outer.start + outerMinimumSpan;
+            }
+
             $scope.startLeftDrag = startLeftDrag;
             $scope.startRightDrag = startRightDrag;
             $scope.startMiddleDrag = startMiddleDrag;
@@ -249,6 +257,9 @@ define(
 
             $scope.updateBoundsFromForm = updateBoundsFromForm;
 
+            $scope.validateStart = validateStart;
+            $scope.validateEnd = validateEnd;
+
             $scope.ticks = [];
 
             // Initialize scope to defaults