diff --git a/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js b/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
index fff26fd053..a09961cab3 100644
--- a/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
+++ b/ng2-components/ng2-activiti-processlist/demo/systemjs.config.js
@@ -25,7 +25,8 @@
'rxjs': 'node_modules/rxjs',
'ng2-translate': 'node_modules/ng2-translate',
'ng2-activiti-processlist': 'node_modules/ng2-activiti-processlist',
- 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist'
+ 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core/dist',
+ 'ng2-alfresco-datatable': 'node_modules/ng2-alfresco-datatable/dist'
};
// packages tells the System loader how to load when no filename and/or no extension
@@ -35,7 +36,8 @@
'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' },
'ng2-translate': { defaultExtension: 'js' },
'ng2-activiti-processlist': { main: 'index.js', defaultExtension: 'js' },
- 'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' }
+ 'ng2-alfresco-core': { main: 'index.js', defaultExtension: 'js' },
+ 'ng2-alfresco-datatable': { main: 'index.js', defaultExtension: 'js' }
};
var ngPackageNames = [
diff --git a/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.html b/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.html
index 75a078b75f..beedb69313 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.html
+++ b/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.html
@@ -1,20 +1,6 @@
My Activiti Processes
{{ 'PROCESSLIST.NONE' | translate }}
-
- {{ 'PROCESSLIST.SUMMARY' | translate:{total: processInstances.length} }}
-
-
- {{ 'PROCESSLIST.COLUMN.NAME' | translate }} |
-
-
-
-
-
- {{instance.name}} |
-
-
-
-
-{{ 'PROCESSLIST.ERROR' | translate:{errorMessage: errorMessage} }}
-
+
+
diff --git a/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.ts
index db2a29d1df..1f7b697a17 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/ng2-activiti-processlist.component.ts
@@ -20,6 +20,10 @@ import {
OnInit
} from '@angular/core';
import { AlfrescoPipeTranslate, AlfrescoTranslationService } from 'ng2-alfresco-core';
+import {
+ ALFRESCO_DATATABLE_DIRECTIVES,
+ ObjectDataTableAdapter
+} from 'ng2-alfresco-datatable';
import { ActivitiProcessService } from '../services/activiti-process-service.service';
import { ProcessInstance } from '../models/process-instance';
@@ -36,12 +40,14 @@ declare let __moduleName: string;
`
],
templateUrl: './ng2-activiti-processlist.component.html',
+ directives: [ ALFRESCO_DATATABLE_DIRECTIVES ],
pipes: [ AlfrescoPipeTranslate ]
})
export class Ng2ActivitiProcesslistComponent implements OnInit {
errorMessage: string;
processInstances: ProcessInstance[];
+ data: ObjectDataTableAdapter;
constructor (
private processService: ActivitiProcessService,
@@ -59,7 +65,18 @@ export class Ng2ActivitiProcesslistComponent implements OnInit {
getProcesses() {
this.processService.getProcesses()
.subscribe(
- processInstances => this.processInstances = processInstances,
+ (processInstances) => {
+ // this.processInstances = processInstances;
+ this.data = new ObjectDataTableAdapter(
+ processInstances,
+ [
+ {type: 'text', key: 'id', title: 'Id', sortable: true},
+ {type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true},
+ {type: 'text', key: 'started', title: 'Started', sortable: true},
+ {type: 'text', key: 'startedBy.email', title: 'Started By', sortable: true}
+ ]
+ );
+ },
error => this.errorMessage = error);
}