@progress/kendo-angular-gantt 0.2.1-dev.202112101349 → 0.3.0-dev.202201190830

package/dist/es/editing/dependencies-table.component.js

@@ -0,0 +1,131 @@
+/**-----------------------------------------------------------------------------------------
+* Copyright © 2021 Progress Software Corporation. All rights reserved.
+* Licensed under commercial license. See LICENSE.md in the project root for more information
+*-------------------------------------------------------------------------------------------*/
+import * as tslib_1 from "tslib";
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { FormArray, FormControl, FormGroup, Validators } from '@angular/forms';
+import { MappingService } from '../common/mapping.service';
+import { GanttLocalizationService } from '../localization/gantt-localization.service';
+import { DependencyType } from '../models/dependency-type.enum';
+import { EditService } from './edit.service';
+/**
+ * @hidden
+ */
+var DependenciesTableComponent = /** @class */ (function () {
+    function DependenciesTableComponent(mapper, editService, localizationService) {
+        this.mapper = mapper;
+        this.editService = editService;
+        this.localizationService = localizationService;
+        this.dependenciesChange = new EventEmitter();
+        this.selectedKeys = [];
+        this.formGroups = new FormArray([]);
+        this.dependencyTypes = this.getDependencyTypes();
+    }
+    Object.defineProperty(DependenciesTableComponent.prototype, "taskId", {
+        get: function () {
+            return this.editService.dataItem.id;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(DependenciesTableComponent.prototype, "dependencyIdField", {
+        // The target dependency id field
+        // e.g. if Predecessors, we have the `fromId` which is the currently edited task,
+        // while the `toId` is missing (needs to be selected by the user)
+        get: function () {
+            return this.dependencyType === 'predecessor' ? 'fromId' : 'toId';
+        },
+        enumerable: true,
+        configurable: true
+    });
+    DependenciesTableComponent.prototype.ngOnInit = function () {
+        var _this = this;
+        // generate the FormGroups per each Grid row
+        if (this.formGroups.controls.length === 0) {
+            var fields_1 = this.mapper.dependencyFields;
+            this.dependencies.forEach(function (item) {
+                var _a;
+                var formGroup = new FormGroup((_a = {},
+                    _a[fields_1.id] = new FormControl(_this.mapper.extractFromDependency(item, 'id')),
+                    _a[fields_1.fromId] = new FormControl(_this.mapper.extractFromDependency(item, 'fromId'), Validators.required),
+                    _a[fields_1.toId] = new FormControl(_this.mapper.extractFromDependency(item, 'toId'), Validators.required),
+                    _a[fields_1.type] = new FormControl(_this.mapper.extractFromDependency(item, 'type'), Validators.required),
+                    _a));
+                _this.formGroups.push(formGroup);
+            });
+        }
+        this.formGroups.valueChanges.subscribe(function (val) {
+            _this.formGroups.controls.forEach(function (control) {
+                if (control.dirty) {
+                    _this.editService.updateDependencies(control.value);
+                }
+            });
+            _this.dependenciesChange.emit(val);
+        });
+    };
+    DependenciesTableComponent.prototype.getFormControl = function (dataItemIndex, field) {
+        // return the FormControl for the respective column editor
+        return this.formGroups.controls
+            .find(function (_control, index) { return index === dataItemIndex; })
+            .get(this.mapper.dependencyFields[field]);
+    };
+    DependenciesTableComponent.prototype.getText = function (token) {
+        return this.localizationService.get(token);
+    };
+    DependenciesTableComponent.prototype.getDependencyTypes = function () {
+        var types = Object.keys(DependencyType)
+            .filter(function (value) { return typeof DependencyType[value] === 'number'; })
+            .map(function (type) {
+            return {
+                type: type,
+                id: DependencyType[type]
+            };
+        });
+        return types;
+    };
+    DependenciesTableComponent.prototype.addHandler = function () {
+        var _a;
+        var fields = this.mapper.dependencyFields;
+        var formGroup = new FormGroup((_a = {},
+            _a[fields.id] = new FormControl(),
+            _a[fields.fromId] = new FormControl(this.dependencyIdField === 'toId' ? this.taskId : null, Validators.required),
+            _a[fields.toId] = new FormControl(this.dependencyIdField === 'fromId' ? this.taskId : null, Validators.required),
+            _a[fields.type] = new FormControl(null, Validators.required),
+            _a));
+        this.formGroups.push(formGroup);
+    };
+    DependenciesTableComponent.prototype.removeHandler = function () {
+        var selectedIndex = this.selectedKeys[0];
+        var item = this.formGroups.at(selectedIndex).value;
+        this.editService.deleteDependency(item);
+        this.formGroups.removeAt(selectedIndex);
+    };
+    tslib_1.__decorate([
+        Input(),
+        tslib_1.__metadata("design:type", Array)
+    ], DependenciesTableComponent.prototype, "tasks", void 0);
+    tslib_1.__decorate([
+        Input(),
+        tslib_1.__metadata("design:type", Array)
+    ], DependenciesTableComponent.prototype, "dependencies", void 0);
+    tslib_1.__decorate([
+        Input(),
+        tslib_1.__metadata("design:type", String)
+    ], DependenciesTableComponent.prototype, "dependencyType", void 0);
+    tslib_1.__decorate([
+        Output(),
+        tslib_1.__metadata("design:type", EventEmitter)
+    ], DependenciesTableComponent.prototype, "dependenciesChange", void 0);
+    DependenciesTableComponent = tslib_1.__decorate([
+        Component({
+            selector: 'kendo-gantt-dependencies-table',
+            template: "\n        <kendo-grid\n            [data]=\"dependencies\"\n            [selectable]=\"{ mode: 'single' }\"\n            [(selectedKeys)]=\"selectedKeys\"\n            kendoGridSelectBy\n            [height]=\"295\"\n        >\n            <ng-template kendoGridToolbarTemplate>\n                <button kendoButton (click)=\"addHandler()\">\n                    {{ getText('taskEditingDependenciesAddButtonText') }}\n                </button>\n                <button kendoButton (click)=\"removeHandler()\" [disabled]=\"selectedKeys.length === 0\">\n                    {{ getText('taskEditingDependenciesRemoveButtonText') }}\n                </button>\n            </ng-template>\n            <kendo-grid-column [title]=\"getText('taskEditingDependenciesGridNameColumnTitle')\" [field]=\"dependencyIdField\">\n                <ng-template kendoGridCellTemplate let-dataItem=\"dataItem\" let-column=\"column\" let-rowIndex=\"rowIndex\">\n                    <kendo-dropdownlist\n                        [data]=\"tasks\"\n                        textField=\"title\"\n                        valueField=\"id\"\n                        [valuePrimitive]=\"true\"\n                        [formControl]=\"getFormControl(rowIndex, column.field)\"\n                    >\n                    </kendo-dropdownlist>\n                </ng-template>\n            </kendo-grid-column>\n            <kendo-grid-column [title]=\"getText('taskEditingDependenciesGridTypeColumnTitle')\" field=\"type\">\n                <ng-template kendoGridCellTemplate let-dataItem=\"dataItem\" let-column=\"column\" let-rowIndex=\"rowIndex\">\n                    <kendo-dropdownlist\n                        [data]=\"dependencyTypes\"\n                        textField=\"type\"\n                        valueField=\"id\"\n                        [valuePrimitive]=\"true\"\n                        [formControl]=\"getFormControl(rowIndex, column.field)\"\n                    >\n                    </kendo-dropdownlist>\n                </ng-template>\n            </kendo-grid-column>\n        </kendo-grid>\n    "
+        }),
+        tslib_1.__metadata("design:paramtypes", [MappingService,
+            EditService,
+            GanttLocalizationService])
+    ], DependenciesTableComponent);
+    return DependenciesTableComponent;
+}());
+export { DependenciesTableComponent };

package/dist/es/editing/edit-dialog.component.js

@@ -3,40 +3,71 @@
 * Licensed under commercial license. See LICENSE.md in the project root for more information
 *-------------------------------------------------------------------------------------------*/
 import * as tslib_1 from "tslib";
-import { Component, Input } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { ChangeDetectorRef, Component, Input } from '@angular/core';
 import { LocalizationService } from '@progress/kendo-angular-l10n';
 import { MappingService } from '../common/mapping.service';
+import { DependencyType } from '../models/dependency-type.enum';
 import { EditService } from './edit.service';
 /**
  * @hidden
  */
 var EditDialogComponent = /** @class */ (function () {
-    function EditDialogComponent(mapper, editService, localizationService) {
+    function EditDialogComponent(mapper, editService, cdr, localizationService) {
         this.mapper = mapper;
         this.editService = editService;
+        this.cdr = cdr;
         this.localizationService = localizationService;
     }
+    EditDialogComponent.prototype.ngOnInit = function () {
+        var _this = this;
+        this.editService.loadTasks(this.data).subscribe(function (value) {
+            _this.loadedTasks = value;
+        });
+    };
+    Object.defineProperty(EditDialogComponent.prototype, "predecessors", {
+        get: function () {
+            return this.editService.predecessors;
+        },
+        set: function (items) {
+            this.editService.predecessors = items;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    Object.defineProperty(EditDialogComponent.prototype, "successors", {
+        get: function () {
+            return this.editService.successors;
+        },
+        set: function (items) {
+            this.editService.successors = items;
+        },
+        enumerable: true,
+        configurable: true
+    });
     EditDialogComponent.prototype.getText = function (token) {
         return this.localizationService.get(token);
     };
+    EditDialogComponent.prototype.getDependencyType = function (typeId) {
+        return DependencyType[typeId];
+    };
     EditDialogComponent.prototype.handleEditingResult = function (editResultType) {
         this.editService.triggerEditEvent(editResultType);
     };
-    EditDialogComponent.prototype.onTaskDelete = function () {
-        this.editService.showConfirmationDialog.next();
+    EditDialogComponent.prototype.handleTaskDelete = function () {
+        this.editService.taskDelete.next(this.editService.dataItem);
     };
     tslib_1.__decorate([
         Input(),
-        tslib_1.__metadata("design:type", FormGroup)
-    ], EditDialogComponent.prototype, "formGroup", void 0);
+        tslib_1.__metadata("design:type", Array)
+    ], EditDialogComponent.prototype, "data", void 0);
     EditDialogComponent = tslib_1.__decorate([
         Component({
             selector: 'kendo-gantt-edit-dialog',
-            template: "\n        <kendo-dialog\n            [title]=\"getText('taskEditingDialogTitle')\"\n            [width]=\"575\"\n            [height]=\"470\"\n            (close)=\"handleEditingResult('cancel')\">\n            <kendo-dialog-messages\n                [closeTitle]=\"getText('taskEditingDialogCloseTitle')\"></kendo-dialog-messages>\n            <form class=\"k-form\" [formGroup]=\"formGroup\">\n                <kendo-formfield *ngIf=\"formGroup.contains(mapper.taskFields.title)\">\n                    <kendo-label [for]=\"mapper.taskFields.title\" [text]=\"getText('titleFieldInputLabel')\"></kendo-label>\n                    <input class=\"k-textbox\" [formControlName]=\"mapper.taskFields.title\" />\n                </kendo-formfield>\n                <div class=\"k-hstack\">\n                    <kendo-formfield [style.width.%]=\"49\" *ngIf=\"formGroup.contains(mapper.taskFields.start)\">\n                        <kendo-label [for]=\"mapper.taskFields.start\" [text]=\"getText('startFieldInputLabel')\"></kendo-label>\n                        <kendo-datetimepicker [formControlName]=\"mapper.taskFields.start\"></kendo-datetimepicker>\n                    </kendo-formfield>\n                    <kendo-treelist-spacer></kendo-treelist-spacer>\n                    <kendo-formfield [style.width.%]=\"49\" *ngIf=\"formGroup.contains(mapper.taskFields.end)\">\n                        <kendo-label [for]=\"mapper.taskFields.end\" [text]=\"getText('endFieldInputLabel')\"></kendo-label>\n                        <kendo-datetimepicker [formControlName]=\"mapper.taskFields.end\"></kendo-datetimepicker>\n                    </kendo-formfield>\n                </div>\n                <kendo-formfield [style.width.%]=\"49\" *ngIf=\"formGroup.contains(mapper.taskFields.completionRatio)\">\n                    <kendo-label [for]=\"mapper.taskFields.completionRatio\" [text]=\"getText('completionRatioFieldInputLabel')\"></kendo-label>\n                    <kendo-numerictextbox\n                        [formControlName]=\"mapper.taskFields.completionRatio\"\n                        [min]=\"0\"\n                        [max]=\"1\"\n                        [decimals]=\"2\"\n                        format=\"p2\"\n                        [step]=\"0.01\"\n                    ></kendo-numerictextbox>\n                </kendo-formfield>\n            </form>\n            <kendo-dialog-actions layout=\"normal\">\n                <button kendoButton (click)=\"onTaskDelete()\">{{ getText('deleteButtonText') }}</button>\n                <kendo-treelist-spacer></kendo-treelist-spacer>\n                <button kendoButton [primary]=\"true\" (click)=\"handleEditingResult('save')\">{{ getText('saveButtonText') }}</button>\n                <button kendoButton (click)=\"handleEditingResult('cancel')\">{{ getText('cancelButtonText') }}</button>\n            </kendo-dialog-actions>\n        </kendo-dialog>\n    "
+            template: "\n        <kendo-dialog\n            [title]=\"getText('taskEditingDialogTitle')\"\n            [width]=\"575\"\n            [height]=\"470\"\n            (close)=\"handleEditingResult('cancel')\">\n            <kendo-dialog-messages\n                [closeTitle]=\"getText('taskEditingDialogCloseTitle')\"></kendo-dialog-messages>\n\n            <kendo-tabstrip [keepTabContent]=\"true\">\n                <kendo-tabstrip-tab [title]=\"getText('taskEditingGeneralTabTitle')\" [selected]=\"true\">\n                    <ng-template kendoTabContent>\n                    <kendo-gantt-task-fields></kendo-gantt-task-fields>\n                    </ng-template>\n                </kendo-tabstrip-tab>\n                <kendo-tabstrip-tab [title]=\"getText('taskEditingPredecessorsTabTitle')\">\n                    <ng-template kendoTabContent>\n                        <kendo-gantt-dependencies-table\n                            [tasks]=\"loadedTasks\"\n                            [(dependencies)]=\"predecessors\"\n                            dependencyType=\"predecessor\"\n                        >\n                        </kendo-gantt-dependencies-table>\n                    </ng-template>\n                </kendo-tabstrip-tab>\n                <kendo-tabstrip-tab [title]=\"getText('taskEditingSuccessorsTabTitle')\">\n                    <ng-template kendoTabContent>\n                        <kendo-gantt-dependencies-table\n                            [tasks]=\"loadedTasks\"\n                            [(dependencies)]=\"successors\"\n                            dependencyType=\"successor\">\n                        </kendo-gantt-dependencies-table>\n                    </ng-template>\n                </kendo-tabstrip-tab>\n            </kendo-tabstrip>\n\n            <kendo-dialog-actions layout=\"normal\">\n                <button\n                    kendoButton\n                    [kendoEventsOutsideAngular]=\"{\n                        click: handleTaskDelete\n                    }\"\n                    [scope]=\"this\"\n                >\n                    {{ getText('deleteButtonText') }}\n                </button>\n                <kendo-treelist-spacer></kendo-treelist-spacer>\n                <button kendoButton [primary]=\"true\" (click)=\"handleEditingResult('save')\">{{ getText('saveButtonText') }}</button>\n                <button kendoButton (click)=\"handleEditingResult('cancel')\">{{ getText('cancelButtonText') }}</button>\n            </kendo-dialog-actions>\n        </kendo-dialog>\n    "
         }),
         tslib_1.__metadata("design:paramtypes", [MappingService,
             EditService,
+            ChangeDetectorRef,
             LocalizationService])
     ], EditDialogComponent);
     return EditDialogComponent;

package/dist/es/editing/edit.service.js

@@ -4,35 +4,119 @@
 *-------------------------------------------------------------------------------------------*/
 import * as tslib_1 from "tslib";
 import { Injectable } from '@angular/core';
-import { Subject } from 'rxjs';
+import { EMPTY, forkJoin, isObservable, of, Subject } from 'rxjs';
+import { map, expand, reduce } from 'rxjs/operators';
+import { MappingService } from '../common/mapping.service';
+import { isPresent, normalizeGanttData } from '../utils';
 /**
  * @hidden
  */
 var EditService = /** @class */ (function () {
-    function EditService() {
+    function EditService(mapper) {
+        var _this = this;
+        this.mapper = mapper;
         this.showEditingDialog = new Subject();
-        this.showConfirmationDialog = new Subject();
+        this.taskDelete = new Subject();
         this.editEvent = new Subject();
+        this.addEvent = new Subject();
+        this.predecessors = [];
+        this.successors = [];
+        this.updatedItems = [];
+        this.deletedItems = [];
+        this.itemIndex = function (item, data) {
+            return data.findIndex(function (dataItem) { return _this.mapper.extractFromTask(dataItem, 'id') === _this.mapper.extractFromTask(item, 'id'); });
+        };
     }
-    EditService.prototype.createEditDialog = function (dataItem, formGroup) {
+    Object.defineProperty(EditService.prototype, "dependencies", {
+        get: function () {
+            return this.predecessors.concat(this.successors);
+        },
+        set: function (items) {
+            var _this = this;
+            // Can this whole thing be moved to edit-dialog? Dependencies might not be needed here
+            var dataItemId = this.mapper.extractFromTask(this.dataItem, 'id');
+            this.predecessors = items.filter(function (item) { return _this.mapper.extractFromDependency(item, 'toId') === dataItemId; });
+            this.successors = items.filter(function (item) { return _this.mapper.extractFromDependency(item, 'fromId') === dataItemId; });
+        },
+        enumerable: true,
+        configurable: true
+    });
+    EditService.prototype.createEditDialog = function (dataItem, taskFormGroup, dependencies) {
         this.dataItem = dataItem;
-        this.formGroup = formGroup;
+        this.taskFormGroup = taskFormGroup;
+        this.dependencies = dependencies;
         this.showEditingDialog.next(true);
     };
     EditService.prototype.closeEditDialog = function () {
         this.showEditingDialog.next(false);
         this.dataItem = undefined;
-        this.formGroup = undefined;
+        this.taskFormGroup = undefined;
+        this.dependencies = [];
+        this.updatedItems = [];
+        this.deletedItems = [];
     };
     EditService.prototype.triggerEditEvent = function (editResultType) {
         this.editEvent.next({
-            formGroup: this.formGroup,
+            taskFormGroup: this.taskFormGroup,
             dataItem: this.dataItem,
+            dependencies: {
+                createdItems: this.getCreatedDependencies(),
+                updatedItems: this.updatedItems,
+                deletedItems: this.deletedItems
+            },
             editResultType: editResultType
         });
     };
+    EditService.prototype.updateDependencies = function (item) {
+        if (!this.isNew(item)) {
+            // update
+            var index = this.itemIndex(item, this.updatedItems);
+            if (index !== -1) {
+                this.updatedItems.splice(index, 1, item);
+            }
+            else {
+                this.updatedItems.push(item);
+            }
+        }
+    };
+    EditService.prototype.getCreatedDependencies = function () {
+        var _this = this;
+        return this.dependencies.filter(function (item) { return _this.mapper.extractFromDependency(item, 'id') === null; });
+    };
+    EditService.prototype.deleteDependency = function (item) {
+        var updatedIndex = this.itemIndex(item, this.updatedItems);
+        if (updatedIndex !== -1) {
+            this.updatedItems.splice(updatedIndex, 1);
+        }
+        if (!this.isNew(item)) {
+            this.deletedItems.push(item);
+        }
+    };
+    EditService.prototype.loadTasks = function (initialValues, isInitializer) {
+        var _this = this;
+        if (isInitializer === void 0) { isInitializer = true; }
+        return forkJoin(initialValues.map(function (v) { return _this.getElementById(v); })).pipe(map(function (value) {
+            return value.reduce(function (acc, item) { return acc = acc.concat(normalizeGanttData(item)); }, []);
+        }), expand(function (values) {
+            if (values.some(function (el) { return _this.hasChildren(el); })) {
+                return _this.loadTasks(values, false);
+            }
+            return EMPTY;
+        }), reduce(function (acc, values) { return acc.concat(values); }, isInitializer ? initialValues.slice() : []));
+    };
+    EditService.prototype.getElementById = function (item) {
+        var children = this.fetchChildren(item);
+        if (isObservable(children)) {
+            return children;
+        }
+        return of(children);
+    };
+    EditService.prototype.isNew = function (item) {
+        return !isPresent(this.mapper.extractFromDependency(item, 'id'));
+    };
     EditService = tslib_1.__decorate([
-        Injectable()
+        Injectable(),
+        tslib_1.__metadata("design:paramtypes", [MappingService])
     ], EditService);
     return EditService;
 }());

package/dist/es/editing/task-fields.component.js

@@ -0,0 +1,43 @@
+/**-----------------------------------------------------------------------------------------
+* Copyright © 2021 Progress Software Corporation. All rights reserved.
+* Licensed under commercial license. See LICENSE.md in the project root for more information
+*-------------------------------------------------------------------------------------------*/
+import * as tslib_1 from "tslib";
+import { Component } from '@angular/core';
+import { MappingService } from '../common/mapping.service';
+import { GanttLocalizationService } from '../localization/gantt-localization.service';
+import { EditService } from './edit.service';
+/**
+ * @hidden
+ */
+var TaskFieldsComponent = /** @class */ (function () {
+    function TaskFieldsComponent(mapper, editService, localizationService) {
+        this.mapper = mapper;
+        this.editService = editService;
+        this.localizationService = localizationService;
+    }
+    Object.defineProperty(TaskFieldsComponent.prototype, "formGroup", {
+        /**
+         * @hidden
+         */
+        get: function () {
+            return this.editService.taskFormGroup;
+        },
+        enumerable: true,
+        configurable: true
+    });
+    TaskFieldsComponent.prototype.getText = function (token) {
+        return this.localizationService.get(token);
+    };
+    TaskFieldsComponent = tslib_1.__decorate([
+        Component({
+            selector: 'kendo-gantt-task-fields',
+            template: "\n        <form class=\"k-form\" [formGroup]=\"formGroup\">\n            <kendo-formfield *ngIf=\"formGroup.contains(mapper.taskFields.title)\">\n                <kendo-label [for]=\"mapper.taskFields.title\" [text]=\"getText('titleFieldInputLabel')\"></kendo-label>\n                <input class=\"k-textbox\" [formControlName]=\"mapper.taskFields.title\" />\n            </kendo-formfield>\n            <div class=\"k-hstack\">\n                <kendo-formfield [style.width.%]=\"49\" *ngIf=\"formGroup.contains(mapper.taskFields.start)\">\n                    <kendo-label [for]=\"mapper.taskFields.start\" [text]=\"getText('startFieldInputLabel')\"></kendo-label>\n                    <kendo-datetimepicker [formControlName]=\"mapper.taskFields.start\"></kendo-datetimepicker>\n                </kendo-formfield>\n                <kendo-treelist-spacer></kendo-treelist-spacer>\n                <kendo-formfield [style.width.%]=\"49\" *ngIf=\"formGroup.contains(mapper.taskFields.end)\">\n                    <kendo-label [for]=\"mapper.taskFields.end\" [text]=\"getText('endFieldInputLabel')\"></kendo-label>\n                    <kendo-datetimepicker [formControlName]=\"mapper.taskFields.end\"></kendo-datetimepicker>\n                </kendo-formfield>\n            </div>\n            <kendo-formfield [style.width.%]=\"49\" *ngIf=\"formGroup.contains(mapper.taskFields.completionRatio)\">\n                <kendo-label [for]=\"mapper.taskFields.completionRatio\" [text]=\"getText('completionRatioFieldInputLabel')\"></kendo-label>\n                <kendo-numerictextbox\n                    [formControlName]=\"mapper.taskFields.completionRatio\"\n                    [min]=\"0\"\n                    [max]=\"1\"\n                    [decimals]=\"2\"\n                    format=\"p2\"\n                    [step]=\"0.01\"\n                ></kendo-numerictextbox>\n            </kendo-formfield>\n        </form>\n    "
+        }),
+        tslib_1.__metadata("design:paramtypes", [MappingService,
+            EditService,
+            GanttLocalizationService])
+    ], TaskFieldsComponent);
+    return TaskFieldsComponent;
+}());
+export { TaskFieldsComponent };