From 8116c89d7e17df4bf7e4dca45dc36fdc49d80300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Leo=20Gr=C3=A4tz?= <23726273+LarsLeo@users.noreply.github.com> Date: Wed, 12 Sep 2018 17:06:55 +0200 Subject: [PATCH] TSK-24 create new task initial new Task creation. Also moved Classification services to general tab. --- .../administration/administration.module.ts | 4 +- .../classification-details.component.spec.ts | 4 +- .../classification-details.component.ts | 4 +- .../classification-list.component.spec.ts | 4 +- .../list/classification-list.component.ts | 4 +- web/src/app/guards/domain-guard.ts | 2 +- web/src/app/models/classification.ts | 22 +- .../classification-categories.service.ts | 0 .../classifications.service.ts | 2 +- web/src/app/shared/sort/sort.component.html | 2 +- web/src/app/shared/sort/sort.component.ts | 1 - .../app/shared/tree/tree.component.spec.ts | 2 +- web/src/app/shared/tree/tree.component.ts | 2 +- .../app/workplace/models/object-reference.ts | 9 + web/src/app/workplace/models/task.ts | 74 +++---- .../app/workplace/services/task.service.ts | 19 +- .../workplace/services/workplace.service.ts | 19 ++ .../general/general-fields.component.html | 188 +++++++++++------- .../general/general-fields.component.scss | 4 + .../general/general-fields.component.ts | 37 +++- .../taskdetails/taskdetails.component.html | 14 +- .../taskdetails/taskdetails.component.scss | 3 + .../taskdetails/taskdetails.component.ts | 123 ++++++++---- .../tasklist-toolbar.component.html | 14 +- .../tasklist-toolbar.component.ts | 47 +++-- .../tasklist/tasklist.component.html | 5 +- .../tasklist/tasklist.component.scss | 5 +- .../workplace/tasklist/tasklist.component.ts | 49 +++-- web/src/app/workplace/workplace.module.ts | 8 +- web/src/assets/_site.scss | 3 +- 30 files changed, 444 insertions(+), 230 deletions(-) rename web/src/app/{administration/services/classification-categories-service => services/classifications}/classification-categories.service.ts (100%) rename web/src/app/{administration => }/services/classifications/classifications.service.ts (97%) create mode 100644 web/src/app/workplace/models/object-reference.ts create mode 100644 web/src/app/workplace/services/workplace.service.ts create mode 100644 web/src/app/workplace/taskdetails/general/general-fields.component.scss diff --git a/web/src/app/administration/administration.module.ts b/web/src/app/administration/administration.module.ts index 386ef070d..6d32f576d 100644 --- a/web/src/app/administration/administration.module.ts +++ b/web/src/app/administration/administration.module.ts @@ -28,8 +28,8 @@ import {WorkbasketService} from 'app/services/workbasket/workbasket.service'; import {SavingWorkbasketService} from './services/saving-workbaskets/saving-workbaskets.service'; import {ClassificationDefinitionService} from './services/classification-definition/classification-definition.service'; import {WorkbasketDefinitionService} from './services/workbasket-definition/workbasket-definition.service'; -import {ClassificationsService} from './services/classifications/classifications.service'; -import {ClassificationCategoriesService} from './services/classification-categories-service/classification-categories.service'; +import {ClassificationsService} from '../services/classifications/classifications.service'; +import {ClassificationCategoriesService} from 'app/services/classifications/classification-categories.service'; import { AccessItemsManagementComponent } from 'app/administration/access-items-management/access-items-management.component'; const MODULES = [ diff --git a/web/src/app/administration/classification/details/classification-details.component.spec.ts b/web/src/app/administration/classification/details/classification-details.component.spec.ts index 4ec76e5a3..5db40d514 100644 --- a/web/src/app/administration/classification/details/classification-details.component.spec.ts +++ b/web/src/app/administration/classification/details/classification-details.component.spec.ts @@ -15,11 +15,11 @@ import { LinksClassification } from 'app/models/links-classfication'; import { Pair } from 'app/models/pair'; // tslint:disable:max-line-length -import { ClassificationCategoriesService } from 'app/administration/services/classification-categories-service/classification-categories.service'; +import { ClassificationCategoriesService } from 'app/services/classifications/classification-categories.service'; // tslint:enable:max-line-length import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; -import { ClassificationsService } from 'app/administration/services/classifications/classifications.service'; +import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { TreeNodeModel } from 'app/models/tree-node'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { AlertService } from 'app/services/alert/alert.service'; diff --git a/web/src/app/administration/classification/details/classification-details.component.ts b/web/src/app/administration/classification/details/classification-details.component.ts index 378deb852..ec2515c01 100644 --- a/web/src/app/administration/classification/details/classification-details.component.ts +++ b/web/src/app/administration/classification/details/classification-details.component.ts @@ -10,7 +10,7 @@ import { AlertModel, AlertType } from 'app/models/alert'; import { highlight } from 'app/shared/animations/validation.animation'; import { TaskanaDate } from 'app/shared/util/taskana.date'; -import { ClassificationsService } from 'app/administration/services/classifications/classifications.service'; +import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { MasterAndDetailService } from 'app/services/masterAndDetail/master-and-detail.service'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; import { RequestInProgressService } from 'app/services/requestInProgress/request-in-progress.service'; @@ -19,7 +19,7 @@ import { TreeService } from 'app/services/tree/tree.service'; import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; // tslint:disable:max-line-length -import { ClassificationCategoriesService } from 'app/administration/services/classification-categories-service/classification-categories.service'; +import { ClassificationCategoriesService } from 'app/services/classifications/classification-categories.service'; // tslint:enable:max-line-length import { DomainService } from 'app/services/domain/domain.service'; import { CustomFieldsService } from '../../../services/custom-fields/custom-fields.service'; diff --git a/web/src/app/administration/classification/master/list/classification-list.component.spec.ts b/web/src/app/administration/classification/master/list/classification-list.component.spec.ts index d6631d709..03237469a 100644 --- a/web/src/app/administration/classification/master/list/classification-list.component.spec.ts +++ b/web/src/app/administration/classification/master/list/classification-list.component.spec.ts @@ -15,7 +15,7 @@ import { ClassificationTypesSelectorComponent } from 'app/shared/classification- import { WorkbasketDefinitionService } from 'app/administration/services/workbasket-definition/workbasket-definition.service'; import { AlertService } from 'app/services/alert/alert.service'; -import { ClassificationsService } from 'app/administration/services/classifications/classifications.service'; +import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { ClassificationDefinitionService } from 'app/administration/services/classification-definition/classification-definition.service'; import { DomainService } from 'app/services/domain/domain.service'; import { ErrorModalService } from 'app/services/errorModal/error-modal.service'; @@ -23,7 +23,7 @@ import { RequestInProgressService } from 'app/services/requestInProgress/request import { configureTests } from 'app/app.test.configuration'; import { ClassificationCategoriesService -} from 'app/administration/services/classification-categories-service/classification-categories.service'; +} from 'app/services/classifications/classification-categories.service'; import { Pair } from 'app/models/pair'; import { TreeService } from 'app/services/tree/tree.service'; diff --git a/web/src/app/administration/classification/master/list/classification-list.component.ts b/web/src/app/administration/classification/master/list/classification-list.component.ts index 22b8042e0..e43672326 100644 --- a/web/src/app/administration/classification/master/list/classification-list.component.ts +++ b/web/src/app/administration/classification/master/list/classification-list.component.ts @@ -6,10 +6,10 @@ import { TaskanaType } from 'app/models/taskana-type'; import { Classification } from 'app/models/classification'; import { TreeNodeModel } from 'app/models/tree-node'; -import { ClassificationsService } from 'app/administration/services/classifications/classifications.service'; +import { ClassificationsService } from 'app/services/classifications/classifications.service'; import { ClassificationCategoriesService -} from 'app/administration/services/classification-categories-service/classification-categories.service'; +} from 'app/services/classifications/classification-categories.service'; import { Pair } from 'app/models/pair'; import { ClassificationDefinition } from '../../../../models/classification-definition'; diff --git a/web/src/app/guards/domain-guard.ts b/web/src/app/guards/domain-guard.ts index 2a7b05df6..7a7cacf11 100644 --- a/web/src/app/guards/domain-guard.ts +++ b/web/src/app/guards/domain-guard.ts @@ -17,7 +17,7 @@ export class DomainGuard implements CanActivate { }), catchError(() => { this.errorModalService.triggerError(new ErrorModel( - 'There was an error, please contact with your administrator', 'There was an error getting Domains')) + 'There was an error, please contact with your administrator', 'There was an error getting Domains')); return of(false) }) ); diff --git a/web/src/app/models/classification.ts b/web/src/app/models/classification.ts index 328161963..f640a378b 100644 --- a/web/src/app/models/classification.ts +++ b/web/src/app/models/classification.ts @@ -1,15 +1,15 @@ -import { Links } from 'app/models/links'; +import {Links} from 'app/models/links'; export class Classification { - constructor(public classificationId: string, - public key: string, - public category: string, - public type: string, - public domain: string, - public name: string, - public parentId: string, - public priority: number, - public serviceLevel: string, - public _links: Links = new Links()) { + constructor(public classificationId: string = undefined, + public key: string = undefined, + public category: string = undefined, + public type: string = undefined, + public domain: string = undefined, + public name: string = undefined, + public parentId: string = undefined, + public priority: number = undefined, + public serviceLevel: string = undefined, + public _links: Links = new Links()) { } } diff --git a/web/src/app/administration/services/classification-categories-service/classification-categories.service.ts b/web/src/app/services/classifications/classification-categories.service.ts similarity index 100% rename from web/src/app/administration/services/classification-categories-service/classification-categories.service.ts rename to web/src/app/services/classifications/classification-categories.service.ts diff --git a/web/src/app/administration/services/classifications/classifications.service.ts b/web/src/app/services/classifications/classifications.service.ts similarity index 97% rename from web/src/app/administration/services/classifications/classifications.service.ts rename to web/src/app/services/classifications/classifications.service.ts index 9ef833cfc..c3269c6f9 100644 --- a/web/src/app/administration/services/classifications/classifications.service.ts +++ b/web/src/app/services/classifications/classifications.service.ts @@ -8,7 +8,7 @@ import { Classification } from 'app/models/classification'; import { ClassificationDefinition } from 'app/models/classification-definition'; import { ClassificationResource } from 'app/models/classification-resource'; -import { ClassificationCategoriesService } from '../classification-categories-service/classification-categories.service'; +import { ClassificationCategoriesService } from './classification-categories.service'; import { DomainService } from 'app/services/domain/domain.service'; import { TaskanaQueryParameters } from 'app/shared/util/query-parameters'; import { Direction } from 'app/models/sorting'; diff --git a/web/src/app/shared/sort/sort.component.html b/web/src/app/shared/sort/sort.component.html index 2aa4d750e..f0493f0c4 100644 --- a/web/src/app/shared/sort/sort.component.html +++ b/web/src/app/shared/sort/sort.component.html @@ -1,5 +1,5 @@
- diff --git a/web/src/app/shared/sort/sort.component.ts b/web/src/app/shared/sort/sort.component.ts index 9a24b6050..aaa51e0e1 100644 --- a/web/src/app/shared/sort/sort.component.ts +++ b/web/src/app/shared/sort/sort.component.ts @@ -8,7 +8,6 @@ import {Direction, SortingModel} from 'app/models/sorting'; }) export class SortComponent implements OnInit { @Input() sortingFields: Map; - @Input() enabled = true; @Input() menuPosition = 'right'; @Output() performSorting = new EventEmitter(); diff --git a/web/src/app/shared/tree/tree.component.spec.ts b/web/src/app/shared/tree/tree.component.spec.ts index 2c6cab2ec..ff29493cf 100644 --- a/web/src/app/shared/tree/tree.component.spec.ts +++ b/web/src/app/shared/tree/tree.component.spec.ts @@ -8,7 +8,7 @@ import { TaskanaTreeComponent } from './tree.component'; import { TreeService } from 'app/services/tree/tree.service'; import { ClassificationCategoriesService -} from 'app/administration/services/classification-categories-service/classification-categories.service'; +} from 'app/services/classifications/classification-categories.service'; import { configureTests } from 'app/app.test.configuration'; import { Pair } from 'app/models/pair'; diff --git a/web/src/app/shared/tree/tree.component.ts b/web/src/app/shared/tree/tree.component.ts index 040442fac..1a6e5308a 100644 --- a/web/src/app/shared/tree/tree.component.ts +++ b/web/src/app/shared/tree/tree.component.ts @@ -8,7 +8,7 @@ import { KEYS, ITreeOptions, TreeComponent, TreeNode } from 'angular-tree-compon import { TreeService } from '../../services/tree/tree.service'; import { ClassificationCategoriesService -} from 'app/administration/services/classification-categories-service/classification-categories.service'; +} from 'app/services/classifications/classification-categories.service'; import { Pair } from 'app/models/pair'; import { Subscription } from 'rxjs'; diff --git a/web/src/app/workplace/models/object-reference.ts b/web/src/app/workplace/models/object-reference.ts new file mode 100644 index 000000000..7b58a3f3c --- /dev/null +++ b/web/src/app/workplace/models/object-reference.ts @@ -0,0 +1,9 @@ +export class ObjectReference { + constructor(public id: string = undefined, + public company: string = undefined, + public system: string = undefined, + public systemInstance: string = undefined, + public type: string = undefined, + public value: string = undefined) { + } +} diff --git a/web/src/app/workplace/models/task.ts b/web/src/app/workplace/models/task.ts index aca98d9e5..b7d8871b1 100644 --- a/web/src/app/workplace/models/task.ts +++ b/web/src/app/workplace/models/task.ts @@ -1,45 +1,47 @@ import {Classification} from 'app/models/classification'; import {Workbasket} from 'app/models/workbasket'; +import {ObjectReference} from './object-reference'; export class Task { - constructor(public businessProcessId: string, - public parentBusinessProcessId: string, - public owner: string, - public taskId: string, - public created: string, // ISO-8601 - public claimed: string, // ISO-8601 - public completed: string, // ISO-8601 - public modified: string, // ISO-8601 - public planned: string, // ISO-8601 - public due: string, // ISO-8601 - public name: string, - public creator: string, - public description: string, - public note: string, - public state: any, - public read: boolean, - public transferred: boolean, - public priority: number, - public classificationSummaryResource: Classification, - public workbasketSummaryResource: Workbasket, + constructor(public taskId: string, + public primaryObjRef: ObjectReference = undefined, + public workbasketSummaryResource: Workbasket = undefined, + public classificationSummaryResource: Classification = undefined, + public businessProcessId: string = undefined, + public parentBusinessProcessId: string = undefined, + public owner: string = undefined, + public created: string = undefined, // ISO-8601 + public claimed: string = undefined, // ISO-8601 + public completed: string = undefined, // ISO-8601 + public modified: string = undefined, // ISO-8601 + public planned: string = undefined, // ISO-8601 + public due: string = undefined, // ISO-8601 + public name: string = undefined, + public creator: string = undefined, + public description: string = undefined, + public note: string = undefined, + public state: any = undefined, + public read: boolean = undefined, + public transferred: boolean = undefined, + public priority: number = undefined, public customAttributes: Array = [], public callbackInfo: Array = [], - public custom1: string, - public custom2: string, - public custom3: string, - public custom4: string, - public custom5: string, - public custom6: string, - public custom7: string, - public custom8: string, - public custom9: string, - public custom10: string, - public custom11: string, - public custom12: string, - public custom13: string, - public custom14: string, - public custom15: string, - public custom16: string) { + public custom1: string = undefined, + public custom2: string = undefined, + public custom3: string = undefined, + public custom4: string = undefined, + public custom5: string = undefined, + public custom6: string = undefined, + public custom7: string = undefined, + public custom8: string = undefined, + public custom9: string = undefined, + public custom10: string = undefined, + public custom11: string = undefined, + public custom12: string = undefined, + public custom13: string = undefined, + public custom14: string = undefined, + public custom15: string = undefined, + public custom16: string = undefined) { } } diff --git a/web/src/app/workplace/services/task.service.ts b/web/src/app/workplace/services/task.service.ts index 851e313da..bd0402c64 100644 --- a/web/src/app/workplace/services/task.service.ts +++ b/web/src/app/workplace/services/task.service.ts @@ -5,6 +5,7 @@ import {Injectable} from '@angular/core'; import {environment} from 'environments/environment'; import {TaskResource} from 'app/workplace/models/task-resource'; import {Direction} from 'app/models/sorting'; +import {Workbasket} from 'app/models/workbasket'; @Injectable() export class TaskService { @@ -17,11 +18,15 @@ export class TaskService { STATE = 'state'; url = `${environment.taskanaRestUrl}/v1/tasks`; + taskChangedSource = new Subject(); taskChangedStream = this.taskChangedSource.asObservable(); taskDeletedSource = new Subject(); taskDeletedStream = this.taskDeletedSource.asObservable(); - private taskSelected = new Subject(); + taskAddedSource = new Subject(); + taskAddedStream = this.taskAddedSource.asObservable(); + taskSelectedSource = new Subject(); + taskSelectedStream = this.taskSelectedSource.asObservable(); constructor(private httpClient: HttpClient) { } @@ -34,12 +39,16 @@ export class TaskService { this.taskDeletedSource.next(task); } + publishAddedTask(task: Task) { + this.taskAddedSource.next(task); + } + selectTask(task: Task) { - this.taskSelected.next(task); + this.taskSelectedSource.next(task); } getSelectedTask(): Observable { - return this.taskSelected.asObservable(); + return this.taskSelectedStream; } /** @@ -82,6 +91,10 @@ export class TaskService { return this.httpClient.delete(`${this.url}/${task.taskId}`); } + createTask(task: Task): Observable { + return this.httpClient.post(`${this.url}`, task); + } + private getTaskQueryParameters(basketId: string, sortBy: string, sortDirection: string, diff --git a/web/src/app/workplace/services/workplace.service.ts b/web/src/app/workplace/services/workplace.service.ts new file mode 100644 index 000000000..aebad00c6 --- /dev/null +++ b/web/src/app/workplace/services/workplace.service.ts @@ -0,0 +1,19 @@ +import {Injectable} from '@angular/core'; +import {Observable, Subject} from 'rxjs/index'; +import {Workbasket} from 'app/models/workbasket'; + +@Injectable() +export class WorkplaceService { + currentWorkbasket: Workbasket = undefined; + workbasketSelectedSource = new Subject(); + workbasketSelectedStream = this.workbasketSelectedSource.asObservable(); + + selectWorkbasket(workbasket: Workbasket) { + this.currentWorkbasket = workbasket; + this.workbasketSelectedSource.next(workbasket); + } + + getSelectedWorkbasket(): Observable { + return this.workbasketSelectedStream; + } +} diff --git a/web/src/app/workplace/taskdetails/general/general-fields.component.html b/web/src/app/workplace/taskdetails/general/general-fields.component.html index af39a4a4c..6943810fa 100644 --- a/web/src/app/workplace/taskdetails/general/general-fields.component.html +++ b/web/src/app/workplace/taskdetails/general/general-fields.component.html @@ -1,108 +1,162 @@ - +
-
+
+
+ + +
+
+ + +
+
+ + +
-
-
-
-
- - -
-
- - -
-
- - -
-
- - -
- -
+
-
+
+ + +
+
+ + +
+
+ + +
+
-
- - +
+ + +
+
+ + +
+
+
+
+ + +
- - + +
- - -
-
- - -
-
- - Business Process ID +
- - + +
-
- - +
+ +
-
+
+ + +
+
+ + +
+
= new EventEmitter(); + task: Task; - constructor() { + @Output() taskChange: EventEmitter = new EventEmitter(); + @Output() classificationsReceived: EventEmitter = new EventEmitter(); + + requestInProgress = false; + selectedClassification: Classification = new Classification(); + classifications: Classification[] = undefined; + + constructor(private classificationService: ClassificationsService) { } ngOnInit() { + this.requestInProgress = true; + this.classificationService.getClassifications().subscribe(classificationList => { + this.requestInProgress = false; + this.classifications = classificationList; + this.classificationsReceived.emit(this.classifications); + }); } + @Input() + set _task(task: Task) { + this.task = task; + this.selectedClassification = task.classificationSummaryResource; + } + + selectClassification(classification: Classification) { + this.selectedClassification = classification; + this.task.classificationSummaryResource = classification; + } } diff --git a/web/src/app/workplace/taskdetails/taskdetails.component.html b/web/src/app/workplace/taskdetails/taskdetails.component.html index f3f2fe1ef..780f833ee 100644 --- a/web/src/app/workplace/taskdetails/taskdetails.component.html +++ b/web/src/app/workplace/taskdetails/taskdetails.component.html @@ -31,11 +31,12 @@
-
-

