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

#1107 Fixes demo and documentation

Browse Source
This commit is contained in:
mauriziovitale84
2016-11-18 16:36:54 +00:00
committed by Mario Romano
parent 1501e2c2cc
commit e127837bcc
6 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
demo-shell-ng2/app/components/activiti/activiti-demo.component.html
View File

@@ -36,8 +36,8 @@
</div>
<div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp">
<span>Task List</span>
<activiti-tasklist *ngIf="taskFilter && taskFilter.hasFilter()" [appId]="taskFilter.appId"
[processDefinitionId]="taskFilter.filter.processDefinitionId"
<activiti-tasklist *ngIf="taskFilter?.hasFilter()" [appId]="taskFilter.appId"
[processDefinitionKey]="taskFilter.filter.processDefinitionKey"
[name]="taskFilter.filter.name"
[assignment]="taskFilter.filter.assignment"
[state]="taskFilter.filter.state"
@@ -71,7 +71,12 @@
</div>
<div class="mdl-cell mdl-cell--3-col task-column">
<span>Process List</span>
<activiti-process-instance-list [filter]="processFilter" [data]="dataProcesses"
<activiti-process-instance-list *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId"
[processDefinitionKey]="processFilter.filter.processDefinitionKey"
[name]="processFilter.filter.name"
[state]="processFilter.filter.state"
[sort]="processFilter.filter.sort"
[data]="dataProcesses"
(rowClick)="onProcessRowClick($event)" (onSuccess)="onSuccessProcessList($event)"
#activitiprocesslist></activiti-process-instance-list>
</div>

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

@@ -81,9 +81,9 @@ export class ActivitiDemoComponent implements AfterViewChecked {
taskSchemaColumns: any [] = [];
processSchemaColumns: any [] = [];
taskFilter: any;
taskFilter: FilterRepresentationModel;
report: any;
processFilter: any;
processFilter: FilterRepresentationModel;
sub: Subscription;
@@ -103,11 +103,10 @@ export class ActivitiDemoComponent implements AfterViewChecked {
this.dataProcesses = new ObjectDataTableAdapter(
[],
[
{type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true},
{type: 'text', key: 'started', title: 'Started', cssClass: 'hidden', sortable: true}
{type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column'},
{type: 'text', key: 'started', title: 'Started', cssClass: 'hidden'}
]
);
this.dataProcesses.setSorting(new DataSorting('started', 'desc'));
// Uncomment this line to replace all 'text' field editors with custom component
// formRenderingService.setComponentTypeResolver('text', () => CustomEditorComponent, true);
@@ -163,10 +162,10 @@ export class ActivitiDemoComponent implements AfterViewChecked {
}
onSuccessTaskList(event: FilterRepresentationModel) {
this.currentTaskId = this.activititasklist.getCurrentTaskId();
this.currentTaskId = this.activititasklist.getCurrentId();
}
onProcessFilterClick(event: any) {
onProcessFilterClick(event: FilterRepresentationModel) {
this.processFilter = event;
}
@@ -175,7 +174,7 @@ export class ActivitiDemoComponent implements AfterViewChecked {
}
onSuccessProcessList(event: any) {
this.currentProcessInstanceId = this.activitiprocesslist.getCurrentProcessId();
this.currentProcessInstanceId = this.activitiprocesslist.getCurrentId();
}
onTaskRowClick(taskId) {