@syncfusion/ej2-gantt 21.1.38 → 21.1.41

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

@@ -602,10 +602,10 @@ class DateProcessor {
      */
     getDurationAsSeconds(duration, durationUnit) {
         let value = 0;
-        if (!durationUnit || durationUnit === 'day') {
+        if (!durationUnit || durationUnit.toLocaleLowerCase() === 'day') {
             value = this.parent.secondsPerDay * duration;
         }
-        else if (durationUnit === 'hour') {
+        else if (durationUnit.toLocaleLowerCase() === 'hour') {
             value = duration * 3600;
         }
         else {
@@ -1753,6 +1753,7 @@ class TaskProcessor extends DateProcessor {
      */
     prepareDataSource(data) {
         this.prepareRecordCollection(data, 0);
+        this.parent.initialLoadData = extend({}, {}, this.parent.flatData, true);
         // Method to maintain the shared task uniqueIds
         if (this.parent.viewType === 'ResourceView') {
             this.calculateSharedTaskUniqueIds();
@@ -2570,7 +2571,7 @@ class TaskProcessor extends DateProcessor {
             return 0;
         }
         else {
-            return this.getTaskWidth(sDate, eDate);
+            return this.getTaskWidth(sDate, eDate, ganttProp);
         }
     }
     getTaskbarHeight() {
@@ -2684,13 +2685,29 @@ class TaskProcessor extends DateProcessor {
      * @returns {number} .
      * @private
      */
-    getTaskWidth(startDate, endDate) {
+    getTaskWidth(startDate, endDate, ganttData) {
         const sDate = new Date(startDate.getTime());
         const eDate = new Date(endDate.getTime());
         const tierMode = this.parent.timelineModule.bottomTier !== 'None' ? this.parent.timelineModule.bottomTier :
             this.parent.timelineModule.topTier;
+        let isValid = false;
+        let modifiedsDate = new Date(startDate.getTime());
+        let hour = 0;
+        if (ganttData && ganttData.durationUnit == 'hour') {
+            modifiedsDate = new Date(modifiedsDate.getTime() + ganttData.duration * 60 * 60 * 1000);
+        }
+        if (ganttData && ganttData.durationUnit == 'minute') {
+            modifiedsDate = new Date(modifiedsDate.getTime() + ganttData.duration * 60 * 60 * 60 * 1000);
+        }
+        for (let i = 0; i < this.parent.dayWorkingTime.length; i++) {
+            hour = hour + this.parent.dayWorkingTime[i].to - this.parent.dayWorkingTime[i].from;
+        }
+        let dateDiff = modifiedsDate.getTime() - sDate.getTime();
         if (tierMode === 'Day') {
-            if (this.getSecondsInDecimal(sDate) === this.parent.defaultStartTime) {
+            if ((Math.floor((dateDiff / (1000 * 60 * 60)) % 24) >= hour || dateDiff === 0)) {
+                isValid = true;
+            }
+            if (this.getSecondsInDecimal(sDate) === this.parent.defaultStartTime && isValid) {
                 sDate.setHours(0, 0, 0, 0);
             }
             if (this.getSecondsInDecimal(eDate) === this.parent.defaultEndTime) {
@@ -2700,11 +2717,19 @@ class TaskProcessor extends DateProcessor {
                 eDate.setHours(0, 0, 0, 0);
             }
         }
+        else {
+            isValid = true;
+        }
         if ((sDate).getTime() === (eDate).getTime()) {
             return (this.parent.perDayWidth);
         }
         else {
-            return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth);
+            if (isValid) {
+                return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth);
+            }
+            else {
+                return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * hour)) * this.parent.perDayWidth);
+            }
         }
     }
     /**
@@ -9934,7 +9959,6 @@ class ChartRows extends DateProcessor {
         }
         if (this.templateData.hasChildRecords) {
             const parentTaskbarTemplateNode = this.getParentTaskbarNode(i, taskbarContainerNode);
-            const milestoneTemplateNode = this.getMilestoneNode(i, taskbarContainerNode);
             if (!this.templateData.ganttProperties.isAutoSchedule) {
                 const manualTaskbar = this.getManualTaskbar();
                 if (!isNullOrUndefined(manualTaskbar[0])) {
@@ -9949,9 +9973,6 @@ class ChartRows extends DateProcessor {
             if (parentTaskbarTemplateNode && parentTaskbarTemplateNode.length > 0) {
                 taskbarContainerNode[0].appendChild([].slice.call(parentTaskbarTemplateNode)[0]);
             }
-            else if (milestoneTemplateNode && milestoneTemplateNode.length > 0) {
-                taskbarContainerNode[0].appendChild([].slice.call(milestoneTemplateNode)[0]);
-            }
             if (this.parent.renderBaseline && this.templateData.ganttProperties.baselineStartDate &&
                 this.templateData.ganttProperties.baselineEndDate) {
                 taskBaselineTemplateNode = ((this.templateData.ganttProperties.baselineStartDate.getTime() === this.templateData.ganttProperties.baselineEndDate.getTime()) || ((!isNullOrUndefined(this.templateData.ganttProperties.baselineStartDate) && !isNullOrUndefined(this.templateData.ganttProperties.startDate) && (this.templateData.ganttProperties.baselineStartDate.getTime() === this.templateData.ganttProperties.startDate.getTime()))
@@ -11098,7 +11119,7 @@ class Dependency {
                 this.dateValidateModule.calculateEndDate(childGanttRecord);
             }
             this.parent.dataOperation.updateWidthLeft(childGanttRecord);
-            if (!this.parent.isLoad && childGanttRecord.parentItem && this.parent.isInPredecessorValidation &&
+            if (!this.parent.isLoad && !this.parent.isFromOnPropertyChange && childGanttRecord.parentItem && this.parent.isInPredecessorValidation &&
                 this.parent.getParentTask(childGanttRecord.parentItem).ganttProperties.isAutoSchedule) {
                 if (this.parentIds.indexOf(childGanttRecord.parentItem.uniqueID) === -1) {
                     this.parentIds.push(childGanttRecord.parentItem.uniqueID);
@@ -14140,6 +14161,9 @@ let Gantt = class Gantt extends Component {
      * @private
      */
     renderGantt(isChange) {
+        if (isChange) {
+            this.isFromOnPropertyChange = isChange;
+        }
         // predecessor calculation
         if (this.predecessorModule && this.taskFields.dependency) {
             this.predecessorModule['parentIds'] = [];
@@ -14154,7 +14178,6 @@ let Gantt = class Gantt extends Component {
             this.timelineModule.validateTimelineProp();
         }
         if (isChange) {
-            this.isFromOnPropertyChange = isChange;
             if (this.enableValidation) {
                 this.dataOperation.updateGanttData();
             }
@@ -21916,6 +21939,7 @@ class DialogEdit {
     renderNotesTab(itemName) {
         const ganttObj = this.parent;
         const inputModel = this.beforeOpenArgs[itemName];
+        inputModel.enableHtmlSanitizer = this.parent.enableHtmlSanitizer;
         const ganttProp = this.editedRecord.ganttProperties;
         const divElement = this.createDivElement('', ganttObj.element.id + '' + itemName + 'TabContainer');
         RichTextEditor.Inject(Toolbar$2, Link, HtmlEditor, QuickToolbar, Count);
@@ -24504,7 +24528,13 @@ class Edit$2 {
                 }
                 else if (isNullOrUndefined(previousData)) {
                     calcEndDate = previousStartDate;
-                    this.calculateDateByRoundOffDuration(childRecords[i], calcEndDate);
+                    const initialData = this.parent.initialLoadData[childRecords[i].index];
+                    if (this.parent.isLoad) {
+                        this.calculateDateByRoundOffDuration(initialData, calcEndDate);
+                    }
+                    else {
+                        this.calculateDateByRoundOffDuration(childRecords[i], calcEndDate);
+                    }
                     if (this.parent.isOnEdit && this.validatedChildItems.indexOf(childRecords[i]) === -1) {
                         this.validatedChildItems.push(childRecords[i]);
                     }
@@ -28929,12 +28959,14 @@ class NonWorkingDay {
     }
     updateHolidayLabelHeight() {
         const height = this.parent.getContentHeight();
+        let gantttable = document.getElementById("ganttContainer");
         // eslint-disable-next-line
         let toolbarHeight = 0;
         if (!isNullOrUndefined(this.parent.toolbarModule) && !isNullOrUndefined(this.parent.toolbarModule.element)) {
             toolbarHeight = this.parent.toolbarModule.element.offsetHeight;
         }
-        const viewportHeight = this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
+        const viewportHeight = (this.parent.height === 'auto') ? gantttable.offsetHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight :
+            this.parent.ganttHeight - toolbarHeight - this.parent.ganttChartModule.chartTimelineContainer.offsetHeight;
         const top = (viewportHeight < height) ? viewportHeight / 2 : height / 2;
         const labels = this.holidayContainer.querySelectorAll('.' + holidayLabel);
         for (let i = 0; i < labels.length; i++) {
@@ -30222,7 +30254,7 @@ class ContextMenu$2 {
             splitTaskDuration = Math.ceil(currentTaskDifference / this.parent.timelineSettings.timelineUnitSize);
             splitTaskDuration -= 1;
         }
-        const contextMenuClickDate = this.parent.dataOperation.getEndDate(startDate, splitTaskDuration, this.rowData.ganttProperties.durationUnit, this.rowData, false);
+        const contextMenuClickDate = this.parent.dataOperation.getEndDate(startDate, splitTaskDuration, (this.parent.timelineSettings.bottomTier.unit !== "None") ? this.parent.timelineSettings.bottomTier.unit.toLocaleLowerCase() : this.parent.timelineSettings.topTier.unit.toLocaleLowerCase(), this.rowData, false);
         return contextMenuClickDate;
     }
     contextMenuBeforeOpen(args) {