{{task?.name}}

+

{{task.name}}  + {{'Creating Task'}} +

- +
@@ -62,7 +65,8 @@
- +
diff --git a/web/src/app/workplace/taskdetails/taskdetails.component.scss b/web/src/app/workplace/taskdetails/taskdetails.component.scss index e69de29bb..3648a5600 100644 --- a/web/src/app/workplace/taskdetails/taskdetails.component.scss +++ b/web/src/app/workplace/taskdetails/taskdetails.component.scss @@ -0,0 +1,3 @@ +.panel > .panel-body { + max-height: calc(100vh - 150px); +} diff --git a/web/src/app/workplace/taskdetails/taskdetails.component.ts b/web/src/app/workplace/taskdetails/taskdetails.component.ts index 558fd7f79..abf7fc079 100644 --- a/web/src/app/workplace/taskdetails/taskdetails.component.ts +++ b/web/src/app/workplace/taskdetails/taskdetails.component.ts @@ -1,16 +1,20 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs'; -import { ActivatedRoute, Router } from '@angular/router'; +import {Component, OnDestroy, OnInit} from '@angular/core'; +import {Subscription} from 'rxjs'; +import {ActivatedRoute, Router} from '@angular/router'; -import { TaskService } from 'app/workplace/services/task.service'; -import { RemoveConfirmationService } from 'app/services/remove-confirmation/remove-confirmation.service'; +import {TaskService} from 'app/workplace/services/task.service'; +import {RemoveConfirmationService} from 'app/services/remove-confirmation/remove-confirmation.service'; -import { Task } from 'app/workplace/models/task'; -import { ErrorModel } from '../../models/modal-error'; -import { ErrorModalService } from '../../services/errorModal/error-modal.service'; -import { RequestInProgressService } from '../../services/requestInProgress/request-in-progress.service'; -import { AlertService } from '../../services/alert/alert.service'; -import { AlertModel, AlertType } from '../../models/alert'; +import {Task} from 'app/workplace/models/task'; +import {ErrorModel} from 'app/models/modal-error'; +import {ErrorModalService} from 'app/services/errorModal/error-modal.service'; +import {RequestInProgressService} from 'app/services/requestInProgress/request-in-progress.service'; +import {AlertService} from 'app/services/alert/alert.service'; +import {AlertModel, AlertType} from 'app/models/alert'; +import {TaskanaDate} from 'app/shared/util/taskana.date'; +import {ObjectReference} from 'app/workplace/models/object-reference'; +import {Workbasket} from 'app/models/workbasket'; +import {WorkplaceService} from 'app/workplace/services/workplace.service'; @Component({ selector: 'taskana-task-details', @@ -18,63 +22,104 @@ import { AlertModel, AlertType } from '../../models/alert'; styleUrls: ['./taskdetails.component.scss'] }) export class TaskdetailsComponent implements OnInit, OnDestroy { - task: Task = null; - taskClone: Task = null; + task: Task = undefined; + taskClone: Task = undefined; requestInProgress = false; tabSelected = 'general'; + currentWorkbasket: Workbasket = undefined; + currentId: string = undefined; private routeSubscription: Subscription; - + private workbasketSubscription: Subscription; constructor(private route: ActivatedRoute, - private taskService: TaskService, - private router: Router, - private removeConfirmationService: RemoveConfirmationService, - private requestInProgressService: RequestInProgressService, - private alertService: AlertService, - private errorModalService: ErrorModalService) { + private taskService: TaskService, + private workplaceService: WorkplaceService, + private router: Router, + private removeConfirmationService: RemoveConfirmationService, + private requestInProgressService: RequestInProgressService, + private alertService: AlertService, + private errorModalService: ErrorModalService) { } ngOnInit() { + this.currentWorkbasket = this.workplaceService.currentWorkbasket; + this.workbasketSubscription = this.workplaceService.getSelectedWorkbasket().subscribe(workbasket => { + this.currentWorkbasket = workbasket; + }); this.routeSubscription = this.route.params.subscribe(params => { - const id = params['id']; - this.getTask(id); + this.currentId = params['id']; + if (!this.currentWorkbasket && this.currentId === 'new-task') { + this.router.navigate(['']); + } + this.getTask(); }); } resetTask(): void { - this.task = { ...this.taskClone }; + this.task = {...this.taskClone}; this.task.customAttributes = this.taskClone.customAttributes.slice(0); this.task.callbackInfo = this.taskClone.callbackInfo.slice(0); + this.task.primaryObjRef = {...this.taskClone.primaryObjRef}; this.alertService.triggerAlert(new AlertModel(AlertType.INFO, 'Reset edited fields')); } - getTask(id: string): void { + getTask(): void { this.requestInProgress = true; - this.taskService.getTask(id).subscribe(task => { + if (this.currentId === 'new-task') { this.requestInProgress = false; - this.task = task; + this.task = new Task(undefined, new ObjectReference(), this.currentWorkbasket); this.cloneTask(); - this.taskService.selectTask(task); - }, err => { - this.errorModalService.triggerError( - new ErrorModel('An error occurred while fetching the task', err)); - }); + } else { + this.taskService.getTask(this.currentId).subscribe(task => { + this.requestInProgress = false; + this.task = task; + this.cloneTask(); + this.taskService.selectTask(task); + }, err => { + this.errorModalService.triggerError( + new ErrorModel('An error occurred while fetching the task', err)); + }); + } + } + + onSave() { + this.requestInProgressService.setRequestInProgress(true); + this.currentId === 'new-task' ? this.createTask() : this.updateTask(); } updateTask() { - this.requestInProgressService.setRequestInProgress(true); this.taskService.updateTask(this.task).subscribe(task => { this.requestInProgressService.setRequestInProgress(false); this.task = task; this.cloneTask(); this.taskService.publishUpdatedTask(task); this.alertService.triggerAlert(new AlertModel(AlertType.SUCCESS, 'Update successful!')) - }, err => {this.alertService.triggerAlert(new AlertModel(AlertType.DANGER, 'Update not successful!'))}); + }, err => { + this.alertService.triggerAlert(new AlertModel(AlertType.DANGER, 'Update not successful!')) + }); } - openTask(taskId: string) { - this.router.navigate([{ outlets: { detail: `task/${taskId}` } }], { relativeTo: this.route.parent }); + createTask() { + this.addDateToTask(); + this.taskService.createTask(this.task).subscribe(task => { + this.requestInProgressService.setRequestInProgress(false); + this.alertService.triggerAlert(new AlertModel(AlertType.SUCCESS, `Task ${this.currentId} was created successfully`)); + this.task = task; + this.taskService.selectTask(this.task); + this.taskService.publishAddedTask(task); + this.router.navigate(['../' + task.taskId], {relativeTo: this.route}); + }); + } + + private addDateToTask() { + const date = TaskanaDate.getDate(); + this.task.created = date; + this.task.modified = date; + } + + openTask() { + this.router.navigate([{outlets: {detail: `task/${this.currentId}`}}], {relativeTo: this.route.parent}); } workOnTaskDisabled(): boolean { @@ -83,10 +128,9 @@ export class TaskdetailsComponent implements OnInit, OnDestroy { deleteTask(): void { this.removeConfirmationService.setRemoveConfirmation(this.deleteTaskConfirmation.bind(this), - `You are going to delete Task: ${this.task.taskId}. Can you confirm this action?`); + `You are going to delete Task: ${this.currentId}. Can you confirm this action?`); } - deleteTaskConfirmation(): void { this.taskService.deleteTask(this.task).subscribe(); this.taskService.publishDeletedTask(this.task); @@ -101,7 +145,7 @@ export class TaskdetailsComponent implements OnInit, OnDestroy { backClicked(): void { this.task = undefined; this.taskService.selectTask(this.task); - this.router.navigate(['./'], { relativeTo: this.route.parent }); + this.router.navigate(['./'], {relativeTo: this.route.parent}); } ngOnDestroy(): void { @@ -111,8 +155,9 @@ export class TaskdetailsComponent implements OnInit, OnDestroy { } private cloneTask() { - this.taskClone = { ...this.task }; + this.taskClone = {...this.task}; this.taskClone.customAttributes = this.task.customAttributes.slice(0); this.taskClone.callbackInfo = this.task.callbackInfo.slice(0); + this.taskClone.primaryObjRef = {...this.task.primaryObjRef}; } } diff --git a/web/src/app/workplace/tasklist/tasklist-toolbar/tasklist-toolbar.component.html b/web/src/app/workplace/tasklist/tasklist-toolbar/tasklist-toolbar.component.html index 142cff0b0..ec1a9e0b6 100644 --- a/web/src/app/workplace/tasklist/tasklist-toolbar/tasklist-toolbar.component.html +++ b/web/src/app/workplace/tasklist/tasklist-toolbar/tasklist-toolbar.component.html @@ -1,8 +1,15 @@
  • -
    +
    + +
    +
    - @@ -14,10 +21,9 @@
    -