@syncfusion/ej2-gantt 21.2.5 → 21.2.8

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

@@ -387,7 +387,7 @@ class DateProcessor {
             else if (hour > this.parent.defaultStartTime && hour < this.parent.defaultEndTime) {
                 for (let i = 0; i < this.parent.workingTimeRanges.length; i++) {
                     const value = this.parent.workingTimeRanges[i];
-                    if (hour >= value.to && (this.parent.workingTimeRanges[i + 1] &&
+                    if (hour > value.to && (this.parent.workingTimeRanges[i + 1] &&
                         hour < this.parent.workingTimeRanges[i + 1].from)) {
                         this.setTime(this.parent.workingTimeRanges[i + 1].from, cloneDate);
                         break;
@@ -1716,7 +1716,7 @@ class TaskProcessor extends DateProcessor {
     constructResourceViewDataSource(resources, data, unassignedTasks) {
         for (let i = 0; i < data.length; i++) {
             const tempData = data[i];
-            const child = this.parent.taskFields.child != null ? this.parent.taskFields.child : 'Children';
+            const child = this.parent.taskFields.child != null ? this.parent.taskFields.child : this.parent.taskFields.child = 'Children';
             const resourceData = tempData && tempData[this.parent.taskFields.resourceInfo];
             const resourceIdMapping = this.parent.resourceFields.id;
             if ((!tempData[child] || tempData[child].length === 0) && resourceData && resourceData.length) {
@@ -1885,7 +1885,7 @@ class TaskProcessor extends DateProcessor {
             (this.parent.taskMode === 'Manual') ? false :
                 data[taskSettings.manual] === true ? false : true;
         this.parent.setRecordValue('ganttProperties', ganttProperties, ganttData);
-        if (!isNullOrUndefined(data[taskSettings.id])) {
+        if (!isNullOrUndefined(data[taskSettings.id]) && (!((this.parent.viewType === "ResourceView" && level == 0))) || data[taskSettings.name] === "Unassigned Task") {
             id = data[taskSettings.id];
             name = data[taskSettings.name];
             this.addTaskData(ganttData, data, isLoad);
@@ -2302,7 +2302,7 @@ class TaskProcessor extends DateProcessor {
             startDate = this.getDateFromFormat(data[taskSettings.startDate], true);
             endDate = this.getDateFromFormat(data[taskSettings.endDate], true);
         }
-        const segments = taskSettings.segments ? (data[taskSettings.segments] ||
+        const segments = taskSettings.segments && (!isNullOrUndefined(data[taskSettings.segments]) || !isNullOrUndefined(ganttData.taskData)) ? (data[taskSettings.segments] ||
             ganttData.taskData[taskSettings.segments]) : null;
         const isMileStone = taskSettings.milestone ? data[taskSettings.milestone] ? true : false : false;
         const durationMapping = data[taskSettings.durationUnit] ? data[taskSettings.durationUnit] : '';
@@ -3125,6 +3125,9 @@ class TaskProcessor extends DateProcessor {
             return resourceIdCollection;
         }
         resourceIdCollection = data[this.parent.taskFields.resourceInfo];
+        if (resourceIdCollection != "" && typeof resourceIdCollection == "string") {
+            resourceIdCollection = resourceIdCollection.split(',');
+        }
         let resourceData;
         if (!isNullOrUndefined(this.parent.editModule) && !isNullOrUndefined(this.parent.editModule.dialogModule)
             && this.parent.editModule.dialogModule.isAddNewResource) {
@@ -3134,6 +3137,7 @@ class TaskProcessor extends DateProcessor {
             resourceData = this.parent.resources;
         }
         const resourceIDMapping = this.parent.resourceFields.id;
+        const resourceNameMapping = this.parent.resourceFields.name;
         const resourceUnitMapping = this.parent.resourceFields.unit;
         const resourceGroup = this.parent.resourceFields.group;
         const resources = [];
@@ -3144,7 +3148,7 @@ class TaskProcessor extends DateProcessor {
                     return true;
                 }
                 else {
-                    return (resourceIdCollection[count] === resourceInfo[resourceIDMapping]);
+                    return (resourceIdCollection[count] === resourceInfo[resourceIDMapping]) || (resourceIdCollection[count] === resourceInfo[resourceNameMapping]);
                 }
             });
             const ganttDataResource = extend({}, resource[0]);
@@ -4612,7 +4616,7 @@ class GanttChart {
     setVirtualHeight() {
         if (this.parent.virtualScrollModule && this.parent.enableVirtualization) {
             const wrapper = getValue('virtualTrack', this.parent.ganttChartModule.virtualRender);
-            wrapper.style.height = this.parent.treeGrid.element.getElementsByClassName('e-virtualtable')[0].style.height;
+            wrapper.style.height = this.parent.treeGrid.element.getElementsByClassName('e-virtualtrack')[0].style.height;
             const wrapper1 = getValue('wrapper', this.parent.ganttChartModule.virtualRender);
             const treegridVirtualHeight = this.parent.treeGrid.element.getElementsByClassName('e-virtualtable')[0].style.transform;
             wrapper1.style.transform = treegridVirtualHeight;
@@ -8725,7 +8729,7 @@ class ChartRows extends DateProcessor {
             if (this.taskLabelTemplateFunction && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
                 const taskLabelTemplateNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressDiv[0]);
                 if (taskLabelTemplateNode && taskLabelTemplateNode.length > 0) {
-                    tempDiv.appendChild(taskLabelTemplateNode[0]);
+                    append(taskLabelTemplateNode, tempDiv);
                     labelString = tempDiv.innerHTML;
                 }
             }
@@ -9280,7 +9284,7 @@ class ChartRows extends DateProcessor {
             if (leftLabelTemplateNode[0]['data'] === 'null') {
                 leftLabelTemplateNode[0]['data'] = '';
             }
-            leftLabelNode[0].appendChild([].slice.call(leftLabelTemplateNode)[0]);
+            append(leftLabelTemplateNode, leftLabelNode[0]);
         }
         if (this.parent.enableRtl) {
             leftLabelNode[0].style.paddingLeft = '25px';
@@ -9335,7 +9339,7 @@ class ChartRows extends DateProcessor {
             if (rightLabelTemplateNode[0]['data'] === 'null') {
                 rightLabelTemplateNode[0]['data'] = '';
             }
-            rightLabelNode[0].appendChild([].slice.call(rightLabelTemplateNode)[0]);
+            append(rightLabelTemplateNode, rightLabelNode[0]);
         }
         if (this.parent.enableRtl) {
             rightLabelNode[0].style.marginLeft = '0px';
@@ -9991,12 +9995,12 @@ class ChartRows extends DateProcessor {
                 }
             }
             if ((this.templateData.ganttProperties.autoDuration !== 0) && !this.templateData.ganttProperties.isMilestone && parentTaskbarTemplateNode && parentTaskbarTemplateNode.length > 0) {
-                taskbarContainerNode[0].appendChild([].slice.call(parentTaskbarTemplateNode)[0]);
+                append(parentTaskbarTemplateNode, taskbarContainerNode[0]);
             }
             else if ((this.templateData.ganttProperties.duration === 0 && this.templateData.ganttProperties.isMilestone && this.templateData.ganttProperties.isAutoSchedule)) {
                 const milestoneTemplateNode = this.getMilestoneNode(i, taskbarContainerNode);
                 if (milestoneTemplateNode && milestoneTemplateNode.length > 0) {
-                    taskbarContainerNode[0].appendChild([].slice.call(milestoneTemplateNode)[0]);
+                    append(milestoneTemplateNode, taskbarContainerNode[0]);
                 }
             }
             if (this.parent.renderBaseline && this.templateData.ganttProperties.baselineStartDate &&
@@ -10050,7 +10054,7 @@ class ChartRows extends DateProcessor {
                         }
                     }
                     else {
-                        taskbarContainerNode[0].appendChild([].slice.call(childTaskbarTemplateNode)[0]);
+                        append(childTaskbarTemplateNode, taskbarContainerNode[0]);
                     }
                 }
                 if (childTaskbarProgressResizeNode) {
@@ -13344,7 +13348,10 @@ class FocusModule {
                 break;
             case 'addRow':
                 {
-                    if (isNullOrUndefined(document.getElementById(this.parent.element.id + '_dialog'))) {
+                    if (ganttObj.editModule && ganttObj.editModule.cellEditModule && ganttObj.editModule.cellEditModule.isCellEdit) {
+                        e.stopPropagation();
+                    }
+                    else if (isNullOrUndefined(document.getElementById(this.parent.element.id + '_dialog'))) {
                         e.preventDefault();
                         ganttObj.addRecord(undefined, this.parent.editSettings.newRowPosition);
                         const focussedElement = ganttObj.element;
@@ -13866,6 +13873,9 @@ let Gantt = class Gantt extends Component {
         const ganttHeader = this.chartPane.childNodes[0].childNodes[0];
         this.scrollLeftValue = this.chartPane.childNodes[0].childNodes[0]['scrollLeft'];
         const ganttContent = this.chartPane.childNodes[0].childNodes[1];
+        if (this.treeGrid.element) {
+            this.ganttChartModule['setVirtualHeight']();
+        }
         if (!this.contentMaskTable) {
             if (ganttContent) {
                 let content$$1 = ganttContent;
@@ -19665,7 +19675,8 @@ class TaskbarEdit extends DateProcessor {
             this.dependencyCancel = true;
         }
         if ((this.taskBarEditAction === 'ConnectorPointLeftDrag' ||
-            this.taskBarEditAction === 'ConnectorPointRightDrag') && this.drawPredecessor) {
+            this.taskBarEditAction === 'ConnectorPointRightDrag') && this.drawPredecessor && (!this.connectorSecondRecord.hasChildRecords ||
+            this.connectorSecondRecord.hasChildRecords && this.parent.allowParentDependency)) {
             this.parent.connectorLineEditModule.updatePredecessor(this.connectorSecondRecord, this.finalPredecessor);
             if (this.parent.UpdateOffsetOnTaskbarEdit) {
                 this.parent.connectorLineEditModule['calculateOffset'](this.connectorSecondRecord);
@@ -19998,7 +20009,9 @@ class TaskbarEdit extends DateProcessor {
             }
             this.showHideTaskBarEditingElements(element, this.highlightedSecondElement, true);
         }
-        if (isNullOrUndefined(this.connectorSecondAction) && !isNullOrUndefined(this.connectorSecondElement)) {
+        if (isNullOrUndefined(this.connectorSecondAction) && !isNullOrUndefined(this.connectorSecondElement) &&
+            (!this.connectorSecondRecord.hasChildRecords || this.connectorSecondRecord.hasChildRecords &&
+                this.parent.allowParentDependency)) {
             this.editTooltip.showHideTaskbarEditTooltip(false, this.segmentIndex);
             removeClass([this.connectorSecondElement.querySelector('.' + connectorPointLeft)], [connectorPointAllowBlock]);
             removeClass([this.connectorSecondElement.querySelector('.' + connectorPointRight)], [connectorPointAllowBlock]);
@@ -24110,9 +24123,8 @@ class Edit$2 {
                     (isNullOrUndefined(taskData.startDate) && !isNullOrUndefined(prevStart)) ||
                     (isNullOrUndefined(taskData.endDate) && !isNullOrUndefined(prevEnd)) ||
                     (prevStart && prevStart.getTime() !== taskData.startDate.getTime())
-                    || (prevEnd && prevEnd.getTime() !== taskData.endDate.getTime())
-                    || (!isNullOrUndefined(prevDuration) && prevDuration !== taskData.duration)
-                    || (!isNullOrUndefined(prevDuration) && prevDuration === taskData.duration &&
+                        && (prevEnd && prevEnd.getTime() !== taskData.endDate.getTime())
+                    || (!isNullOrUndefined(prevDuration) && prevDuration !== taskData.duration &&
                         prevDurationUnit !== taskData.durationUnit)) {
                     isMoved = true;
                 }
@@ -26307,6 +26319,7 @@ class Edit$2 {
             let args = {};
             args = this.constructTaskAddedEventArgs(cAddedRecord, this.parent.editedRecords, 'beforeAdd');
             this.parent.trigger('actionBegin', args, (args) => {
+                this.parent.previousRecords = {};
                 if (!isNullOrUndefined(this.parent.loadingIndicator) && this.parent.loadingIndicator.indicatorType === "Shimmer") {
                     this.parent.showMaskRow();
                 }
@@ -30301,7 +30314,7 @@ class ContextMenu$2 {
                 this.parent.ganttChartModule.targetElement;
         // Closed edited cell before opening context menu
         // eslint-disable-next-line
-        if (!isNullOrUndefined(this.parent.editModule) && this.parent.editModule.cellEditModule && this.parent.editModule.cellEditModule.isCellEdit && target.parentElement.classList.contains('e-row')) {
+        if (!isNullOrUndefined(this.parent.editModule) && this.parent.editModule.cellEditModule && this.parent.editModule.cellEditModule.isCellEdit && target.parentElement.classList.contains('e-row') || target.parentElement.classList.contains('e-treecolumn-container')) {
             this.parent.treeGrid.closeEdit();
         }
         if (!isNullOrUndefined(args.element) && args.element.id === this.parent.element.id + '_contextmenu') {
@@ -34978,11 +34991,22 @@ class PdfGanttPredecessor {
         this.parent = parent;
         this.pdfGantt = pdfGantt;
     }
-    findindex(num) {
+    findindex(num, pdfExportProperties) {
         var dataindex;
-        this.parent.currentViewData.map((data, index) => { if (data.index == num) {
-            dataindex = index;
-        } });
+        if (pdfExportProperties.exportType === 'CurrentViewData') {
+            this.parent.currentViewData.map(function (data, index) {
+                if (data.index == num) {
+                    dataindex = index;
+                }
+            });
+        }
+        else {
+            this.parent.flatData.map(function (data, index) {
+                if (data.index == num) {
+                    dataindex = index;
+                }
+            });
+        }
         return dataindex;
     }
     /**
@@ -34992,11 +35016,11 @@ class PdfGanttPredecessor {
      * @returns {void}
      * @private
      */
-    drawPredecessor(pdfGantt) {
+    drawPredecessor(pdfGantt, pdfExportProperties) {
         this.pdfGantt = pdfGantt;
         const pages = pdfGantt.result.page.section.getPages();
-        const parentTask = pdfGantt.taskbarCollection[this.findindex(this.parentIndex)];
-        const childTask = pdfGantt.taskbarCollection[this.findindex(this.childIndex)];
+        const parentTask = pdfGantt.taskbarCollection[this.findindex(this.parentIndex, pdfExportProperties)];
+        const childTask = pdfGantt.taskbarCollection[this.findindex(this.childIndex, pdfExportProperties)];
         let startPage = new PdfPage();
         let endPage = new PdfPage();
         let predecessorType = '';
@@ -35006,7 +35030,7 @@ class PdfGanttPredecessor {
         let childY = 0;
         switch (this.type) {
             case 'FS':
-                if (childTask.startPage > -1 && parentTask.endPage > -1) {
+                if ((!isNullOrUndefined(childTask) && childTask.startPage > -1) && (!isNullOrUndefined(parentTask) && parentTask.endPage > -1)) {
                     startPage = pages[parentTask.endPage];
                     endPage = pages[childTask.startPage];
                     parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
@@ -35033,7 +35057,7 @@ class PdfGanttPredecessor {
                 }
                 break;
             case 'SF':
-                if (childTask.endPage > -1 && parentTask.startPage > -1) {
+                if ((!isNullOrUndefined(childTask) && childTask.endPage > -1) && (!isNullOrUndefined(parentTask) && parentTask.startPage > -1)) {
                     startPage = pages[parentTask.startPage];
                     endPage = pages[childTask.endPage];
                     parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
@@ -35060,7 +35084,7 @@ class PdfGanttPredecessor {
                 }
                 break;
             case 'FF':
-                if (childTask.endPage > -1 && parentTask.endPage > -1) {
+                if ((!isNullOrUndefined(childTask) && childTask.endPage > -1) && (!isNullOrUndefined(parentTask) && parentTask.endPage > -1)) {
                     startPage = pages[parentTask.endPage];
                     endPage = pages[childTask.endPage];
                     parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
@@ -35087,7 +35111,7 @@ class PdfGanttPredecessor {
                 }
                 break;
             case 'SS':
-                if (childTask.startPage > -1 && parentTask.startPage > -1) {
+                if ((!isNullOrUndefined(childTask) && childTask.startPage > -1) && (!isNullOrUndefined(parentTask) && parentTask.startPage > -1)) {
                     startPage = pages[parentTask.startPage];
                     endPage = pages[childTask.startPage];
                     parentPageData = pdfGantt.pdfPageDetail[parentTask.startPage - pdfGantt.chartPageIndex];
@@ -35414,12 +35438,12 @@ class PdfGantt extends PdfTreeGrid {
         }
         return this.taskbars;
     }
-    drawChart(result) {
+    drawChart(result, pdfExportProperties) {
         this.result = result;
         this.totalPages = this.result.page.section.count;
         this.perColumnPages = this.totalPages / this.layouter.columnRanges.length;
         this.calculateRange();
-        this.drawGantttChart();
+        this.drawGantttChart(pdfExportProperties);
         this.drawPageBorder();
     }
     //Calcualte the header range for each pdf page based on schedule start and end date.
@@ -35568,7 +35592,7 @@ class PdfGantt extends PdfTreeGrid {
         }
     }
     //Draw the gantt chart side
-    drawGantttChart() {
+    drawGantttChart(pdfExportProperties) {
         let taskbarPoint = this.startPoint;
         const pagePoint = new PointF();
         let pageStartX = 0;
@@ -35642,7 +35666,7 @@ class PdfGantt extends PdfTreeGrid {
         // Draw predecessor line.
         for (let i = 0; i < this.predecessorCollection.length; i++) {
             const predecessor = this.predecessorCollection[i];
-            predecessor.drawPredecessor(this);
+            predecessor.drawPredecessor(this, pdfExportProperties);
         }
     }
 }
@@ -35755,7 +35779,7 @@ class PdfExport {
             const format = new PdfTreeGridLayoutFormat();
             format.break = PdfLayoutBreakType.FitElement;
             const layouter = this.gantt.drawGrid(pdfPage, 0, 0, format);
-            this.gantt.drawChart(layouter);
+            this.gantt.drawChart(layouter, pdfExportProperties);
             if (!isMultipleExport) {
                 if (!this.isBlob) {
                     // save the PDF