Separate Start Process UI from dialog

- Add Start Process section in demo shell
- Remove old component in filters component

Refs #1048
This commit is contained in:
Will Abson
2016-11-21 17:13:31 +00:00
committed by Mario Romano
parent ae6f4eeb1c
commit 9e7ca14ec9
11 changed files with 325 additions and 115 deletions

View File

@@ -8,6 +8,7 @@
<a id="apps-header" href="#apps" class="mdl-layout__tab is-active">APPS</a>
<a id="tasks-header" href="#tasks" class="mdl-layout__tab">TASK LIST</a>
<a id="processes-header" href="#processes" class="mdl-layout__tab">PROCESS LIST</a>
<a id="start-process-header" href="#start-process" class="mdl-layout__tab">START PROCESS</a>
<a id="report-header" href="#report" class="mdl-layout__tab">ANALYTICS</a>
</div>
</header>
@@ -64,7 +65,6 @@
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col task-column">
<span>Process Filters</span>
<activiti-start-process-instance [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process-instance>
<activiti-process-instance-filters [appId]="appId"
(filterClick)="onProcessFilterClick($event)" (onSuccess)="onSuccessProcessFilterList($event)"
#activitiprocessfilter></activiti-process-instance-filters>
@@ -90,6 +90,21 @@
</section>
<!-- START PROCESS COMPONENT -->
<section class="mdl-layout__tab-panel" id="start-process">
<div class="page-content">
<div class="page-content">
<div class="mdl-grid">
<div class="mdl-cell mdl-cell--12-col task-column">
<span>Start Process</span>
<activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
</div>
</div>
</div>
</div>
</section>
<!-- ANALYTICS COMPONENT -->
<section class="mdl-layout__tab-panel" id="report">

View File

@@ -22,7 +22,7 @@ import {
ActivitiApps,
ActivitiTaskList
} from 'ng2-activiti-tasklist';
import { ActivitiProcessInstanceListComponent } from 'ng2-activiti-processlist';
import { ActivitiProcessInstanceListComponent, ActivitiStartProcessInstance } from 'ng2-activiti-processlist';
import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs/Rx';
import {
@@ -65,6 +65,9 @@ export class ActivitiDemoComponent implements AfterViewChecked {
@ViewChild('activitiprocessdetails')
activitiprocessdetails: any;
@ViewChild(ActivitiStartProcessInstance)
activitiStartProcess: ActivitiStartProcessInstance;
@ViewChild('tabmain')
tabMain: any;
@@ -186,7 +189,9 @@ export class ActivitiDemoComponent implements AfterViewChecked {
}
onStartProcessInstance() {
this.activitiStartProcess.reset();
this.activitiprocesslist.reload();
this.changeTab('start-process', 'processes');
}
processCancelled(data: any) {