@syncfusion/ej2-gantt 24.2.6 → 24.2.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/dist/ej2-gantt.min.js +2 -2
- package/dist/ej2-gantt.umd.min.js +2 -2
- package/dist/ej2-gantt.umd.min.js.map +1 -1
- package/dist/es6/ej2-gantt.es2015.js +295 -170
- package/dist/es6/ej2-gantt.es2015.js.map +1 -1
- package/dist/es6/ej2-gantt.es5.js +295 -170
- package/dist/es6/ej2-gantt.es5.js.map +1 -1
- package/dist/global/ej2-gantt.min.js +2 -2
- package/dist/global/ej2-gantt.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +16 -16
- package/src/gantt/actions/connector-line-edit.js +33 -5
- package/src/gantt/actions/dependency.d.ts +23 -0
- package/src/gantt/actions/dependency.js +176 -12
- package/src/gantt/actions/dialog-edit.js +1 -1
- package/src/gantt/actions/edit.d.ts +1 -22
- package/src/gantt/actions/edit.js +9 -129
- package/src/gantt/actions/selection.js +8 -1
- package/src/gantt/actions/taskbar-edit.js +20 -4
- package/src/gantt/base/date-processor.js +10 -3
- package/src/gantt/base/gantt.js +14 -1
- package/src/gantt/base/task-processor.js +22 -10
- package/src/gantt/base/tree-grid.js +1 -1
- package/src/gantt/renderer/timeline.js +2 -4
- package/styles/bootstrap.css +3 -3
- package/styles/gantt/bootstrap.css +3 -3
|
@@ -43,7 +43,7 @@ var Edit = /** @class */ (function () {
|
|
|
43
43
|
*/
|
|
44
44
|
this.deletedTaskDetails = [];
|
|
45
45
|
this.parent = parent;
|
|
46
|
-
this.validatedChildItems = [];
|
|
46
|
+
this.parent.predecessorModule.validatedChildItems = [];
|
|
47
47
|
if (this.parent.editSettings.allowEditing && this.parent.editSettings.mode === 'Auto') {
|
|
48
48
|
this.cellEditModule = new CellEdit(this.parent);
|
|
49
49
|
}
|
|
@@ -880,8 +880,8 @@ var Edit = /** @class */ (function () {
|
|
|
880
880
|
}
|
|
881
881
|
if (this.parent.isConnectorLineUpdate && this.parent.autoCalculateDateScheduling) {
|
|
882
882
|
/* validating predecessor for updated child items */
|
|
883
|
-
for (var i = 0; i < this.validatedChildItems.length; i++) {
|
|
884
|
-
var child = this.validatedChildItems[i];
|
|
883
|
+
for (var i = 0; i < this.parent.predecessorModule.validatedChildItems.length; i++) {
|
|
884
|
+
var child = this.parent.predecessorModule.validatedChildItems[i];
|
|
885
885
|
if (child.ganttProperties.predecessor && child.ganttProperties.predecessor.length > 0) {
|
|
886
886
|
this.parent.editedTaskBarItem = child;
|
|
887
887
|
this.parent.predecessorModule.validatePredecessor(child, [], '');
|
|
@@ -895,6 +895,7 @@ var Edit = /** @class */ (function () {
|
|
|
895
895
|
this.parent.editedTaskBarItem = ganttRecord;
|
|
896
896
|
}
|
|
897
897
|
if (!this.isValidatedEditedRecord) {
|
|
898
|
+
this.isFirstCall = true;
|
|
898
899
|
this.parent.predecessorModule.validatePredecessor(ganttRecord, [], '');
|
|
899
900
|
}
|
|
900
901
|
this.isValidatedEditedRecord = false;
|
|
@@ -902,7 +903,7 @@ var Edit = /** @class */ (function () {
|
|
|
902
903
|
}
|
|
903
904
|
if (this.parent.allowParentDependency && ganttRecord.hasChildRecords && this.parent.previousRecords[ganttRecord.uniqueID].ganttProperties.startDate &&
|
|
904
905
|
(args.action === "DrawConnectorLine")) {
|
|
905
|
-
this.updateChildItems(ganttRecord);
|
|
906
|
+
this.parent.predecessorModule['updateChildItems'](ganttRecord);
|
|
906
907
|
}
|
|
907
908
|
this.updateParentItemOnEditing();
|
|
908
909
|
this.parent.dataOperation.updateParentItems(ganttRecord, true);
|
|
@@ -915,6 +916,7 @@ var Edit = /** @class */ (function () {
|
|
|
915
916
|
var parentData = this.parent.getRecordByID(ganttRecord.parentItem.taskId);
|
|
916
917
|
if (!isNullOrUndefined(parentData)) {
|
|
917
918
|
if (!parentData.ganttProperties.predecessorsName) {
|
|
919
|
+
this.isFirstCall = true;
|
|
918
920
|
this.parent.predecessorModule.validatePredecessor(parentData, [], '');
|
|
919
921
|
this.updateParentItemOnEditing();
|
|
920
922
|
this.parent.ganttChartModule.reRenderConnectorLines();
|
|
@@ -945,7 +947,7 @@ var Edit = /** @class */ (function () {
|
|
|
945
947
|
Edit.prototype.updateParentChildRecord = function (data) {
|
|
946
948
|
var ganttRecord = data;
|
|
947
949
|
if (ganttRecord.hasChildRecords && this.taskbarMoved && (ganttRecord[this.parent.taskFields.manual] === false || this.parent.taskMode === 'Auto') && (!isNullOrUndefined(this.parent.editModule.cellEditModule) && !this.parent.editModule.cellEditModule.isResourceCellEdited)) {
|
|
948
|
-
this.updateChildItems(ganttRecord);
|
|
950
|
+
this.parent.predecessorModule['updateChildItems'](ganttRecord);
|
|
949
951
|
}
|
|
950
952
|
if (!isNullOrUndefined(this.parent.editModule.cellEditModule)) {
|
|
951
953
|
this.parent.editModule.cellEditModule.isResourceCellEdited = false;
|
|
@@ -990,29 +992,6 @@ var Edit = /** @class */ (function () {
|
|
|
990
992
|
this.parent.dataOperation.updateWidthLeft(data);
|
|
991
993
|
}
|
|
992
994
|
};
|
|
993
|
-
/**
|
|
994
|
-
*
|
|
995
|
-
* @param {IGanttData} data .
|
|
996
|
-
* @param {Date} newStartDate .
|
|
997
|
-
* @returns {void} .
|
|
998
|
-
*/
|
|
999
|
-
Edit.prototype.calculateDateByRoundOffDuration = function (data, newStartDate) {
|
|
1000
|
-
var ganttRecord = data;
|
|
1001
|
-
var taskData = ganttRecord.ganttProperties;
|
|
1002
|
-
var projectStartDate = new Date(newStartDate.getTime());
|
|
1003
|
-
if (!isNullOrUndefined(taskData.endDate) && isNullOrUndefined(taskData.startDate)) {
|
|
1004
|
-
var endDate = this.parent.dateValidationModule.checkStartDate(projectStartDate, taskData, null);
|
|
1005
|
-
this.parent.setRecordValue('endDate', this.parent.dateValidationModule.checkEndDate(endDate, ganttRecord.ganttProperties), taskData, true);
|
|
1006
|
-
}
|
|
1007
|
-
else {
|
|
1008
|
-
this.parent.setRecordValue('startDate', this.parent.dateValidationModule.checkStartDate(projectStartDate, taskData, false), taskData, true);
|
|
1009
|
-
if (!isNullOrUndefined(taskData.duration)) {
|
|
1010
|
-
this.parent.dateValidationModule.calculateEndDate(ganttRecord);
|
|
1011
|
-
}
|
|
1012
|
-
}
|
|
1013
|
-
this.parent.dataOperation.updateWidthLeft(data);
|
|
1014
|
-
this.parent.dataOperation.updateTaskData(ganttRecord);
|
|
1015
|
-
};
|
|
1016
995
|
/**
|
|
1017
996
|
* To update progress value of parent tasks
|
|
1018
997
|
*
|
|
@@ -1122,106 +1101,6 @@ var Edit = /** @class */ (function () {
|
|
|
1122
1101
|
Edit.prototype.updateScheduleDatesOnEditing = function (args) {
|
|
1123
1102
|
//..
|
|
1124
1103
|
};
|
|
1125
|
-
/**
|
|
1126
|
-
*
|
|
1127
|
-
* @param {IGanttData} ganttRecord .
|
|
1128
|
-
* @returns {void} .
|
|
1129
|
-
*/
|
|
1130
|
-
Edit.prototype.updateChildItems = function (ganttRecord) {
|
|
1131
|
-
var previousData = this.parent.previousRecords[ganttRecord.uniqueID];
|
|
1132
|
-
var previousStartDate;
|
|
1133
|
-
if (isNullOrUndefined(previousData) ||
|
|
1134
|
-
(isNullOrUndefined(previousData) && !isNullOrUndefined(previousData.ganttProperties))) {
|
|
1135
|
-
previousStartDate = new Date(ganttRecord.ganttProperties.startDate.getTime());
|
|
1136
|
-
}
|
|
1137
|
-
else {
|
|
1138
|
-
if (!isNullOrUndefined(previousData.ganttProperties.startDate)) {
|
|
1139
|
-
previousStartDate = new Date(previousData.ganttProperties.startDate.getTime());
|
|
1140
|
-
}
|
|
1141
|
-
}
|
|
1142
|
-
var currentStartDate = ganttRecord.ganttProperties.startDate;
|
|
1143
|
-
var childRecords = [];
|
|
1144
|
-
var validStartDate;
|
|
1145
|
-
var validEndDate;
|
|
1146
|
-
var calcEndDate;
|
|
1147
|
-
var isRightMove;
|
|
1148
|
-
var durationDiff;
|
|
1149
|
-
this.getUpdatableChildRecords(ganttRecord, childRecords);
|
|
1150
|
-
if (childRecords.length === 0) {
|
|
1151
|
-
return;
|
|
1152
|
-
}
|
|
1153
|
-
if (!isNullOrUndefined(previousStartDate) && !isNullOrUndefined(currentStartDate) && previousStartDate.getTime() > currentStartDate.getTime()) {
|
|
1154
|
-
validStartDate = this.parent.dateValidationModule.checkStartDate(currentStartDate);
|
|
1155
|
-
validEndDate = this.parent.dateValidationModule.checkEndDate(previousStartDate, ganttRecord.ganttProperties);
|
|
1156
|
-
isRightMove = false;
|
|
1157
|
-
}
|
|
1158
|
-
else {
|
|
1159
|
-
validStartDate = this.parent.dateValidationModule.checkStartDate(previousStartDate);
|
|
1160
|
-
validEndDate = this.parent.dateValidationModule.checkEndDate(currentStartDate, ganttRecord.ganttProperties);
|
|
1161
|
-
isRightMove = true;
|
|
1162
|
-
}
|
|
1163
|
-
//Get Duration
|
|
1164
|
-
if (!isNullOrUndefined(validStartDate) && !isNullOrUndefined(validEndDate) && validStartDate.getTime() >= validEndDate.getTime()) {
|
|
1165
|
-
durationDiff = 0;
|
|
1166
|
-
}
|
|
1167
|
-
else {
|
|
1168
|
-
durationDiff = this.parent.dateValidationModule.getDuration(validStartDate, validEndDate, 'minute', true, false);
|
|
1169
|
-
}
|
|
1170
|
-
for (var i = 0; i < childRecords.length; i++) {
|
|
1171
|
-
if (childRecords[i].ganttProperties.isAutoSchedule) {
|
|
1172
|
-
if (durationDiff > 0) {
|
|
1173
|
-
var startDate = isScheduledTask(childRecords[i].ganttProperties) ?
|
|
1174
|
-
childRecords[i].ganttProperties.startDate : childRecords[i].ganttProperties.startDate ?
|
|
1175
|
-
childRecords[i].ganttProperties.startDate : childRecords[i].ganttProperties.endDate ?
|
|
1176
|
-
childRecords[i].ganttProperties.endDate : new Date(previousStartDate.toString());
|
|
1177
|
-
if (isRightMove) {
|
|
1178
|
-
calcEndDate = this.parent.dateValidationModule.getEndDate(this.parent.dateValidationModule.checkStartDate(startDate, childRecords[i].ganttProperties, childRecords[i].ganttProperties.isMilestone), durationDiff, 'minute', childRecords[i].ganttProperties, false);
|
|
1179
|
-
}
|
|
1180
|
-
else {
|
|
1181
|
-
calcEndDate = this.parent.dateValidationModule.getStartDate(this.parent.dateValidationModule.checkEndDate(startDate, childRecords[i].ganttProperties), durationDiff, 'minute', childRecords[i].ganttProperties);
|
|
1182
|
-
}
|
|
1183
|
-
this.calculateDateByRoundOffDuration(childRecords[i], calcEndDate);
|
|
1184
|
-
if (this.parent.isOnEdit && this.validatedChildItems.indexOf(childRecords[i]) === -1) {
|
|
1185
|
-
this.validatedChildItems.push(childRecords[i]);
|
|
1186
|
-
}
|
|
1187
|
-
}
|
|
1188
|
-
else if (isNullOrUndefined(previousData)) {
|
|
1189
|
-
calcEndDate = previousStartDate;
|
|
1190
|
-
var initialData = this.parent.initialLoadData[childRecords[i].index];
|
|
1191
|
-
if (this.parent.isLoad) {
|
|
1192
|
-
this.calculateDateByRoundOffDuration(initialData, calcEndDate);
|
|
1193
|
-
}
|
|
1194
|
-
else {
|
|
1195
|
-
this.calculateDateByRoundOffDuration(childRecords[i], calcEndDate);
|
|
1196
|
-
}
|
|
1197
|
-
if (this.parent.isOnEdit && this.validatedChildItems.indexOf(childRecords[i]) === -1) {
|
|
1198
|
-
this.validatedChildItems.push(childRecords[i]);
|
|
1199
|
-
}
|
|
1200
|
-
}
|
|
1201
|
-
}
|
|
1202
|
-
}
|
|
1203
|
-
if (childRecords.length) {
|
|
1204
|
-
this.parent.dataOperation.updateParentItems(ganttRecord, true);
|
|
1205
|
-
}
|
|
1206
|
-
};
|
|
1207
|
-
/**
|
|
1208
|
-
* To get updated child records.
|
|
1209
|
-
*
|
|
1210
|
-
* @param {IGanttData} parentRecord .
|
|
1211
|
-
* @param {IGanttData} childLists .
|
|
1212
|
-
* @returns {void} .
|
|
1213
|
-
*/
|
|
1214
|
-
Edit.prototype.getUpdatableChildRecords = function (parentRecord, childLists) {
|
|
1215
|
-
var childRecords = parentRecord.childRecords;
|
|
1216
|
-
for (var i = 0; i < childRecords.length; i++) {
|
|
1217
|
-
if (childRecords[i].ganttProperties.isAutoSchedule) {
|
|
1218
|
-
childLists.push(childRecords[i]);
|
|
1219
|
-
if (childRecords[i].hasChildRecords) {
|
|
1220
|
-
this.getUpdatableChildRecords(childRecords[i], childLists);
|
|
1221
|
-
}
|
|
1222
|
-
}
|
|
1223
|
-
}
|
|
1224
|
-
};
|
|
1225
1104
|
/**
|
|
1226
1105
|
* @param {ITaskbarEditedEventArgs} args .
|
|
1227
1106
|
* @returns {void} .
|
|
@@ -1734,7 +1613,7 @@ var Edit = /** @class */ (function () {
|
|
|
1734
1613
|
this.resetValidateArgs();
|
|
1735
1614
|
this.parent.editedTaskBarItem = null;
|
|
1736
1615
|
this.parent.isOnEdit = false;
|
|
1737
|
-
this.validatedChildItems = [];
|
|
1616
|
+
this.parent.predecessorModule.validatedChildItems = [];
|
|
1738
1617
|
this.parent.isConnectorLineUpdate = false;
|
|
1739
1618
|
this.parent.editedTaskBarItem = null;
|
|
1740
1619
|
this.taskbarMoved = false;
|
|
@@ -3641,6 +3520,7 @@ var Edit = /** @class */ (function () {
|
|
|
3641
3520
|
for (var k = 0; k < this.updateParentRecords.length; k++) {
|
|
3642
3521
|
this.parent.dataOperation.updateParentItems(this.updateParentRecords[k]);
|
|
3643
3522
|
}
|
|
3523
|
+
this.isFirstCall = true;
|
|
3644
3524
|
this.parent.editedRecords.forEach(function (record) {
|
|
3645
3525
|
_this.parent.predecessorModule.validatePredecessor(record, [], '');
|
|
3646
3526
|
});
|
|
@@ -93,7 +93,14 @@ var Selection = /** @class */ (function () {
|
|
|
93
93
|
if (this.parent.enableTimelineVirtualization) {
|
|
94
94
|
this.parent['isRowSelected'] = true;
|
|
95
95
|
}
|
|
96
|
-
|
|
96
|
+
if (args.data && !isNullOrUndefined(args.data['length'])) {
|
|
97
|
+
for (var i = 0; i < args.data['length']; i++) {
|
|
98
|
+
this.parent.ganttChartModule.updateScrollLeft(args.data[i].ganttProperties.left);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
this.parent.ganttChartModule.updateScrollLeft(getValue('data.ganttProperties.left', args));
|
|
103
|
+
}
|
|
97
104
|
}
|
|
98
105
|
args.target = this.actualTarget;
|
|
99
106
|
if (!isNullOrUndefined(args.foreignKeyData) && Object.keys(args.foreignKeyData).length === 0) {
|
|
@@ -733,7 +733,12 @@ var TaskbarEdit = /** @class */ (function (_super) {
|
|
|
733
733
|
event.preventDefault();
|
|
734
734
|
if (!isNullOrUndefined(this.taskbarElement) && !isNullOrUndefined(this.editElement) && (this.taskBarEditAction !== "ConnectorPointRightDrag" && this.taskBarEditAction !== "ConnectorPointLeftDrag") && !(this.parent.viewType === 'ResourceView' && this.currentData.hasChildRecords)) {
|
|
735
735
|
var currentElement = this.editElement.parentElement;
|
|
736
|
-
|
|
736
|
+
if (this.parent.enableTimelineVirtualization && this.parent.timelineModule.wholeTimelineWidth > this.parent.element.offsetWidth * 3) {
|
|
737
|
+
currentElement.style.setProperty("position", "relative");
|
|
738
|
+
}
|
|
739
|
+
else {
|
|
740
|
+
currentElement.style.setProperty("position", "absolute");
|
|
741
|
+
}
|
|
737
742
|
if ((this.taskBarEditAction === 'ChildDrag' || this.taskBarEditAction === 'LeftResizing') && !isNullOrUndefined(this.currentIndex) && !isNullOrUndefined(this.currentIndex) ? Number(this.currentIndex) === 0 : false) {
|
|
738
743
|
this.taskbarElement.childNodes[0].childNodes[0].style.setProperty("top", currentElement.parentElement.offsetTop + "px");
|
|
739
744
|
if (this.parent.allowTaskbarDragAndDrop && this.taskBarEditAction !== 'LeftResizing' && this.taskBarEditAction !== 'RightResizing' && this.taskBarEditAction !== 'ProgressResizing') {
|
|
@@ -752,8 +757,14 @@ var TaskbarEdit = /** @class */ (function (_super) {
|
|
|
752
757
|
}
|
|
753
758
|
}
|
|
754
759
|
if (this.taskBarEditAction !== 'ProgressResizing') {
|
|
755
|
-
|
|
756
|
-
|
|
760
|
+
if (this.parent.enableTimelineVirtualization && this.parent.timelineModule.wholeTimelineWidth > this.parent.element.offsetWidth * 3) {
|
|
761
|
+
var rootElement = this.parent.ganttChartModule.chartBodyContainer.querySelectorAll(".e-chart-scroll-container");
|
|
762
|
+
rootElement[0].appendChild(this.taskbarResizer);
|
|
763
|
+
}
|
|
764
|
+
else {
|
|
765
|
+
var rootElement = this.parent.ganttChartModule.chartBodyContainer.querySelectorAll(".e-chart-rows-container");
|
|
766
|
+
rootElement[0].appendChild(this.taskbarResizer);
|
|
767
|
+
}
|
|
757
768
|
}
|
|
758
769
|
}
|
|
759
770
|
if (this.parent.allowTaskbarDragAndDrop && (this.taskBarEditAction === "ChildDrag" || this.taskBarEditAction === "ParentDrag" ||
|
|
@@ -1880,7 +1891,12 @@ var TaskbarEdit = /** @class */ (function (_super) {
|
|
|
1880
1891
|
currentElement.style.position = null;
|
|
1881
1892
|
}
|
|
1882
1893
|
else {
|
|
1883
|
-
|
|
1894
|
+
if (this.parent.enableTimelineVirtualization && this.parent.timelineModule.wholeTimelineWidth > this.parent.element.offsetWidth * 3) {
|
|
1895
|
+
currentElement.style.setProperty("position", "relative");
|
|
1896
|
+
}
|
|
1897
|
+
else {
|
|
1898
|
+
currentElement.style.setProperty("position", "absolute");
|
|
1899
|
+
}
|
|
1884
1900
|
}
|
|
1885
1901
|
}
|
|
1886
1902
|
var item = this.taskBarEditRecord.ganttProperties;
|
|
@@ -1075,9 +1075,16 @@ var DateProcessor = /** @class */ (function () {
|
|
|
1075
1075
|
DateProcessor.prototype.convert = function (date, timezone) {
|
|
1076
1076
|
var fromOffset = date.getTimezoneOffset();
|
|
1077
1077
|
var toOffset = this.offset(date, timezone);
|
|
1078
|
-
|
|
1079
|
-
|
|
1080
|
-
|
|
1078
|
+
if (fromOffset < 0) {
|
|
1079
|
+
date = new Date(date.getTime() - (fromOffset - toOffset) / 60000);
|
|
1080
|
+
var toLocalOffset = date.getTimezoneOffset();
|
|
1081
|
+
return new Date(date.getTime() - (toLocalOffset - fromOffset) / 60000);
|
|
1082
|
+
}
|
|
1083
|
+
else {
|
|
1084
|
+
date = new Date(date.getTime() + (fromOffset - toOffset) * 60000);
|
|
1085
|
+
var toLocalOffset = date.getTimezoneOffset();
|
|
1086
|
+
return new Date(date.getTime() + (toLocalOffset - fromOffset) * 60000);
|
|
1087
|
+
}
|
|
1081
1088
|
};
|
|
1082
1089
|
/**
|
|
1083
1090
|
* @param {string | Date} date .
|
package/src/gantt/base/gantt.js
CHANGED
|
@@ -1540,7 +1540,7 @@ var Gantt = /** @class */ (function (_super) {
|
|
|
1540
1540
|
this.treeGridModule.treeGridColumns = [];
|
|
1541
1541
|
this.treeGridModule.validateGanttColumns();
|
|
1542
1542
|
this.treeGrid.columns = this.treeGridModule.treeGridColumns;
|
|
1543
|
-
this.treeGrid.
|
|
1543
|
+
this.treeGrid.refreshColumns();
|
|
1544
1544
|
this.chartRowsModule.initiateTemplates();
|
|
1545
1545
|
this.timelineModule.updateChartByNewTimeline();
|
|
1546
1546
|
break;
|
|
@@ -2587,6 +2587,19 @@ var Gantt = /** @class */ (function (_super) {
|
|
|
2587
2587
|
var tempSplitterSettings = {};
|
|
2588
2588
|
tempSplitterSettings[type] = value;
|
|
2589
2589
|
var splitterPosition = this.splitterModule.calculateSplitterPosition(tempSplitterSettings);
|
|
2590
|
+
switch (type) {
|
|
2591
|
+
case 'view':
|
|
2592
|
+
this.splitterSettings.view = tempSplitterSettings[type];
|
|
2593
|
+
break;
|
|
2594
|
+
case 'columnIndex':
|
|
2595
|
+
this.splitterSettings.columnIndex = tempSplitterSettings[type];
|
|
2596
|
+
break;
|
|
2597
|
+
case 'position':
|
|
2598
|
+
this.splitterSettings.position = tempSplitterSettings[type];
|
|
2599
|
+
break;
|
|
2600
|
+
default:
|
|
2601
|
+
break;
|
|
2602
|
+
}
|
|
2590
2603
|
var pane1 = this.splitterModule.splitterObject.element.querySelectorAll('.e-pane')[0];
|
|
2591
2604
|
var pane2 = this.splitterModule.splitterObject.element.querySelectorAll('.e-pane')[1];
|
|
2592
2605
|
this.splitterModule.splitterPreviousPositionGrid = pane1.scrollWidth + 1 + 'px';
|
|
@@ -687,12 +687,14 @@ var TaskProcessor = /** @class */ (function (_super) {
|
|
|
687
687
|
work = parseFloat(work.toFixed(2));
|
|
688
688
|
}
|
|
689
689
|
}
|
|
690
|
-
if (ganttData.childRecords
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
690
|
+
if (ganttData.childRecords) {
|
|
691
|
+
if (ganttData.childRecords.length > 0 && this.parent.isOnEdit) {
|
|
692
|
+
var childCompletedWorks = 0;
|
|
693
|
+
for (var i = 0; i < ganttData.childRecords.length; i++) {
|
|
694
|
+
childCompletedWorks += ganttData.childRecords[i].ganttProperties.work;
|
|
695
|
+
}
|
|
696
|
+
work += childCompletedWorks;
|
|
694
697
|
}
|
|
695
|
-
work += childCompletedWorks;
|
|
696
698
|
}
|
|
697
699
|
this.parent.setRecordValue('work', work, ganttData.ganttProperties, true);
|
|
698
700
|
if (!isNullOrUndefined(this.parent.taskFields.work)) {
|
|
@@ -908,7 +910,7 @@ var TaskProcessor = /** @class */ (function (_super) {
|
|
|
908
910
|
this.parent.setRecordValue('work', work, ganttProperties, true);
|
|
909
911
|
switch (tType) {
|
|
910
912
|
case 'FixedDuration':
|
|
911
|
-
this.
|
|
913
|
+
this.updateWorkWithDuration(ganttData);
|
|
912
914
|
break;
|
|
913
915
|
case 'FixedWork':
|
|
914
916
|
this.updateUnitWithWork(ganttData);
|
|
@@ -1264,7 +1266,12 @@ var TaskProcessor = /** @class */ (function (_super) {
|
|
|
1264
1266
|
return ((this.getTimeDifference(sDate, eDate, true) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth);
|
|
1265
1267
|
}
|
|
1266
1268
|
else {
|
|
1267
|
-
|
|
1269
|
+
if (ganttData.durationUnit === "day" && ganttData.duration < 1 && isNullOrUndefined(this.parent.taskFields.duration)) {
|
|
1270
|
+
return (ganttData.duration * this.parent.perDayWidth);
|
|
1271
|
+
}
|
|
1272
|
+
else {
|
|
1273
|
+
return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * hour)) * this.parent.perDayWidth);
|
|
1274
|
+
}
|
|
1268
1275
|
}
|
|
1269
1276
|
}
|
|
1270
1277
|
}
|
|
@@ -1275,6 +1282,7 @@ var TaskProcessor = /** @class */ (function (_super) {
|
|
|
1275
1282
|
}
|
|
1276
1283
|
if (this.getSecondsInDecimal(eDate) === this.parent.defaultEndTime) {
|
|
1277
1284
|
eDate.setHours(24);
|
|
1285
|
+
eDate.setHours(0, 0, 0, 0);
|
|
1278
1286
|
}
|
|
1279
1287
|
if (this.getSecondsInDecimal(eDate) === this.parent.defaultStartTime) {
|
|
1280
1288
|
eDate.setHours(0, 0, 0, 0);
|
|
@@ -1317,14 +1325,18 @@ var TaskProcessor = /** @class */ (function (_super) {
|
|
|
1317
1325
|
this.parent.ganttChartModule.scrollObject['isSetScrollLeft'])) && !isFromTimelineVirtulization) {
|
|
1318
1326
|
isValid = false;
|
|
1319
1327
|
}
|
|
1320
|
-
if (this.parent.enableTimelineVirtualization && isValid && !this.parent.timelineModule['performedTimeSpanAction']) {
|
|
1328
|
+
if (!this.parent.editModule && this.parent.enableTimelineVirtualization && isValid && !this.parent.timelineModule['performedTimeSpanAction']) {
|
|
1321
1329
|
leftValueForStartDate = (this.parent.enableTimelineVirtualization && this.parent.ganttChartModule.scrollObject.element.scrollLeft != 0)
|
|
1322
1330
|
? this.parent.ganttChartModule.scrollObject.getTimelineLeft() : null;
|
|
1323
1331
|
}
|
|
1324
|
-
var timelineStartDate = (this.parent.enableTimelineVirtualization && !isNullOrUndefined(leftValueForStartDate))
|
|
1332
|
+
var timelineStartDate = (!this.parent.editModule && this.parent.enableTimelineVirtualization && !isNullOrUndefined(leftValueForStartDate))
|
|
1325
1333
|
? new Date((this.parent.timelineModule['dateByLeftValue'](leftValueForStartDate)).toString()) : new Date(this.parent.timelineModule.timelineStartDate);
|
|
1326
1334
|
if (timelineStartDate) {
|
|
1327
|
-
|
|
1335
|
+
var leftValue = (date.getTime() - timelineStartDate.getTime()) / (1000 * 60 * 60 * 24) * this.parent.perDayWidth;
|
|
1336
|
+
if (this.parent.isInDst(timelineStartDate) && !this.parent.isInDst(startDate) && (this.parent.timelineModule.topTier == 'Hour' || this.parent.timelineModule.bottomTier == 'Hour')) {
|
|
1337
|
+
leftValue = leftValue - this.parent.timelineSettings.timelineUnitSize;
|
|
1338
|
+
}
|
|
1339
|
+
return leftValue;
|
|
1328
1340
|
}
|
|
1329
1341
|
else {
|
|
1330
1342
|
return 0;
|
|
@@ -424,7 +424,7 @@ var GanttTreeGrid = /** @class */ (function () {
|
|
|
424
424
|
this.currentEditRow = {};
|
|
425
425
|
}
|
|
426
426
|
}
|
|
427
|
-
if (getValue('requestType', args) === '
|
|
427
|
+
if (getValue('requestType', args) === 'filterAfterOpen') {
|
|
428
428
|
this.parent.notify('actionComplete', args);
|
|
429
429
|
}
|
|
430
430
|
if (getValue('requestType', args) === 'searching') {
|
|
@@ -114,10 +114,8 @@ var Timeline = /** @class */ (function () {
|
|
|
114
114
|
this.parent.dateValidationModule.calculateProjectDates();
|
|
115
115
|
}
|
|
116
116
|
if (!isNullOrUndefined(this.parent.zoomingProjectStartDate)) {
|
|
117
|
-
this.parent.cloneProjectStartDate = this.parent.
|
|
118
|
-
|
|
119
|
-
this.parent.cloneProjectEndDate = this.parent.cloneProjectEndDate.getTime() > this.parent.zoomingProjectEndDate.getTime()
|
|
120
|
-
? this.parent.cloneProjectEndDate : this.parent.zoomingProjectEndDate;
|
|
117
|
+
this.parent.cloneProjectStartDate = this.parent.zoomingProjectStartDate;
|
|
118
|
+
this.parent.cloneProjectEndDate = this.parent.zoomingProjectEndDate;
|
|
121
119
|
}
|
|
122
120
|
this.parent.zoomingProjectStartDate = null;
|
|
123
121
|
this.parent.zoomingProjectEndDate = null;
|
package/styles/bootstrap.css
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
.e-richtexteditor .e-rte-toolbar.e-extended-toolbar .e-toolbar-items .e-toolbar-item .e-rte-dropdown-btn.e-active.e-tbar-btn {
|
|
2
2
|
background: #e6e6e6;
|
|
3
|
-
border:
|
|
4
|
-
padding-left:
|
|
5
|
-
padding-right:
|
|
3
|
+
border: 0;
|
|
4
|
+
padding-left: 9px;
|
|
5
|
+
padding-right: 3.5px;
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
.e-bigger .e-richtexteditor .e-rte-toolbar.e-extended-toolbar .e-toolbar-items .e-toolbar-item .e-tbar-btn.e-btn.e-control.e-dropdown-btn.e-rte-dropdown-btn.e-active {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
.e-richtexteditor .e-rte-toolbar.e-extended-toolbar .e-toolbar-items .e-toolbar-item .e-rte-dropdown-btn.e-active.e-tbar-btn {
|
|
2
2
|
background: #e6e6e6;
|
|
3
|
-
border:
|
|
4
|
-
padding-left:
|
|
5
|
-
padding-right:
|
|
3
|
+
border: 0;
|
|
4
|
+
padding-left: 9px;
|
|
5
|
+
padding-right: 3.5px;
|
|
6
6
|
}
|
|
7
7
|
|
|
8
8
|
.e-bigger .e-richtexteditor .e-rte-toolbar.e-extended-toolbar .e-toolbar-items .e-toolbar-item .e-tbar-btn.e-btn.e-control.e-dropdown-btn.e-rte-dropdown-btn.e-active {
|