@syncfusion/ej2-gantt 19.4.48 → 19.4.50

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

@@ -6041,6 +6041,7 @@ class Timeline {
      * @private
      */
     createTimelineTemplate(tier) {
+        var isFirstCell = false;
         const parent = this.parent;
         let parentTh = '';
         let parentTr = '';
@@ -6057,10 +6058,19 @@ class Timeline {
             // PDf export collection
             const timelineCell = {};
             timelineCell.startDate = new Date(startDate.getTime());
-            parentTr = this.getHeaterTemplateString(new Date(startDate.toString()), mode, tier, false, count, timelineCell);
+            if (mode === 'Month' && tier === 'bottomTier' && ((this.parent.currentZoomingLevel.level === 5) || (this.parent.currentZoomingLevel.level === 6)) && scheduleDateCollection.length === 0) {
+                isFirstCell = true;
+            }
+            parentTr = this.getHeaterTemplateString(new Date(startDate.toString()), mode, tier, false, count, timelineCell, isFirstCell);
             scheduleDateCollection.push(new Date(startDate.toString()));
-            increment = this.getIncrement(startDate, count, mode);
-            newTime = startDate.getTime() + increment;
+            if (isFirstCell) {
+                newTime = this.calculateQuarterEndDate(startDate).getTime();
+            }
+            else {
+                increment = this.getIncrement(startDate, count, mode);
+                newTime = startDate.getTime() + increment;
+            }
+            isFirstCell = false;
             startDate.setTime(newTime);
             if (startDate >= endDate) {
                 /* eslint-disable-next-line */
@@ -6170,6 +6180,21 @@ class Timeline {
             mode === 'Hour' || mode === 'Minutes') &&
             this.parent.nonWorkingDayIndex.indexOf(day.getDay()) !== -1;
     }
+    calculateQuarterEndDate(date) {
+        const 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);
+        }
+        else {
+            return new Date(date.getFullYear() + 1, 0, 1);
+        }
+    }
     /**
      * To construct template string.
      *
@@ -6183,7 +6208,7 @@ class Timeline {
      * @private
      */
     /* eslint-disable-next-line */
-    getHeaterTemplateString(scheduleWeeks, mode, tier, isLast, count, timelineCell) {
+    getHeaterTemplateString(scheduleWeeks, mode, tier, isLast, count, timelineCell, isFirstCell) {
         let parentTr = '';
         let td = '';
         const format = tier === 'topTier' ?
@@ -6198,7 +6223,7 @@ class Timeline {
             this.customFormat(scheduleWeeks, format, tier, mode, formatter);
         thWidth = (this.getIncrement(scheduleWeeks, count, mode) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth;
         const cellWidth = thWidth;
-        thWidth = isLast ? this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.timelineRoundOffEndDate)
+        thWidth = isLast || isFirstCell ? isLast ? this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.timelineRoundOffEndDate) : this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.calculateQuarterEndDate(scheduleWeeks))
             : thWidth;
         const isWeekendCell = this.isWeekendHeaderCell(mode, tier, scheduleWeeks);
         const textClassName = tier === 'topTier' ? ' e-gantt-top-cell-text' : '';
@@ -11861,7 +11886,7 @@ class FocusModule {
                 {
                     if (isNullOrUndefined(document.getElementById(this.parent.element.id + '_dialog'))) {
                         e.preventDefault();
-                        ganttObj.addRecord();
+                        ganttObj.addRecord(undefined, this.parent.editSettings.newRowPosition);
                         const focussedElement = ganttObj.element;
                         focussedElement.focus();
                     }
@@ -15205,6 +15230,7 @@ class CellEdit {
          * @private
          */
         this.isCellEdit = false;
+        this.isResourceCellEdited = false;
         this.parent = ganttObj;
         this.bindTreeGridProperties();
     }
@@ -15633,6 +15659,7 @@ class CellEdit {
         const resourceSettings = this.parent.resourceFields;
         const editedResourceId = editedObj[this.parent.taskFields.resourceInfo];
         if (editedResourceId) {
+            this.isResourceCellEdited = true;
             const tempResourceInfo = this.parent.dataOperation.setResourceInfo(editedObj);
             const editedResouceLength = tempResourceInfo.length;
             const previousResource = previousData.ganttProperties.resourceInfo;
@@ -18906,7 +18933,15 @@ class DialogEdit {
                         field: fields[i], headerText: this.localeObj.getConstant(fields[i]), editType: 'stringedit', width: '200px',
                         edit: {
                             write: (args) => {
-                                const datePickerModel = this.beforeOpenArgs[generalTabString][this.parent.taskFields[fields[i]]];
+                                let datePickerModel;
+                                if (!isNullOrUndefined(this.beforeOpenArgs[generalTabString])) {
+                                    datePickerModel = this.beforeOpenArgs[generalTabString][this.parent.taskFields[fields[i]]];
+                                }
+                                else {
+                                    let columnFields = this.getGeneralColumnFields();
+                                    let columnModel = this.getFieldsModel(columnFields);
+                                    datePickerModel = columnModel[this.parent.taskFields[fields[i]]];
+                                }
                                 const value = args.rowData[args.column.field];
                                 setValue('value', value, datePickerModel);
                                 const datePicker = new this.inputs[this.parent.columnByField[this.parent.taskFields[fields[i]]].editType](datePickerModel);
@@ -18929,7 +18964,15 @@ class DialogEdit {
                         field: fields[i], headerText: this.localeObj.getConstant(fields[i]), editType: 'stringedit', width: '100px',
                         edit: {
                             write: (args) => {
-                                const inputTextModel = this.beforeOpenArgs[generalTabString][this.parent.taskFields[fields[i]]];
+                                let inputTextModel;
+                                if (!isNullOrUndefined(this.beforeOpenArgs[generalTabString])) {
+                                    inputTextModel = this.beforeOpenArgs[generalTabString][this.parent.taskFields[fields[i]]];
+                                }
+                                else {
+                                    let columnFields = this.getGeneralColumnFields();
+                                    let columnModel = this.getFieldsModel(columnFields);
+                                    inputTextModel = columnModel[this.parent.taskFields[fields[i]]];
+                                }
                                 inputTextModel.floatLabelType = 'Never';
                                 const value = args.rowData[args.column.field];
                                 if (!isNullOrUndefined(value)) {
@@ -21588,9 +21631,12 @@ class Edit$2 {
      */
     updateParentChildRecord(data) {
         const ganttRecord = data;
-        if (ganttRecord.hasChildRecords && this.taskbarMoved && this.parent.taskMode === 'Auto' && this.parent.previousRecords[data.uniqueID].resources === ganttRecord.ganttProperties['resourceNames']) {
+        if (ganttRecord.hasChildRecords && this.taskbarMoved && this.parent.taskMode === 'Auto' && (!isNullOrUndefined(this.parent.editModule.cellEditModule) && !this.parent.editModule.cellEditModule.isResourceCellEdited)) {
             this.updateChildItems(ganttRecord);
         }
+        if (!isNullOrUndefined(this.parent.editModule.cellEditModule)) {
+            this.parent.editModule.cellEditModule.isResourceCellEdited = false;
+        }
     }
     /**
      * To update records while changing schedule mode.
@@ -23040,7 +23086,7 @@ class Edit$2 {
                 /*Record Updates*/
                 recordIndex = flatRecords.indexOf(this.addRowSelectedItem);
                 updatedCollectionIndex = currentViewData.indexOf(this.addRowSelectedItem);
-                this.recordCollectionUpdate(childIndex, recordIndex, updatedCollectionIndex, record, parentItem);
+                this.recordCollectionUpdate(childIndex, recordIndex, updatedCollectionIndex, record, parentItem, rowPosition);
                 break;
             case 'Below':
                 currentItemIndex = flatRecords.indexOf(this.addRowSelectedItem);
@@ -23054,7 +23100,7 @@ class Edit$2 {
                     recordIndex = currentItemIndex + 1;
                     updatedCollectionIndex = currentViewData.indexOf(this.addRowSelectedItem) + 1;
                 }
-                this.recordCollectionUpdate(childIndex + 1, recordIndex, updatedCollectionIndex, record, parentItem);
+                this.recordCollectionUpdate(childIndex + 1, recordIndex, updatedCollectionIndex, record, parentItem, rowPosition);
                 break;
             case 'Child':
                 currentItemIndex = flatRecords.indexOf(this.addRowSelectedItem);
@@ -23082,7 +23128,7 @@ class Edit$2 {
                         this.addRowSelectedItem.ganttProperties.segments = null;
                     }
                 }
-                this.recordCollectionUpdate(childIndex + 1, recordIndex, updatedCollectionIndex, record, parentItem);
+                this.recordCollectionUpdate(childIndex + 1, recordIndex, updatedCollectionIndex, record, parentItem, rowPosition);
                 break;
         }
         this.newlyAddedRecordBackup = record;
@@ -23096,7 +23142,7 @@ class Edit$2 {
      * @returns {void} .
      * @private
      */
-    recordCollectionUpdate(childIndex, recordIndex, updatedCollectionIndex, record, parentItem) {
+    recordCollectionUpdate(childIndex, recordIndex, updatedCollectionIndex, record, parentItem, rowPosition) {
         const flatRecords = this.parent.flatData;
         const currentViewData = this.parent.currentViewData;
         const ids = this.parent.ids;
@@ -23118,7 +23164,15 @@ class Edit$2 {
                 !isNullOrUndefined(this.parent.dataSource)) {
                 const child = this.parent.taskFields.child;
                 if (parentItem.taskData[child] && parentItem.taskData[child].length > 0) {
-                    parentItem.taskData[child].push(record.taskData);
+                    if (rowPosition === 'Above') {
+                        parentItem.taskData[child].splice(childIndex, 0, record.taskData);
+                    }
+                    else if (rowPosition === 'Below') {
+                        parentItem.taskData[child].splice(childIndex + 1, 0, record.taskData);
+                    }
+                    else {
+                        parentItem.taskData[child].push(record.taskData);
+                    }
                 }
                 else {
                     parentItem.taskData[child] = [];
@@ -23203,13 +23257,13 @@ class Edit$2 {
         }
         for (let i = 0; i < addedRecord.length; i++) {
             if (isNullOrUndefined(rowPosition) || isNullOrUndefined(this.addRowSelectedItem)) {
-                rowPosition = 'Top';
+                rowPosition = rowPosition === 'Bottom' ? 'Bottom' : 'Top';
             }
             if (rowPosition === 'Top') {
                 dataSource.splice(0, 0, addedRecord[i].taskData);
             }
             else if (rowPosition === 'Bottom') {
-                dataSource.push(addedRecord[i]);
+                dataSource.push(addedRecord[i].taskData);
             }
             else {
                 if (!isNullOrUndefined(taskFields.id) && !isNullOrUndefined(taskFields.parentID)) {
@@ -23361,7 +23415,7 @@ class Edit$2 {
                     else {
                         if (this.parent.viewType === 'ProjectView') {
                             if ((rowPosition === 'Top' || rowPosition === 'Bottom') ||
-                                ((rowPosition === 'Above' || rowPosition === 'Below') && !args.data.parentItem)) {
+                                ((rowPosition === 'Above' || rowPosition === 'Below' || rowPosition === 'Child') && !args.data.parentItem)) {
                                 if (args.data instanceof Array) {
                                     this.updateRealDataSource(args.data, rowPosition);
                                 }
@@ -23404,6 +23458,59 @@ class Edit$2 {
      * @returns {void} .
      * @private
      */
+    createNewRecord() {
+        const tempRecord = {};
+        const ganttColumns = this.parent.ganttColumns;
+        const taskSettingsFields = this.parent.taskFields;
+        const taskId = this.parent.editModule.getNewTaskId();
+        for (let i = 0; i < ganttColumns.length; i++) {
+            const fieldName = ganttColumns[i].field;
+            if (fieldName === taskSettingsFields.id) {
+                tempRecord[fieldName] = taskId;
+            }
+            else if (ganttColumns[i].field === taskSettingsFields.startDate) {
+                if (isNullOrUndefined(tempRecord[taskSettingsFields.endDate])) {
+                    tempRecord[fieldName] = this.parent.editModule.dialogModule.getMinimumStartDate();
+                }
+                else {
+                    tempRecord[fieldName] = new Date(tempRecord[taskSettingsFields.endDate]);
+                }
+                if (this.parent.timezone) {
+                    tempRecord[fieldName] = this.parent.dateValidationModule.remove(tempRecord[fieldName], this.parent.timezone);
+                }
+            }
+            else if (ganttColumns[i].field === taskSettingsFields.endDate) {
+                if (isNullOrUndefined(tempRecord[taskSettingsFields.startDate])) {
+                    tempRecord[fieldName] = this.parent.editModule.dialogModule.getMinimumStartDate();
+                }
+                else {
+                    tempRecord[fieldName] = new Date(tempRecord[taskSettingsFields.startDate]);
+                }
+                if (this.parent.timezone) {
+                    tempRecord[fieldName] = this.parent.dateValidationModule.remove(tempRecord[fieldName], this.parent.timezone);
+                }
+            }
+            else if (ganttColumns[i].field === taskSettingsFields.duration) {
+                tempRecord[fieldName] = 1;
+            }
+            else if (ganttColumns[i].field === taskSettingsFields.name) {
+                tempRecord[fieldName] = this.parent.editModule.dialogModule['localeObj'].getConstant('addDialogTitle') + ' ' + taskId;
+            }
+            else if (ganttColumns[i].field === taskSettingsFields.progress) {
+                tempRecord[fieldName] = 0;
+            }
+            else if (ganttColumns[i].field === taskSettingsFields.work) {
+                tempRecord[fieldName] = 0;
+            }
+            else if (ganttColumns[i].field === 'taskType') {
+                tempRecord[fieldName] = this.parent.taskType;
+            }
+            else {
+                tempRecord[this.parent.ganttColumns[i].field] = '';
+            }
+        }
+        return tempRecord;
+    }
     validateTaskPosition(data, rowPosition, rowIndex, cAddedRecord) {
         const selectedRowIndex = isNullOrUndefined(rowIndex) || isNaN(parseInt(rowIndex.toString(), 10)) ?
             this.parent.selectionModule ?
@@ -23415,7 +23522,7 @@ class Edit$2 {
                         this.parent.selectionModule.getSelectedRowCellIndexes()[0].rowIndex : null : null : rowIndex;
         this.addRowSelectedItem = isNullOrUndefined(selectedRowIndex) ? null : this.parent.updatedRecords[selectedRowIndex];
         rowPosition = isNullOrUndefined(rowPosition) ? this.parent.editSettings.newRowPosition : rowPosition;
-        data = isNullOrUndefined(data) ? this.parent.editModule.dialogModule.composeAddRecord() : data;
+        data = isNullOrUndefined(data) ? this.createNewRecord() : data;
         if (((isNullOrUndefined(selectedRowIndex) || selectedRowIndex < 0 ||
             isNullOrUndefined(this.addRowSelectedItem)) && (rowPosition === 'Above'
             || rowPosition === 'Below'