From 5e46d0eb7a6b9f36f78648d7f47b6c791f585ece Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 8 Apr 2016 12:54:42 +0000
Subject: [PATCH] Task #8887: columnMagnet and viewScale
---
.../lib/static/app/controllers/ganttprojectcontroller.js | 6 +++---
.../lib/static/app/controllers/ganttresourcecontroller.js | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
index b1622500ee8..f5c766398e8 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js
@@ -41,11 +41,11 @@ ganttProjectControllerMod.controller('GanttProjectController', ['$scope', 'dataS
$scope.options = {
mode: 'custom',
- viewScale: '15 minutes',
+ viewScale: '1 hours',
currentDate: 'line',
currentDateValue: $scope.dataService.lofarTime,
- columnMagnetUnit: 'minute',
- columnMagnetValue: 1,
+ columnMagnet: '1 minutes',
+ timeFramesMagnet: false,
sideMode: 'Tree',
columns: ['model.name', 'starttime', 'endtime'],
treeTableColumns: ['starttime', 'endtime'],
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
index a21a596c7e5..5cc6d23e014 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js
@@ -30,11 +30,11 @@ ganttResourceControllerMod.controller('GanttResourceController', ['$scope', 'dat
$scope.options = {
mode: 'custom',
- viewScale: '15 minutes',
+ viewScale: '1 hours',
currentDate: 'line',
currentDateValue: $scope.dataService.lofarTime,
- columnMagnetUnit: 'minute',
- columnMagnetValue: 1,
+ columnMagnet: '1 minutes',
+ timeFramesMagnet: false,
sideMode: 'Tree',
treeHeaderContent: '<i class="fa fa-align-justify"></i> {{getHeader()}}',
autoExpand: 'both',
--
GitLab