@syncfusion/ej2-gantt 20.1.50 → 20.1.55

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

@@ -5030,7 +5030,7 @@ class GanttChart {
                     this.parent.treeGrid.grid.notify('key-pressed', e);
                 }
             }
-            if (!this.parent.editModule.cellEditModule.isCellEdit) {
+            if (!isInEditedState) {
                 if (nextElement) {
                     if ($target.classList.contains('e-rowcell')) {
                         this.manageFocus($target, 'remove', false);
@@ -6092,7 +6092,7 @@ class Timeline {
             // PDf export collection
             const 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);
@@ -6106,6 +6106,10 @@ class Timeline {
             }
             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);
@@ -6226,12 +6230,12 @@ class Timeline {
     checkDate(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);
             }
         }
@@ -6984,7 +6988,7 @@ class GanttTreeGrid {
         return eventArgs;
     }
     treeActionComplete(args) {
-        const updatedArgs = extend({}, args, true);
+        const updatedArgs = extend({}, args);
         if (getValue('requestType', args) === 'sorting') {
             this.parent.notify('updateModel', {});
             deleteObject(updatedArgs, 'isFrozen');
@@ -8051,8 +8055,8 @@ class ChartRows extends DateProcessor {
                 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))) {
@@ -8093,14 +8097,16 @@ class ChartRows extends DateProcessor {
                     data.ganttProperties.segments.length === 0))) {
                 if (template !== '' && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
                     let templateElement = this.createDivElement(template)[0];
-                    templateElement.appendChild(tempDiv);
-                    progressDiv[0].appendChild(templateElement);
                     let 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) {
@@ -8687,8 +8693,8 @@ class ChartRows extends DateProcessor {
                 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))) {
@@ -8708,14 +8714,16 @@ class ChartRows extends DateProcessor {
                         this.taskBarHeight + 'px;">' + labelString + '</span>';
                 }
                 let labelElement = this.createDivElement(labelDiv)[0];
-                labelElement.appendChild(div);
-                progressBarInnerDiv[0].appendChild(labelElement);
                 let 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;
             }
             const milestoneTemplate = '<div class="' + parentMilestone + '" style="position:absolute;">' +
@@ -12562,6 +12570,9 @@ let Gantt = class Gantt extends Component {
             }
             else {
                 this.treeGrid.dataSource = this.flatData;
+                if (!isNullOrUndefined(document.getElementsByClassName('e-listview')[0])) {
+                    this.treeGrid.dataBind();
+                }
             }
         }
         else {
@@ -21304,6 +21315,9 @@ class Edit$2 {
             if (!isNullOrUndefined(this.parent.editModule) && ganttData) {
                 this.parent.isOnEdit = true;
                 this.validateUpdateValues(data, ganttData, true);
+                if (data[this.parent.taskFields.resourceInfo]) {
+                    this.updateResourceRelatedFields(ganttData, 'resource');
+                }
                 const keys = Object.keys(data);
                 if (keys.indexOf(tasks.startDate) !== -1 || keys.indexOf(tasks.endDate) !== -1 ||
                     keys.indexOf(tasks.duration) !== -1) {
@@ -24755,7 +24769,7 @@ class Filter$1 {
     }
     updateFilterMenuPosition(element, args) {
         addClass([element], 'e-gantt');
-        document.body.appendChild(element);
+        document.querySelector('#' + this.parent.controlId).appendChild(element);
         let targetElement;
         if (this.parent.showColumnMenu) {
             targetElement = document.querySelector('#treeGrid' + this.parent.controlId + '_gridcontrol_colmenu_Filter');
@@ -25873,6 +25887,7 @@ class Toolbar$3 {
 
 class NonWorkingDay {
     constructor(gantt) {
+        this.weekendWidthUpdated = false;
         this.parent = gantt;
         this.nonworkingContainer = null;
         this.holidayContainer = null;
@@ -26012,6 +26027,14 @@ class NonWorkingDay {
                     width = this.parent.dataOperation.getTaskWidth(start, tempEnd);
                     isFirstCell = false;
                 }
+                let 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;
+                    }
+                }
                 const weekendDiv = createElement('div', {
                     className: weekend, styles: `left:${left}px;width:${width}px;height:100%;`
                 });
@@ -30158,6 +30181,9 @@ class ExportHelper {
             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();
+            }
             const 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;
@@ -30506,6 +30532,12 @@ class PdfGanttTaskbarCollection {
         const progressFormat = new PdfStringFormat();
         progressFormat.lineAlignment = PdfVerticalAlignment.Middle;
         progressFormat.alignment = PdfTextAlignment.Right;
+        let isLabelString = false;
+        let updatedWidth;
+        if (/^[a-zA-Z]/.test(this.taskLabel)) {
+            isLabelString = true;
+            progressFormat.alignment = PdfTextAlignment.Left;
+        }
         let pageIndex = -1;
         if (!taskbar.isMilestone) {
             const taskbarPen = new PdfPen(taskbar.taskBorderColor);
@@ -30527,10 +30559,14 @@ class PdfGanttTaskbarCollection {
                 }
                 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)) {
+                            updatedWidth = this.progressWidth;
+                            if (isLabelString) {
+                                updatedWidth = this.width;
+                            }
+                            taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), startPoint.y + adjustHeight, pixelToPoint(updatedWidth), pixelToPoint(this.height), progressFormat);
                         }
                     }
                 }
@@ -30545,14 +30581,16 @@ class PdfGanttTaskbarCollection {
                     this.isStartPoint = true;
                 }
                 let renderWidth = 0;
-                this.width = this.width - (detail.totalWidth - (this.left - cumulativeWidth));
+                if (!isLabelString) {
+                    this.width = this.width - (detail.totalWidth - (this.left - cumulativeWidth));
+                }
                 renderWidth = (detail.totalWidth - (this.left - cumulativeWidth));
                 if (!this.isScheduledTask && this.unscheduledTaskBy !== 'duration') {
                     this.drawUnscheduledTask(taskGraphics, startPoint, cumulativeWidth, adjustHeight);
                 }
                 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) {
                         let progressBoundsWidth = 0;
                         if (this.progressWidth <= renderWidth) {
                             progressBoundsWidth = this.progressWidth;
@@ -30562,8 +30600,12 @@ class PdfGanttTaskbarCollection {
                         }
                         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)) {
+                            updatedWidth = progressBoundsWidth;
+                            if (isLabelString) {
+                                updatedWidth = this.width;
+                            }
+                            taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left - cumulativeWidth), (startPoint.y + adjustHeight), pixelToPoint(updatedWidth), pixelToPoint(this.height), progressFormat);
                         }
                     }
                 }
@@ -30580,8 +30622,12 @@ class PdfGanttTaskbarCollection {
                 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)) {
+                        updatedWidth = this.progressWidth;
+                        if (isLabelString) {
+                            updatedWidth = this.width;
+                        }
+                        taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(updatedWidth), pixelToPoint(this.height), progressFormat);
                     }
                 }
                 this.isCompleted = true;
@@ -30595,7 +30641,7 @@ class PdfGanttTaskbarCollection {
                     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) {
                     let progressBoundsWidth = 0;
                     if (this.progressWidth <= detail.totalWidth) {
                         progressBoundsWidth = this.progressWidth;
@@ -30605,8 +30651,12 @@ class PdfGanttTaskbarCollection {
                     }
                     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)) {
+                        updatedWidth = progressBoundsWidth;
+                        if (isLabelString) {
+                            updatedWidth = this.width;
+                        }
+                        taskGraphics.drawString(this.taskLabel.toString(), font, fontColor, fontBrush, startPoint.x + pixelToPoint(this.left), (startPoint.y + adjustHeight), pixelToPoint(updatedWidth), pixelToPoint(this.height), progressFormat);
                     }
                 }
                 this.isCompleted = false;