@syncfusion/ej2-gantt 20.1.60 → 20.2.39

package/src/gantt/renderer/timeline.js

@@ -37,6 +37,9 @@ var Timeline = /** @class */ (function () {
         this.totalTimelineWidth = 0;
         this.customTimelineSettings = null;
         this.parent.isTimelineRoundOff = this.isZoomToFit ? false : isNullOrUndefined(this.parent.projectStartDate) ? true : false;
+        if (this.parent.enablePersistence) {
+            this.parent.timelineSettings = this.parent.currentZoomingLevel;
+        }
     };
     /**
      * To render timeline header series.
@@ -164,6 +167,10 @@ var Timeline = /** @class */ (function () {
         this.parent.isTimelineRoundOff = this.isZoomToFit ? false : isNullOrUndefined(this.parent.projectStartDate) ? true : false;
         this.processTimelineUnit();
         this.parent.updateProjectDates(this.parent.cloneProjectStartDate, this.parent.cloneProjectEndDate, this.parent.isTimelineRoundOff);
+        var criticalModule = this.parent.criticalPathModule;
+        if (this.parent.enableCriticalPath && criticalModule) {
+            criticalModule.criticalConnectorLine(criticalModule.criticalPathCollection, criticalModule.detailPredecessorCollection, true, criticalModule.predecessorCollectionTaskIds);
+        }
         if (this.isZooming || this.isZoomToFit) {
             var args = {
                 requestType: this.isZoomIn ? 'AfterZoomIn' : this.isZoomToFit ? 'AfterZoomToProject' : 'AfterZoomOut',
@@ -222,8 +229,8 @@ var Timeline = /** @class */ (function () {
             }
         }
         var newTimeline = extend({}, {}, zoomingLevel, true);
-        this.roundOffDateToZoom(this.parent.cloneProjectStartDate, true, perDayWidth, newTimeline.bottomTier.unit);
-        this.roundOffDateToZoom(this.parent.cloneProjectEndDate, false, perDayWidth, newTimeline.bottomTier.unit);
+        this.roundOffDateToZoom(this.parent.cloneProjectStartDate, true, perDayWidth, newTimeline.bottomTier.unit, zoomingLevel);
+        this.roundOffDateToZoom(this.parent.cloneProjectEndDate, false, perDayWidth, newTimeline.bottomTier.unit, zoomingLevel);
         var numberOfCells = this.calculateNumberOfTimelineCells(newTimeline);
         var scrollHeight = this.parent.ganttChartModule.scrollElement.offsetHeight - 17; //17 is horizontal scrollbar width
         var contentHeight = this.parent.ganttChartModule.chartBodyContent.offsetHeight;
@@ -239,24 +246,40 @@ var Timeline = /** @class */ (function () {
         this.parent.trigger('actionBegin', args);
         this.changeTimelineSettings(newTimeline);
     };
-    Timeline.prototype.roundOffDateToZoom = function (date, isStartDate, perDayWidth, tierMode) {
-        var width = tierMode === 'Month' || tierMode === 'Year' ? 60 : 20;
-        var roundOffTime = (width / perDayWidth) * (24 * 60 * 60 * 1000);
+    Timeline.prototype.bottomTierCellWidthCalc = function (mode, zoomLevel, date) {
+        var convertedMilliSeconds;
+        switch (mode) {
+            case 'Minutes':
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (60 * 1000);
+                break;
+            case 'Hour':
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (60 * 60 * 1000);
+                break;
+            case 'Week':
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (7 * 24 * 60 * 60 * 1000);
+                break;
+            case 'Day':
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (24 * 60 * 60 * 1000);
+                break;
+            case 'Month':
+                var daysInMonth = new Date(date.getFullYear(), date.getMonth() + 1, 0).getDate();
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (60 * 60 * 24 * daysInMonth * 1000);
+                break;
+            case 'Year':
+                var daysInYear = (date.getFullYear() % 400 === 0 || (date.getFullYear() % 100 !== 0 && date.getFullYear() % 4 === 0)) ? 366 : 365;
+                convertedMilliSeconds = zoomLevel.bottomTier.count * (60 * 60 * 24 * daysInYear * 1000);
+                break;
+        }
+        return convertedMilliSeconds;
+    };
+    Timeline.prototype.roundOffDateToZoom = function (date, isStartDate, perDayWidth, tierMode, zoomingLevel) {
+        var roundOffTime = this.bottomTierCellWidthCalc(tierMode, zoomingLevel, date);
         if (isStartDate) {
             date.setTime(date.getTime() - roundOffTime);
         }
         else {
             date.setTime(date.getTime() + roundOffTime);
         }
-        if (tierMode === 'Hour') {
-            date.setMinutes(isStartDate ? -120 : 120);
-        }
-        else if (tierMode === 'Minutes') {
-            date.setSeconds(isStartDate ? -120 : 120);
-        }
-        else {
-            date.setHours(isStartDate ? -48 : 48, 0, 0, 0);
-        }
     };
     Timeline.prototype.calculateNumberOfTimelineCells = function (newTimeline) {
         var numberOfDays = Math.abs((this.parent.cloneProjectEndDate.getTime() -
@@ -827,7 +850,7 @@ var Timeline = /** @class */ (function () {
             parentTr = this.getHeaterTemplateString(new Date(startDate.toString()), mode, tier, false, count, timelineCell, isFirstCell);
             scheduleDateCollection.push(new Date(startDate.toString()));
             if (isFirstCell) {
-                newTime = this.calculateQuarterEndDate(startDate).getTime();
+                newTime = this.calculateQuarterEndDate(startDate, count).getTime();
             }
             else {
                 increment = this.getIncrement(startDate, count, mode);
@@ -983,19 +1006,29 @@ var Timeline = /** @class */ (function () {
             mode === 'Hour' || mode === 'Minutes') &&
             this.parent.nonWorkingDayIndex.indexOf(day.getDay()) !== -1;
     };
-    Timeline.prototype.calculateQuarterEndDate = function (date) {
+    Timeline.prototype.calculateQuarterEndDate = function (date, count) {
         var month = date.getMonth();
-        if (month >= 0 && month <= 2) {
-            return new Date(date.getFullYear(), 3, 1);
-        }
-        else if (month >= 3 && month <= 5) {
-            return new Date(date.getFullYear(), 6, 1);
-        }
-        else if (month >= 6 && month <= 8) {
-            return new Date(date.getFullYear(), 9, 1);
+        if (count === 3) {
+            if (month >= 0 && month <= 2) {
+                return new Date(date.getFullYear(), 3, 1);
+            }
+            else if (month >= 3 && month <= 5) {
+                return new Date(date.getFullYear(), 6, 1);
+            }
+            else if (month >= 6 && month <= 8) {
+                return new Date(date.getFullYear(), 9, 1);
+            }
+            else {
+                return new Date(date.getFullYear() + 1, 0, 1);
+            }
         }
         else {
-            return new Date(date.getFullYear() + 1, 0, 1);
+            if (month >= 0 && month <= 5) {
+                return new Date(date.getFullYear(), 6, 1);
+            }
+            else {
+                return new Date(date.getFullYear() + 1, 0, 1);
+            }
         }
     };
     /**
@@ -1026,7 +1059,7 @@ var Timeline = /** @class */ (function () {
             this.customFormat(scheduleWeeks, format, tier, mode, formatter);
         thWidth = (this.getIncrement(scheduleWeeks, count, mode) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth;
         var cellWidth = thWidth;
-        thWidth = isLast || isFirstCell ? isLast ? this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.timelineRoundOffEndDate) : this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.calculateQuarterEndDate(scheduleWeeks))
+        thWidth = isLast || isFirstCell ? isLast ? this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.timelineRoundOffEndDate) : this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.calculateQuarterEndDate(scheduleWeeks, count))
             : thWidth;
         var isWeekendCell = this.isWeekendHeaderCell(mode, tier, scheduleWeeks);
         var textClassName = tier === 'topTier' ? ' e-gantt-top-cell-text' : '';
@@ -1379,6 +1412,10 @@ var Timeline = /** @class */ (function () {
             else if (type === 'nextTimeSpan' && isFrom === 'publicMethod') {
                 this.parent.ganttChartModule.updateScrollLeft(this.parent.timelineModule.totalTimelineWidth);
             }
+            else if (type === 'nextTimeSpan' && isFrom === 'TaskbarEditing') {
+                var currentScrollLeft = document.getElementsByClassName('e-chart-scroll-container e-content')[0].scrollLeft;
+                this.parent.element.querySelector('.e-timeline-header-container').scrollLeft = currentScrollLeft;
+            }
             this.parent.timelineModule.timeSpanActionEvent('actionComplete', type, isFrom);
         }
         else {

package/src/global.js

@@ -1,3 +1,3 @@
 import * as index from './index';
-index.Gantt.Inject(index.Filter, index.Selection, index.Sort, index.Reorder, index.Resize, index.Edit, index.DayMarkers, index.Toolbar, index.ContextMenu, index.ExcelExport, index.RowDD, index.ColumnMenu, index.PdfExport, index.VirtualScroll);
+index.Gantt.Inject(index.Filter, index.Selection, index.Sort, index.Reorder, index.Resize, index.Edit, index.DayMarkers, index.Toolbar, index.ContextMenu, index.ExcelExport, index.RowDD, index.ColumnMenu, index.PdfExport, index.VirtualScroll, index.CriticalPath);
 export * from './index';

package/styles/bootstrap-dark.css

@@ -162,6 +162,9 @@
 .e-gantt .e-add::before {
   content: "\e823";
 }
+.e-gantt .e-critical-path::before {
+  content: "\e93a";
+}
 .e-gantt .e-edit::before {
   content: "\e944";
 }
@@ -256,12 +259,6 @@
 .e-bigger .e-gantt .e-gantt-chart .e-timeline-top-header-cell {
   height: 32px;
 }
-.e-bigger .e-gantt .e-gantt-chart .e-taskbar-left-resizer,
-.e-bigger .e-gantt .e-gantt-chart .e-taskbar-right-resizer {
-  padding-left: 10px;
-  padding-right: 10px;
-  width: 30px;
-}
 .e-bigger .e-gantt .e-gantt-chart .e-event-markers .e-span-label {
   border-radius: 4px !important;
   font-size: 12px !important;
@@ -272,7 +269,7 @@
 .e-bigger .e-gantt .e-gantt-chart .e-event-markers .e-gantt-right-arrow {
   border-bottom: 6px solid transparent;
   border-right: 6px solid transparent;
-  border-right-color: #cae8ff;
+  border-right-color: #d9edf7;
   border-top: 6px solid transparent;
   top: 73px !important;
 }
@@ -313,30 +310,34 @@
 .e-bigger .e-gantt .e-gantt-tree-grid-pane .e-columnheader .e-headercell {
   height: 63px !important;
 }
-.e-bigger .e-btn-group:not(.e-rtl):not(.e-vertical) .e-btn:first-of-type {
-  background-color: #000000;
-  border-color: #000000;
-  color: #F9FAFB;
-  font-size: 12px;
-  line-height: 18px;
-  padding: 0 8px 0 0;
+.e-bigger .e-gantt .e-dialog .e-dlg-header-content {
+  padding: 16px 4px 16px 16px !important;
 }
-.e-bigger .e-btn-group:not(.e-rtl):not(.e-vertical) .e-btn:last-of-type {
-  background-color: #000000;
-  border-color: #000000;
-  color: #F9FAFB;
-  font-size: 12px;
-  line-height: 18px;
-  padding: 0 0 0 8px;
+.e-bigger .e-gantt .e-dialog .e-dlg-header-content .e-btn.e-dlg-closeicon-btn {
+  left: 0 !important;
 }
-.e-bigger .e-tooltip-wrap .e-tip-content {
-  padding: 3px !important;
+.e-bigger .e-gantt .e-dialog .e-btn .e-btn-icon.e-icon-dlg-close {
+  font-size: 12px !important;
+}
+.e-bigger .e-gantt .e-dialog .e-footer-content {
+  height: 70px !important;
+  padding: 16px !important;
 }
-.e-bigger .e-grid .e-flmenu-valuediv {
+.e-bigger .e-gantt .e-dialog .e-footer-content .e-btn {
+  margin-left: 12px;
+}
+.e-bigger .e-gantt .e-dialog .e-dlg-header {
+  line-height: 28px;
+}
+.e-bigger .e-gantt .e-filter-popup {
+  width: 350px !important;
+}
+.e-bigger .e-gantt .e-grid .e-flmenu-valuediv {
   padding: 16px 0 0 !important;
 }
-.e-bigger .e-tab .e-tab-header .e-toolbar-item .e-tab-wrap {
-  padding: 0 16px !important;
+.e-bigger .e-gantt .e-filter-popup .e-dlg-content {
+  border-radius: 6px !important;
+  padding: 32px 16px 16px !important;
 }
 .e-bigger .e-columnmenu {
   top: 40px;
@@ -345,6 +346,9 @@
   border-radius: 6px;
   width: 556px !important;
 }
+.e-bigger .e-gantt-dialog .e-tab .e-tab-header .e-toolbar-item .e-tab-wrap {
+  padding: 0 16px !important;
+}
 .e-bigger .e-gantt-dialog .e-edit-form-column:nth-child(odd) {
   padding: 16px 12px 0 16px;
 }
@@ -373,97 +377,87 @@
 .e-bigger .e-gantt-dialog .e-dlg-header-content .e-btn.e-dlg-closeicon-btn {
   border-radius: 50%;
   height: auto !important;
-  width: auto !important;
+  width: auto;
 }
 .e-bigger .e-gantt-dialog .e-tab .e-tab-header .e-toolbar-item.e-active {
   margin-left: 5px !important;
 }
-.e-bigger .e-control-wrapper .e-input-group-icon.e-date-icon {
+.e-bigger .e-gantt-dialog .e-control-wrapper .e-input-group-icon.e-date-icon {
   font-size: 16px !important;
 }
-.e-bigger .e-float-input.e-control-wrapper {
-  width: 250px !important;
-}
-.e-bigger .e-predecessor-tooltip {
-  background-color: #000000;
-}
-.e-bigger .e-predecessor-dialog {
-  background-color: #f5f5f5;
-}
-.e-bigger .e-predecessor-dialog .e-dlg-content {
-  background-color: #f5f5f5;
-  padding: 10px 9px 9px 14px !important;
-}
-.e-bigger .e-dialog .e-dlg-header-content {
-  padding: 16px 4px 16px 16px !important;
-}
-.e-bigger .e-dialog .e-dlg-header-content .e-btn.e-dlg-closeicon-btn {
-  left: 0 !important;
-}
-.e-bigger .e-dialog .e-btn .e-btn-icon.e-icon-dlg-close {
-  font-size: 12px !important;
-}
-.e-bigger .e-dialog .e-footer-content {
-  height: 70px !important;
-  padding: 16px !important;
-}
-.e-bigger .e-dialog .e-footer-content .e-btn {
-  margin-left: 12px;
+.e-bigger .e-gantt-dialog .e-control-wrapper .e-input-group-icon.e-date-icon {
+  min-height: 35px !important;
+  min-width: 35.82px !important;
 }
-.e-bigger .e-dialog .e-dlg-header {
-  line-height: 28px;
+.e-bigger .e-gantt-dialog .e-btn.e-flat {
+  line-height: 24px;
+  padding: 6px 16px 6px 15px !important;
 }
-.e-bigger .e-filter-popup {
-  width: 350px !important;
+.e-bigger .e-gantt-dialog .e-btn.e-primary {
+  padding: 6px 21px 6px 23px !important;
 }
-.e-bigger .e-dlg-content {
-  border-radius: 6px !important;
-  padding: 32px 16px 16px !important;
+.e-bigger .e-gantt-dialog .e-datetime-wrapper .e-time-icon.e-icons::before {
+  font-size: 16px !important;
 }
-.e-bigger .e-float-input.e-control-wrapper input ~ label.e-label-top.e-float-text {
+.e-bigger .e-gantt-dialog .e-float-input.e-control-wrapper input ~ label.e-label-top.e-float-text {
   font-size: 14px;
   line-height: 22px;
 }
-.e-bigger .e-float-input.e-control-wrapper input[disabled] ~ label.e-label-top.e-float-text {
+.e-bigger .e-gantt-dialog .e-float-input.e-control-wrapper input[disabled] ~ label.e-label-top.e-float-text {
   font-size: 14px;
   line-height: 22px;
 }
-.e-bigger .e-float-input.e-control-wrapper input {
+.e-bigger .e-gantt-dialog .e-float-input.e-control-wrapper input {
   height: 34px !important;
 }
-.e-bigger .e-left-btn:disabled {
-  color: #adadad !important;
-}
-.e-bigger .e-right-btn:disabled {
-  color: #adadad !important;
-}
-.e-bigger .e-input-group-icon.e-date-icon {
-  min-width: 36px !important;
-}
-.e-bigger .e-control-wrapper .e-input-group-icon.e-date-icon {
-  min-height: 35px !important;
-  min-width: 35.82px !important;
-}
-.e-bigger .e-numeric.e-control-wrapper.e-input-group .e-input-group-icon {
+.e-bigger .e-gantt-dialog .e-numeric.e-control-wrapper.e-input-group .e-input-group-icon {
   min-height: 35px !important;
   min-width: 35.82px !important;
 }
-.e-bigger .e-control-wrapper .e-input-group-icon.e-time-icon {
+.e-bigger .e-gantt-dialog .e-control-wrapper .e-input-group-icon.e-time-icon {
   min-height: 35px !important;
   min-width: 35.82px !important;
 }
-.e-bigger .e-input-group.e-control-wrapper {
+.e-bigger .e-gantt-dialog .e-input-group.e-control-wrapper {
   height: 36px;
 }
-.e-bigger .e-datetime-wrapper .e-time-icon.e-icons::before {
-  font-size: 16px !important;
+.e-bigger .e-gantt-dialog .e-input-group-icon.e-date-icon {
+  min-width: 36px !important;
 }
-.e-bigger .e-btn.e-flat {
-  line-height: 24px;
-  padding: 6px 16px 6px 15px !important;
+.e-bigger .e-predecessor-tooltip {
+  background-color: #000;
 }
-.e-bigger .e-btn.e-primary {
-  padding: 6px 21px 6px 23px !important;
+.e-bigger .e-predecessor-tooltip .e-left-btn:disabled {
+  color: #adadad !important;
+}
+.e-bigger .e-predecessor-tooltip .e-right-btn:disabled {
+  color: #adadad !important;
+}
+.e-bigger .e-predecessor-tooltip .e-tip-content {
+  padding: 3px !important;
+}
+.e-bigger .e-predecessor-tooltip .e-btn-group:not(.e-rtl):not(.e-vertical) .e-btn:first-of-type {
+  background-color: #000;
+  border-color: #000;
+  color: #fff;
+  font-size: 12px;
+  line-height: 18px;
+  padding: 0 8px 0 0;
+}
+.e-bigger .e-predecessor-tooltip .e-btn-group:not(.e-rtl):not(.e-vertical) .e-btn:last-of-type {
+  background-color: #000;
+  border-color: #000;
+  color: #fff;
+  font-size: 12px;
+  line-height: 18px;
+  padding: 0 0 0 8px;
+}
+.e-bigger .e-predecessor-dialog {
+  background-color: #fff;
+}
+.e-bigger .e-predecessor-dialog .e-dlg-content {
+  background-color: #fff;
+  padding: 10px 9px 9px 14px !important;
 }
 
 .e-gantt {
@@ -1034,6 +1028,9 @@
 .e-gantt .e-gantt-chart .e-connector-line-hover {
   outline: 1px solid;
 }
+.e-gantt .e-gantt-chart .e-critical-connector-line-hover {
+  outline: 1px solid;
+}
 .e-gantt .e-gantt-chart .e-connector-line-hover-z-index {
   z-index: 100;
 }
@@ -1472,6 +1469,10 @@
   background-color: #67c1b2;
   border: #4fb29f;
 }
+.e-gantt .e-gantt-chart .e-gantt-critical-child-manualprogressbar {
+  background-color: #67c1b2;
+  border: #4fb29f;
+}
 .e-gantt .e-gantt-chart .e-holiday {
   background: #393939;
 }
@@ -1503,7 +1504,6 @@
 }
 .e-gantt .e-gantt-chart .e-gantt-unscheduled-taskbar {
   background: linear-gradient(to right, rgba(0, 112, 240, 0.2), #0070f0 30%, #0070f0 70%, #0070f0 70%, rgba(0, 112, 240, 0.2) 100%);
-  background-color: rgba(0, 112, 240, 0.2);
   border: 0px;
   border-radius: 4px;
 }
@@ -1514,10 +1514,10 @@
   border-top-color: #dadada;
 }
 .e-gantt .e-gantt-chart .e-progress-resize-gripper .e-progressbar-handler {
-  background: #222;
+  background: #2a2a2a;
 }
 .e-gantt .e-gantt-chart .e-progress-resize-gripper .e-progressbar-handler-after {
-  border-bottom-color: #222;
+  border-bottom-color: #2a2a2a;
 }
 .e-gantt .e-gantt-chart .e-gantt-dependency-view-container {
   display: block;
@@ -1804,4 +1804,56 @@
 }
 .e-gantt.e-device .e-backarrowspan {
   color: #000;
+}
+
+.e-gantt .e-gantt-chart .e-criticalconnector-line {
+  border-color: #d13438;
+}
+
+.e-gantt .e-gantt-chart .e-criticalconnector-line-right-arrow {
+  border-left-color: #d13438;
+}
+
+.e-gantt .e-gantt-chart .e-criticalconnector-line-left-arrow {
+  border-right-color: #d13438;
+}
+
+.e-gantt .e-gantt-chart .e-critical-connector-line-hover {
+  border-color: #f3d8da;
+  outline-color: #f3d8da;
+}
+
+.e-gantt .e-gantt-chart .e-critical-connector-line-right-arrow-hover {
+  border-left-color: #f3d8da;
+}
+
+.e-gantt .e-gantt-chart .e-critical-connector-line-left-arrow-hover {
+  border-right-color: #f3d8da;
+}
+
+.e-gantt .e-gantt-chart .e-gantt-child-critical-taskbar-inner-div {
+  background-color: #F3D8DA;
+  border: 1px solid #F3D8DA;
+  border-radius: 4px;
+}
+
+.e-gantt .e-gantt-chart .e-gantt-child-critical-progressbar-inner-div {
+  background-color: #D13438;
+  border: 1px solid #0070f0;
+  border-radius: 4px;
+}
+
+.e-gantt .e-gantt-chart .e-gantt-critical-unscheduled-taskbar {
+  background: linear-gradient(to right, rgba(255, 85, 85, 0.2), #D13438 30%, #D13438 70%, #D13438 70%, rgba(255, 85, 85, 0.2) 100%);
+  background-color: rgba(255, 85, 85, 0.2);
+  border: 0px;
+  border-radius: 4px;
+}
+
+.e-gantt .e-gantt-chart .e-critical-milestone-top {
+  border-bottom-color: #D13438;
+}
+
+.e-gantt .e-gantt-chart .e-critical-milestone-bottom {
+  border-top-color: #D13438;
 }