Added end delta

nasa · Jul 14, 2016 · 14463d3 · 14463d3
1 parent fd29473
commit 14463d3
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 25 deletions.
diff --git a/platform/features/conductor-v2/res/templates/time-conductor.html b/platform/features/conductor-v2/res/templates/time-conductor.html
@@ -3,6 +3,9 @@
     .start-delta {
         left: 180px;
     }
+    .end-delta {
+        right: 0;
+    }
 </style>
 <div ng-controller="TimeConductorController as tcController"
      class="l-time-conductor l-flex-col {{modeModel.selected}}-mode">
@@ -39,7 +42,7 @@
         </span>
         <span class="l-time-range-input-w end-delta"
               ng-class="{'hide':(modeModel.selected === 'fixed')}">
-            <mct-control key="'time-field'"
+            <mct-control key="'datetime-field'"
                          structure="{
                             format: 'duration',
                             validate: tcController.validateEndDelta

diff --git a/platform/features/conductor-v2/src/MctConductorAxis.js b/platform/features/conductor-v2/src/MctConductorAxis.js
@@ -48,7 +48,7 @@ define(
                             .append('svg:svg')
                             .attr('width', '100%')
                             .attr('height', height);
-                var xScale = d3.scaleTime();
+                var xScale = d3.scaleUtc();
                 var xAxis = d3.axisTop();
                 // draw x axis with labels and move to the bottom of the chart area
                 var axisElement = vis.append("g")

diff --git a/platform/features/conductor-v2/src/TimeConductorController.js b/platform/features/conductor-v2/src/TimeConductorController.js
@@ -32,16 +32,18 @@ define(
             this.$scope = $scope;
             this.$timeout = $timeout;
             this.conductor = conductor;
+            this.startDelta = FIFTEEN_MINUTES;
             this.endDelta = 0;
 
             this.changing = {
                 'start': false,
-                'startDelta': false,
-                'end': false,
-                'endDelta': false
+                'end': false
             };
 
-            $scope.formModel = {};
+            $scope.formModel = {
+                startDelta: this.startDelta,
+                endDelta: this.endDelta
+            };
 
             conductor.on('bounds', function (bounds) {
                 if (!self.changing['start']) {
@@ -50,13 +52,6 @@ define(
                 if (!self.changing['end']) {
                     $scope.formModel.end = bounds.end;
                 }
-                if (!self.changing['startDelta']) {
-                    $scope.formModel.startDelta = bounds.end - bounds.start;
-                }
-
-                if (!self.changing['endDelta']) {
-                    $scope.formModel.endDelta = 0;
-                }
             });
 
             conductor.on('follow', function (follow){
@@ -148,11 +143,17 @@ define(
         TimeConductorController.prototype.updateDeltasFromForm = function (formModel) {
 
             if (this.validateDeltas(formModel)) {
-                var oldBounds = this.conductor.bounds(),
-                    newBounds = {
-                        start: oldBounds.end - formModel.startDelta,
-                        end: oldBounds.end + formModel.endDelta
-                    };
+                //Calculate the previous 'true' end value (without delta)
+                var oldEnd = this.conductor.bounds().end - this.endDelta || 0;
+
+                this.startDelta = formModel.startDelta;
+                this.endDelta = formModel.endDelta;
+
+                var newBounds = {
+                    start: oldEnd - this.startDelta,
+                    end: oldEnd + this.endDelta
+                };
+
                 this.conductor.bounds(newBounds);
             }
         };
@@ -172,22 +173,20 @@ define(
                 var tickInterval = 1000;
                 var conductor = this.conductor;
                 var $timeout = this.$timeout;
+                var self = this;
 
                 conductor.follow(true);
-                setToNowMinus(FIFTEEN_MINUTES);
+                setBoundsToNow(self.startDelta, self.endDelta);
 
                 var timeoutPromise = $timeout(tick, tickInterval);
 
-                function setToNowMinus(delta) {
+                function setBoundsToNow(startDelta, endDelta) {
                     var now = Math.ceil(Date.now() / 1000) * 1000;
-                    conductor.bounds({start: now - delta, end: now});
+                    conductor.bounds({start: now - startDelta, end: now + endDelta});
                 }
 
                 function tick() {
-                    var bounds = conductor.bounds();
-                    var delta = bounds.end - bounds.start;
-                    setToNowMinus(delta);
-
+                    setBoundsToNow(self.startDelta, self.endDelta);
                     timeoutPromise = $timeout(tick, tickInterval)
                 }