diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html index 884f329661..34fe93ed19 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html @@ -4,7 +4,7 @@
- +
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html index 58d9053139..60f472ba5b 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html @@ -19,10 +19,29 @@
+
{{ 'DETAILS.TASKS.NO_ACTIVE' | translate }}
+
+ {{ 'DETAILS.LABELS.START_FORM'|translate }} + + +
+ {{ 'DETAILS.LABELS.TASKS_COMPLETED'|translate }} @@ -38,6 +57,7 @@
+
{{ 'DETAILS.TASKS.NO_COMPLETED' | translate }}
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts index 90e9d21fe5..bcb62e4fa2 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts @@ -21,6 +21,7 @@ import { ActivitiProcessService } from './../services/activiti-process.service'; import { TaskDetailsModel } from 'ng2-activiti-tasklist'; import { Observable, Observer } from 'rxjs/Rx'; import { DatePipe } from '@angular/common'; +import { ProcessInstance } from '../models/process-instance'; declare let componentHandler: any; @@ -33,7 +34,7 @@ declare let componentHandler: any; export class ActivitiProcessInstanceTasks implements OnInit { @Input() - processInstanceId: string; + processInstanceDetails: ProcessInstance; @Input() showRefreshButton: boolean = true; @@ -78,8 +79,8 @@ export class ActivitiProcessInstanceTasks implements OnInit { this.completedTasks.push(task); }); - if (this.processInstanceId) { - this.load(this.processInstanceId); + if (this.processInstanceDetails && this.processInstanceDetails.id) { + this.load(this.processInstanceDetails.id); } } @@ -166,11 +167,11 @@ export class ActivitiProcessInstanceTasks implements OnInit { public taskFormCompleted() { this.closeDialog(); - this.load(this.processInstanceId); - this.taskFormCompletedEmitter.emit(this.processInstanceId); + this.load(this.processInstanceDetails.id); + this.taskFormCompletedEmitter.emit(this.processInstanceDetails.id); } public onRefreshClicked() { - this.load(this.processInstanceId); + this.load(this.processInstanceDetails.id); } } diff --git a/ng2-components/ng2-activiti-processlist/src/i18n/en.json b/ng2-components/ng2-activiti-processlist/src/i18n/en.json index 2c124caa35..448ab632ea 100644 --- a/ng2-components/ng2-activiti-processlist/src/i18n/en.json +++ b/ng2-components/ng2-activiti-processlist/src/i18n/en.json @@ -17,6 +17,7 @@ "STARTED_BY": "Started by", "STARTED": "Started", "COMMENTS": "Comments", + "START_FORM": "Start Form", "TASKS_ACTIVE": "Active Tasks", "TASKS_COMPLETED": "Completed Tasks", "TASK_SUBTITLE": "Assigned to {{user}}, created {{created}}"