@syncfusion/ej2-gantt 21.2.5 → 21.2.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -388,7 +388,7 @@ var DateProcessor = /** @__PURE__ @class */ (function () {
388
388
  else if (hour > this.parent.defaultStartTime && hour < this.parent.defaultEndTime) {
389
389
  for (var i = 0; i < this.parent.workingTimeRanges.length; i++) {
390
390
  var value = this.parent.workingTimeRanges[i];
391
- if (hour >= value.to && (this.parent.workingTimeRanges[i + 1] &&
391
+ if (hour > value.to && (this.parent.workingTimeRanges[i + 1] &&
392
392
  hour < this.parent.workingTimeRanges[i + 1].from)) {
393
393
  this.setTime(this.parent.workingTimeRanges[i + 1].from, cloneDate);
394
394
  break;
@@ -1741,7 +1741,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
1741
1741
  TaskProcessor.prototype.constructResourceViewDataSource = function (resources, data, unassignedTasks) {
1742
1742
  var _loop_1 = function (i) {
1743
1743
  var tempData = data[i];
1744
- var child = this_1.parent.taskFields.child != null ? this_1.parent.taskFields.child : 'Children';
1744
+ var child = this_1.parent.taskFields.child != null ? this_1.parent.taskFields.child : this_1.parent.taskFields.child = 'Children';
1745
1745
  var resourceData = tempData && tempData[this_1.parent.taskFields.resourceInfo];
1746
1746
  var resourceIdMapping = this_1.parent.resourceFields.id;
1747
1747
  if ((!tempData[child] || tempData[child].length === 0) && resourceData && resourceData.length) {
@@ -1923,7 +1923,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
1923
1923
  (this.parent.taskMode === 'Manual') ? false :
1924
1924
  data[taskSettings.manual] === true ? false : true;
1925
1925
  this.parent.setRecordValue('ganttProperties', ganttProperties, ganttData);
1926
- if (!isNullOrUndefined(data[taskSettings.id])) {
1926
+ if (!isNullOrUndefined(data[taskSettings.id]) && (!((this.parent.viewType === "ResourceView" && level == 0))) || data[taskSettings.name] === "Unassigned Task") {
1927
1927
  id = data[taskSettings.id];
1928
1928
  name = data[taskSettings.name];
1929
1929
  this.addTaskData(ganttData, data, isLoad);
@@ -2342,7 +2342,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
2342
2342
  startDate = this.getDateFromFormat(data[taskSettings.startDate], true);
2343
2343
  endDate = this.getDateFromFormat(data[taskSettings.endDate], true);
2344
2344
  }
2345
- var segments = taskSettings.segments ? (data[taskSettings.segments] ||
2345
+ var segments = taskSettings.segments && (!isNullOrUndefined(data[taskSettings.segments]) || !isNullOrUndefined(ganttData.taskData)) ? (data[taskSettings.segments] ||
2346
2346
  ganttData.taskData[taskSettings.segments]) : null;
2347
2347
  var isMileStone = taskSettings.milestone ? data[taskSettings.milestone] ? true : false : false;
2348
2348
  var durationMapping = data[taskSettings.durationUnit] ? data[taskSettings.durationUnit] : '';
@@ -3169,6 +3169,9 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
3169
3169
  return resourceIdCollection;
3170
3170
  }
3171
3171
  resourceIdCollection = data[this.parent.taskFields.resourceInfo];
3172
+ if (resourceIdCollection != "" && typeof resourceIdCollection == "string") {
3173
+ resourceIdCollection = resourceIdCollection.split(',');
3174
+ }
3172
3175
  var resourceData;
3173
3176
  if (!isNullOrUndefined(this.parent.editModule) && !isNullOrUndefined(this.parent.editModule.dialogModule)
3174
3177
  && this.parent.editModule.dialogModule.isAddNewResource) {
@@ -3178,6 +3181,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
3178
3181
  resourceData = this.parent.resources;
3179
3182
  }
3180
3183
  var resourceIDMapping = this.parent.resourceFields.id;
3184
+ var resourceNameMapping = this.parent.resourceFields.name;
3181
3185
  var resourceUnitMapping = this.parent.resourceFields.unit;
3182
3186
  var resourceGroup = this.parent.resourceFields.group;
3183
3187
  var resources = [];
@@ -3188,7 +3192,7 @@ var TaskProcessor = /** @__PURE__ @class */ (function (_super) {
3188
3192
  return true;
3189
3193
  }
3190
3194
  else {
3191
- return (resourceIdCollection[count] === resourceInfo[resourceIDMapping]);
3195
+ return (resourceIdCollection[count] === resourceInfo[resourceIDMapping]) || (resourceIdCollection[count] === resourceInfo[resourceNameMapping]);
3192
3196
  }
3193
3197
  });
3194
3198
  var ganttDataResource = extend({}, resource[0]);
@@ -4658,7 +4662,7 @@ var GanttChart = /** @__PURE__ @class */ (function () {
4658
4662
  GanttChart.prototype.setVirtualHeight = function () {
4659
4663
  if (this.parent.virtualScrollModule && this.parent.enableVirtualization) {
4660
4664
  var wrapper = getValue('virtualTrack', this.parent.ganttChartModule.virtualRender);
4661
- wrapper.style.height = this.parent.treeGrid.element.getElementsByClassName('e-virtualtable')[0].style.height;
4665
+ wrapper.style.height = this.parent.treeGrid.element.getElementsByClassName('e-virtualtrack')[0].style.height;
4662
4666
  var wrapper1 = getValue('wrapper', this.parent.ganttChartModule.virtualRender);
4663
4667
  var treegridVirtualHeight = this.parent.treeGrid.element.getElementsByClassName('e-virtualtable')[0].style.transform;
4664
4668
  wrapper1.style.transform = treegridVirtualHeight;
@@ -9131,7 +9135,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
9131
9135
  if (this.taskLabelTemplateFunction && !isNullOrUndefined(progressDiv) && progressDiv.length > 0) {
9132
9136
  var taskLabelTemplateNode = this.taskLabelTemplateFunction(extend({ index: i }, data), this.parent, 'TaskLabelTemplate', this.getTemplateID('TaskLabelTemplate'), false, undefined, progressDiv[0]);
9133
9137
  if (taskLabelTemplateNode && taskLabelTemplateNode.length > 0) {
9134
- tempDiv.appendChild(taskLabelTemplateNode[0]);
9138
+ append(taskLabelTemplateNode, tempDiv);
9135
9139
  labelString = tempDiv.innerHTML;
9136
9140
  }
9137
9141
  }
@@ -9686,7 +9690,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
9686
9690
  if (leftLabelTemplateNode[0]['data'] === 'null') {
9687
9691
  leftLabelTemplateNode[0]['data'] = '';
9688
9692
  }
9689
- leftLabelNode[0].appendChild([].slice.call(leftLabelTemplateNode)[0]);
9693
+ append(leftLabelTemplateNode, leftLabelNode[0]);
9690
9694
  }
9691
9695
  if (this.parent.enableRtl) {
9692
9696
  leftLabelNode[0].style.paddingLeft = '25px';
@@ -9741,7 +9745,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
9741
9745
  if (rightLabelTemplateNode[0]['data'] === 'null') {
9742
9746
  rightLabelTemplateNode[0]['data'] = '';
9743
9747
  }
9744
- rightLabelNode[0].appendChild([].slice.call(rightLabelTemplateNode)[0]);
9748
+ append(rightLabelTemplateNode, rightLabelNode[0]);
9745
9749
  }
9746
9750
  if (this.parent.enableRtl) {
9747
9751
  rightLabelNode[0].style.marginLeft = '0px';
@@ -10398,12 +10402,12 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
10398
10402
  }
10399
10403
  }
10400
10404
  if ((this.templateData.ganttProperties.autoDuration !== 0) && !this.templateData.ganttProperties.isMilestone && parentTaskbarTemplateNode && parentTaskbarTemplateNode.length > 0) {
10401
- taskbarContainerNode[0].appendChild([].slice.call(parentTaskbarTemplateNode)[0]);
10405
+ append(parentTaskbarTemplateNode, taskbarContainerNode[0]);
10402
10406
  }
10403
10407
  else if ((this.templateData.ganttProperties.duration === 0 && this.templateData.ganttProperties.isMilestone && this.templateData.ganttProperties.isAutoSchedule)) {
10404
10408
  var milestoneTemplateNode = this.getMilestoneNode(i, taskbarContainerNode);
10405
10409
  if (milestoneTemplateNode && milestoneTemplateNode.length > 0) {
10406
- taskbarContainerNode[0].appendChild([].slice.call(milestoneTemplateNode)[0]);
10410
+ append(milestoneTemplateNode, taskbarContainerNode[0]);
10407
10411
  }
10408
10412
  }
10409
10413
  if (this.parent.renderBaseline && this.templateData.ganttProperties.baselineStartDate &&
@@ -10457,7 +10461,7 @@ var ChartRows = /** @__PURE__ @class */ (function (_super) {
10457
10461
  }
10458
10462
  }
10459
10463
  else {
10460
- taskbarContainerNode[0].appendChild([].slice.call(childTaskbarTemplateNode)[0]);
10464
+ append(childTaskbarTemplateNode, taskbarContainerNode[0]);
10461
10465
  }
10462
10466
  }
10463
10467
  if (childTaskbarProgressResizeNode) {
@@ -13761,7 +13765,10 @@ var FocusModule = /** @__PURE__ @class */ (function () {
13761
13765
  break;
13762
13766
  case 'addRow':
13763
13767
  {
13764
- if (isNullOrUndefined(document.getElementById(this.parent.element.id + '_dialog'))) {
13768
+ if (ganttObj.editModule && ganttObj.editModule.cellEditModule && ganttObj.editModule.cellEditModule.isCellEdit) {
13769
+ e.stopPropagation();
13770
+ }
13771
+ else if (isNullOrUndefined(document.getElementById(this.parent.element.id + '_dialog'))) {
13765
13772
  e.preventDefault();
13766
13773
  ganttObj.addRecord(undefined, this.parent.editSettings.newRowPosition);
13767
13774
  var focussedElement = ganttObj.element;
@@ -14299,6 +14306,9 @@ var Gantt = /** @__PURE__ @class */ (function (_super) {
14299
14306
  var ganttHeader = this.chartPane.childNodes[0].childNodes[0];
14300
14307
  this.scrollLeftValue = this.chartPane.childNodes[0].childNodes[0]['scrollLeft'];
14301
14308
  var ganttContent = this.chartPane.childNodes[0].childNodes[1];
14309
+ if (this.treeGrid.element) {
14310
+ this.ganttChartModule['setVirtualHeight']();
14311
+ }
14302
14312
  if (!this.contentMaskTable) {
14303
14313
  if (ganttContent) {
14304
14314
  var content$$1 = ganttContent;
@@ -20139,7 +20149,8 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
20139
20149
  this.dependencyCancel = true;
20140
20150
  }
20141
20151
  if ((this.taskBarEditAction === 'ConnectorPointLeftDrag' ||
20142
- this.taskBarEditAction === 'ConnectorPointRightDrag') && this.drawPredecessor) {
20152
+ this.taskBarEditAction === 'ConnectorPointRightDrag') && this.drawPredecessor && (!this.connectorSecondRecord.hasChildRecords ||
20153
+ this.connectorSecondRecord.hasChildRecords && this.parent.allowParentDependency)) {
20143
20154
  this.parent.connectorLineEditModule.updatePredecessor(this.connectorSecondRecord, this.finalPredecessor);
20144
20155
  if (this.parent.UpdateOffsetOnTaskbarEdit) {
20145
20156
  this.parent.connectorLineEditModule['calculateOffset'](this.connectorSecondRecord);
@@ -20472,7 +20483,9 @@ var TaskbarEdit = /** @__PURE__ @class */ (function (_super) {
20472
20483
  }
20473
20484
  this.showHideTaskBarEditingElements(element, this.highlightedSecondElement, true);
20474
20485
  }
20475
- if (isNullOrUndefined(this.connectorSecondAction) && !isNullOrUndefined(this.connectorSecondElement)) {
20486
+ if (isNullOrUndefined(this.connectorSecondAction) && !isNullOrUndefined(this.connectorSecondElement) &&
20487
+ (!this.connectorSecondRecord.hasChildRecords || this.connectorSecondRecord.hasChildRecords &&
20488
+ this.parent.allowParentDependency)) {
20476
20489
  this.editTooltip.showHideTaskbarEditTooltip(false, this.segmentIndex);
20477
20490
  removeClass([this.connectorSecondElement.querySelector('.' + connectorPointLeft)], [connectorPointAllowBlock]);
20478
20491
  removeClass([this.connectorSecondElement.querySelector('.' + connectorPointRight)], [connectorPointAllowBlock]);
@@ -24633,9 +24646,8 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
24633
24646
  (isNullOrUndefined(taskData.startDate) && !isNullOrUndefined(prevStart)) ||
24634
24647
  (isNullOrUndefined(taskData.endDate) && !isNullOrUndefined(prevEnd)) ||
24635
24648
  (prevStart && prevStart.getTime() !== taskData.startDate.getTime())
24636
- || (prevEnd && prevEnd.getTime() !== taskData.endDate.getTime())
24637
- || (!isNullOrUndefined(prevDuration) && prevDuration !== taskData.duration)
24638
- || (!isNullOrUndefined(prevDuration) && prevDuration === taskData.duration &&
24649
+ && (prevEnd && prevEnd.getTime() !== taskData.endDate.getTime())
24650
+ || (!isNullOrUndefined(prevDuration) && prevDuration !== taskData.duration &&
24639
24651
  prevDurationUnit !== taskData.durationUnit)) {
24640
24652
  isMoved = true;
24641
24653
  }
@@ -26846,6 +26858,7 @@ var Edit$2 = /** @__PURE__ @class */ (function () {
26846
26858
  var args = {};
26847
26859
  args = this.constructTaskAddedEventArgs(cAddedRecord_1, this.parent.editedRecords, 'beforeAdd');
26848
26860
  this.parent.trigger('actionBegin', args, function (args) {
26861
+ _this.parent.previousRecords = {};
26849
26862
  if (!isNullOrUndefined(_this.parent.loadingIndicator) && _this.parent.loadingIndicator.indicatorType === "Shimmer") {
26850
26863
  _this.parent.showMaskRow();
26851
26864
  }
@@ -30880,7 +30893,7 @@ var ContextMenu$2 = /** @__PURE__ @class */ (function () {
30880
30893
  this.parent.ganttChartModule.targetElement;
30881
30894
  // Closed edited cell before opening context menu
30882
30895
  // eslint-disable-next-line
30883
- if (!isNullOrUndefined(this.parent.editModule) && this.parent.editModule.cellEditModule && this.parent.editModule.cellEditModule.isCellEdit && target.parentElement.classList.contains('e-row')) {
30896
+ 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')) {
30884
30897
  this.parent.treeGrid.closeEdit();
30885
30898
  }
30886
30899
  if (!isNullOrUndefined(args.element) && args.element.id === this.parent.element.id + '_contextmenu') {
@@ -35832,11 +35845,22 @@ var PdfGanttPredecessor = /** @__PURE__ @class */ (function () {
35832
35845
  PdfGanttPredecessor.prototype.add = function () {
35833
35846
  return new PdfGanttPredecessor(this.parent);
35834
35847
  };
35835
- PdfGanttPredecessor.prototype.findindex = function (num) {
35848
+ PdfGanttPredecessor.prototype.findindex = function (num, pdfExportProperties) {
35836
35849
  var dataindex;
35837
- this.parent.currentViewData.map(function (data, index) { if (data.index == num) {
35838
- dataindex = index;
35839
- } });
35850
+ if (pdfExportProperties.exportType === 'CurrentViewData') {
35851
+ this.parent.currentViewData.map(function (data, index) {
35852
+ if (data.index == num) {
35853
+ dataindex = index;
35854
+ }
35855
+ });
35856
+ }
35857
+ else {
35858
+ this.parent.flatData.map(function (data, index) {
35859
+ if (data.index == num) {
35860
+ dataindex = index;
35861
+ }
35862
+ });
35863
+ }
35840
35864
  return dataindex;
35841
35865
  };
35842
35866
  /**
@@ -35846,11 +35870,11 @@ var PdfGanttPredecessor = /** @__PURE__ @class */ (function () {
35846
35870
  * @returns {void}
35847
35871
  * @private
35848
35872
  */
35849
- PdfGanttPredecessor.prototype.drawPredecessor = function (pdfGantt) {
35873
+ PdfGanttPredecessor.prototype.drawPredecessor = function (pdfGantt, pdfExportProperties) {
35850
35874
  this.pdfGantt = pdfGantt;
35851
35875
  var pages = pdfGantt.result.page.section.getPages();
35852
- var parentTask = pdfGantt.taskbarCollection[this.findindex(this.parentIndex)];
35853
- var childTask = pdfGantt.taskbarCollection[this.findindex(this.childIndex)];
35876
+ var parentTask = pdfGantt.taskbarCollection[this.findindex(this.parentIndex, pdfExportProperties)];
35877
+ var childTask = pdfGantt.taskbarCollection[this.findindex(this.childIndex, pdfExportProperties)];
35854
35878
  var startPage = new PdfPage();
35855
35879
  var endPage = new PdfPage();
35856
35880
  var predecessorType = '';
@@ -35860,7 +35884,7 @@ var PdfGanttPredecessor = /** @__PURE__ @class */ (function () {
35860
35884
  var childY = 0;
35861
35885
  switch (this.type) {
35862
35886
  case 'FS':
35863
- if (childTask.startPage > -1 && parentTask.endPage > -1) {
35887
+ if ((!isNullOrUndefined(childTask) && childTask.startPage > -1) && (!isNullOrUndefined(parentTask) && parentTask.endPage > -1)) {
35864
35888
  startPage = pages[parentTask.endPage];
35865
35889
  endPage = pages[childTask.startPage];
35866
35890
  parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
@@ -35887,7 +35911,7 @@ var PdfGanttPredecessor = /** @__PURE__ @class */ (function () {
35887
35911
  }
35888
35912
  break;
35889
35913
  case 'SF':
35890
- if (childTask.endPage > -1 && parentTask.startPage > -1) {
35914
+ if ((!isNullOrUndefined(childTask) && childTask.endPage > -1) && (!isNullOrUndefined(parentTask) && parentTask.startPage > -1)) {
35891
35915
  startPage = pages[parentTask.startPage];
35892
35916
  endPage = pages[childTask.endPage];
35893
35917
  parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
@@ -35914,7 +35938,7 @@ var PdfGanttPredecessor = /** @__PURE__ @class */ (function () {
35914
35938
  }
35915
35939
  break;
35916
35940
  case 'FF':
35917
- if (childTask.endPage > -1 && parentTask.endPage > -1) {
35941
+ if ((!isNullOrUndefined(childTask) && childTask.endPage > -1) && (!isNullOrUndefined(parentTask) && parentTask.endPage > -1)) {
35918
35942
  startPage = pages[parentTask.endPage];
35919
35943
  endPage = pages[childTask.endPage];
35920
35944
  parentPageData = pdfGantt.pdfPageDetail[parentTask.endPage - pdfGantt.chartPageIndex];
@@ -35941,7 +35965,7 @@ var PdfGanttPredecessor = /** @__PURE__ @class */ (function () {
35941
35965
  }
35942
35966
  break;
35943
35967
  case 'SS':
35944
- if (childTask.startPage > -1 && parentTask.startPage > -1) {
35968
+ if ((!isNullOrUndefined(childTask) && childTask.startPage > -1) && (!isNullOrUndefined(parentTask) && parentTask.startPage > -1)) {
35945
35969
  startPage = pages[parentTask.startPage];
35946
35970
  endPage = pages[childTask.startPage];
35947
35971
  parentPageData = pdfGantt.pdfPageDetail[parentTask.startPage - pdfGantt.chartPageIndex];
@@ -36299,12 +36323,12 @@ var PdfGantt = /** @__PURE__ @class */ (function (_super) {
36299
36323
  enumerable: true,
36300
36324
  configurable: true
36301
36325
  });
36302
- PdfGantt.prototype.drawChart = function (result) {
36326
+ PdfGantt.prototype.drawChart = function (result, pdfExportProperties) {
36303
36327
  this.result = result;
36304
36328
  this.totalPages = this.result.page.section.count;
36305
36329
  this.perColumnPages = this.totalPages / this.layouter.columnRanges.length;
36306
36330
  this.calculateRange();
36307
- this.drawGantttChart();
36331
+ this.drawGantttChart(pdfExportProperties);
36308
36332
  this.drawPageBorder();
36309
36333
  };
36310
36334
  //Calcualte the header range for each pdf page based on schedule start and end date.
@@ -36453,7 +36477,7 @@ var PdfGantt = /** @__PURE__ @class */ (function (_super) {
36453
36477
  }
36454
36478
  };
36455
36479
  //Draw the gantt chart side
36456
- PdfGantt.prototype.drawGantttChart = function () {
36480
+ PdfGantt.prototype.drawGantttChart = function (pdfExportProperties) {
36457
36481
  var _this = this;
36458
36482
  var taskbarPoint = this.startPoint;
36459
36483
  var pagePoint = new PointF();
@@ -36528,7 +36552,7 @@ var PdfGantt = /** @__PURE__ @class */ (function (_super) {
36528
36552
  // Draw predecessor line.
36529
36553
  for (var i = 0; i < this.predecessorCollection.length; i++) {
36530
36554
  var predecessor = this.predecessorCollection[i];
36531
- predecessor.drawPredecessor(this);
36555
+ predecessor.drawPredecessor(this, pdfExportProperties);
36532
36556
  }
36533
36557
  };
36534
36558
  return PdfGantt;
@@ -36645,7 +36669,7 @@ var PdfExport = /** @__PURE__ @class */ (function () {
36645
36669
  var format = new PdfTreeGridLayoutFormat();
36646
36670
  format.break = PdfLayoutBreakType.FitElement;
36647
36671
  var layouter = _this.gantt.drawGrid(pdfPage, 0, 0, format);
36648
- _this.gantt.drawChart(layouter);
36672
+ _this.gantt.drawChart(layouter, pdfExportProperties);
36649
36673
  if (!isMultipleExport) {
36650
36674
  if (!_this.isBlob) {
36651
36675
  // save the PDF