diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js index 24d0600532fd85fe0e9aedadd425e8f29b49b10e..6791a97e2834da310f8dc78b28c288a796c947bd 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js @@ -141,7 +141,7 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS var numTasks = tasks.length; //only enable dependencies (arrows between tasks) in detailed view - $scope.options.dependencies = (fullTimespanInMinutes <= 6*60 && numTasks <= 100) || numTasks < 20; + $scope.options.dependencies = false; var has_any_task_with_dependencies = false; var ganttRows = []; @@ -153,6 +153,8 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS $scope.options.toDate = upperViewBound; var fullTimespanInMinutes = (upperViewBound - lowerViewBound) / (60 * 1000); + $scope.options.dependencies = (fullTimespanInMinutes <= 6*60 && numTasks <= 100) || numTasks < 20; + if(fullTimespanInMinutes > 28*24*60) { $scope.options.viewScale = '7 days'; } else if(fullTimespanInMinutes > 14*24*60) { @@ -279,7 +281,7 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS ganttProjectTypeRows.push(availableRow); ganttRows.push(availableRow); } - + // Scheduled tasks that are blocked tasks are shown differently and use a tooltip var css_class = "task-status-"; if (task.blocked_by_ids.length > 0) { @@ -295,10 +297,10 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS from: task.starttime, to: task.endtime, raTask: task, - + // Leave color property undefined; it is now defined by CSS //color: self.taskStatusColors[task.status], - + classes: css_class, movable: $.inArray(task.status_id, editableTaskStatusIds) > -1 };