@syncfusion/ej2-gantt 24.1.44 → 24.1.45

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

@@ -3848,14 +3848,11 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
      */
     TaskProcessor.prototype.updateWidthLeft = function (data) {
         var ganttRecord = data.ganttProperties;
+        var totalSegmentsProgressWidth = 0;
         // task endDate may be changed in segment calculation so this must be calculated first.
         // task width calculating was based on endDate
         if (!isNullOrUndefined(ganttRecord.segments) && ganttRecord.segments.length > 0) {
             var segments = ganttRecord.segments;
-            var fixedWidth = true;
-            var totalTaskWidth = this.splitTasksDuration(segments) * ((this.parent.timelineModule.bottomTier === "Hour" || this.parent.timelineModule.bottomTier === "Minutes") ? this.parent.timelineSettings.timelineUnitSize : this.parent.perDayWidth);
-            
-            var totalProgressWidth = this.parent.dataOperation.getProgressWidth(totalTaskWidth, ganttRecord.progress);
             for (var i = 0; i < segments.length; i++) {
                 var segment = segments[i];
                 if (i === 0 && !isNullOrUndefined(ganttRecord.startDate) &&
@@ -3866,22 +3863,27 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
                     this.parent.chartRowsModule.incrementSegments(segments, 0, data);
                 }
                 segment.width = this.getSplitTaskWidth(segment.startDate, segment.duration, data);
+                totalSegmentsProgressWidth = totalSegmentsProgressWidth + segment.width;
                 segment.showProgress = false;
                 segment.progressWidth = -1;
                 if (i !== 0) {
                     var pStartDate = new Date(ganttRecord.startDate.getTime());
                     segment.left = this.getSplitTaskLeft(segment.startDate, pStartDate);
                 }
-                if (totalProgressWidth > 0 && totalProgressWidth > segment.width) {
-                    totalProgressWidth = totalProgressWidth - segment.width;
-                    segment.progressWidth = segment.width;
-                    segment.showProgress = false;
-                }
-                else if (fixedWidth) {
-                    segment.progressWidth = totalProgressWidth;
-                    segment.showProgress = true;
-                    totalProgressWidth = totalProgressWidth - segment.width;
-                    fixedWidth = false;
+            }
+            var setProgress = this.parent.dataOperation.getProgressWidth(totalSegmentsProgressWidth, ganttRecord.progress);
+            var isValid = true;
+            for (var i = 0; i < segments.length; i++) {
+                if (isValid) {
+                    if (setProgress <= segments[i].width) {
+                        segments[i].progressWidth = setProgress;
+                        segments[i].showProgress = true;
+                        isValid = false;
+                    }
+                    else {
+                        segments[i].progressWidth = segments[i].width;
+                        setProgress = setProgress - segments[i].progressWidth;
+                    }
                 }
             }
             this.parent.setRecordValue('segments', ganttRecord.segments, ganttRecord, true);
@@ -3889,7 +3891,12 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
         }
         this.parent.setRecordValue('width', this.parent.dataOperation.calculateWidth(data), ganttRecord, true);
         this.parent.setRecordValue('left', this.parent.dataOperation.calculateLeft(ganttRecord), ganttRecord, true);
-        this.parent.setRecordValue('progressWidth', this.parent.dataOperation.getProgressWidth((ganttRecord.isAutoSchedule || !data.hasChildRecords ? ganttRecord.width : ganttRecord.autoWidth), ganttRecord.progress), ganttRecord, true);
+        if (!isNullOrUndefined(ganttRecord.segments) && ganttRecord.segments.length > 0) {
+            this.parent.setRecordValue('progressWidth', this.parent.dataOperation.getProgressWidth(totalSegmentsProgressWidth, ganttRecord.progress), ganttRecord, true);
+        }
+        else {
+            this.parent.setRecordValue('progressWidth', this.parent.dataOperation.getProgressWidth((ganttRecord.isAutoSchedule || !data.hasChildRecords ? ganttRecord.width : ganttRecord.autoWidth), ganttRecord.progress), ganttRecord, true);
+        }
     };
     /**
      * method to update left, width, progress width in record
@@ -24408,6 +24415,9 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
         var ganttObj = this.parent;
         var resourceSettings = ganttObj.resourceFields;
         var ganttData = this.beforeOpenArgs.rowData;
+        if (((this.beforeOpenArgs.requestType === 'beforeOpenEditDialog' && !isNullOrUndefined(this.editedRecord[this.parent.taskFields.resourceInfo])) || (this.beforeOpenArgs.requestType === 'beforeOpenAddDialog' && !isNullOrUndefined(this.editedRecord[this.parent.taskFields.resourceInfo]))) && (typeof (this.editedRecord[this.parent.taskFields.resourceInfo]) === "object")) {
+            this.parent.setRecordValue('resourceInfo', this.parent.dataOperation.setResourceInfo(this.editedRecord), ganttData.ganttProperties, true);
+        }
         var rowResource = ganttData.ganttProperties.resourceInfo;
         var inputModel = this.beforeOpenArgs[itemName];
         var resourceTreeGridId = ganttObj.element.id + '' + itemName + 'TabContainer';
@@ -24446,6 +24456,11 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                 this.ganttResources.push(resourceInfo[i]);
             }
         }
+        else if (!this.isEdit && !isNullOrUndefined(resourceInfo)) {
+            for (var i = 0; i < resourceInfo.length; i++) {
+                this.ganttResources.push(resourceInfo[i]);
+            }
+        }
         inputModel.rowSelected = function (args) {
             _this.updateResourceCollection(args, resourceTreeGridId);
         };
@@ -24857,7 +24872,14 @@ var DialogEdit = /** @__PURE__ @class */ (function () {
                     }
                 }
                 else {
-                    tasksData[fieldName] = controlObj.value;
+                    if (fieldName === "Duration") {
+                        var numericValue = parseFloat(String(controlObj.value));
+                        
+                        tasksData[fieldName] = numericValue;
+                    }
+                    else {
+                        tasksData[fieldName] = controlObj.value;
+                    }
                     if (this.parent.enableHtmlSanitizer && typeof (controlObj.value) === 'string') {
                         controlObj.value = SanitizeHtmlHelper.sanitize(controlObj.value);
                         tasksData[fieldName] = controlObj.value;
@@ -27551,9 +27573,11 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
             var taskID = updateRecord.ganttProperties.taskId;
             var resourceID = prevResource[index][this.parent.resourceFields.id];
             var record = flatRecords[this.parent.getTaskIds().indexOf('R' + resourceID)];
-            for (var j = 0; j < record.childRecords.length; j++) {
-                if (record.childRecords[j].ganttProperties.taskId === taskID) {
-                    this.removeChildRecord(record.childRecords[j]);
+            if (!isNullOrUndefined(record)) {
+                for (var j = 0; j < record.childRecords.length; j++) {
+                    if (record.childRecords[j].ganttProperties.taskId === taskID) {
+                        this.removeChildRecord(record.childRecords[j]);
+                    }
                 }
             }
         }
@@ -29107,7 +29131,6 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                             addedRecords: [args.newTaskData],
                             changedRecords: args.modifiedTaskData
                         };
-                        var prevID_1 = args.data.ganttProperties.taskId.toString();
                         /* tslint:disable-next-line */
                         var query = _this.parent.query instanceof Query ? _this.parent.query : new Query();
                         var adaptor = data_2.adaptor;
@@ -29115,14 +29138,21 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
                             /* tslint:disable-next-line */
                             var crud = data_2.saveChanges(updatedData_2, _this.parent.taskFields.id, null, query);
                             crud.then(function (e) {
+                                if (e.addedRecords[0][_this.parent.taskFields.id].toString() != args.data['ganttProperties']['taskId']) {
+                                    args.data['ganttProperties']['taskId'] = e.addedRecords[0][_this.parent.taskFields.id].toString();
+                                    args.newTaskData[tempTaskID] = e.addedRecords[0][_this.parent.taskFields.id].toString();
+                                    args.data['ganttProperties']['rowUniqueID'] = e.addedRecords[0][_this.parent.taskFields.id].toString();
+                                    _this.parent.ids.push(e.addedRecords[0][_this.parent.taskFields.id].toString());
+                                }
+                                var prevID = args.data.ganttProperties.taskId.toString();
                                 if (_this.parent.taskFields.id && !isNullOrUndefined(e.addedRecords[0][_this.parent.taskFields.id]) &&
-                                    e.addedRecords[0][_this.parent.taskFields.id].toString() == prevID_1) {
+                                    e.addedRecords[0][_this.parent.taskFields.id].toString() == prevID) {
                                     _this.parent.setRecordValue('taskId', e.addedRecords[0][_this.parent.taskFields.id], args.data.ganttProperties, true);
                                     _this.parent.setRecordValue('taskData', e.addedRecords[0], args.data);
                                     _this.parent.setRecordValue(_this.parent.taskFields.id, e.addedRecords[0][_this.parent.taskFields.id], args.data);
                                     _this.parent.setRecordValue('rowUniqueID', e.addedRecords[0][_this.parent.taskFields.id].toString(), args.data.ganttProperties, true);
                                     _this.updateClientDataFromServer(e, args);
-                                    var idsIndex = _this.parent.ids.indexOf(prevID_1);
+                                    var idsIndex = _this.parent.ids.indexOf(prevID);
                                     if (idsIndex !== -1) {
                                         _this.parent.ids[idsIndex] = e.addedRecords[0][_this.parent.taskFields.id].toString();
                                     }
@@ -38337,13 +38367,22 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
             progressFormat.alignment = PdfTextAlignment.Left;
         }
         var pageIndex = -1;
+        var renderBaselineWidth = 0;
+        if (this.baselineWidth > detail.totalWidth) {
+            renderBaselineWidth = detail.totalWidth;
+            this.baselineWidth = this.baselineWidth - detail.totalWidth;
+        }
+        else {
+            renderBaselineWidth = this.baselineWidth;
+        }
+        var baselinePen = new PdfPen(taskbar.baselineBorderColor);
+        var baselineBrush = new PdfSolidBrush(taskbar.baselineColor);
+        var renderedBaseline = false;
         if (!taskbar.isMilestone) {
             var taskbarPen_1 = new PdfPen(taskbar.taskBorderColor);
             var taskBrush_1 = new PdfSolidBrush(taskbar.taskColor);
-            var baselinePen = new PdfPen(taskbar.baselineBorderColor);
             var manualParentBorderPen = new PdfPen(taskbar.manualParentBorder);
             var manualChildBorderPen = new PdfPen(taskbar.manualChildBorder);
-            var baselineBrush = new PdfSolidBrush(taskbar.baselineColor);
             var manualTaskbarPen = new PdfPen(taskbar.manuallineColor);
             var manualParentPen = new PdfPen(taskbar.manualParentProgress);
             var manualline = new PdfPen(taskbar.manuallineColor);
@@ -38414,11 +38453,12 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 else {
                     if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
                         if (this.isAutoFit()) {
-                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), (this.baselineWidth), pixelToPoint(this.baselineHeight));
+                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), (renderBaselineWidth), pixelToPoint(this.baselineHeight));
                         }
                         else {
-                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
                         }
+                        renderedBaseline = true;
                     }
                     if (taskbar.isSpliterTask) {
                         splitline.dashStyle = PdfDashStyle.Dot;
@@ -38631,11 +38671,12 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 else {
                     if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
                         if (this.isAutoFit()) {
-                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), (this.baselineWidth), pixelToPoint(this.baselineHeight));
+                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), (renderBaselineWidth), pixelToPoint(this.baselineHeight));
                         }
                         else {
-                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
                         }
