inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Complete Task button for tasks with no form

Browse Source 
- Allows standalone tasks to be completed

Refs #530
This commit is contained in:
Will Abson
2016-09-22 14:56:52 +01:00
parent faf4d7eeac
commit 23af7f738f
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
View File

@@ -33,6 +33,8 @@
(onError)='onErrorEmitter($event)' (onError)='onErrorEmitter($event)'
(executeOutcome)='executeOutcomeEmitter($event)' (executeOutcome)='executeOutcomeEmitter($event)'
#activitiForm> #activitiForm>
</activiti-form> </activiti-form>
<button type="button" class="mdl-button" *ngIf="!hasFormKey() && isTaskActive()" (click)="onComplete()">
{{ 'TASK_DETAILS.BUTTON.COMPLETE' | translate }}
</button>
</div> </div>

5
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
View File

@@ -133,6 +133,10 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
&& this.taskDetails.formKey !== 'null'; && this.taskDetails.formKey !== 'null';
} }
isTaskActive() {
return this.taskDetails && this.taskDetails.duration === null;
}
/** /**
* Load the activiti task details * Load the activiti task details
* @param taskId * @param taskId
@@ -176,6 +180,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
this.activitiTaskList.completeTask(this.taskId).subscribe( this.activitiTaskList.completeTask(this.taskId).subscribe(
(res) => { (res) => {
console.log(res); console.log(res);
this.formCompleted.emit(res);
} }
); );
} }

3
ng2-components/ng2-activiti-tasklist/src/i18n/en.json
View File

@@ -13,6 +13,9 @@
"COMMENTS": "Comments", "COMMENTS": "Comments",
"CHECKLIST": "Checklist" "CHECKLIST": "Checklist"
}, },
"BUTTON": {
"COMPLETE": "Complete"
},
"MESSAGES": { "MESSAGES": {
"NONE": "No task details found." "NONE": "No task details found."
}, },