@syncfusion/ej2-gantt 24.1.44 → 24.1.45

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

@@ -3802,14 +3802,11 @@ class TaskProcessor extends DateProcessor {
      */
     updateWidthLeft(data) {
         const ganttRecord = data.ganttProperties;
+        let 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) {
             const segments = ganttRecord.segments;
-            let fixedWidth = true;
-            const totalTaskWidth = this.splitTasksDuration(segments) * ((this.parent.timelineModule.bottomTier === "Hour" || this.parent.timelineModule.bottomTier === "Minutes") ? this.parent.timelineSettings.timelineUnitSize : this.parent.perDayWidth);
-            
-            let totalProgressWidth = this.parent.dataOperation.getProgressWidth(totalTaskWidth, ganttRecord.progress);
             for (let i = 0; i < segments.length; i++) {
                 const segment = segments[i];
                 if (i === 0 && !isNullOrUndefined(ganttRecord.startDate) &&
@@ -3820,22 +3817,27 @@ class TaskProcessor extends DateProcessor {
                     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) {
                     const 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;
+            }
+            let setProgress = this.parent.dataOperation.getProgressWidth(totalSegmentsProgressWidth, ganttRecord.progress);
+            let isValid = true;
+            for (let 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);
@@ -3843,7 +3845,12 @@ class TaskProcessor extends DateProcessor {
         }
         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
@@ -23903,6 +23910,9 @@ class DialogEdit {
         const ganttObj = this.parent;
         const resourceSettings = ganttObj.resourceFields;
         const 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);
+        }
         const rowResource = ganttData.ganttProperties.resourceInfo;
         const inputModel = this.beforeOpenArgs[itemName];
         const resourceTreeGridId = ganttObj.element.id + '' + itemName + 'TabContainer';
@@ -23941,6 +23951,11 @@ class DialogEdit {
                 this.ganttResources.push(resourceInfo[i]);
             }
         }
+        else if (!this.isEdit && !isNullOrUndefined(resourceInfo)) {
+            for (let i = 0; i < resourceInfo.length; i++) {
+                this.ganttResources.push(resourceInfo[i]);
+            }
+        }
         inputModel.rowSelected = (args) => {
             this.updateResourceCollection(args, resourceTreeGridId);
         };
@@ -24349,7 +24364,14 @@ class DialogEdit {
                     }
                 }
                 else {
-                    tasksData[fieldName] = controlObj.value;
+                    if (fieldName === "Duration") {
+                        let 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;
@@ -27002,9 +27024,11 @@ class Edit$2 {
             const taskID = updateRecord.ganttProperties.taskId;
             const resourceID = prevResource[index][this.parent.resourceFields.id];
             const record = flatRecords[this.parent.getTaskIds().indexOf('R' + resourceID)];
-            for (let j = 0; j < record.childRecords.length; j++) {
-                if (record.childRecords[j].ganttProperties.taskId === taskID) {
-                    this.removeChildRecord(record.childRecords[j]);
+            if (!isNullOrUndefined(record)) {
+                for (let j = 0; j < record.childRecords.length; j++) {
+                    if (record.childRecords[j].ganttProperties.taskId === taskID) {
+                        this.removeChildRecord(record.childRecords[j]);
+                    }
                 }
             }
         }
@@ -28543,7 +28567,6 @@ class Edit$2 {
                             addedRecords: [args.newTaskData],
                             changedRecords: args.modifiedTaskData
                         };
-                        const prevID = args.data.ganttProperties.taskId.toString();
                         /* tslint:disable-next-line */
                         const query = this.parent.query instanceof Query ? this.parent.query : new Query();
                         const adaptor = data.adaptor;
@@ -28551,6 +28574,13 @@ class Edit$2 {
                             /* tslint:disable-next-line */
                             const crud = data.saveChanges(updatedData, this.parent.taskFields.id, null, query);
                             crud.then((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());
+                                }
+                                const 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) {
                                     this.parent.setRecordValue('taskId', e.addedRecords[0][this.parent.taskFields.id], args.data.ganttProperties, true);
@@ -37451,13 +37481,22 @@ class PdfGanttTaskbarCollection {
             progressFormat.alignment = PdfTextAlignment.Left;
         }
         let pageIndex = -1;
+        let renderBaselineWidth = 0;
+        if (this.baselineWidth > detail.totalWidth) {
+            renderBaselineWidth = detail.totalWidth;
+            this.baselineWidth = this.baselineWidth - detail.totalWidth;
+        }
+        else {
+            renderBaselineWidth = this.baselineWidth;
+        }
+        const baselinePen = new PdfPen(taskbar.baselineBorderColor);
+        const baselineBrush = new PdfSolidBrush(taskbar.baselineColor);
+        let renderedBaseline = false;
         if (!taskbar.isMilestone) {
             const taskbarPen = new PdfPen(taskbar.taskBorderColor);
             const taskBrush = new PdfSolidBrush(taskbar.taskColor);
-            const baselinePen = new PdfPen(taskbar.baselineBorderColor);
             const manualParentBorderPen = new PdfPen(taskbar.manualParentBorder);
             const manualChildBorderPen = new PdfPen(taskbar.manualChildBorder);
-            const baselineBrush = new PdfSolidBrush(taskbar.baselineColor);
             const manualTaskbarPen = new PdfPen(taskbar.manuallineColor);
             const manualParentPen = new PdfPen(taskbar.manualParentProgress);
             const manualline = new PdfPen(taskbar.manuallineColor);
@@ -37528,11 +37567,12 @@ class PdfGanttTaskbarCollection {
                 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 + pixelToPoint(taskbar.height + 3), (this.baselineWidth), pixelToPoint(this.baselineHeight));
+                            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(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
                         }
+                        renderedBaseline = true;
                     }
                     if (taskbar.isSpliterTask) {
                         splitline.dashStyle = PdfDashStyle.Dot;
@@ -37745,11 +37785,12 @@ class PdfGanttTaskbarCollection {
                 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 + pixelToPoint(taskbar.height + 3), (this.baselineWidth), pixelToPoint(this.baselineHeight));
+                            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(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                            taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
                         }
+                        renderedBaseline = true;
                     }
                     if (taskbar.isSpliterTask) {
                         let pervwidth = 0;
@@ -37906,11 +37947,12 @@ class PdfGanttTaskbarCollection {
                 }
                 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 + pixelToPoint(taskbar.height + 3), (this.baselineWidth), pixelToPoint(this.baselineHeight));
+                        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(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
                     }
+                    renderedBaseline = true;
                 }
                 if (!this.isScheduledTask && this.unscheduledTaskBy === 'duration') {
                     let brush1;
@@ -38062,11 +38104,12 @@ class PdfGanttTaskbarCollection {
                 }
                 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 + pixelToPoint(taskbar.height + 3), (this.baselineWidth), pixelToPoint(this.baselineHeight));
+                        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(this.baselineWidth), pixelToPoint(this.baselineHeight));
+                        taskGraphics.drawRectangle(baselinePen, baselineBrush, startPoint.x + pixelToPoint(taskbar.baselineLeft - cumulativeWidth) + 0.5, startPoint.y + adjustHeight + pixelToPoint(taskbar.height + 3), pixelToPoint(renderBaselineWidth), pixelToPoint(this.baselineHeight));
                     }
+                    renderedBaseline = true;
                 }
                 if (!this.isScheduledTask && this.unscheduledTaskBy === 'duration') {
                     let brush1;
@@ -38287,6 +38330,15 @@ class PdfGanttTaskbarCollection {
                 this.drawMilestone(page, startPoint, detail, cumulativeWidth);
             }
         }
+        if (this.baselineEndDate >= detail.startDate && !renderedBaseline && detail.startIndex != 1 && this.parent.renderBaseline && taskbar.baselineStartDate && taskbar.baselineEndDate) {
+            const 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;
     }