Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
I
intranet-gantt-editor
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
project-open
intranet-gantt-editor
Commits
ed54b084
Commit
ed54b084
authored
Dec 18, 2020
by
Frank Bergmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Fixed persistence of zoom buttons
- Fixed default type of task dependencies for compatibility
parent
9aadc669
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
GanttSchedulingController.js
www/controller/GanttSchedulingController.js
+1
-1
GanttZoomController.js
www/controller/GanttZoomController.js
+13
-1
GanttBarPanel.adp
www/view/GanttBarPanel.adp
+1
-1
No files found.
www/controller/GanttSchedulingController.js
View file @
ed54b084
...
...
@@ -908,7 +908,7 @@ Ext.define('GanttEditor.controller.GanttSchedulingController', {
var
succEndDate
=
PO
.
Utilities
.
pgToDate
(
succ
.
get
(
'end_date'
));
if
(
!
succEndDate
)
{
return
false
;
}
var
dependencyTypeId
=
dep
.
type_id
;
// 9660=FF, 9662=FS, 9664=SF, 9666=SS
if
(
dependencyTypeId
==
9650
)
dependencyTypeId
=
966
0
;
// compatibility
if
(
dependencyTypeId
==
9650
)
dependencyTypeId
=
966
2
;
// compatibility
// If the start of succ is before the end of pred...
var
changedNodes
=
[];
...
...
www/controller/GanttZoomController.js
View file @
ed54b084
...
...
@@ -223,6 +223,10 @@ Ext.define('GanttEditor.controller.GanttZoomController', {
me
.
getGanttBarPanel
().
needsRedraw
=
true
;
me
.
senchaPreferenceStore
.
setPreference
(
'axisEndX'
,
ganttBarPanel
.
axisEndX
);
// Persist the new zoom parameters
me
.
senchaPreferenceStore
.
setPreference
(
'axisStartTime'
,
ganttBarPanel
.
axisStartDate
.
getTime
());
me
.
senchaPreferenceStore
.
setPreference
(
'axisEndTime'
,
ganttBarPanel
.
axisEndDate
.
getTime
());
if
(
me
.
debug
)
console
.
log
(
'GanttEditor.controller.GanttZoomController.onButtonZoomIn: Finished'
);
},
...
...
@@ -269,7 +273,9 @@ Ext.define('GanttEditor.controller.GanttZoomController', {
ganttBarPanel
.
axisEndX
=
endX
;
me
.
getGanttBarPanel
().
needsRedraw
=
true
;
me
.
senchaPreferenceStore
.
setPreference
(
'axisEndX'
,
ganttBarPanel
.
axisEndX
);
// Persist the new zoom parameters
me
.
senchaPreferenceStore
.
setPreference
(
'axisStartTime'
,
ganttBarPanel
.
axisStartDate
.
getTime
());
me
.
senchaPreferenceStore
.
setPreference
(
'axisEndTime'
,
ganttBarPanel
.
axisEndDate
.
getTime
());
if
(
me
.
debug
)
console
.
log
(
'GanttEditor.controller.GanttZoomController.onButtonZoomOut: Finished'
);
},
...
...
@@ -380,6 +386,7 @@ Ext.define('GanttEditor.controller.GanttZoomController', {
if
(
me
.
debug
)
console
.
log
(
'GanttEditor.controller.GanttZoomController.onButtonZoomCenter: Starting'
);
var
ganttTreePanel
=
me
.
getGanttTreePanel
();
var
ganttBarPanel
=
me
.
getGanttBarPanel
();
// Is a task selected? Otherwise center around the entire project
var
selectionModel
=
ganttTreePanel
.
getSelectionModel
();
...
...
@@ -397,6 +404,11 @@ Ext.define('GanttEditor.controller.GanttZoomController', {
}
*/
me
.
senchaPreferenceStore
.
setPreference
(
'axisEndX'
,
ganttBarPanel
.
axisEndX
);
// Persist the new zoom parameters
me
.
senchaPreferenceStore
.
setPreference
(
'axisStartTime'
,
ganttBarPanel
.
axisStartDate
.
getTime
());
me
.
senchaPreferenceStore
.
setPreference
(
'axisEndTime'
,
ganttBarPanel
.
axisEndDate
.
getTime
());
if
(
me
.
debug
)
console
.
log
(
'GanttEditor.controller.GanttZoomController.onButtonZoomCenter: Finished'
);
},
...
...
www/view/GanttBarPanel.adp
View file @
ed54b084
...
...
@@ -955,7 +955,7 @@ Ext.define('GanttEditor.view.GanttBarPanel', {
var depName = 'Task dependency';
var depTypeId = dependencyModel.type_id;
if (depTypeId == 9650) depTypeId = 966
0
; // compatibility
if (depTypeId == 9650) depTypeId = 966
2
; // compatibility
switch (depTypeId) {
case 9660: depName = '@finish_to_finish_l10n@'; break;
case 9662: depName = '@finish_to_start_l10n@'; break;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment