From 5bf260609a866cdba9337438a5b15f07b74a86b9 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Tue, 12 Apr 2016 09:28:16 +0000
Subject: [PATCH] Task #8887: auto adjust timespans based on task/claim
timestamps
---
.../static/app/controllers/datacontroller.js | 45 ++++++++++++++++++-
.../app/controllers/ganttprojectcontroller.js | 16 +++++++
.../controllers/ganttresourcecontroller.js | 15 +++++++
3 files changed, 75 insertions(+), 1 deletion(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
index 3f7124d94f7..a1b1ee744d1 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js
@@ -26,6 +26,9 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
self.filteredTasks = [];
self.filteredTaskDict = {};
+ self.taskTimes = {};
+ self.resourceClaimTimes = {};
+
self.selected_resource;
self.initialLoadComplete = false;
@@ -61,6 +64,8 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
self.filteredTasks = self.tasks;
self.filteredTaskDict = self.taskDict;
+ self.computeMinMaxTaskTimes();
+
defer.resolve();
});
@@ -73,6 +78,21 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
})
};
+ self.computeMinMaxTaskTimes = function() {
+ var starttimes = self.filteredTasks.map(function(t) { return t.starttime;});
+ var endtimes = self.filteredTasks.map(function(t) { return t.endtime;});
+
+ var minStarttime = new Date(Math.min.apply(null, starttimes));
+ var maxEndtime = new Date(Math.max.apply(null, endtimes));
+ var fullTimespanInMinutes = (maxEndtime - minStarttime) / (60 * 1000);
+
+ self.taskTimes = {
+ min: minStarttime,
+ max: maxEndtime,
+ fullTimespanInMinutes: fullTimespanInMinutes
+ };
+ };
+
self.getResources = function() {
var defer = $q.defer();
$http.get('/rest/resources').success(function(result) {
@@ -122,12 +142,29 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
self.resourceClaims = result.resourceclaims;
self.resourceClaimDict = self.toIdBasedDict(self.resourceClaims);
+ self.computeMinMaxResourceClaimTimes();
+
defer.resolve();
});
return defer.promise;
};
+ self.computeMinMaxResourceClaimTimes = function() {
+ var starttimes = self.resourceClaims.map(function(rc) { return rc.starttime;});
+ var endtimes = self.resourceClaims.map(function(rc) { return rc.endtime;});
+
+ var minStarttime = new Date(Math.min.apply(null, starttimes));
+ var maxEndtime = new Date(Math.max.apply(null, endtimes));
+ var fullTimespanInMinutes = (maxEndtime - minStarttime) / (60 * 1000);
+
+ self.resourceClaimTimes = {
+ min: minStarttime,
+ max: maxEndtime,
+ fullTimespanInMinutes: fullTimespanInMinutes
+ };
+ };
+
self.getResourceGroups = function() {
var defer = $q.defer();
$http.get('/rest/resourcegroups').success(function(result) {
@@ -309,6 +346,8 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
}
}
}
+
+ self.computeMinMaxTaskTimes();
} else if(change.objectType == 'resourceClaim') {
anyResourceClaims = true;
var changedClaim = change.value;
@@ -332,6 +371,8 @@ angular.module('raeApp').factory("dataService", ['$http', '$q', function($http,
}
}
}
+
+ self.computeMinMaxResourceClaimTimes();
} else if(change.objectType == 'resourceCapacity') {
if(change.changeType == 'update') {
var changedCapacity = change.value;
@@ -377,7 +418,9 @@ dataControllerMod.controller('DataController',
['$scope', 'dataService',
function($scope, dataService) {
var self = this;
- self.dataService = dataService;
+ $scope.dataService = dataService;
+
+ $scope.$watch('dataService.filteredTasks', dataService.computeMinMaxTaskTimes);
dataService.initialLoad();
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
index f5c766398e8..5a067aa5d94 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
@@ -60,6 +60,7 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS
}
},
autoExpand: 'both',
+ taskOutOfRange: 'truncate',
dependencies: true,
api: function(api) {
// API Object is used to control methods and events from angular-gantt.
@@ -114,6 +115,20 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS
var ganntRowsDict = {};
if(numProjecs > 0 && numTasks > 0 && numTasktypes > 0) {
+ $scope.options.fromDate = $scope.dataService.taskTimes.minStarttime;
+ $scope.options.toDate = $scope.dataService.taskTimes.maxEndtime;
+ var fullTimespanInMinutes = $scope.dataService.taskTimes.fullTimespanInMinutes;
+
+ if(fullTimespanInMinutes > 14*24*60) {
+ $scope.options.viewScale = '1 days';
+ } else if(fullTimespanInMinutes > 7*24*60) {
+ $scope.options.viewScale = '6 hours';
+ } else if(fullTimespanInMinutes > 2*24*60) {
+ $scope.options.viewScale = '3 hours';
+ } else {
+ $scope.options.viewScale = '1 hours';
+ }
+
for(var i = 0; i < numTasks; i++) {
var task = tasks[i];
@@ -193,6 +208,7 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS
$scope.$watch('dataService.resourceGroupMemberships', updateGanttData);
$scope.$watch('dataService.filteredTaskDict', updateGanttData);
$scope.$watch('dataService.momProjectsDict', updateGanttData, true);
+ $scope.$watch('dataService.taskTimes', updateGanttData, true);
$scope.$watch('dataService.lofarTime', function() {$scope.options.currentDateValue= $scope.dataService.lofarTime;});
}
]);
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
index 5cc6d23e014..7c41500ca86 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
@@ -38,6 +38,7 @@ ganttResourceControllerMod.controller('GanttResourceController', ['$scope', 'dat
sideMode: 'Tree',
treeHeaderContent: '<i class="fa fa-align-justify"></i> {{getHeader()}}',
autoExpand: 'both',
+ taskOutOfRange: 'truncate',
api: function(api) {
// API Object is used to control methods and events from angular-gantt.
$scope.api = api;
@@ -103,6 +104,20 @@ ganttResourceControllerMod.controller('GanttResourceController', ['$scope', 'dat
return;
}
+ $scope.options.fromDate = $scope.dataService.resourceClaimTimes.minStarttime;
+ $scope.options.toDate = $scope.dataService.resourceClaimTimes.maxEndtime;
+ var fullTimespanInMinutes = $scope.dataService.resourceClaimTimes.fullTimespanInMinutes;
+
+ if(fullTimespanInMinutes > 14*24*60) {
+ $scope.options.viewScale = '1 days';
+ } else if(fullTimespanInMinutes > 7*24*60) {
+ $scope.options.viewScale = '6 hours';
+ } else if(fullTimespanInMinutes > 2*24*60) {
+ $scope.options.viewScale = '3 hours';
+ } else {
+ $scope.options.viewScale = '1 hours';
+ }
+
var editableTaskStatusIds = $scope.dataService.editableTaskStatusIds;
//dict resourceGroup2GanttRows for fast lookup of ganttrows based on groupId
--
GitLab