@syncfusion/ej2-gantt 22.1.36 → 22.1.37

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

@@ -1528,6 +1528,7 @@ class DateProcessor {
             setValue('minStartDate', minStartDate, editArgs);
             setValue('maxEndDate', maxEndDate, editArgs);
         }
+        this.parent['isProjectDateUpdated'] = true;
     }
     /**
      *
@@ -2070,7 +2071,7 @@ class TaskProcessor extends DateProcessor {
                             endDate = this.getEndDate(startDate, duration, data.ganttProperties.durationUnit, data.ganttProperties, false);
                         }
                         else if (!taskSettings.duration && taskSettings.endDate) {
-                            endDate = (!isNullOrUndefined(data.ganttProperties.endDate)) && endDate.getTime() >
+                            endDate = (!isNullOrUndefined(data.ganttProperties.endDate)) && endDate.getTime() <
                                 data.ganttProperties.endDate.getTime() && i !== segments.length - 1 ? endDate : data.ganttProperties.endDate;
                             duration = this.getDuration(startDate, endDate, data.ganttProperties.durationUnit, data.ganttProperties.isAutoSchedule, data.ganttProperties.isMilestone);
                             if (ganttSegments.length > 0 && endDate.getTime() < startDate.getTime()
@@ -2713,38 +2714,59 @@ class TaskProcessor extends DateProcessor {
             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);
+            modifiedsDate = new Date(modifiedsDate.getTime() + ganttData.duration * 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 ((Math.floor((dateDiff / (1000 * 60 * 60)) % 24) >= hour || dateDiff === 0)) {
-                isValid = true;
+        if (ganttData && ganttData.durationUnit == 'minute' && ganttData.duration < (hour * 60)) {
+            if (tierMode === 'Day') {
+                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) {
+                    eDate.setHours(24);
+                }
+                if (this.getSecondsInDecimal(eDate) === this.parent.defaultStartTime) {
+                    eDate.setHours(0, 0, 0, 0);
+                }
             }
-            if (this.getSecondsInDecimal(sDate) === this.parent.defaultStartTime && isValid) {
-                sDate.setHours(0, 0, 0, 0);
+            else {
+                isValid = true;
             }
-            if (this.getSecondsInDecimal(eDate) === this.parent.defaultEndTime) {
-                eDate.setHours(24);
+            if ((sDate).getTime() === (eDate).getTime()) {
+                return (this.parent.perDayWidth);
             }
-            if (this.getSecondsInDecimal(eDate) === this.parent.defaultStartTime) {
-                eDate.setHours(0, 0, 0, 0);
+            else {
+                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);
+                }
             }
         }
         else {
-            isValid = true;
-        }
-        if ((sDate).getTime() === (eDate).getTime()) {
-            return (this.parent.perDayWidth);
-        }
-        else {
-            if (isValid) {
-                return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth);
+            if (tierMode === 'Day') {
+                if (this.getSecondsInDecimal(sDate) === this.parent.defaultStartTime) {
+                    sDate.setHours(0, 0, 0, 0);
+                }
+                if (this.getSecondsInDecimal(eDate) === this.parent.defaultEndTime) {
+                    eDate.setHours(24);
+                }
+                if (this.getSecondsInDecimal(eDate) === this.parent.defaultStartTime) {
+                    eDate.setHours(0, 0, 0, 0);
+                }
+            }
+            if ((sDate).getTime() === (eDate).getTime()) {
+                return (this.parent.perDayWidth);
             }
             else {
-                return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * hour)) * this.parent.perDayWidth);
+                return ((this.getTimeDifference(sDate, eDate) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth);
             }
         }
     }
@@ -5894,6 +5916,9 @@ class Timeline {
      */
     processZooming(isZoomIn) {
         this.isZoomToFit = false;
+        if (!this.parent['isProjectDateUpdated']) {
+            this.parent.dateValidationModule.calculateProjectDates();
+        }
         if (!isNullOrUndefined(this.parent.zoomingProjectStartDate)) {
             this.parent.cloneProjectStartDate = this.parent.cloneProjectStartDate.getTime() < this.parent.zoomingProjectStartDate.getTime()
                 ? this.parent.cloneProjectStartDate : this.parent.zoomingProjectStartDate;
@@ -19835,6 +19860,7 @@ class TaskbarEdit extends DateProcessor {
                 }
             }
         }
+        this.parent['isProjectDateUpdated'] = false;
     }
     /**
      * To cancel the taskbar edt action.