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

#1431 - fix tasklist on click process task detail (#1492)

Browse Source 
* #1431 - fix tasklist on click process task detail

* Update form-viewer.component.html

#1431 - removed wrong change on form-viewer
This commit is contained in:
Vito
2017-01-17 07:00:37 -08:00
committed by Maurizio Vitale
parent 14d399968c
commit 0fd45a2f88
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
demo-shell-ng2/app/components/activiti/activiti-demo.component.ts
View File

@@ -36,6 +36,7 @@ import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs/Rx';
import {
ObjectDataTableAdapter,
ObjectDataRow,
DataSorting
} from 'ng2-alfresco-datatable';
import { AlfrescoApiService } from 'ng2-alfresco-core';
@@ -144,7 +145,9 @@ export class ActivitiDemoComponent implements AfterViewInit {
}
onTaskFilterClick(event: FilterRepresentationModel) {
this.taskFilter = event;
if(event){
this.taskFilter = event;
}
}
onReportClick(event: any) {
@@ -191,16 +194,14 @@ export class ActivitiDemoComponent implements AfterViewInit {
}
navigateStartProcess() {
this.processFilter = null;
this.activitiprocessfilter.selectFilter(null);
this.cleanProcessFilters();
this.currentProcessInstanceId = currentProcessIdNew;
}
onStartProcessInstance(instance: ProcessInstance) {
this.currentProcessInstanceId = instance.id;
this.activitiStartProcess.reset();
this.processFilter = null;
this.activitiprocessfilter.selectFilter(null);
this.cleanProcessFilters();
}
isStartProcessMode() {
@@ -248,9 +249,21 @@ export class ActivitiDemoComponent implements AfterViewInit {
onProcessDetailsTaskClick(event: TaskDetailsEvent) {
event.preventDefault();
this.currentTaskId = event.value.id;
this.activititasklist.reload();
this.activeTab = 'tasks';
let processTaskDataRow = new ObjectDataRow({
id: event.value.id,
name: event.value.name || 'No name',
created: event.value.created
})
this.activitifilter.selectFilter(null);
this.dataTasks.setRows([processTaskDataRow]);
this.activititasklist.selectTask(event.value.id);
this.currentTaskId = event.value.id;
}
private cleanProcessFilters(){
this.processFilter = null;
this.activitiprocessfilter.selectFilter(null);
}
}