@syncfusion/ej2-gantt 20.4.54 → 21.1.35

package/src/gantt/base/interface.d.ts

@@ -146,6 +146,8 @@ export interface ITaskData {
     workTimelineRanges?: IWorkTimelineRanges[];
     /** Defines overlap index. */
     eOverlapIndex?: number;
+    /** Defines whether overlapped with other taskbar or not. */
+    eOverlapped?: boolean;
     /** Defines task segments. */
     segments?: ITaskSegment[];
     /**

package/src/gantt/base/task-processor.js

@@ -172,7 +172,7 @@ var TaskProcessor = /** @class */ (function (_super) {
     TaskProcessor.prototype.constructResourceViewDataSource = function (resources, data, unassignedTasks) {
         var _loop_1 = function (i) {
             var tempData = data[i];
-            child = this_1.parent.taskFields.child != null ? this_1.parent.taskFields.child : 'Children';
+            var child = this_1.parent.taskFields.child != null ? this_1.parent.taskFields.child : 'Children';
             var resourceData = tempData && tempData[this_1.parent.taskFields.resourceInfo];
             var resourceIdMapping = this_1.parent.resourceFields.id;
             if ((!tempData[child] || tempData[child].length === 0) && resourceData && resourceData.length) {
@@ -199,7 +199,7 @@ var TaskProcessor = /** @class */ (function (_super) {
                 this_1.constructResourceViewDataSource(resources, tempData[this_1.parent.taskFields.child], unassignedTasks);
             }
         };
-        var this_1 = this, child;
+        var this_1 = this;
         for (var i = 0; i < data.length; i++) {
             _loop_1(i);
         }
@@ -258,7 +258,7 @@ var TaskProcessor = /** @class */ (function (_super) {
                 }
             }
             var ganttData = this_3.createRecord(tempData, level, parentItem, true);
-            if (!this_3.parent.enableValidation) {
+            if (!this_3.parent.enableValidation || !this_3.parent.autoCalculateDateScheduling) {
                 this_3.updateTaskLeftWidth(ganttData);
             }
             ganttData.index = this_3.recordIndex++;
@@ -292,6 +292,9 @@ var TaskProcessor = /** @class */ (function (_super) {
                     this_3.parent.setRecordValue('autoDuration', this_3.calculateAutoDuration(parentProp), parentProp, true);
                     this_3.updateAutoWidthLeft(parentData);
                 }
+                if (!this_3.parent.allowParentDependency) {
+                    this_3.resetDependency(parentData);
+                }
                 this_3.updateWidthLeft(parentData);
                 this_3.updateTaskData(parentData);
             }
@@ -408,6 +411,9 @@ var TaskProcessor = /** @class */ (function (_super) {
         if (!isNullOrUndefined(data[taskSettings.child]) && data[taskSettings.child].length > 0) {
             this.parent.setRecordValue('hasChildRecords', true, ganttData);
             this.parent.setRecordValue('isMilestone', false, ganttProperties, true);
+            if (!this.parent.allowParentDependency) {
+                this.resetDependency(ganttData);
+            }
         }
         else {
             this.parent.setRecordValue('hasChildRecords', false, ganttData);
@@ -808,6 +814,16 @@ var TaskProcessor = /** @class */ (function (_super) {
                 }
             }
         }
+        if (!this.parent.autoCalculateDateScheduling) {
+            if (!isNullOrUndefined(ganttData.ganttProperties.startDate)) {
+                ganttData[this.parent.taskFields.startDate] = ganttData.ganttProperties.startDate;
+                ganttData.taskData[this.parent.taskFields.startDate] = ganttData.ganttProperties.startDate;
+            }
+            if (!isNullOrUndefined(ganttData.ganttProperties.endDate)) {
+                ganttData[this.parent.taskFields.endDate] = ganttData.ganttProperties.endDate;
+                ganttData.taskData[this.parent.taskFields.endDate] = ganttData.ganttProperties.endDate;
+            }
+        }
         if (!isNullOrUndefined(segments)) {
             this.parent.setRecordValue('segments', this.setSegmentsInfo(ganttData, true), ganttProperties, true);
         }
@@ -1802,7 +1818,7 @@ var TaskProcessor = /** @class */ (function (_super) {
                 var rangeObj_1 = {};
                 if (this._isInStartDateRange(cStartDate, tStartDate, tEndDate) || this._isInEndDateRange(cEndDate, tStartDate, tEndDate)) {
                     if ((tStartDate.getTime() > cStartDate.getTime() && tStartDate.getTime() < cEndDate.getTime()
-                        && tEndDate.getTime() > cStartDate.getTime() && tEndDate.getTime() > cEndDate.getTime())
+                        && tEndDate.getTime() > cStartDate.getTime() && tEndDate.getTime() >= cEndDate.getTime())
                         || (cStartDate.getTime() === tStartDate.getTime() && cEndDate.getTime() <= tEndDate.getTime())) {
                         rangeObj_1.from = tStartDate;
                         rangeObj_1.to = cEndDate;
@@ -2083,7 +2099,7 @@ var TaskProcessor = /** @class */ (function (_super) {
      */
     TaskProcessor.prototype.updateTaskLeftWidth = function (data) {
         var task = data.ganttProperties;
-        if (!data.hasChildRecords) {
+        if (!data.hasChildRecords || !this.parent.autoCalculateDateScheduling) {
             this.updateWidthLeft(data);
         }
         this.parent.setRecordValue('baselineLeft', this.calculateBaselineLeft(task), task, true);
@@ -2095,7 +2111,12 @@ var TaskProcessor = /** @class */ (function (_super) {
             childData = parentItem.childRecords;
         }
         if (parentItem && childData.indexOf(data) === childData.length - 1 && !data.hasChildRecords && this.parent.enableValidation) {
-            this.updateParentItems(parentItem);
+            if (this.parent.autoCalculateDateScheduling || this.parent.viewType === "ResourceView") {
+                this.updateParentItems(parentItem);
+            }
+            if (!this.parent.autoCalculateDateScheduling) {
+                this.updateWidthLeft(parentItem);
+            }
         }
         else if (parentItem && !this.parent.enableValidation) {
             this.updateWidthLeft(parentItem);
@@ -2238,105 +2259,119 @@ var TaskProcessor = /** @class */ (function (_super) {
         var parentData = isParent ? cloneParent : this.parent.getParentTask(cloneParent);
         var deleteUpdate = false;
         var ganttProp = parentData.ganttProperties;
-        if (parentData.childRecords.length > 0) {
-            var previousStartDate = ganttProp.isAutoSchedule ? ganttProp.startDate : ganttProp.autoStartDate;
-            var previousEndDate = ganttProp.isAutoSchedule ? ganttProp.endDate :
-                ganttProp.autoEndDate;
-            var childRecords = parentData.childRecords;
-            var childLength = childRecords.length;
-            var totalDuration = 0;
-            var progressValues = {};
-            var minStartDate = null;
-            var maxEndDate = null;
-            var milestoneCount = 0;
-            var totalProgress = 0;
-            var childCompletedWorks = 0;
-            var childData = void 0;
-            for (var count = 0; count < childLength; count++) {
-                childData = childRecords[count];
-                if (this.parent.isOnDelete && childData.isDelete) {
-                    if (childLength === 1 && this.parent.viewType === 'ProjectView') {
-                        deleteUpdate = true;
+        if (this.parent.autoCalculateDateScheduling || this.parent.viewType === "ResourceView") {
+            if (parentData.childRecords.length > 0) {
+                var previousStartDate = ganttProp.isAutoSchedule ? ganttProp.startDate : ganttProp.autoStartDate;
+                var previousEndDate = ganttProp.isAutoSchedule ? ganttProp.endDate :
+                    ganttProp.autoEndDate;
+                var childRecords = parentData.childRecords;
+                var childLength = childRecords.length;
+                var totalDuration = 0;
+                var progressValues = {};
+                var minStartDate = null;
+                var maxEndDate = null;
+                var milestoneCount = 0;
+                var totalProgress = 0;
+                var childCompletedWorks = 0;
+                var childData = void 0;
+                for (var count = 0; count < childLength; count++) {
+                    childData = childRecords[count];
+                    if (this.parent.isOnDelete && childData.isDelete) {
+                        if (childLength === 1 && this.parent.viewType === 'ProjectView') {
+                            deleteUpdate = true;
+                        }
+                        continue;
                     }
-                    continue;
-                }
-                var startDate = this.getValidStartDate(childData.ganttProperties);
-                if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoStartDate)) {
-                    startDate = childData.ganttProperties.autoStartDate;
-                }
-                var endDate = this.getValidEndDate(childData.ganttProperties);
-                if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoEndDate)) {
-                    endDate = childData.ganttProperties.autoEndDate;
-                }
-                if (isNullOrUndefined(minStartDate)) {
-                    minStartDate = this.getDateFromFormat(startDate);
-                }
-                if (isNullOrUndefined(maxEndDate)) {
-                    maxEndDate = this.getDateFromFormat(endDate);
-                }
-                if (!isNullOrUndefined(endDate) && this.compareDates(endDate, maxEndDate) === 1) {
-                    maxEndDate = this.getDateFromFormat(endDate);
-                }
-                if (!isNullOrUndefined(startDate) && this.compareDates(startDate, minStartDate) === -1) {
-                    minStartDate = this.getDateFromFormat(startDate);
-                }
-                if (!childData.ganttProperties.isMilestone && isScheduledTask(childData.ganttProperties)) {
-                    progressValues = this.getParentProgress(childData);
-                    totalProgress += getValue('totalProgress', progressValues);
-                    if (childData[this.parent.taskFields.duration] < 1) {
-                        totalDuration += getValue('totalDuration', progressValues);
-                        totalDuration = Number(totalDuration.toFixed(4));
+                    var startDate = this.getValidStartDate(childData.ganttProperties);
+                    if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoStartDate)) {
+                        startDate = childData.ganttProperties.autoStartDate;
+                    }
+                    var endDate = this.getValidEndDate(childData.ganttProperties);
+                    if (parentData.hasChildRecords && !ganttProp.isAutoSchedule && !isNullOrUndefined(childData.ganttProperties.autoEndDate)) {
+                        endDate = childData.ganttProperties.autoEndDate;
+                    }
+                    if (isNullOrUndefined(minStartDate)) {
+                        minStartDate = this.getDateFromFormat(startDate);
+                    }
+                    if (isNullOrUndefined(maxEndDate)) {
+                        maxEndDate = this.getDateFromFormat(endDate);
+                    }
+                    if (!isNullOrUndefined(endDate) && this.compareDates(endDate, maxEndDate) === 1) {
+                        maxEndDate = this.getDateFromFormat(endDate);
+                    }
+                    if (!isNullOrUndefined(startDate) && this.compareDates(startDate, minStartDate) === -1) {
+                        minStartDate = this.getDateFromFormat(startDate);
+                    }
+                    if (!childData.ganttProperties.isMilestone && isScheduledTask(childData.ganttProperties)) {
+                        progressValues = this.getParentProgress(childData);
+                        totalProgress += getValue('totalProgress', progressValues);
+                        if (childData[this.parent.taskFields.duration] < 1) {
+                            totalDuration += getValue('totalDuration', progressValues);
+                            totalDuration = Number(totalDuration.toFixed(4));
+                        }
+                        else {
+                            totalDuration += getValue('totalDuration', progressValues);
+                        }
                     }
                     else {
-                        totalDuration += getValue('totalDuration', progressValues);
+                        milestoneCount++;
                     }
+                    childCompletedWorks += childData.ganttProperties.work;
                 }
-                else {
-                    milestoneCount++;
-                }
-                childCompletedWorks += childData.ganttProperties.work;
-            }
-            if (!deleteUpdate) {
-                if (this.compareDates(previousStartDate, minStartDate) !== 0) {
-                    this.parent.setRecordValue(ganttProp.isAutoSchedule ? 'startDate' : 'autoStartDate', minStartDate, parentData.ganttProperties, true);
-                }
-                if (this.compareDates(previousEndDate, maxEndDate) !== 0) {
-                    this.parent.setRecordValue(ganttProp.isAutoSchedule ? 'endDate' : 'autoEndDate', maxEndDate, parentData.ganttProperties, true);
-                }
-                var taskCount = void 0;
-                if (this.parent.isOnDelete && childData.isDelete) {
-                    taskCount = childLength - milestoneCount - 1;
-                }
-                else {
-                    taskCount = childLength - milestoneCount;
-                }
-                var parentProgress = (taskCount > 0 && totalDuration > 0) ? (totalProgress / totalDuration) : 0;
-                var parentProp = parentData.ganttProperties;
-                var milestone = (taskCount === 0) && minStartDate && maxEndDate &&
-                    minStartDate.getTime() === maxEndDate.getTime() ? true : false;
-                this.parent.setRecordValue('isMilestone', milestone, parentProp, true);
-                if (parentProp.isAutoSchedule) {
-                    this.calculateDuration(parentData);
-                }
-                this.updateWorkWithDuration(parentData);
-                var parentWork = parentProp.work;
-                parentWork = this.parent.isOnEdit ? parentWork : (parentWork + childCompletedWorks);
-                this.parent.setRecordValue('work', parentWork, parentProp, true);
-                this.parent.setRecordValue('taskType', 'FixedDuration', parentProp, true);
-                if (!isNullOrUndefined(this.parent.taskFields.type)) {
-                    this.updateMappingData(parentData, 'type');
-                }
-                this.parent.setRecordValue('progress', Math.floor(parentProgress), parentProp, true);
-                this.parent.setRecordValue('totalProgress', totalProgress, parentProp, true);
-                this.parent.setRecordValue('totalDuration', totalDuration, parentProp, true);
-                if (!parentProp.isAutoSchedule) {
-                    this.parent.setRecordValue('autoDuration', this.calculateAutoDuration(parentProp), parentProp, true);
-                    this.updateAutoWidthLeft(parentData);
+                if (!deleteUpdate) {
+                    var taskCount = void 0;
+                    if (this.parent.isOnDelete && childData.isDelete) {
+                        taskCount = childLength - milestoneCount - 1;
+                    }
+                    else {
+                        taskCount = childLength - milestoneCount;
+                    }
+                    var parentProgress = (taskCount > 0 && totalDuration > 0) ? (totalProgress / totalDuration) : 0;
+                    var parentProp = parentData.ganttProperties;
+                    var milestone = (taskCount === 0) && minStartDate && maxEndDate &&
+                        minStartDate.getTime() === maxEndDate.getTime() ? true : false;
+                    if (this.compareDates(previousStartDate, minStartDate) !== 0) {
+                        this.parent.setRecordValue(ganttProp.isAutoSchedule ? 'startDate' : 'autoStartDate', minStartDate, parentData.ganttProperties, true);
+                        if ((((!isNullOrUndefined(ganttProp.autoDuration)) ? ganttProp.autoDuration === 0 : ganttProp.duration === 0)) && parentData['isManual'] && milestone) {
+                            this.parent.setRecordValue('startDate', minStartDate, parentData.ganttProperties, true);
+                        }
+                    }
+                    if (this.compareDates(previousEndDate, maxEndDate) !== 0) {
+                        this.parent.setRecordValue(ganttProp.isAutoSchedule ? 'endDate' : 'autoEndDate', maxEndDate, parentData.ganttProperties, true);
+                        if ((((!isNullOrUndefined(ganttProp.autoDuration)) ? ganttProp.autoDuration === 0 : ganttProp.duration === 0)) && parentData['isManual'] && milestone) {
+                            this.parent.setRecordValue('endDate', maxEndDate, parentData.ganttProperties, true);
+                        }
+                    }
+                    this.parent.setRecordValue('isMilestone', milestone, parentProp, true);
+                    if (parentProp.isAutoSchedule) {
+                        this.calculateDuration(parentData);
+                    }
+                    this.updateWorkWithDuration(parentData);
+                    var parentWork = parentProp.work;
+                    parentWork = this.parent.isOnEdit ? parentWork : (parentWork + childCompletedWorks);
+                    this.parent.setRecordValue('work', parentWork, parentProp, true);
+                    this.parent.setRecordValue('taskType', 'FixedDuration', parentProp, true);
+                    if (!isNullOrUndefined(this.parent.taskFields.type)) {
+                        this.updateMappingData(parentData, 'type');
+                    }
+                    this.parent.setRecordValue('progress', Math.floor(parentProgress), parentProp, true);
+                    this.parent.setRecordValue('totalProgress', totalProgress, parentProp, true);
+                    this.parent.setRecordValue('totalDuration', totalDuration, parentProp, true);
+                    if (!parentProp.isAutoSchedule) {
+                        this.parent.setRecordValue('autoDuration', this.calculateAutoDuration(parentProp), parentProp, true);
+                        this.updateAutoWidthLeft(parentData);
+                    }
+                    if (!this.parent.allowParentDependency) {
+                        this.resetDependency(parentData);
+                    }
+                    this.updateWidthLeft(parentData);
+                    this.updateTaskData(parentData);
                 }
-                this.updateWidthLeft(parentData);
-                this.updateTaskData(parentData);
             }
         }
+        else {
+            parentData.ganttProperties.endDate = parentData.taskData[this.parent.taskFields.endDate];
+        }
         if (deleteUpdate && parentData.childRecords.length === 1 && parentData.ganttProperties.duration === 0) {
             this.parent.setRecordValue('isMilestone', true, parentData.ganttProperties, true);
             this.updateWidthLeft(parentData);
@@ -2344,7 +2379,9 @@ var TaskProcessor = /** @class */ (function (_super) {
         }
         var parentItem = this.parent.getParentTask(parentData.parentItem);
         if (parentItem) {
-            this.updateParentItems(parentItem);
+            if (this.parent.autoCalculateDateScheduling || this.parent.viewType === "ResourceView") {
+                this.updateParentItems(parentItem);
+            }
         }
         deleteUpdate = false;
     };

package/src/gantt/base/tree-grid.js

@@ -1,5 +1,5 @@
 import { TreeGrid } from '@syncfusion/ej2-treegrid';
-import { createElement, isNullOrUndefined, getValue, extend, EventHandler, deleteObject } from '@syncfusion/ej2-base';
+import { createElement, isNullOrUndefined, getValue, extend, EventHandler, deleteObject, remove } from '@syncfusion/ej2-base';
 import { setValue } from '@syncfusion/ej2-base';
 import { Deferred, Query } from '@syncfusion/ej2-data';
 import { Column as GanttColumn } from '../models/column';
@@ -26,6 +26,15 @@ var GanttTreeGrid = /** @class */ (function () {
         this.columnMenuOpen = function (args) {
             _this.parent.notify('columnMenuOpen', args);
             _this.parent.trigger('columnMenuOpen', args);
+            document.querySelector(".e-colmenu").addEventListener('mousemove', function (event) {
+                var filPopOptions = document.querySelector(".e-filter-popup");
+                var filOptions = document.querySelector(".e-filter-item");
+                if (!isNullOrUndefined(filPopOptions)) {
+                    if (!filOptions.classList.contains('e-focused')) {
+                        remove(_this.parent.filterModule.filterMenuElement);
+                    }
+                }
+            });
         };
         this.columnMenuClick = function (args) {
             _this.parent.trigger('columnMenuClick', args);
@@ -57,6 +66,7 @@ var GanttTreeGrid = /** @class */ (function () {
         this.parent.treeGrid = new TreeGrid();
         this.parent.treeGrid.allowSelection = false;
         this.parent.treeGrid.allowKeyboard = this.parent.allowKeyboard;
+        this.parent.treeGrid['${enableHtmlSanitizer}'] = this.parent.enableHtmlSanitizer;
         this.parent.treeGrid.enableImmutableMode = this.parent.enableImmutableMode;
         this.treeGridColumns = [];
         if (!this.parent.isLocaleChanged && this.parent.isLoad) {
@@ -247,6 +257,12 @@ var GanttTreeGrid = /** @class */ (function () {
         if (!this.parent.ganttChartModule.isExpandCollapseFromChart && !this.parent.isExpandCollapseLevelMethod) {
             var collapsedArgs = this.createExpandCollapseArgs(args);
             this.parent.ganttChartModule.collapsedGanttRow(collapsedArgs);
+            if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && collapsedArgs['gridRow']) {
+                collapsedArgs['gridRow'].style.height = collapsedArgs['chartRow'].style.height;
+                this.parent.contentHeight = this.parent.enableRtl ? this.parent['element'].getElementsByClassName('e-content')[2].children[0]['offsetHeight'] :
+                    this.parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
+                document.getElementsByClassName('e-chart-rows-container')[0]['style'].height = this.parent.contentHeight + 'px';
+            }
         }
         if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
             this.parent.hideMaskRow();
@@ -260,6 +276,12 @@ var GanttTreeGrid = /** @class */ (function () {
             if (!args['data'].length) {
                 var expandedArgs = this.createExpandCollapseArgs(args);
                 this.parent.ganttChartModule.expandedGanttRow(expandedArgs);
+                if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && args['row']) {
+                    args['row'].style.height = this.parent.rowHeight + 'px';
+                    this.parent.contentHeight = this.parent.enableRtl ? this.parent['element'].getElementsByClassName('e-content')[2].children[0]['offsetHeight'] :
+                        this.parent['element'].getElementsByClassName('e-content')[0].children[0]['offsetHeight'];
+                    document.getElementsByClassName('e-chart-rows-container')[0]['style'].height = this.parent.contentHeight + 'px';
+                }
             }
         }
         if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
@@ -352,6 +374,14 @@ var GanttTreeGrid = /** @class */ (function () {
             this.parent.addDeleteRecord = false;
         }
         this.parent.trigger('actionComplete', updatedArgs);
+        if (this.parent.viewType === 'ResourceView' && !this.parent.allowTaskbarOverlap && this.parent.showOverAllocation) {
+            for (var i = 0; i < this.parent.currentViewData.length; i++) {
+                if (this.parent.currentViewData[i].hasChildRecords && !this.parent.currentViewData[i].expanded) {
+                    this.parent.chartRowsModule.updateDragDropRecords(this.parent.currentViewData[i]);
+                }
+            }
+            this.parent.ganttChartModule.renderRangeContainer(this.parent.currentViewData);
+        }
         if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
             this.parent.hideMaskRow();
         }

package/src/gantt/base/utils.js

@@ -139,7 +139,7 @@ export function updateDates(record, parent) {
 export function formatString(str, args) {
     var regx;
     for (var i = 0; i < args.length; i++) {
-        // eslint-disable-next-line detect-non-literal-regexp
+        // eslint-disable-next-line security/detect-non-literal-regexp
         regx = new RegExp('\\{' + (i) + '\\}', 'gm');
         str = str.replace(regx, args[i].toString());
     }

package/src/gantt/renderer/chart-rows.d.ts

@@ -268,6 +268,8 @@ export declare class ChartRows extends DateProcessor {
      * @private
      */
     templateCompiler(template: string): Function;
+    updateOverlapped(): void;
+    updateDragDropRecords(data: IGanttData, tr?: Node): void;
     /**
      * To refresh edited TR
      *