+                        renderedBaseline = true;
                     }
                     if (taskbar.isSpliterTask) {
                         var pervwidth_1 = 0;
@@ -38792,11 +38833,12 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 }
                 if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
                     if (this.isAutoFit()) {
-                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), (this.baselineWidth), pixelToPoint(this.baselineHeight));
+                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), (renderBaselineWidth), pixelToPoint(this.baselineHeight));
                     }
                     else {
-                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
                     }
+                    renderedBaseline = true;
                 }
                 if (!this.isScheduledTask && this.unscheduledTaskBy === 'duration') {
                     var brush1 = void 0;
@@ -38948,11 +38990,12 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 }
                 if (this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
                     if (this.isAutoFit()) {
-                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), (this.baselineWidth), pixelToPoint(this.baselineHeight));
+                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), (renderBaselineWidth), pixelToPoint(this.baselineHeight));
                     }
                     else {
-                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), pixelToPoint(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight_1 + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
                     }
+                    renderedBaseline = true;
                 }
                 if (!this.isScheduledTask && this.unscheduledTaskBy === 'duration') {
                     var brush1 = void 0;
@@ -39173,6 +39216,15 @@ var PdfGanttTaskbarCollection = /** @__PURE__ @class */ (function () {
                 this.drawMilestone(page, startPoint, detail, cumulativeWidth);
             }
         }
+        if (this.baselineEndDate >= detail.startDate && !renderedBaseline && detail.startIndex != 1 && this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
+            var adjustHeight = pixelToPoint((this.parent.rowHeight - this.height) / 4.5);
+            if (this.isAutoFit()) {
+                taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + (taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), (renderBaselineWidth), pixelToPoint(this.baselineHeight));
+            }
+            else {
+                taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
+            }
+        }
         this.drawRightLabel(page, startPoint, detail, cumulativeWidth);
         return isNextPage;
     };