@syncfusion/ej2-gantt 20.1.50 → 20.1.51

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

@@ -6158,7 +6158,7 @@ var Timeline = /** @__PURE__ @class */ (function () {
             // PDf export collection
             var timelineCell = {};
             timelineCell.startDate = new Date(startDate.getTime());
-            if (mode === 'Month' && tier === 'bottomTier' && ((this.parent.currentZoomingLevel.level === 5) || (this.parent.currentZoomingLevel.level === 6)) && scheduleDateCollection.length === 0) {
+            if (mode === 'Month' && tier === 'bottomTier' && (count != 1) && scheduleDateCollection.length === 0) {
                 isFirstCell = true;
             }
             parentTr = this.getHeaterTemplateString(new Date(startDate.toString()), mode, tier, false, count, timelineCell, isFirstCell);
@@ -6172,6 +6172,10 @@ var Timeline = /** @__PURE__ @class */ (function () {
             }
             isFirstCell = false;
             startDate.setTime(newTime);
+            if (startDate.getHours() === 5 && count === 2 && tier === 'bottomTier' &&
+                this.parent.timelineSettings.bottomTier.unit === 'Hour') {
+                startDate.setTime(startDate.getTime() - (1000 * 60 * 60));
+            }
             if (startDate >= endDate) {
                 /* eslint-disable-next-line */
                 parentTr = this.getHeaterTemplateString(scheduleDateCollection[scheduleDateCollection.length - 1], mode, tier, true, count, timelineCell);
@@ -6292,12 +6296,12 @@ var Timeline = /** @__PURE__ @class */ (function () {
     Timeline.prototype.checkDate = function (firstDay, lastDay, increment, count) {
         var date = new Date(firstDay.getTime());
         date.setTime(date.getTime() + increment);
-        if (((date.getTime() - lastDay.getTime()) / (1000 * 60 * 60)) != count && (firstDay.getTimezoneOffset() !== date.getTimezoneOffset())) {
+        if (count !== 1 && ((date.getTime() - lastDay.getTime()) / (1000 * 60 * 60)) != count && (firstDay.getTimezoneOffset() !== date.getTimezoneOffset())) {
             var diffCount = count - (date.getTime() - lastDay.getTime()) / (1000 * 60 * 60);
             if (!this.parent.isInDst(date)) {
                 increment += (1000 * 60 * 60 * diffCount);
             }
-            else if (this.parent.isInDst(date)) {
+            else if (this.parent.isInDst(date) && count !== 2) {
                 increment -= (1000 * 60 * 60 * diffCount);
             }
         }
@@ -7053,7 +7057,7 @@ var GanttTreeGrid = /** @__PURE__ @class */ (function () {
         return eventArgs;
     };
     GanttTreeGrid.prototype.treeActionComplete = function (args) {
-        var updatedArgs = extend({}, args, true);
+        var updatedArgs = extend({}, args);
         if (getValue('requestType', args) === 'sorting') {
             this.parent.notify('updateModel', {});
             deleteObject(updatedArgs, 'isFrozen');
@@ -8439,8 +8443,8 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 labelString = this.getTaskLabel(this.parent.labelSettings.taskLabel);
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
-            if (labelString !== 'null') {
-                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate') {
+            if (labelString.indexOf('null') === -1) {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate' && !this.isTemplate(this.parent.labelSettings.taskLabel)) {
                     labelString = '';
                 }
                 if (isNaN(parseInt(labelString))) {
@@ -8481,14 +8485,16 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                     data.ganttProperties.segments.length === 0))) {
                 if (template !== '' && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
                     var templateElement = this.createDivElement(template)[0];
-                    templateElement.appendChild(tempDiv);
-                    progressDiv[0].appendChild(templateElement);
                     var childLabel = this.parent.labelSettings.taskLabel;
+                    if (childLabel && childLabel['elementRef'])
+                        templateElement.appendChild(tempDiv);
+                    progressDiv[0].appendChild(templateElement);
                     if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
-                        !this.isTemplate(childLabel))
+                        !this.isTemplate(childLabel) &&
+                        progressDiv[0].querySelectorAll('.e-task-label')[0].children[0])
                         progressDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
                     if (progressDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
-                        childLabel && !childLabel['elementRef'])
+                        childLabel && !childLabel['elementRef'] && tempDiv.innerHTML != '')
                         progressDiv[0].querySelectorAll('.e-task-label')[0].textContent = childLabel;
                 }
                 if (!isNullOrUndefined(taskbarInnerDiv) && taskbarInnerDiv.length > 0) {
@@ -9075,8 +9081,8 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                 labelString = this.getTaskLabel(this.parent.labelSettings.taskLabel);
                 labelString = labelString === 'isCustomTemplate' ? this.parent.labelSettings.taskLabel : labelString;
             }
-            if (labelString !== 'null') {
-                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate') {
+            if (labelString.indexOf('null') === -1) {
+                if (this.getTaskLabel(this.parent.labelSettings.taskLabel) === 'isCustomTemplate' && !this.isTemplate(this.parent.labelSettings.taskLabel)) {
                     labelString = '';
                 }
                 if (isNaN(parseInt(labelString))) {
@@ -9096,14 +9102,16 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
                         this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
                 var labelElement = this.createDivElement(labelDiv)[0];
-                labelElement.appendChild(div);
-                progressBarInnerDiv[0].appendChild(labelElement);
                 var parentLabel = this.parent.labelSettings.taskLabel;
+                if (parentLabel && parentLabel['elementRef'])
+                    labelElement.appendChild(div);
+                progressBarInnerDiv[0].appendChild(labelElement);
                 if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent !== '' &&
-                    !this.isTemplate(parentLabel))
+                    !this.isTemplate(parentLabel) &&
+                    progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0])
                     progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].children[0].remove();
                 if (progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent == '' &&
-                    parentLabel && !parentLabel['elementRef'])
+                    parentLabel && !parentLabel['elementRef'] && div.innerHTML != '')
                     progressBarInnerDiv[0].querySelectorAll('.e-task-label')[0].textContent = parentLabel;
             }
             var milestoneTemplate = '<div class="' + parentMilestone + '" style="position:absolute;">' +
@@ -26408,6 +26416,7 @@ var Toolbar$3 = /** @__PURE__ @class */ (function () {
 
 var NonWorkingDay = /** @__PURE__ @class */ (function () {
     function NonWorkingDay(gantt) {
+        this.weekendWidthUpdated = false;
         this.parent = gantt;
         this.nonworkingContainer = null;
         this.holidayContainer = null;
@@ -26547,6 +26556,14 @@ var NonWorkingDay = /** @__PURE__ @class */ (function () {
                     width = this.parent.dataOperation.getTaskWidth(start, tempEnd);
                     isFirstCell = false;
                 }
+                var sDate = new Date(startDate);
+                sDate.setDate(sDate.getDate() + 1);
+                if (sDate.getTimezoneOffset() != this.parent.timelineModule.timelineStartDate.getTimezoneOffset() && !this.weekendWidthUpdated) {
+                    if (this.parent.timelineModule.bottomTier == 'Hour' && this.parent.timelineSettings.bottomTier.count === 1) {
+                        width = width - this.parent.timelineSettings.timelineUnitSize;
+                        this.weekendWidthUpdated = true;
+                    }
+                }
                 var weekendDiv = createElement('div', {
                     className: weekend, styles: "left:" + left + "px;width:" + width + "px;height:100%;"
                 });
@@ -30938,6 +30955,9 @@ var ExportHelper = /** @__PURE__ @class */ (function () {
             if (data[_this.parent.labelSettings.rightLabel]) {
                 taskbar.rightTaskLabel.value = data[_this.parent.labelSettings.rightLabel].toString();
             }
+            if (data[_this.parent.labelSettings.taskLabel]) {
+                taskbar.taskLabel = data[_this.parent.labelSettings.taskLabel].toString();
+            }
             var reduceLeft = ganttProp.isMilestone ? Math.floor(_this.parent.chartRowsModule.taskBarHeight / 2) + 33 : 33; // 33 indicates default timeline cell width
             taskbar.rightTaskLabel.left = ganttProp.left + ganttProp.width + reduceLeft; // right label left value
             taskbar.fontFamily = _this.ganttStyle.fontFamily;
@@ -31299,6 +31319,9 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
         var progressFormat = new PdfStringFormat();
         progressFormat.lineAlignment = PdfVerticalAlignment.Middle;
         progressFormat.alignment = PdfTextAlignment.Right;
+        if (/^[a-zA-Z]/.test(this.taskLabel)) {
+            progressFormat.alignment = PdfTextAlignment.Left;
+        }
         var pageIndex = -1;
         if (!taskbar.isMilestone) {
             var taskbarPen = new PdfPen(taskbar.taskBorderColor);
@@ -31320,10 +31343,10 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 }
                 else {
                     taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(taskbar.width), pixelToPoint(taskbar.height));
-                    if (this.progress > 0 && this.progressWidth > 0 && this.isScheduledTask) {
+                    if (this.isScheduledTask) {
                         taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(taskbar.progressWidth), pixelToPoint(taskbar.height));
-                        if (!isNullOrUndefined(this.parent.taskFields.progress) && !isNullOrUndefined(this.parent.labelSettings.taskLabel)) {
-                            taskGraphics.drawString(this.progress.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), startPoint.y + adjustHeight, pixelToPoint(this.progressWidth), pixelToPoint(this.height), progressFormat);
+                        if (!isNullOrUndefined(this.parent.labelSettings.taskLabel) && !isNullOrUndefined(this.taskLabel)) {
+                            taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), startPoint.y + adjustHeight, pixelToPoint(this.progressWidth), pixelToPoint(this.height), progressFormat);
                         }
                     }
                 }
@@ -31345,7 +31368,7 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 }
                 else {
                     taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(renderWidth), pixelToPoint(taskbar.height));
-                    if (this.progress > 0 && this.progressWidth > 0 && this.isScheduledTask) {
+                    if (this.isScheduledTask) {
                         var progressBoundsWidth = 0;
                         if (this.progressWidth <= renderWidth) {
                             progressBoundsWidth = this.progressWidth;
@@ -31355,8 +31378,8 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                         }
                         taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth) + 0.5, startPoint.y + adjustHeight, pixelToPoint(progressBoundsWidth), pixelToPoint(taskbar.height));
                         this.progressWidth -= progressBoundsWidth;
-                        if (this.progressWidth === 0 && this.progress !== 0 && this.parent.labelSettings.taskLabel) {
-                            taskGraphics.drawString(this.progress.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), (startPoint.y + adjustHeight), pixelToPoint(progressBoundsWidth), pixelToPoint(this.height), progressFormat);
+                        if (this.parent.labelSettings.taskLabel && !isNullOrUndefined(this.taskLabel)) {
+                            taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), (startPoint.y + adjustHeight), pixelToPoint(progressBoundsWidth), pixelToPoint(this.height), progressFormat);
                         }
                     }
                 }
@@ -31373,8 +31396,8 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(taskbar.left + 0.5), startPoint.y + adjustHeight, pixelToPoint(taskbar.width), pixelToPoint(taskbar.height));
                 if (this.isScheduledTask) {
                     taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(taskbar.left + 0.5), startPoint.y + adjustHeight, pixelToPoint(taskbar.progressWidth), pixelToPoint(taskbar.height));
-                    if (this.progressWidth === 0 && this.progress !== 0) {
-                        taskGraphics.drawString(this.progress.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(this.progressWidth), pixelToPoint(this.height), progressFormat);
+                    if (!isNullOrUndefined(this.taskLabel)) {
+                        taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(this.progressWidth), pixelToPoint(this.height), progressFormat);
                     }
                 }
                 this.isCompleted = true;
@@ -31388,7 +31411,7 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                     this.isStartPoint = true;
                 }
                 taskGraphics.drawRectangle(taskbarPen, taskBrush, startPoint.x + pixelToPoint(taskbar.left) + 0.5, startPoint.y + adjustHeight, pixelToPoint(detail.totalWidth), pixelToPoint(taskbar.height));
-                if (this.progress > 0 && this.progressWidth > 0 && this.isScheduledTask) {
+                if (this.isScheduledTask) {
                     var progressBoundsWidth = 0;
                     if (this.progressWidth <= detail.totalWidth) {
                         progressBoundsWidth = this.progressWidth;
@@ -31398,8 +31421,8 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                     }
                     taskGraphics.drawRectangle(progressPen, progressBrush, startPoint.x + pixelToPoint(taskbar.left) + 0.5, startPoint.y + adjustHeight, pixelToPoint(progressBoundsWidth), pixelToPoint(taskbar.height));
                     this.progressWidth -= progressBoundsWidth;
-                    if (this.progressWidth === 0 && this.progress !== 0) {
-                        taskGraphics.drawString(this.progress.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(progressBoundsWidth), pixelToPoint(this.height), progressFormat);
+                    if (!isNullOrUndefined(this.taskLabel)) {
+                        taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(progressBoundsWidth), pixelToPoint(this.height), progressFormat);
                     }
                 }
                 this.isCompleted = false;