@syncfusion/ej2-gantt 23.2.4 → 23.2.7

package/dist/es6/ej2-gantt.es2015.js

@@ -270,7 +270,7 @@ class DateProcessor {
                     if (!this.parent.includeWeekend) {
                         const tempDate = new Date(cloneStartDate.getTime());
                         cloneStartDate = this.getNextWorkingDay(cloneStartDate);
-                        if (tempDate.getTime() !== cloneStartDate.getTime()) {
+                        if (tempDate.getTime() !== cloneStartDate.getTime() && !validateAsMilestone) {
                             this.setTime(startTime, cloneStartDate);
                         }
                     }
@@ -4789,7 +4789,7 @@ class GanttChart {
         if (this.parent.editSettings.allowTaskbarEditing && this.parent.element.querySelector('.e-left-resize-gripper')) {
             isTaskbarEdited = true;
         }
-        if (!isTaskbarEdited) {
+        if (!isTaskbarEdited || e.button == 2) {
             if (this.parent.editSettings.allowEditing && this.parent.treeGrid.element.getElementsByClassName('e-editedbatchcell').length > 0) {
                 this.parent.treeGrid.endEdit();
             }
@@ -6052,6 +6052,10 @@ class Timeline {
         if (!this.parent.isFromOnPropertyChange) {
             this.parent.updateProjectDates(this.parent.cloneProjectStartDate, this.parent.cloneProjectEndDate, this.parent.isTimelineRoundOff);
         }
+        const timelineContainer = this.parent.element.getElementsByClassName('e-timeline-header-container')[0]['offsetHeight'];
+        this.parent.element.getElementsByClassName('e-gridcontent')[0]['style'].height = 'calc(100% - ' + timelineContainer + 'px)';
+        // eslint-disable-next-line
+        this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0]['style'].height = 'calc(100% - ' + timelineContainer + 'px)';
     }
     /**
      * Function used to refresh Gantt rows.
@@ -6263,6 +6267,7 @@ class Timeline {
         }
         this.changeTimelineSettings(newTimeline);
         this.parent.isTimelineRoundOff = isNullOrUndefined(this.parent.projectStartDate) ? true : false;
+        this.isZoomToFit = false;
     }
     bottomTierCellWidthCalc(mode, zoomLevel, date) {
         let convertedMilliSeconds;
@@ -7410,10 +7415,9 @@ class Timeline {
                 const validEndLeft = this.parent.dataOperation.getTaskLeft(validEndDate, false);
                 let isChanged;
                 let taskbarModule = this.parent.editModule.taskbarEditModule;
-                if (!isNullOrUndefined(maxStartLeft) && ((minStartDate < this.timelineStartDate) ||
-                    (!isNullOrUndefined(taskbarModule)) && (!isNullOrUndefined(taskbarModule.taskBarEditAction)
-                        && taskbarModule.taskBarEditAction !== 'ProgressResizing' &&
-                        taskbarModule.taskBarEditAction !== 'RightResizing')) && (maxStartLeft < this.bottomTierCellWidth || maxStartLeft <= validStartLeft)) {
+                if (!isNullOrUndefined(maxStartLeft) && ((!isNullOrUndefined(taskbarModule)) && (!isNullOrUndefined(taskbarModule.taskBarEditAction)
+                    && taskbarModule.taskBarEditAction !== 'ProgressResizing' &&
+                    taskbarModule.taskBarEditAction !== 'RightResizing' && taskbarModule.taskBarEditAction !== 'LeftResizing')) && (maxStartLeft < this.bottomTierCellWidth || maxStartLeft <= validStartLeft)) {
                     isChanged = 'prevTimeSpan';
                     minStartDate = minStartDate > this.timelineStartDate ? this.timelineStartDate : minStartDate;
                 }
@@ -7675,7 +7679,9 @@ class GanttTreeGrid {
         this.parent.treeGrid.loadChildOnDemand = this.parent.loadChildOnDemand;
         this.parent.treeGrid['isFromGantt'] = true;
         this.parent.treeGrid.parentIdMapping = this.parent.taskFields.parentID;
-        this.parent.treeGrid.idMapping = this.parent.taskFields.id;
+        if (this.parent.taskFields.parentID) {
+            this.parent.treeGrid.idMapping = this.parent.taskFields.id;
+        }
         this.parent.treeGrid.showColumnMenu = this.parent.showColumnMenu;
         this.parent.treeGrid.enableCollapseAll = this.parent.collapseAllParentTasks;
         this.parent.treeGrid.columnMenuItems = this.parent.columnMenuItems;
@@ -7716,7 +7722,7 @@ class GanttTreeGrid {
             toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
         }
         this.parent.treeGrid.height =
-            this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0]['offsetHeight'] - 19;
+            this.parent.element.getElementsByClassName('e-chart-scroll-container e-content')[0]['offsetHeight'] - (this.parent.flatData.length == 0 ? 0 : 19);
     }
     getContentDiv() {
         return this.treeGridElement.querySelector('.e-content');
@@ -8223,7 +8229,7 @@ class GanttTreeGrid {
             else {
                 column.headerText = column.headerText ? column.headerText : this.parent.localeObj.getConstant('duration');
             }
-            column.valueAccessor = column.valueAccessor ? column.valueAccessor : !isNullOrUndefined(column.edit) ? null :
+            column.valueAccessor = column.valueAccessor ? column.valueAccessor : !isNullOrUndefined(column.edit) && !isNullOrUndefined(column.edit.read) ? null :
                 this.durationValueAccessor.bind(this);
             column.editType = column.editType ? column.editType : 'stringedit';
             column.type = column.type ? column.type : 'string';
@@ -8370,7 +8376,7 @@ class GanttTreeGrid {
      */
     composeIDColumn(column) {
         const isProjectView = this.parent.viewType === 'ProjectView';
-        const lengthDataSource = this.parent.dataSource['length'];
+        const lengthDataSource = this.parent.dataSource ? this.parent.dataSource['length'] : 0;
         let taskIDName;
         column.isPrimaryKey = isProjectView ? true : false;
         if (this.parent.isLocaleChanged) {
@@ -20153,7 +20159,7 @@ class TaskbarEdit extends DateProcessor {
         pStartDate.setTime(pStartDate.getTime() + (left * milliSecondsPerPixel));
         /* To render the milestone in proper date while editing */
         if (isMilestone && !isNullOrUndefined(property.predecessorsName) && property.predecessorsName !== '') {
-            pStartDate.setDate(pStartDate.getDate() - 1);
+            //   pStartDate.setDate(pStartDate.getDate()-1);
             this.parent.dateValidationModule.setTime(this.parent.defaultEndTime, pStartDate);
             pStartDate = this.parent.dateValidationModule.checkStartDate(pStartDate, property, true);
         }
@@ -20163,9 +20169,9 @@ class TaskbarEdit extends DateProcessor {
             if (this.parent.isInDst(new Date(this.parent.timelineModule.timelineStartDate.toString())) && !this.parent.isInDst(pStartDate)) {
                 pStartDate.setTime(pStartDate.getTime() + (60 * 60 * 1000));
             }
-            else if (!this.parent.isInDst(new Date(this.parent.timelineModule.timelineStartDate.toString())) && this.parent.isInDst(pStartDate)) {
-                pStartDate.setTime(pStartDate.getTime() - (60 * 60 * 1000));
-            }
+            // else if (!this.parent.isInDst(new Date(this.parent.timelineModule.timelineStartDate.toString())) && this.parent.isInDst(pStartDate)) {
+            //     pStartDate.setTime(pStartDate.getTime() - (60 * 60 * 1000));
+            // }
         }
         return pStartDate;
     }
@@ -26768,34 +26774,42 @@ class Edit$2 {
         const predecessorCollection = parentRecordTaskData.predecessor;
         let childRecord;
         let predecessorIndex;
+        let validPredecessor;
         const updatedPredecessor = [];
         for (let count = 0; count < len; count++) {
-            if (predecessorCollection[count].to === parentRecordTaskData.rowUniqueID.toString()) {
-                childRecord = this.parent.getRecordByID(predecessorCollection[count].from);
-                predecessorIndex = getIndex(predecessorCollection[count], 'from', childRecord.ganttProperties.predecessor, 'to');
-                // eslint-disable-next-line
-                let predecessorCollections = (extend([], childRecord.ganttProperties.predecessor, [], true));
-                predecessorCollections.splice(predecessorIndex, 1);
-                this.parent.setRecordValue('predecessor', predecessorCollections, childRecord.ganttProperties, true);
-            }
-            else if (predecessorCollection[count].from === parentRecordTaskData.rowUniqueID.toString()) {
-                childRecord = this.parent.getRecordByID(predecessorCollection[count].to);
-                const prdcList = (childRecord.ganttProperties.predecessorsName.toString()).split(',');
-                const str = predecessorCollection[count].from + predecessorCollection[count].type;
-                const ind = prdcList.indexOf(str);
-                prdcList.splice(ind, 1);
-                this.parent.setRecordValue('predecessorsName', prdcList.join(','), childRecord.ganttProperties, true);
-                this.parent.setRecordValue(this.parent.taskFields.dependency, prdcList.join(','), childRecord);
-                predecessorIndex = getIndex(predecessorCollection[count], 'from', childRecord.ganttProperties.predecessor, 'to');
-                // eslint-disable-next-line
-                const temppredecessorCollection = (extend([], childRecord.ganttProperties.predecessor, [], true));
-                temppredecessorCollection.splice(predecessorIndex, 1);
-                this.parent.setRecordValue('predecessor', temppredecessorCollection, childRecord.ganttProperties, true);
-                this.parent.predecessorModule.validatePredecessorDates(childRecord);
+            const fromRecord = this.parent.getRecordByID(predecessorCollection[count].from);
+            const toRecord = this.parent.getRecordByID(predecessorCollection[count].to);
+            validPredecessor = this.parent.connectorLineEditModule.validateParentPredecessor(fromRecord, toRecord);
+            if (!validPredecessor) {
+                if (predecessorCollection[count].to === parentRecordTaskData.rowUniqueID.toString()) {
+                    childRecord = this.parent.getRecordByID(predecessorCollection[count].from);
+                    predecessorIndex = getIndex(predecessorCollection[count], 'from', childRecord.ganttProperties.predecessor, 'to');
+                    // eslint-disable-next-line
+                    let predecessorCollections = (extend([], childRecord.ganttProperties.predecessor, [], true));
+                    predecessorCollections.splice(predecessorIndex, 1);
+                    this.parent.setRecordValue('predecessor', predecessorCollections, childRecord.ganttProperties, true);
+                }
+                else if (predecessorCollection[count].from === parentRecordTaskData.rowUniqueID.toString()) {
+                    childRecord = this.parent.getRecordByID(predecessorCollection[count].to);
+                    const prdcList = (childRecord.ganttProperties.predecessorsName.toString()).split(',');
+                    const str = predecessorCollection[count].from + predecessorCollection[count].type;
+                    const ind = prdcList.indexOf(str);
+                    prdcList.splice(ind, 1);
+                    this.parent.setRecordValue('predecessorsName', prdcList.join(','), childRecord.ganttProperties, true);
+                    this.parent.setRecordValue(this.parent.taskFields.dependency, prdcList.join(','), childRecord);
+                    predecessorIndex = getIndex(predecessorCollection[count], 'from', childRecord.ganttProperties.predecessor, 'to');
+                    // eslint-disable-next-line
+                    const temppredecessorCollection = (extend([], childRecord.ganttProperties.predecessor, [], true));
+                    temppredecessorCollection.splice(predecessorIndex, 1);
+                    this.parent.setRecordValue('predecessor', temppredecessorCollection, childRecord.ganttProperties, true);
+                    this.parent.predecessorModule.validatePredecessorDates(childRecord);
+                }
             }
         }
-        this.parent.setRecordValue('predecessor', updatedPredecessor, parentRecord.ganttProperties, true);
-        this.parent.setRecordValue('predecessorsName', '', parentRecord.ganttProperties, true);
+        if (!validPredecessor) {
+            this.parent.setRecordValue('predecessor', updatedPredecessor, parentRecord.ganttProperties, true);
+            this.parent.setRecordValue('predecessorsName', '', parentRecord.ganttProperties, true);
+        }
     }
     /**
      * @param {IPredecessor[]} predecessorCollection .
@@ -27756,11 +27770,19 @@ class Edit$2 {
             }
             if (this.dropPosition === 'middleSegment') {
                 if (droppedRec.ganttProperties.predecessor) {
-                    this.parent.editModule.removePredecessorOnDelete(droppedRec);
-                    droppedRec.ganttProperties.predecessor = null;
-                    droppedRec.ganttProperties.predecessorsName = null;
-                    droppedRec[this.parent.taskFields.dependency] = null;
-                    droppedRec.taskData[this.parent.taskFields.dependency] = null;
+                    const len = droppedRec.ganttProperties.predecessor.length;
+                    for (let count = 0; count < len; count++) {
+                        const fromRecord = this.parent.getRecordByID(droppedRec.ganttProperties.predecessor[count].from);
+                        const toRecord = this.parent.getRecordByID(droppedRec.ganttProperties.predecessor[count].to);
+                        const validPredecessor = this.parent.connectorLineEditModule.validateParentPredecessor(fromRecord, toRecord);
+                        if (droppedRec.ganttProperties.predecessor && !validPredecessor) {
+                            this.parent.editModule.removePredecessorOnDelete(droppedRec);
+                            droppedRec.ganttProperties.predecessor = null;
+                            droppedRec.ganttProperties.predecessorsName = null;
+                            droppedRec[this.parent.taskFields.dependency] = null;
+                            droppedRec.taskData[this.parent.taskFields.dependency] = null;
+                        }
+                    }
                 }
                 if (droppedRec.ganttProperties.isMilestone) {
                     this.parent.setRecordValue('isMilestone', false, droppedRec.ganttProperties, true);
@@ -32231,11 +32253,19 @@ class RowDD$1 {
                 }
                 if (this.dropPosition === 'middleSegment') {
                     if (droppedRecord.ganttProperties.predecessor) {
-                        this.parent.editModule.removePredecessorOnDelete(droppedRecord);
-                        droppedRecord.ganttProperties.predecessor = null;
-                        droppedRecord.ganttProperties.predecessorsName = null;
-                        droppedRecord[this.parent.taskFields.dependency] = null;
-                        droppedRecord.taskData[this.parent.taskFields.dependency] = null;
+                        const len = droppedRecord.ganttProperties.predecessor.length;
+                        for (let count = 0; count < len; count++) {
+                            const fromRecord = this.parent.getRecordByID(droppedRecord.ganttProperties.predecessor[count].from);
+                            const toRecord = this.parent.getRecordByID(droppedRecord.ganttProperties.predecessor[count].to);
+                            const validPredecessor = this.parent.connectorLineEditModule.validateParentPredecessor(fromRecord, toRecord);
+                            if (droppedRecord.ganttProperties.predecessor && !validPredecessor) {
+                                this.parent.editModule.removePredecessorOnDelete(droppedRecord);
+                                droppedRecord.ganttProperties.predecessor = null;
+                                droppedRecord.ganttProperties.predecessorsName = null;
+                                droppedRecord[this.parent.taskFields.dependency] = null;
+                                droppedRecord.taskData[this.parent.taskFields.dependency] = null;
+                            }
+                        }
                     }
                     if (droppedRecord.ganttProperties.isMilestone) {
                         this.parent.setRecordValue('isMilestone', false, droppedRecord.ganttProperties, true);