@syncfusion/ej2-gantt 20.2.49 → 20.3.47

package/src/gantt/actions/dependency.js

@@ -4,6 +4,7 @@ var Dependency = /** @class */ (function () {
     function Dependency(gantt) {
         this.parentRecord = [];
         this.parentIds = [];
+        this.parentPredecessors = [];
         this.parent = gantt;
         this.dateValidateModule = this.parent.dateValidationModule;
     }
@@ -19,9 +20,7 @@ var Dependency = /** @class */ (function () {
         for (var count = length; count >= 0; count--) {
             var ganttData = predecessorTasks[count];
             var ganttProp = ganttData.ganttProperties;
-            if (!ganttData.hasChildRecords) {
-                this.ensurePredecessorCollectionHelper(ganttData, ganttProp);
-            }
+            this.ensurePredecessorCollectionHelper(ganttData, ganttProp);
         }
     };
     /**
@@ -121,6 +120,7 @@ var Dependency = /** @class */ (function () {
         var predecessor = predecessorValue.toString();
         var collection = [];
         var match;
+        var isrelationship;
         var values;
         var offsetValue;
         var predecessorText;
@@ -131,8 +131,29 @@ var Dependency = /** @class */ (function () {
                 values = el.split('-');
                 offsetValue = '-';
             }
-            match = values[0].match(/(\d+|[A-z]+)/g);
+            match = [];
             var ids = _this.parent.viewType === 'ResourceView' ? _this.parent.getTaskIds() : _this.parent.ids;
+            var isExist1 = _this.parent.viewType === 'ResourceView' ? ids.indexOf('T' + values[0]) : ids.indexOf(values[0]);
+            if (isExist1 !== -1) {
+                match[0] = values[0];
+            }
+            else {
+                if (ids.indexOf(values[0]) === -1) {
+                    match = values[0].split(" ");
+                    if (match.length === 1) {
+                        if (match[0].indexOf(" ") != -1) {
+                            match = values[0].match(/(\d+|[A-z]+)/g);
+                        }
+                        else {
+                            match[0] = values[0].slice(0, -2);
+                            match[1] = values[0].slice(-2);
+                        }
+                    }
+                }
+                else {
+                    match[0] = values[0];
+                }
+            }
             var isExist = _this.parent.viewType === 'ResourceView' ? ids.indexOf('T' + match[0]) : ids.indexOf(match[0]);
             /*Validate for appropriate predecessor*/
             if (match[0] && isExist !== -1) {
@@ -163,10 +184,18 @@ var Dependency = /** @class */ (function () {
                 offsetUnit: offsetUnits.durationUnit,
                 offset: offsetUnits.duration
             };
-            var isOwnParent = _this.checkIsParent(match[0]);
-            if (!isOwnParent) {
+            var fromData = _this.parent.connectorLineModule.getRecordByID(obj.to);
+            var toData = _this.parent.connectorLineModule.getRecordByID(obj.from);
+            var isValid;
+            if (_this.parent.connectorLineEditModule && toData && fromData) {
+                isValid = _this.parent.connectorLineEditModule.validateParentPredecessor(toData, fromData);
+                if (isValid)
+                    collection.push(obj);
+            }
+            else {
                 collection.push(obj);
             }
+            match.splice(0);
         });
         return collection;
     };
@@ -181,6 +210,9 @@ var Dependency = /** @class */ (function () {
         var predecessors = data.ganttProperties.predecessor;
         var durationUnitTexts = this.parent.durationUnitTexts;
         var resultString = '';
+        var temp1;
+        var match;
+        match = [];
         if (predecessors) {
             var length_1 = predecessors.length;
             for (var i = 0; i < length_1; i++) {
@@ -190,6 +222,15 @@ var Dependency = /** @class */ (function () {
                     : data.ganttProperties.rowUniqueID;
                 if (currentValue.from !== id.toString()) {
                     temp = currentValue.from + currentValue.type;
+                    if (typeof (data.ganttProperties.taskId) === "string") {
+                        match[0] = temp.slice(0, -2);
+                        match[1] = temp.slice(-2);
+                        temp1 = match[0] + " " + match[1];
+                    }
+                    else {
+                        temp1 = temp;
+                    }
+                    temp = temp1;
                     if (currentValue.offset !== 0) {
                         temp += currentValue.offset > 0 ? ('+' + currentValue.offset + ' ') : (currentValue.offset + ' ');
                         var multiple = currentValue.offset !== 1;
@@ -277,9 +318,7 @@ var Dependency = /** @class */ (function () {
         var length = predecessorsCollection.length;
         for (var count = 0; count < length; count++) {
             ganttRecord = predecessorsCollection[count];
-            if (!ganttRecord.hasChildRecords) {
-                this.updatePredecessorHelper(ganttRecord, predecessorsCollection);
-            }
+            this.updatePredecessorHelper(ganttRecord, predecessorsCollection);
         }
     };
     /**
@@ -329,9 +368,22 @@ var Dependency = /** @class */ (function () {
      */
     Dependency.prototype.updatedRecordsDateByPredecessor = function () {
         var flatData = this.parent.flatData;
-        for (var count = 0; count < flatData.length; count++) {
+        var totLength = this.parent.flatData.length;
+        for (var count = 0; count < totLength; count++) {
             if (flatData[count].ganttProperties.predecessor) {
                 this.validatePredecessorDates(flatData[count]);
+                if (flatData[count].hasChildRecords && this.parent.editModule) {
+                    this.parent.editModule['updateChildItems'](flatData[count]);
+                }
+            }
+        }
+    };
+    Dependency.prototype.updateParentPredecessor = function () {
+        if (this.parent.enablePredecessorValidation) {
+            var parentPredecessorLength = this.parentPredecessors.length;
+            for (var i = parentPredecessorLength - 1; i >= 0; i--) {
+                var item = this.parentPredecessors[i];
+                this.validatePredecessorDates(item);
             }
         }
     };
@@ -362,6 +414,10 @@ var Dependency = /** @class */ (function () {
                 var predecessor = predecessors[count];
                 parentGanttRecord = this.parent.connectorLineModule.getRecordByID(predecessor.from);
                 record = this.parent.connectorLineModule.getRecordByID(predecessor.to);
+                if (this.parent.isLoad && this.parentPredecessors.indexOf(ganttRecord) == -1
+                    && (ganttRecord.hasChildRecords || record.hasChildRecords)) {
+                    this.parentPredecessors.push(ganttRecord);
+                }
                 if (record.ganttProperties.isAutoSchedule || this.parent.validateManualTasksOnLinking) {
                     this.validateChildGanttRecord(parentGanttRecord, record);
                 }
@@ -402,8 +458,8 @@ var Dependency = /** @class */ (function () {
                 this.dateValidateModule.calculateEndDate(childGanttRecord);
             }
             this.parent.dataOperation.updateWidthLeft(childGanttRecord);
-            if (childGanttRecord.parentItem && this.parent.getParentTask(childGanttRecord.parentItem).ganttProperties.isAutoSchedule
-                && this.parent.isInPredecessorValidation && !this.parent.isLoad) {
+            if (!this.parent.isLoad && childGanttRecord.parentItem && this.parent.isInPredecessorValidation &&
+                this.parent.getParentTask(childGanttRecord.parentItem).ganttProperties.isAutoSchedule) {
                 if (this.parentIds.indexOf(childGanttRecord.parentItem.uniqueID) === -1) {
                     this.parentIds.push(childGanttRecord.parentItem.uniqueID);
                     this.parentRecord.push(childGanttRecord.parentItem);

package/src/gantt/actions/dialog-edit.d.ts

@@ -26,6 +26,7 @@ export declare class DialogEdit {
     private localeObj;
     private parent;
     private rowIndex;
+    private numericOrString;
     private types;
     private editedRecord;
     private rowData;
@@ -42,6 +43,7 @@ export declare class DialogEdit {
     private tabObj;
     private selectedSegment;
     ganttResources: Object[];
+    private isValidData;
     /**
      * @private
      */
@@ -171,6 +173,7 @@ export declare class DialogEdit {
     private renderSegmentsTab;
     private renderGeneralTab;
     private isCheckIsDisabled;
+    private isParentValid;
     private renderPredecessorTab;
     private gridActionBegin;
     private updateResourceCollection;

package/src/gantt/actions/dialog-edit.js

@@ -5,7 +5,7 @@ import { Tab } from '@syncfusion/ej2-navigations';
 import { Grid, Edit, Toolbar as GridToolbar, Page, getObject } from '@syncfusion/ej2-grids';
 import { ForeignKey, getActualProperties } from '@syncfusion/ej2-grids';
 import { RichTextEditor, Toolbar as RTEToolbar, Link, HtmlEditor, QuickToolbar, Count } from '@syncfusion/ej2-richtexteditor';
-import { TextBox, NumericTextBox, MaskedTextBox } from '@syncfusion/ej2-inputs';
+import { TextBox, NumericTextBox, MaskedTextBox, FormValidator } from '@syncfusion/ej2-inputs';
 import { CheckBox } from '@syncfusion/ej2-buttons';
 import { DatePicker, DateTimePicker } from '@syncfusion/ej2-calendars';
 import { DropDownList, ComboBox } from '@syncfusion/ej2-dropdowns';
@@ -32,6 +32,7 @@ var DialogEdit = /** @class */ (function () {
         this.addedRecord = null;
         this.dialogEditValidationFlag = false;
         this.ganttResources = [];
+        this.isValidData = true;
         /**
          * @private
          */
@@ -273,7 +274,7 @@ var DialogEdit = /** @class */ (function () {
                 tempData[field] = 0;
                 tempData.ganttProperties.work = tempData[field];
             }
-            else if (columns[i].field === 'taskType') {
+            else if (columns[i].field === taskSettings.type) {
                 tempData[field] = this.parent.taskType;
                 tempData.ganttProperties.taskType = tempData[field];
             }
@@ -316,6 +317,24 @@ var DialogEdit = /** @class */ (function () {
      */
     DialogEdit.prototype.openEditDialog = function (taskId) {
         var ganttObj = this.parent;
+        if (!isNullOrUndefined(taskId)) {
+            if (!isNullOrUndefined(taskId['ganttProperties'])) {
+                if (typeof taskId['ganttProperties']['taskId'] === 'string') {
+                    this.numericOrString = "stringedit";
+                }
+                else {
+                    this.numericOrString = "numericedit";
+                }
+            }
+            if (isNullOrUndefined(taskId['ganttProperties']) && !isNullOrUndefined(taskId)) {
+                if (isNaN(Number(taskId)) || this.parent.columnByField[this.parent.taskFields.id].editType === "stringedit") {
+                    this.numericOrString = "stringedit";
+                }
+                else {
+                    this.numericOrString = "numericedit";
+                }
+            }
+        }
         if (typeof taskId === 'object' && !isNullOrUndefined(taskId)) {
             this.rowIndex = this.parent.currentViewData.indexOf(taskId);
             if (this.rowIndex > -1) {
@@ -350,11 +369,11 @@ var DialogEdit = /** @class */ (function () {
         this.beforeOpenArgs.rowIndex = this.rowIndex;
         var dialogMaxWidth = this.parent.isAdaptive ? '' : '600px';
         var dialog = this.parent.createElement('div', { id: ganttObj.element.id + '_dialog', styles: 'max-width:' + dialogMaxWidth });
+        dialog.classList.add('e-gantt-dialog');
         ganttObj.element.appendChild(dialog);
         dialogModel.animationSettings = { effect: 'None' };
         dialogModel.header = this.localeObj.getConstant(this.isEdit ? 'editDialogTitle' : 'addDialogTitle');
         dialogModel.isModal = true;
-        dialogModel.cssClass = 'e-gantt-dialog';
         dialogModel.allowDragging = this.parent.isAdaptive ? false : true;
         dialogModel.showCloseIcon = true;
         var position = this.parent.isAdaptive ? { X: 'top', Y: 'left' } : { X: 'center', Y: 'center' };
@@ -710,6 +729,13 @@ var DialogEdit = /** @class */ (function () {
             placeholder: column.headerText,
             floatLabelType: 'Auto'
         };
+        if (!isNullOrUndefined(this.parent.taskFields.id) && !isNullOrUndefined(this.parent.columnMapping.id)
+            && !isNullOrUndefined(this.numericOrString)) {
+            if (taskSettings.id === column.field) {
+                column.editType = this.numericOrString;
+            }
+        }
+        ;
         switch (column.editType) {
             case 'booleanedit':
                 {
@@ -724,7 +750,7 @@ var DialogEdit = /** @class */ (function () {
             case 'stringedit':
                 {
                     var textBox = common;
-                    if (column.field === ganttObj.columnMapping.duration || column.field === ganttObj.columnMapping.startDate ||
+                    if (column.field === ganttObj.columnMapping.duration || column.field === ganttObj.columnMapping.id || column.field === ganttObj.columnMapping.startDate ||
                         column.field === ganttObj.columnMapping.endDate) {
                         textBox.change = function (args) {
                             _this.validateScheduleFields(args, column, ganttObj);
@@ -781,7 +807,7 @@ var DialogEdit = /** @class */ (function () {
                     break;
                 }
             case 'dropdownedit':
-                if (column.field === 'taskType' || column.field === ganttObj.columnMapping.manual) {
+                if (column.field === ganttObj.columnMapping.type || column.field === ganttObj.columnMapping.manual) {
                     var dataKey = 'dataSource';
                     var fieldsKey = 'fields';
                     var types = [
@@ -809,12 +835,19 @@ var DialogEdit = /** @class */ (function () {
         return fieldsModel;
     };
     DialogEdit.prototype.validateScheduleFields = function (args, column, ganttObj) {
-        var dialog = ganttObj.editModule.dialogModule.dialog;
+        var _a;
+        var dialog;
+        if (!isNullOrUndefined(ganttObj.editModule.dialogModule.dialog)) {
+            dialog = ganttObj.editModule.dialogModule.dialog;
+        }
         var targetId = null;
         var inputElement;
         var currentData = ganttObj.editModule.dialogModule.editedRecord;
         var cellValue = null;
         var colName = null;
+        var formObject;
+        var ids = this.parent.viewType === 'ResourceView' ? this.parent.getTaskIds() : this.parent.ids;
+        var strViewType = this.parent.viewType;
         if (!isNullOrUndefined(args.element)) {
             inputElement = args.element;
             targetId = inputElement.getAttribute('id');
@@ -836,6 +869,22 @@ var DialogEdit = /** @class */ (function () {
         else {
             cellValue = inputElement.value;
             colName = targetId.replace(ganttObj.element.id, '');
+            if (this.parent.columnByField[this.parent.taskFields.id].editType === "stringedit") {
+                var customFn = function (args) {
+                    if (strViewType === 'ResourceView') {
+                        return ids.indexOf('T' + args['value']) === -1 && ids.indexOf('R' + args['value']) === -1;
+                    }
+                    else {
+                        return ids.indexOf(args['value']) === -1;
+                    }
+                };
+                var options = {
+                    rules: (_a = {},
+                        _a[this.parent.taskFields.id] = { required: true, minLength: [customFn, 'ID is already present, please enter new value'] },
+                        _a)
+                };
+                formObject = new FormValidator('#' + this.parent.element.id + 'GeneralTabContainer', options);
+            }
         }
         if (colName.search('Segments') === 0) {
             colName = colName.replace('SegmentsTabContainer', '');
@@ -1059,7 +1108,7 @@ var DialogEdit = /** @class */ (function () {
                 this.validateDuration(currentData);
             }
         }
-        if (columnName === 'taskType') {
+        if (columnName === taskSettings.type) {
             this.parent.setRecordValue('taskType', value, ganttProp, true);
         }
         if (taskSettings.manual === columnName) {
@@ -1419,9 +1468,6 @@ var DialogEdit = /** @class */ (function () {
                 item.content = this.renderGeneralTab(item.content);
             }
             else if (item.content === 'Dependency') {
-                if (this.editedRecord.hasChildRecords) {
-                    item.disabled = true;
-                }
                 item.content = this.renderPredecessorTab(item.content);
             }
             else if (item.content === 'Resources') {
@@ -1527,6 +1573,7 @@ var DialogEdit = /** @class */ (function () {
     };
     DialogEdit.prototype.isCheckIsDisabled = function (column) {
         var disabled = false;
+        var stringOrNumber;
         if (column.allowEditing === false || column.isPrimaryKey || this.parent.readOnly) {
             if (this.parent.customColumns.indexOf(column.field) !== -1) {
                 disabled = true;
@@ -1536,8 +1583,19 @@ var DialogEdit = /** @class */ (function () {
                     column.field === this.parent.taskFields.duration || column.field === this.parent.taskFields.progress ||
                     column.field === this.parent.taskFields.startDate || column.field === this.parent.taskFields.endDate ||
                     column.field === this.parent.taskFields.baselineStartDate || column.field === this.parent.taskFields.baselineEndDate ||
-                    column.field === this.parent.taskFields.work || column.field === 'taskType') {
-                    disabled = true;
+                    column.field === this.parent.taskFields.work || column.field === this.parent.taskFields.type) {
+                    for (var i = 0; i < this.parent.currentViewData['length']; i++) {
+                        if (!isNullOrUndefined(this.parent.currentViewData[i].ganttProperties.taskId)) {
+                            stringOrNumber = this.parent.currentViewData[i].ganttProperties.taskId;
+                            break;
+                        }
+                    }
+                    if (typeof (stringOrNumber) === "string") {
+                        disabled = false;
+                    }
+                    else {
+                        disabled = true;
+                    }
                 }
             }
         }
@@ -1549,13 +1607,30 @@ var DialogEdit = /** @class */ (function () {
                 if ((column.field === this.parent.taskFields.endDate && ((!isNullOrUndefined(this.editedRecord['isManual']) &&
                     this.editedRecord['isManual'] == false) || this.parent.taskMode == 'Auto')) || column.field === this.parent.taskFields.duration ||
                     column.field === this.parent.taskFields.progress || column.field === this.parent.taskFields.work ||
-                    column.field === 'taskType') {
+                    column.field === this.parent.taskFields.type) {
                     disabled = true;
                 }
             }
         }
         return disabled;
     };
+    DialogEdit.prototype.isParentValid = function (data) {
+        if (data.length > 0) {
+            for (var i = 0; i < data.length; i++) {
+                if (data[i].uniqueID == this.beforeOpenArgs.rowData['uniqueID']) {
+                    this.isValidData = false;
+                    break;
+                }
+                if (data[i].hasChildRecords) {
+                    this.isParentValid(data[i].childRecords);
+                }
+                if (!this.isValidData) {
+                    break;
+                }
+            }
+        }
+        return this.isValidData;
+    };
     DialogEdit.prototype.renderPredecessorTab = function (itemName) {
         var _this = this;
         var ganttObj = this.parent;
@@ -1671,7 +1746,20 @@ var DialogEdit = /** @class */ (function () {
         var rowResource = ganttData.ganttProperties.resourceInfo;
         var inputModel = this.beforeOpenArgs[itemName];
         var resourceTreeGridId = ganttObj.element.id + '' + itemName + 'TabContainer';
-        var resourceData = extend([], [], ganttObj.resources, true);
+        var resourceData = [];
+        if (this.parent.viewType === 'ResourceView') {
+            for (var i = 0; i < ganttObj.currentViewData.length; i++) {
+                for (var j = 0; j < ganttObj.resources.length; j++) {
+                    if (ganttObj.currentViewData[i][ganttObj.taskFields.id] === ganttObj.resources[j][resourceSettings.id] &&
+                        (ganttObj.currentViewData[i].hasChildRecords || isNullOrUndefined(ganttObj.currentViewData[i].parentItem))) {
+                        resourceData.push(ganttObj.resources[j]);
+                    }
+                }
+            }
+        }
+        else {
+            resourceData = extend([], [], ganttObj.resources, true);
+        }
         this.parent.dataOperation.updateResourceUnit(resourceData);
         if (!isNullOrUndefined(rowResource)) {
             var count = void 0;
@@ -1840,7 +1928,26 @@ var DialogEdit = /** @class */ (function () {
         this.preTableCollection = [];
         for (var i = 0; i < flatData.length; i++) {
             var data = flatData[i];
-            if (data.hasChildRecords) {
+            var currentFlatData = data;
+            if (data.parentUniqueID === this.beforeOpenArgs.rowData['uniqueID']) {
+                this.isValidData = false;
+            }
+            else {
+                do {
+                    if (currentFlatData.parentItem) {
+                        currentFlatData = this.parent.flatData[this.parent.ids.indexOf(currentFlatData.parentItem.taskId)];
+                        if (currentFlatData.uniqueID == this.beforeOpenArgs.rowData['uniqueID']) {
+                            this.isValidData = false;
+                            break;
+                        }
+                    }
+                } while (currentFlatData.parentItem);
+            }
+            if (data.hasChildRecords && this.isValidData) {
+                this.isValidData = this.isParentValid(data.childRecords);
+            }
+            if (!this.isValidData) {
+                this.isValidData = true;
                 continue;
             }
             var taskId = this.parent.viewType === 'ResourceView' ? data.ganttProperties.taskId.toString()
@@ -2046,6 +2153,10 @@ var DialogEdit = /** @class */ (function () {
             if (inputElement) {
                 var fieldName = inputElement.id.replace(ganttObj.element.id, '');
                 var controlObj = div.querySelector('#' + ganttObj.element.id + fieldName).ej2_instances[0];
+                if (this.parent.columnByField[this.parent.taskFields.id].editType === "stringedit" && fieldName === this.parent.taskFields.id) {
+                    var valueString = controlObj.value.toString();
+                    controlObj.value = valueString;
+                }
                 var column = ganttObj.columnByField[fieldName];
                 if (!isNullOrUndefined(column.edit) && isNullOrUndefined(column.edit.params)) {
                     var read = column.edit.read;
@@ -2081,6 +2192,7 @@ var DialogEdit = /** @class */ (function () {
         this.parent.setRecordValue('duration', fromRecord.ganttProperties.duration, toRecord.ganttProperties, true);
         this.parent.setRecordValue('durationUnit', fromRecord.ganttProperties.durationUnit, toRecord.ganttProperties, true);
         this.parent.setRecordValue('work', fromRecord.ganttProperties.work, toRecord.ganttProperties, true);
+        this.parent.setRecordValue('type', fromRecord.ganttProperties.taskType, toRecord.ganttProperties, true);
         if (!isNullOrUndefined(this.parent.taskFields.startDate)) {
             this.parent.dataOperation.updateMappingData(this.rowData, this.parent.taskFields.startDate);
         }
@@ -2103,6 +2215,9 @@ var DialogEdit = /** @class */ (function () {
         if (!isNullOrUndefined(this.parent.taskFields.manual)) {
             this.parent.dataOperation.updateMappingData(this.rowData, this.parent.taskFields.manual);
         }
+        if (!isNullOrUndefined(this.parent.taskFields.type)) {
+            this.parent.dataOperation.updateMappingData(this.rowData, "type");
+        }
     };
     DialogEdit.prototype.updatePredecessorTab = function (preElement) {
         var gridObj = preElement.ej2_instances[0];