Task #9192 and #9579: fixes for editing from/to times

SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js

@@ -682,7 +682,7 @@ dataControllerMod.controller('DataController',
     $scope.openViewFromDatePopup = function() { $scope.viewFromDatePopupOpened = true; };
     $scope.openViewToDatePopup = function() { $scope.viewToDatePopupOpened = true; };
     $scope.zoomTimespans = [{value:30, name:'30 Minutes'}, {value:60, name:'1 Hour'}, {value:3*60, name:'3 Hours'}, {value:6*60, name:'6 Hours'}, {value:12*60, name:'12 Hours'}, {value:24*60, name:'1 Day'}, {value:2*24*60, name:'2 Days'}, {value:3*24*60, name:'3 Days'}, {value:5*24*60, name:'5 Days'}, {value:7*24*60, name:'1 Week'}, {value:14*24*60, name:'2 Weeks'}, {value:28*24*60, name:'4 Weeks'}, {value:1, name:'Custom (1 min)'}];
-    $scope.zoomTimespan = $scope.zoomTimespans[5];
+    $scope.zoomTimespan = $scope.zoomTimespans[4];
     $scope.jumpToNow = function() {
         var floorLofarTime = dataService.floorDate(dataService.lofarTime, 1, 5);
         dataService.viewTimeSpan = {
@@ -784,17 +784,19 @@ dataControllerMod.controller('DataController',
         }
     };
 
-    $scope.$watch('dataService.viewTimeSpan.from', function() {
+    $scope.onViewTimeSpanFromChanged = function() {
+        dataService.autoFollowNow = false;
         if(dataService.viewTimeSpan.from >= dataService.viewTimeSpan.to) {
-            dataService.viewTimeSpan.from = dataService.floorDate(new Date(dataService.viewTimeSpan.to.getTime() - 5*60*1000), 1, 5);
+            dataService.viewTimeSpan.to = dataService.floorDate(new Date(dataService.viewTimeSpan.from.getTime() + $scope.zoomTimespan.value*60*1000), 1, 5);
         }
-    });
+    };
 
-    $scope.$watch('dataService.viewTimeSpan.to', function() {
+    $scope.onViewTimeSpanToChanged = function() {
+        dataService.autoFollowNow = false;
         if(dataService.viewTimeSpan.to <= dataService.viewTimeSpan.from) {
-            dataService.viewTimeSpan.to = dataService.floorDate(new Date(dataService.viewTimeSpan.from.getTime() + 5*60*1000), 1, 5);
+            dataService.viewTimeSpan.from = dataService.floorDate(new Date(dataService.viewTimeSpan.to.getTime() - $scope.zoomTimespan.value*60*1000), 1, 5);
         }
-    });
+    };
 
     $scope.$watch('dataService.viewTimeSpan', function() {
         $scope.selectZoomTimespan();

SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html

@@ -60,7 +60,7 @@
                     <span class="input-group-btn">
                         <button type="button" class="btn btn-default" ng-click="openViewFromDatePopup()"><i class="glyphicon glyphicon-calendar"></i></button>
                     </span>
-                    <uib-timepicker ng-model="dataService.viewTimeSpan.from" hour-step="1" minute-step="5" show-meridian="false" show-spinners="false"></uib-timepicker>
+                    <uib-timepicker ng-model="dataService.viewTimeSpan.from" ng-change="onViewTimeSpanFromChanged()" hour-step="1" minute-step="5" show-meridian="false" show-spinners="false"></uib-timepicker>
                 </p>
             </div>
             <div class="col-md-3">
@@ -70,7 +70,7 @@
                     <span class="input-group-btn">
                         <button type="button" class="btn btn-default" ng-click="openViewToDatePopup()"><i class="glyphicon glyphicon-calendar"></i></button>
                     </span>
-                    <uib-timepicker ng-model="dataService.viewTimeSpan.to" hour-step="1" minute-step="5" show-meridian="false" show-spinners="false"></uib-timepicker>
+                    <uib-timepicker ng-model="dataService.viewTimeSpan.to" ng-change="onViewTimeSpanToChanged()" hour-step="1" minute-step="5" show-meridian="false" show-spinners="false"></uib-timepicker>
                 </p>
             </div>
             <div class="col-md-2">