Fix demo after refactoring

This commit is contained in:
mauriziovitale84
2016-11-18 13:08:44 +00:00
committed by Mario Romano
parent 2bcb8e9b04
commit 1501e2c2cc
2 changed files with 61 additions and 60 deletions

View File

@@ -63,34 +63,35 @@ import { ObjectDataTableAdapter, DataSorting } from 'ng2-alfresco-datatable';
<section class="mdl-layout__tab-panel" id="processes"> <section class="mdl-layout__tab-panel" id="processes">
<div class="page-content"> <div class="page-content">
<div class="page-content"> <div class="mdl-grid">
<div class="mdl-grid"> <div class="mdl-cell mdl-cell--2-col task-column">
<div class="mdl-cell mdl-cell--2-col task-column"> <span>Process Filters</span>
<span>Process Filters</span> <activiti-start-process-instance [appId]="appId"></activiti-start-process-instance>
<activiti-start-process-instance [appId]="appId"></activiti-start-process-instance> <activiti-process-instance-filters
<activiti-process-instance-filters [appId]="appId"
[appId]="appId" (filterClick)="onProcessFilterClick($event)"
(filterClick)="onProcessFilterClick($event)" (onSuccess)="onSuccessProcessFilterList($event)"
(onSuccess)="onSuccessProcessFilterList($event)" #activitiprocessfilter></activiti-process-instance-filters>
#activitiprocessfilter></activiti-process-instance-filters> </div>
</div> <div class="mdl-cell mdl-cell--3-col task-column">
<div class="mdl-cell mdl-cell--3-col task-column"> <span>Process List</span>
<span>Process List</span> <activiti-process-instance-list *ngIf="processFilter?.hasFilter()" [appId]="processFilter.appId"
<activiti-process-instance-list [processDefinitionKey]="processFilter.filter.processDefinitionKey"
[filter]="processFilter" [name]="processFilter.filter.name"
[data]="dataProcesses" [state]="processFilter.filter.state"
(rowClick)="onProcessRowClick($event)" [sort]="processFilter.filter.sort"
(onSuccess)="onSuccessProcessList($event)" [data]="dataProcesses"
#activitiprocesslist></activiti-process-instance-list> (rowClick)="onProcessRowClick($event)"
</div> (onSuccess)="onSuccessProcessList($event)"
<div class="mdl-cell mdl-cell--7-col task-column"> #activitiprocesslist></activiti-process-instance-list>
<span>Process Details</span> </div>
<activiti-process-instance-details <div class="mdl-cell mdl-cell--7-col task-column">
[processInstanceId]="currentProcessInstanceId" <span>Process Details</span>
(taskFormCompleted)="taskFormCompleted()" <activiti-process-instance-details
(processCancelled)="processCancelled()" [processInstanceId]="currentProcessInstanceId"
#activitiprocessdetails></activiti-process-instance-details> (taskFormCompleted)="taskFormCompleted()"
</div> (processCancelled)="processCancelled()"
#activitiprocessdetails></activiti-process-instance-details>
</div> </div>
</div> </div>
</div> </div>

View File

@@ -80,8 +80,8 @@ import { ObjectDataTableAdapter, DataSorting } from 'ng2-alfresco-datatable';
</div> </div>
<div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp"> <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp">
<span>Task List</span> <span>Task List</span>
<activiti-tasklist *ngIf="taskFilter && taskFilter.hasFilter()" [appId]="taskFilter.appId" <activiti-tasklist *ngIf="taskFilter?.hasFilter()" [appId]="taskFilter.appId"
[processDefinitionId]="taskFilter.filter.processDefinitionId" [processDefinitionKey]="taskFilter.filter.processDefinitionKey"
[name]="taskFilter.filter.name" [name]="taskFilter.filter.name"
[assignment]="taskFilter.filter.assignment" [assignment]="taskFilter.filter.assignment"
[state]="taskFilter.filter.state" [state]="taskFilter.filter.state"
@@ -207,9 +207,9 @@ class MyDemoApp implements OnInit {
} }
onSuccessTaskList(event: FilterRepresentationModel) { onSuccessTaskList(event: FilterRepresentationModel) {
this.currentTaskId = this.activititasklist.getCurrentTaskId(); this.currentTaskId = this.activititasklist.getCurrentId();
} }
main
onTaskRowClick(taskId) { onTaskRowClick(taskId) {
this.currentTaskId = taskId; this.currentTaskId = taskId;
} }