@syncfusion/ej2-gantt 19.4.48 → 19.4.50
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.
- package/CHANGELOG.md +10 -0
- package/dist/ej2-gantt.umd.min.js +2 -2
- package/dist/ej2-gantt.umd.min.js.map +1 -1
- package/dist/es6/ej2-gantt.es2015.js +125 -18
- package/dist/es6/ej2-gantt.es2015.js.map +1 -1
- package/dist/es6/ej2-gantt.es5.js +125 -18
- package/dist/es6/ej2-gantt.es5.js.map +1 -1
- package/dist/global/ej2-gantt.min.js +2 -2
- package/dist/global/ej2-gantt.min.js.map +1 -1
- package/dist/global/index.d.ts +1 -1
- package/package.json +14 -14
- package/src/gantt/actions/cell-edit.d.ts +1 -0
- package/src/gantt/actions/cell-edit.js +2 -0
- package/src/gantt/actions/dialog-edit.js +18 -2
- package/src/gantt/actions/edit.d.ts +1 -0
- package/src/gantt/actions/edit.js +74 -10
- package/src/gantt/actions/keyboard.js +1 -1
- package/src/gantt/renderer/timeline.d.ts +1 -0
- package/src/gantt/renderer/timeline.js +30 -5
- package/styles/bootstrap-dark.css +3 -3
- package/styles/bootstrap.css +3 -3
- package/styles/bootstrap4.css +3 -3
- package/styles/bootstrap5-dark.css +1 -1
- package/styles/bootstrap5.css +1 -1
- package/styles/gantt/_bootstrap-dark-definition.scss +3 -3
- package/styles/gantt/_bootstrap-definition.scss +3 -3
- package/styles/gantt/_bootstrap4-definition.scss +3 -3
- package/styles/gantt/_bootstrap5-definition.scss +1 -1
- package/styles/gantt/_fluent-definition.scss +1 -1
- package/styles/gantt/_tailwind-definition.scss +3 -3
- package/styles/gantt/bootstrap-dark.css +3 -3
- package/styles/gantt/bootstrap.css +3 -3
- package/styles/gantt/bootstrap4.css +3 -3
- package/styles/gantt/bootstrap5-dark.css +1 -1
- package/styles/gantt/bootstrap5.css +1 -1
- package/styles/gantt/tailwind-dark.css +3 -3
- package/styles/gantt/tailwind.css +3 -3
- package/styles/tailwind-dark.css +3 -3
- package/styles/tailwind.css +3 -3
package/dist/global/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*!
|
|
2
2
|
* filename: index.d.ts
|
|
3
|
-
* version : 19.4.
|
|
3
|
+
* version : 19.4.50
|
|
4
4
|
* Copyright Syncfusion Inc. 2001 - 2020. All rights reserved.
|
|
5
5
|
* Use of this code is subject to the terms of our license.
|
|
6
6
|
* A copy of the current license can be obtained at any time by e-mailing
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"_from": "@syncfusion/ej2-gantt@*",
|
|
3
|
-
"_id": "@syncfusion/ej2-gantt@19.4.
|
|
3
|
+
"_id": "@syncfusion/ej2-gantt@19.4.48",
|
|
4
4
|
"_inBundle": false,
|
|
5
|
-
"_integrity": "sha512-
|
|
5
|
+
"_integrity": "sha512-fY8JJul26Xe0spdqD4+BjyaglbRjxSyxGCf8cNkkBRfX3bVy/36PHglr5qibrV3KbShkkOPCyWiTgm+Sbme/PA==",
|
|
6
6
|
"_location": "/@syncfusion/ej2-gantt",
|
|
7
7
|
"_phantomChildren": {},
|
|
8
8
|
"_requested": {
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"/@syncfusion/ej2-react-gantt",
|
|
24
24
|
"/@syncfusion/ej2-vue-gantt"
|
|
25
25
|
],
|
|
26
|
-
"_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-19.4.
|
|
27
|
-
"_shasum": "
|
|
26
|
+
"_resolved": "http://nexus.syncfusion.com/repository/ej2-hotfix-new/@syncfusion/ej2-gantt/-/ej2-gantt-19.4.48.tgz",
|
|
27
|
+
"_shasum": "d57e28193070a1ee84904bcb6215e2d999f67ce7",
|
|
28
28
|
"_spec": "@syncfusion/ej2-gantt@*",
|
|
29
29
|
"_where": "/jenkins/workspace/automation_release_19.1.0.1-ZPMUBNQ6AUYH6YGEFBPVYMEQLRRW2SLD4XCZ6GATNZJFYJ3RIAOA/packages/included",
|
|
30
30
|
"author": {
|
|
@@ -36,18 +36,18 @@
|
|
|
36
36
|
"bundleDependencies": false,
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@syncfusion/ej2-base": "~19.4.48",
|
|
39
|
-
"@syncfusion/ej2-buttons": "~19.4.
|
|
40
|
-
"@syncfusion/ej2-calendars": "~19.4.
|
|
41
|
-
"@syncfusion/ej2-data": "~19.4.
|
|
42
|
-
"@syncfusion/ej2-dropdowns": "~19.4.
|
|
43
|
-
"@syncfusion/ej2-grids": "~19.4.
|
|
39
|
+
"@syncfusion/ej2-buttons": "~19.4.50",
|
|
40
|
+
"@syncfusion/ej2-calendars": "~19.4.50",
|
|
41
|
+
"@syncfusion/ej2-data": "~19.4.50",
|
|
42
|
+
"@syncfusion/ej2-dropdowns": "~19.4.50",
|
|
43
|
+
"@syncfusion/ej2-grids": "~19.4.50",
|
|
44
44
|
"@syncfusion/ej2-inputs": "~19.4.48",
|
|
45
45
|
"@syncfusion/ej2-layouts": "~19.4.48",
|
|
46
46
|
"@syncfusion/ej2-lists": "~19.4.48",
|
|
47
|
-
"@syncfusion/ej2-navigations": "~19.4.
|
|
48
|
-
"@syncfusion/ej2-popups": "~19.4.
|
|
49
|
-
"@syncfusion/ej2-richtexteditor": "~19.4.
|
|
50
|
-
"@syncfusion/ej2-treegrid": "~19.4.
|
|
47
|
+
"@syncfusion/ej2-navigations": "~19.4.50",
|
|
48
|
+
"@syncfusion/ej2-popups": "~19.4.50",
|
|
49
|
+
"@syncfusion/ej2-richtexteditor": "~19.4.50",
|
|
50
|
+
"@syncfusion/ej2-treegrid": "~19.4.50"
|
|
51
51
|
},
|
|
52
52
|
"deprecated": false,
|
|
53
53
|
"description": "Essential JS 2 Gantt Component",
|
|
@@ -75,6 +75,6 @@
|
|
|
75
75
|
"url": "git+https://github.com/syncfusion/ej2-gantt.git"
|
|
76
76
|
},
|
|
77
77
|
"typings": "index.d.ts",
|
|
78
|
-
"version": "19.4.
|
|
78
|
+
"version": "19.4.50",
|
|
79
79
|
"sideEffects": false
|
|
80
80
|
}
|
|
@@ -10,6 +10,7 @@ var CellEdit = /** @class */ (function () {
|
|
|
10
10
|
* @private
|
|
11
11
|
*/
|
|
12
12
|
this.isCellEdit = false;
|
|
13
|
+
this.isResourceCellEdited = false;
|
|
13
14
|
this.parent = ganttObj;
|
|
14
15
|
this.bindTreeGridProperties();
|
|
15
16
|
}
|
|
@@ -439,6 +440,7 @@ var CellEdit = /** @class */ (function () {
|
|
|
439
440
|
var resourceSettings = this.parent.resourceFields;
|
|
440
441
|
var editedResourceId = editedObj[this.parent.taskFields.resourceInfo];
|
|
441
442
|
if (editedResourceId) {
|
|
443
|
+
this.isResourceCellEdited = true;
|
|
442
444
|
var tempResourceInfo = this.parent.dataOperation.setResourceInfo(editedObj);
|
|
443
445
|
var editedResouceLength = tempResourceInfo.length;
|
|
444
446
|
var previousResource = previousData.ganttProperties.resourceInfo;
|
|
@@ -1103,7 +1103,15 @@ var DialogEdit = /** @class */ (function () {
|
|
|
1103
1103
|
field: fields[i], headerText: this_1.localeObj.getConstant(fields[i]), editType: 'stringedit', width: '200px',
|
|
1104
1104
|
edit: {
|
|
1105
1105
|
write: function (args) {
|
|
1106
|
-
var datePickerModel
|
|
1106
|
+
var datePickerModel;
|
|
1107
|
+
if (!isNullOrUndefined(_this.beforeOpenArgs[generalTabString])) {
|
|
1108
|
+
datePickerModel = _this.beforeOpenArgs[generalTabString][_this.parent.taskFields[fields[i]]];
|
|
1109
|
+
}
|
|
1110
|
+
else {
|
|
1111
|
+
var columnFields = _this.getGeneralColumnFields();
|
|
1112
|
+
var columnModel = _this.getFieldsModel(columnFields);
|
|
1113
|
+
datePickerModel = columnModel[_this.parent.taskFields[fields[i]]];
|
|
1114
|
+
}
|
|
1107
1115
|
var value = args.rowData[args.column.field];
|
|
1108
1116
|
setValue('value', value, datePickerModel);
|
|
1109
1117
|
var datePicker = new _this.inputs[_this.parent.columnByField[_this.parent.taskFields[fields[i]]].editType](datePickerModel);
|
|
@@ -1126,7 +1134,15 @@ var DialogEdit = /** @class */ (function () {
|
|
|
1126
1134
|
field: fields[i], headerText: this_1.localeObj.getConstant(fields[i]), editType: 'stringedit', width: '100px',
|
|
1127
1135
|
edit: {
|
|
1128
1136
|
write: function (args) {
|
|
1129
|
-
var inputTextModel
|
|
1137
|
+
var inputTextModel;
|
|
1138
|
+
if (!isNullOrUndefined(_this.beforeOpenArgs[generalTabString])) {
|
|
1139
|
+
inputTextModel = _this.beforeOpenArgs[generalTabString][_this.parent.taskFields[fields[i]]];
|
|
1140
|
+
}
|
|
1141
|
+
else {
|
|
1142
|
+
var columnFields = _this.getGeneralColumnFields();
|
|
1143
|
+
var columnModel = _this.getFieldsModel(columnFields);
|
|
1144
|
+
inputTextModel = columnModel[_this.parent.taskFields[fields[i]]];
|
|
1145
|
+
}
|
|
1130
1146
|
inputTextModel.floatLabelType = 'Never';
|
|
1131
1147
|
var value = args.rowData[args.column.field];
|
|
1132
1148
|
if (!isNullOrUndefined(value)) {
|
|
@@ -467,6 +467,7 @@ export declare class Edit {
|
|
|
467
467
|
* @returns {void} .
|
|
468
468
|
* @private
|
|
469
469
|
*/
|
|
470
|
+
createNewRecord(): IGanttData;
|
|
470
471
|
validateTaskPosition(data?: Object | object[], rowPosition?: RowPosition, rowIndex?: number, cAddedRecord?: IGanttData[]): void;
|
|
471
472
|
private updateNewRecord;
|
|
472
473
|
/**
|
|
@@ -821,9 +821,12 @@ var Edit = /** @class */ (function () {
|
|
|
821
821
|
*/
|
|
822
822
|
Edit.prototype.updateParentChildRecord = function (data) {
|
|
823
823
|
var ganttRecord = data;
|
|
824
|
-
if (ganttRecord.hasChildRecords && this.taskbarMoved && this.parent.taskMode === 'Auto' && this.parent.
|
|
824
|
+
if (ganttRecord.hasChildRecords && this.taskbarMoved && this.parent.taskMode === 'Auto' && (!isNullOrUndefined(this.parent.editModule.cellEditModule) && !this.parent.editModule.cellEditModule.isResourceCellEdited)) {
|
|
825
825
|
this.updateChildItems(ganttRecord);
|
|
826
826
|
}
|
|
827
|
+
if (!isNullOrUndefined(this.parent.editModule.cellEditModule)) {
|
|
828
|
+
this.parent.editModule.cellEditModule.isResourceCellEdited = false;
|
|
829
|
+
}
|
|
827
830
|
};
|
|
828
831
|
/**
|
|
829
832
|
* To update records while changing schedule mode.
|
|
@@ -2275,7 +2278,7 @@ var Edit = /** @class */ (function () {
|
|
|
2275
2278
|
/*Record Updates*/
|
|
2276
2279
|
recordIndex = flatRecords.indexOf(this.addRowSelectedItem);
|
|
2277
2280
|
updatedCollectionIndex = currentViewData.indexOf(this.addRowSelectedItem);
|
|
2278
|
-
this.recordCollectionUpdate(childIndex, recordIndex, updatedCollectionIndex, record, parentItem);
|
|
2281
|
+
this.recordCollectionUpdate(childIndex, recordIndex, updatedCollectionIndex, record, parentItem, rowPosition);
|
|
2279
2282
|
break;
|
|
2280
2283
|
case 'Below':
|
|
2281
2284
|
currentItemIndex = flatRecords.indexOf(this.addRowSelectedItem);
|
|
@@ -2289,7 +2292,7 @@ var Edit = /** @class */ (function () {
|
|
|
2289
2292
|
recordIndex = currentItemIndex + 1;
|
|
2290
2293
|
updatedCollectionIndex = currentViewData.indexOf(this.addRowSelectedItem) + 1;
|
|
2291
2294
|
}
|
|
2292
|
-
this.recordCollectionUpdate(childIndex + 1, recordIndex, updatedCollectionIndex, record, parentItem);
|
|
2295
|
+
this.recordCollectionUpdate(childIndex + 1, recordIndex, updatedCollectionIndex, record, parentItem, rowPosition);
|
|
2293
2296
|
break;
|
|
2294
2297
|
case 'Child':
|
|
2295
2298
|
currentItemIndex = flatRecords.indexOf(this.addRowSelectedItem);
|
|
@@ -2317,7 +2320,7 @@ var Edit = /** @class */ (function () {
|
|
|
2317
2320
|
this.addRowSelectedItem.ganttProperties.segments = null;
|
|
2318
2321
|
}
|
|
2319
2322
|
}
|
|
2320
|
-
this.recordCollectionUpdate(childIndex + 1, recordIndex, updatedCollectionIndex, record, parentItem);
|
|
2323
|
+
this.recordCollectionUpdate(childIndex + 1, recordIndex, updatedCollectionIndex, record, parentItem, rowPosition);
|
|
2321
2324
|
break;
|
|
2322
2325
|
}
|
|
2323
2326
|
this.newlyAddedRecordBackup = record;
|
|
@@ -2331,7 +2334,7 @@ var Edit = /** @class */ (function () {
|
|
|
2331
2334
|
* @returns {void} .
|
|
2332
2335
|
* @private
|
|
2333
2336
|
*/
|
|
2334
|
-
Edit.prototype.recordCollectionUpdate = function (childIndex, recordIndex, updatedCollectionIndex, record, parentItem) {
|
|
2337
|
+
Edit.prototype.recordCollectionUpdate = function (childIndex, recordIndex, updatedCollectionIndex, record, parentItem, rowPosition) {
|
|
2335
2338
|
var flatRecords = this.parent.flatData;
|
|
2336
2339
|
var currentViewData = this.parent.currentViewData;
|
|
2337
2340
|
var ids = this.parent.ids;
|
|
@@ -2353,7 +2356,15 @@ var Edit = /** @class */ (function () {
|
|
|
2353
2356
|
!isNullOrUndefined(this.parent.dataSource)) {
|
|
2354
2357
|
var child = this.parent.taskFields.child;
|
|
2355
2358
|
if (parentItem.taskData[child] && parentItem.taskData[child].length > 0) {
|
|
2356
|
-
|
|
2359
|
+
if (rowPosition === 'Above') {
|
|
2360
|
+
parentItem.taskData[child].splice(childIndex, 0, record.taskData);
|
|
2361
|
+
}
|
|
2362
|
+
else if (rowPosition === 'Below') {
|
|
2363
|
+
parentItem.taskData[child].splice(childIndex + 1, 0, record.taskData);
|
|
2364
|
+
}
|
|
2365
|
+
else {
|
|
2366
|
+
parentItem.taskData[child].push(record.taskData);
|
|
2367
|
+
}
|
|
2357
2368
|
}
|
|
2358
2369
|
else {
|
|
2359
2370
|
parentItem.taskData[child] = [];
|
|
@@ -2438,13 +2449,13 @@ var Edit = /** @class */ (function () {
|
|
|
2438
2449
|
}
|
|
2439
2450
|
for (var i = 0; i < addedRecord.length; i++) {
|
|
2440
2451
|
if (isNullOrUndefined(rowPosition) || isNullOrUndefined(this.addRowSelectedItem)) {
|
|
2441
|
-
rowPosition = 'Top';
|
|
2452
|
+
rowPosition = rowPosition === 'Bottom' ? 'Bottom' : 'Top';
|
|
2442
2453
|
}
|
|
2443
2454
|
if (rowPosition === 'Top') {
|
|
2444
2455
|
dataSource.splice(0, 0, addedRecord[i].taskData);
|
|
2445
2456
|
}
|
|
2446
2457
|
else if (rowPosition === 'Bottom') {
|
|
2447
|
-
dataSource.push(addedRecord[i]);
|
|
2458
|
+
dataSource.push(addedRecord[i].taskData);
|
|
2448
2459
|
}
|
|
2449
2460
|
else {
|
|
2450
2461
|
if (!isNullOrUndefined(taskFields.id) && !isNullOrUndefined(taskFields.parentID)) {
|
|
@@ -2597,7 +2608,7 @@ var Edit = /** @class */ (function () {
|
|
|
2597
2608
|
else {
|
|
2598
2609
|
if (_this.parent.viewType === 'ProjectView') {
|
|
2599
2610
|
if ((rowPosition === 'Top' || rowPosition === 'Bottom') ||
|
|
2600
|
-
((rowPosition === 'Above' || rowPosition === 'Below') && !args.data.parentItem)) {
|
|
2611
|
+
((rowPosition === 'Above' || rowPosition === 'Below' || rowPosition === 'Child') && !args.data.parentItem)) {
|
|
2601
2612
|
if (args.data instanceof Array) {
|
|
2602
2613
|
_this.updateRealDataSource(args.data, rowPosition);
|
|
2603
2614
|
}
|
|
@@ -2640,6 +2651,59 @@ var Edit = /** @class */ (function () {
|
|
|
2640
2651
|
* @returns {void} .
|
|
2641
2652
|
* @private
|
|
2642
2653
|
*/
|
|
2654
|
+
Edit.prototype.createNewRecord = function () {
|
|
2655
|
+
var tempRecord = {};
|
|
2656
|
+
var ganttColumns = this.parent.ganttColumns;
|
|
2657
|
+
var taskSettingsFields = this.parent.taskFields;
|
|
2658
|
+
var taskId = this.parent.editModule.getNewTaskId();
|
|
2659
|
+
for (var i = 0; i < ganttColumns.length; i++) {
|
|
2660
|
+
var fieldName = ganttColumns[i].field;
|
|
2661
|
+
if (fieldName === taskSettingsFields.id) {
|
|
2662
|
+
tempRecord[fieldName] = taskId;
|
|
2663
|
+
}
|
|
2664
|
+
else if (ganttColumns[i].field === taskSettingsFields.startDate) {
|
|
2665
|
+
if (isNullOrUndefined(tempRecord[taskSettingsFields.endDate])) {
|
|
2666
|
+
tempRecord[fieldName] = this.parent.editModule.dialogModule.getMinimumStartDate();
|
|
2667
|
+
}
|
|
2668
|
+
else {
|
|
2669
|
+
tempRecord[fieldName] = new Date(tempRecord[taskSettingsFields.endDate]);
|
|
2670
|
+
}
|
|
2671
|
+
if (this.parent.timezone) {
|
|
2672
|
+
tempRecord[fieldName] = this.parent.dateValidationModule.remove(tempRecord[fieldName], this.parent.timezone);
|
|
2673
|
+
}
|
|
2674
|
+
}
|
|
2675
|
+
else if (ganttColumns[i].field === taskSettingsFields.endDate) {
|
|
2676
|
+
if (isNullOrUndefined(tempRecord[taskSettingsFields.startDate])) {
|
|
2677
|
+
tempRecord[fieldName] = this.parent.editModule.dialogModule.getMinimumStartDate();
|
|
2678
|
+
}
|
|
2679
|
+
else {
|
|
2680
|
+
tempRecord[fieldName] = new Date(tempRecord[taskSettingsFields.startDate]);
|
|
2681
|
+
}
|
|
2682
|
+
if (this.parent.timezone) {
|
|
2683
|
+
tempRecord[fieldName] = this.parent.dateValidationModule.remove(tempRecord[fieldName], this.parent.timezone);
|
|
2684
|
+
}
|
|
2685
|
+
}
|
|
2686
|
+
else if (ganttColumns[i].field === taskSettingsFields.duration) {
|
|
2687
|
+
tempRecord[fieldName] = 1;
|
|
2688
|
+
}
|
|
2689
|
+
else if (ganttColumns[i].field === taskSettingsFields.name) {
|
|
2690
|
+
tempRecord[fieldName] = this.parent.editModule.dialogModule['localeObj'].getConstant('addDialogTitle') + ' ' + taskId;
|
|
2691
|
+
}
|
|
2692
|
+
else if (ganttColumns[i].field === taskSettingsFields.progress) {
|
|
2693
|
+
tempRecord[fieldName] = 0;
|
|
2694
|
+
}
|
|
2695
|
+
else if (ganttColumns[i].field === taskSettingsFields.work) {
|
|
2696
|
+
tempRecord[fieldName] = 0;
|
|
2697
|
+
}
|
|
2698
|
+
else if (ganttColumns[i].field === 'taskType') {
|
|
2699
|
+
tempRecord[fieldName] = this.parent.taskType;
|
|
2700
|
+
}
|
|
2701
|
+
else {
|
|
2702
|
+
tempRecord[this.parent.ganttColumns[i].field] = '';
|
|
2703
|
+
}
|
|
2704
|
+
}
|
|
2705
|
+
return tempRecord;
|
|
2706
|
+
};
|
|
2643
2707
|
Edit.prototype.validateTaskPosition = function (data, rowPosition, rowIndex, cAddedRecord) {
|
|
2644
2708
|
var selectedRowIndex = isNullOrUndefined(rowIndex) || isNaN(parseInt(rowIndex.toString(), 10)) ?
|
|
2645
2709
|
this.parent.selectionModule ?
|
|
@@ -2651,7 +2715,7 @@ var Edit = /** @class */ (function () {
|
|
|
2651
2715
|
this.parent.selectionModule.getSelectedRowCellIndexes()[0].rowIndex : null : null : rowIndex;
|
|
2652
2716
|
this.addRowSelectedItem = isNullOrUndefined(selectedRowIndex) ? null : this.parent.updatedRecords[selectedRowIndex];
|
|
2653
2717
|
rowPosition = isNullOrUndefined(rowPosition) ? this.parent.editSettings.newRowPosition : rowPosition;
|
|
2654
|
-
data = isNullOrUndefined(data) ? this.
|
|
2718
|
+
data = isNullOrUndefined(data) ? this.createNewRecord() : data;
|
|
2655
2719
|
if (((isNullOrUndefined(selectedRowIndex) || selectedRowIndex < 0 ||
|
|
2656
2720
|
isNullOrUndefined(this.addRowSelectedItem)) && (rowPosition === 'Above'
|
|
2657
2721
|
|| rowPosition === 'Below'
|
|
@@ -141,7 +141,7 @@ var FocusModule = /** @class */ (function () {
|
|
|
141
141
|
{
|
|
142
142
|
if (isNullOrUndefined(document.getElementById(this.parent.element.id + '_dialog'))) {
|
|
143
143
|
e.preventDefault();
|
|
144
|
-
ganttObj.addRecord();
|
|
144
|
+
ganttObj.addRecord(undefined, this.parent.editSettings.newRowPosition);
|
|
145
145
|
var focussedElement = ganttObj.element;
|
|
146
146
|
focussedElement.focus();
|
|
147
147
|
}
|
|
@@ -798,6 +798,7 @@ var Timeline = /** @class */ (function () {
|
|
|
798
798
|
* @private
|
|
799
799
|
*/
|
|
800
800
|
Timeline.prototype.createTimelineTemplate = function (tier) {
|
|
801
|
+
var isFirstCell = false;
|
|
801
802
|
var parent = this.parent;
|
|
802
803
|
var parentTh = '';
|
|
803
804
|
var parentTr = '';
|
|
@@ -814,10 +815,19 @@ var Timeline = /** @class */ (function () {
|
|
|
814
815
|
// PDf export collection
|
|
815
816
|
var timelineCell = {};
|
|
816
817
|
timelineCell.startDate = new Date(startDate.getTime());
|
|
817
|
-
|
|
818
|
+
if (mode === 'Month' && tier === 'bottomTier' && ((this.parent.currentZoomingLevel.level === 5) || (this.parent.currentZoomingLevel.level === 6)) && scheduleDateCollection.length === 0) {
|
|
819
|
+
isFirstCell = true;
|
|
820
|
+
}
|
|
821
|
+
parentTr = this.getHeaterTemplateString(new Date(startDate.toString()), mode, tier, false, count, timelineCell, isFirstCell);
|
|
818
822
|
scheduleDateCollection.push(new Date(startDate.toString()));
|
|
819
|
-
|
|
820
|
-
|
|
823
|
+
if (isFirstCell) {
|
|
824
|
+
newTime = this.calculateQuarterEndDate(startDate).getTime();
|
|
825
|
+
}
|
|
826
|
+
else {
|
|
827
|
+
increment = this.getIncrement(startDate, count, mode);
|
|
828
|
+
newTime = startDate.getTime() + increment;
|
|
829
|
+
}
|
|
830
|
+
isFirstCell = false;
|
|
821
831
|
startDate.setTime(newTime);
|
|
822
832
|
if (startDate >= endDate) {
|
|
823
833
|
/* eslint-disable-next-line */
|
|
@@ -927,6 +937,21 @@ var Timeline = /** @class */ (function () {
|
|
|
927
937
|
mode === 'Hour' || mode === 'Minutes') &&
|
|
928
938
|
this.parent.nonWorkingDayIndex.indexOf(day.getDay()) !== -1;
|
|
929
939
|
};
|
|
940
|
+
Timeline.prototype.calculateQuarterEndDate = function (date) {
|
|
941
|
+
var month = date.getMonth();
|
|
942
|
+
if (month >= 0 && month <= 2) {
|
|
943
|
+
return new Date(date.getFullYear(), 3, 1);
|
|
944
|
+
}
|
|
945
|
+
else if (month >= 3 && month <= 5) {
|
|
946
|
+
return new Date(date.getFullYear(), 6, 1);
|
|
947
|
+
}
|
|
948
|
+
else if (month >= 6 && month <= 8) {
|
|
949
|
+
return new Date(date.getFullYear(), 9, 1);
|
|
950
|
+
}
|
|
951
|
+
else {
|
|
952
|
+
return new Date(date.getFullYear() + 1, 0, 1);
|
|
953
|
+
}
|
|
954
|
+
};
|
|
930
955
|
/**
|
|
931
956
|
* To construct template string.
|
|
932
957
|
*
|
|
@@ -940,7 +965,7 @@ var Timeline = /** @class */ (function () {
|
|
|
940
965
|
* @private
|
|
941
966
|
*/
|
|
942
967
|
/* eslint-disable-next-line */
|
|
943
|
-
Timeline.prototype.getHeaterTemplateString = function (scheduleWeeks, mode, tier, isLast, count, timelineCell) {
|
|
968
|
+
Timeline.prototype.getHeaterTemplateString = function (scheduleWeeks, mode, tier, isLast, count, timelineCell, isFirstCell) {
|
|
944
969
|
var parentTr = '';
|
|
945
970
|
var td = '';
|
|
946
971
|
var format = tier === 'topTier' ?
|
|
@@ -955,7 +980,7 @@ var Timeline = /** @class */ (function () {
|
|
|
955
980
|
this.customFormat(scheduleWeeks, format, tier, mode, formatter);
|
|
956
981
|
thWidth = (this.getIncrement(scheduleWeeks, count, mode) / (1000 * 60 * 60 * 24)) * this.parent.perDayWidth;
|
|
957
982
|
var cellWidth = thWidth;
|
|
958
|
-
thWidth = isLast ? this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.timelineRoundOffEndDate)
|
|
983
|
+
thWidth = isLast || isFirstCell ? isLast ? this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.timelineRoundOffEndDate) : this.calculateWidthBetweenTwoDate(mode, scheduleWeeks, this.calculateQuarterEndDate(scheduleWeeks))
|
|
959
984
|
: thWidth;
|
|
960
985
|
var isWeekendCell = this.isWeekendHeaderCell(mode, tier, scheduleWeeks);
|
|
961
986
|
var textClassName = tier === 'topTier' ? ' e-gantt-top-cell-text' : '';
|
|
@@ -1351,10 +1351,10 @@
|
|
|
1351
1351
|
.e-gantt .e-gantt-chart .e-timeline-header-container {
|
|
1352
1352
|
background: #1a1a1a;
|
|
1353
1353
|
border-bottom-color: #484848;
|
|
1354
|
-
border-bottom-width:
|
|
1354
|
+
border-bottom-width: 0px;
|
|
1355
1355
|
border-right-color: #484848;
|
|
1356
1356
|
color: #f0f0f0;
|
|
1357
|
-
height:
|
|
1357
|
+
height: 64px;
|
|
1358
1358
|
}
|
|
1359
1359
|
|
|
1360
1360
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell,
|
|
@@ -1373,7 +1373,7 @@
|
|
|
1373
1373
|
}
|
|
1374
1374
|
|
|
1375
1375
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell {
|
|
1376
|
-
height:
|
|
1376
|
+
height: 32px;
|
|
1377
1377
|
}
|
|
1378
1378
|
|
|
1379
1379
|
.e-gantt .e-gantt-chart .e-chart-root-container {
|
package/styles/bootstrap.css
CHANGED
|
@@ -1501,10 +1501,10 @@
|
|
|
1501
1501
|
.e-gantt .e-gantt-chart .e-timeline-header-container {
|
|
1502
1502
|
background: #fff;
|
|
1503
1503
|
border-bottom-color: #ddd;
|
|
1504
|
-
border-bottom-width:
|
|
1504
|
+
border-bottom-width: 0px;
|
|
1505
1505
|
border-right-color: #ddd;
|
|
1506
1506
|
color: #333;
|
|
1507
|
-
height:
|
|
1507
|
+
height: 64px;
|
|
1508
1508
|
}
|
|
1509
1509
|
|
|
1510
1510
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell,
|
|
@@ -1523,7 +1523,7 @@
|
|
|
1523
1523
|
}
|
|
1524
1524
|
|
|
1525
1525
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell {
|
|
1526
|
-
height:
|
|
1526
|
+
height: 32px;
|
|
1527
1527
|
}
|
|
1528
1528
|
|
|
1529
1529
|
.e-gantt .e-gantt-chart .e-chart-root-container {
|
package/styles/bootstrap4.css
CHANGED
|
@@ -1718,10 +1718,10 @@
|
|
|
1718
1718
|
.e-gantt .e-gantt-chart .e-timeline-header-container {
|
|
1719
1719
|
background: #fff;
|
|
1720
1720
|
border-bottom-color: #dee2e6;
|
|
1721
|
-
border-bottom-width:
|
|
1721
|
+
border-bottom-width: 0px;
|
|
1722
1722
|
border-right-color: #dee2e6;
|
|
1723
1723
|
color: #212529;
|
|
1724
|
-
height:
|
|
1724
|
+
height: 64px;
|
|
1725
1725
|
}
|
|
1726
1726
|
|
|
1727
1727
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell,
|
|
@@ -1740,7 +1740,7 @@
|
|
|
1740
1740
|
}
|
|
1741
1741
|
|
|
1742
1742
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell {
|
|
1743
|
-
height:
|
|
1743
|
+
height: 32px;
|
|
1744
1744
|
}
|
|
1745
1745
|
|
|
1746
1746
|
.e-gantt .e-gantt-chart .e-chart-root-container {
|
package/styles/bootstrap5.css
CHANGED
|
@@ -111,10 +111,10 @@ $gantt-baseline-color: #f0ad4e !default;
|
|
|
111
111
|
$gantt-child-progress-margin-left: 0.5px !default;
|
|
112
112
|
$gantt-timeline-single-header-outer-div: 45px !default;
|
|
113
113
|
$gantt-chart-timeline-single-header-outer-div: 47px !default;
|
|
114
|
-
$gantt-header-border-height:
|
|
114
|
+
$gantt-header-border-height: 64px !default;
|
|
115
115
|
$gantt-treegrid-header-border-height: 63px !default;
|
|
116
|
-
$gantt-header-border-bottom-width:
|
|
117
|
-
$gantt-timeline-top-header-cell-height:
|
|
116
|
+
$gantt-header-border-bottom-width: 0px !default;
|
|
117
|
+
$gantt-timeline-top-header-cell-height: 32px !default;
|
|
118
118
|
$gantt-header-border-radius: 4px !default;
|
|
119
119
|
$gantt-splitter-border-top-right-radius: 0px !default;
|
|
120
120
|
$gantt-splitter-border-top-left-radius: 0px !default;
|
|
@@ -111,10 +111,10 @@ $gantt-baseline-color: #FF9800 !default;
|
|
|
111
111
|
$gantt-child-progress-margin-left: 0.5px !default;
|
|
112
112
|
$gantt-timeline-single-header-outer-div: 45px !default;
|
|
113
113
|
$gantt-chart-timeline-single-header-outer-div: 47px !default;
|
|
114
|
-
$gantt-header-border-height:
|
|
114
|
+
$gantt-header-border-height: 64px !default;
|
|
115
115
|
$gantt-treegrid-header-border-height: 63px !default;
|
|
116
|
-
$gantt-header-border-bottom-width:
|
|
117
|
-
$gantt-timeline-top-header-cell-height:
|
|
116
|
+
$gantt-header-border-bottom-width: 0px !default;
|
|
117
|
+
$gantt-timeline-top-header-cell-height: 32px !default;
|
|
118
118
|
$gantt-header-border-radius: 4px !default;
|
|
119
119
|
$gantt-splitter-border-top-right-radius: 0px !default;
|
|
120
120
|
$gantt-splitter-border-top-left-radius: 0px !default;
|
|
@@ -111,10 +111,10 @@ $gantt-baseline-color: $orange !default;
|
|
|
111
111
|
$gantt-child-progress-margin-left: 0.5px !default;
|
|
112
112
|
$gantt-timeline-single-header-outer-div: 45px !default;
|
|
113
113
|
$gantt-chart-timeline-single-header-outer-div: 47px !default;
|
|
114
|
-
$gantt-header-border-height:
|
|
114
|
+
$gantt-header-border-height: 64px !default;
|
|
115
115
|
$gantt-treegrid-header-border-height: 63px !default;
|
|
116
|
-
$gantt-header-border-bottom-width:
|
|
117
|
-
$gantt-timeline-top-header-cell-height:
|
|
116
|
+
$gantt-header-border-bottom-width: 0px !default;
|
|
117
|
+
$gantt-timeline-top-header-cell-height: 32px !default;
|
|
118
118
|
$gantt-header-border-radius: 0px !default;
|
|
119
119
|
$gantt-splitter-border-top-right-radius: 0px !default;
|
|
120
120
|
$gantt-splitter-border-top-left-radius: 0px !default;
|
|
@@ -138,7 +138,7 @@ $gantt-chart-timeline-single-header-outer-div: 46px !default;
|
|
|
138
138
|
$gantt-header-border-height: 64px !default;
|
|
139
139
|
$gantt-treegrid-header-border-height: 63px !default;
|
|
140
140
|
$gantt-header-border-bottom-width: 1px !default;
|
|
141
|
-
$gantt-timeline-top-header-cell-height:
|
|
141
|
+
$gantt-timeline-top-header-cell-height: 32px !default;
|
|
142
142
|
$gantt-header-border-radius: 0px !default;
|
|
143
143
|
$gantt-splitter-border-top-right-radius: 0px !default;
|
|
144
144
|
$gantt-splitter-border-top-left-radius: 0px !default;
|
|
@@ -138,7 +138,7 @@ $gantt-chart-timeline-single-header-outer-div: 46px !default;
|
|
|
138
138
|
$gantt-header-border-height: 64px !default;
|
|
139
139
|
$gantt-treegrid-header-border-height: 63px !default;
|
|
140
140
|
$gantt-header-border-bottom-width: 1px !default;
|
|
141
|
-
$gantt-timeline-top-header-cell-height:
|
|
141
|
+
$gantt-timeline-top-header-cell-height: 32px !default;
|
|
142
142
|
$gantt-header-border-radius: 0px !default;
|
|
143
143
|
$gantt-splitter-border-top-right-radius: 0px !default;
|
|
144
144
|
$gantt-splitter-border-top-left-radius: 0px !default;
|
|
@@ -133,10 +133,10 @@ $gantt-active-color-opacity: 0.9 !default;
|
|
|
133
133
|
$gantt-child-progress-margin-left: 0.5px !default;
|
|
134
134
|
$gantt-timeline-single-header-outer-div: 45px !default;
|
|
135
135
|
$gantt-chart-timeline-single-header-outer-div: 46px !default;
|
|
136
|
-
$gantt-header-border-height:
|
|
136
|
+
$gantt-header-border-height: 49px !default;
|
|
137
137
|
$gantt-treegrid-header-border-height: 48px !default;
|
|
138
|
-
$gantt-header-border-bottom-width:
|
|
139
|
-
$gantt-timeline-top-header-cell-height:
|
|
138
|
+
$gantt-header-border-bottom-width: 0px !default;
|
|
139
|
+
$gantt-timeline-top-header-cell-height: 24.5px !default;
|
|
140
140
|
$gantt-header-border-radius: 0px !default;
|
|
141
141
|
$gantt-splitter-border-top-right-radius: 0px !default;
|
|
142
142
|
$gantt-splitter-border-top-left-radius: 0px !default;
|
|
@@ -1351,10 +1351,10 @@
|
|
|
1351
1351
|
.e-gantt .e-gantt-chart .e-timeline-header-container {
|
|
1352
1352
|
background: #1a1a1a;
|
|
1353
1353
|
border-bottom-color: #484848;
|
|
1354
|
-
border-bottom-width:
|
|
1354
|
+
border-bottom-width: 0px;
|
|
1355
1355
|
border-right-color: #484848;
|
|
1356
1356
|
color: #f0f0f0;
|
|
1357
|
-
height:
|
|
1357
|
+
height: 64px;
|
|
1358
1358
|
}
|
|
1359
1359
|
|
|
1360
1360
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell,
|
|
@@ -1373,7 +1373,7 @@
|
|
|
1373
1373
|
}
|
|
1374
1374
|
|
|
1375
1375
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell {
|
|
1376
|
-
height:
|
|
1376
|
+
height: 32px;
|
|
1377
1377
|
}
|
|
1378
1378
|
|
|
1379
1379
|
.e-gantt .e-gantt-chart .e-chart-root-container {
|
|
@@ -1501,10 +1501,10 @@
|
|
|
1501
1501
|
.e-gantt .e-gantt-chart .e-timeline-header-container {
|
|
1502
1502
|
background: #fff;
|
|
1503
1503
|
border-bottom-color: #ddd;
|
|
1504
|
-
border-bottom-width:
|
|
1504
|
+
border-bottom-width: 0px;
|
|
1505
1505
|
border-right-color: #ddd;
|
|
1506
1506
|
color: #333;
|
|
1507
|
-
height:
|
|
1507
|
+
height: 64px;
|
|
1508
1508
|
}
|
|
1509
1509
|
|
|
1510
1510
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell,
|
|
@@ -1523,7 +1523,7 @@
|
|
|
1523
1523
|
}
|
|
1524
1524
|
|
|
1525
1525
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell {
|
|
1526
|
-
height:
|
|
1526
|
+
height: 32px;
|
|
1527
1527
|
}
|
|
1528
1528
|
|
|
1529
1529
|
.e-gantt .e-gantt-chart .e-chart-root-container {
|
|
@@ -1718,10 +1718,10 @@
|
|
|
1718
1718
|
.e-gantt .e-gantt-chart .e-timeline-header-container {
|
|
1719
1719
|
background: #fff;
|
|
1720
1720
|
border-bottom-color: #dee2e6;
|
|
1721
|
-
border-bottom-width:
|
|
1721
|
+
border-bottom-width: 0px;
|
|
1722
1722
|
border-right-color: #dee2e6;
|
|
1723
1723
|
color: #212529;
|
|
1724
|
-
height:
|
|
1724
|
+
height: 64px;
|
|
1725
1725
|
}
|
|
1726
1726
|
|
|
1727
1727
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell,
|
|
@@ -1740,7 +1740,7 @@
|
|
|
1740
1740
|
}
|
|
1741
1741
|
|
|
1742
1742
|
.e-gantt .e-gantt-chart .e-timeline-top-header-cell {
|
|
1743
|
-
height:
|
|
1743
|
+
height: 32px;
|
|
1744
1744
|
}
|
|
1745
1745
|
|
|
1746
1746
|
.e-gantt .e-gantt-chart .e-chart-root-container {
|