From d107d803c21d7c7fce08fa4e3295761957cbc648 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Tue, 27 Jun 2017 09:51:21 +0100 Subject: [PATCH] create new TaskDetailsModel in loadNextTask (#2017) --- .../activiti-task-details.component.ts | 43 +++++++++---------- .../activiti-task-header.component.ts | 1 + .../src/models/task-details.model.ts | 9 +++- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts index d7a171251a..64b5870756 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { - Component, +import { Component, Input, OnInit, ViewChild, @@ -152,15 +151,13 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { } } - ngOnChanges(changes: SimpleChanges) { - let taskId = changes['taskId']; + ngOnChanges(changes: SimpleChanges): void { + let taskId = changes.taskId; + if (taskId && !taskId.currentValue) { this.reset(); - return; - } - if (taskId && taskId.currentValue) { + } else if (taskId && taskId.currentValue) { this.loadDetails(taskId.currentValue); - return; } } @@ -221,7 +218,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { * @param processInstanceId * @param processDefinitionId */ - private loadNextTask(processInstanceId: string, processDefinitionId: string) { + private loadNextTask(processInstanceId: string, processDefinitionId: string): void { let requestNode = new TaskQueryRequestRepresentationModel( { processInstanceId: processInstanceId, @@ -231,7 +228,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { this.activitiTaskList.getTasks(requestNode).subscribe( (response) => { if (response && response.length > 0) { - this.taskDetails = response[0]; + this.taskDetails = new TaskDetailsModel(response[0]); } else { this.reset(); } @@ -243,28 +240,28 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { /** * Complete button clicked */ - onComplete() { + onComplete(): void { this.activitiTaskList.completeTask(this.taskId).subscribe( (res) => this.onFormCompleted(null) ); } - onFormContentClick(content: ContentLinkModel) { + onFormContentClick(content: ContentLinkModel): void { this.formContentClicked.emit(content); } - onFormSaved(form: FormModel) { + onFormSaved(form: FormModel): void { this.formSaved.emit(form); } - onFormCompleted(form: FormModel) { + onFormCompleted(form: FormModel): void { this.formCompleted.emit(form); if (this.showNextTask) { this.loadNextTask(this.taskDetails.processInstanceId, this.taskDetails.processDefinitionId); } } - onFormLoaded(form: FormModel) { + onFormLoaded(form: FormModel): void { this.taskFormName = null; if (form && form.name) { this.taskFormName = form.name; @@ -272,20 +269,20 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { this.formLoaded.emit(form); } - onChecklistTaskCreated(task: TaskDetailsModel) { + onChecklistTaskCreated(task: TaskDetailsModel): void { this.taskCreated.emit(task); } - onChecklistTaskDeleted(taskId: string) { + onChecklistTaskDeleted(taskId: string): void { this.taskDeleted.emit(taskId); } - onFormError(error: any) { + onFormError(error: any): void { this.errorDialog.nativeElement.showModal(); this.onError.emit(error); } - onFormExecuteOutcome(event: FormOutcomeEvent) { + onFormExecuteOutcome(event: FormOutcomeEvent): void { this.executeOutcome.emit(event); } @@ -293,24 +290,24 @@ export class ActivitiTaskDetails implements OnInit, OnChanges { this.errorDialog.nativeElement.close(); } - public showPeopleDialog() { + public showPeopleDialog(): void { if (!this.peopleDialog.nativeElement.showModal) { dialogPolyfill.registerDialog(this.peopleDialog.nativeElement); } this.peopleDialog.nativeElement.showModal(); } - public closePeopleDialog() { + public closePeopleDialog(): void { if (this.peopleDialog) { this.peopleDialog.nativeElement.close(); } } - onClaimTask(taskId: string) { + onClaimTask(taskId: string): void { this.loadDetails(taskId); } - toggleHeaderContent() { + toggleHeaderContent(): void { this.showHeaderContent = !this.showHeaderContent; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts index c3bf8b5864..950bfd2a2c 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-header.component.ts @@ -52,6 +52,7 @@ export class ActivitiTaskHeader implements OnChanges { refreshData() { if (this.taskDetails) { + this.properties = [ new CardViewModel({label: 'Status:', value: this.getTaskStatus(), key: 'status'}), new CardViewModel({label: 'Due Date:', value: this.taskDetails.dueDate, format: 'MMM DD YYYY', key: 'dueDate', default: 'No date'}), diff --git a/ng2-components/ng2-activiti-tasklist/src/models/task-details.model.ts b/ng2-components/ng2-activiti-tasklist/src/models/task-details.model.ts index 77209f243a..408318d933 100644 --- a/ng2-components/ng2-activiti-tasklist/src/models/task-details.model.ts +++ b/ng2-components/ng2-activiti-tasklist/src/models/task-details.model.ts @@ -92,9 +92,14 @@ export class TaskDetailsModel { } getFullName(): string { + let fullName: string = ''; + if (this.assignee) { - return this.assignee.firstName + ' ' + this.assignee.lastName; + let firstName: string = this.assignee.firstName ? this.assignee.firstName : ''; + let lastName: string = this.assignee.lastName ? this.assignee.lastName : ''; + fullName = `${firstName} ${lastName}`; } - return ''; + + return fullName.trim(); } }