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

Move Start Process form into Process List view

Browse Source 
Refs #1048
This commit is contained in:
Will Abson
2016-11-22 13:36:09 +00:00
committed by Mario Romano
parent 8a85c69256
commit a6a5400956
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,6 @@
<a id="apps-header" href="#apps" class="mdl-layout__tab is-active">APPS</a> <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="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="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> <a id="report-header" href="#report" class="mdl-layout__tab">ANALYTICS</a>
</div> </div>
</header> </header>
@@ -81,22 +80,11 @@
(rowClick)="onProcessRowClick($event)" (onSuccess)="onSuccessProcessList($event)" (rowClick)="onProcessRowClick($event)" (onSuccess)="onSuccessProcessList($event)"
#activitiprocesslist></activiti-process-instance-list> #activitiprocesslist></activiti-process-instance-list>
</div> </div>
<div class="mdl-cell mdl-cell--7-col task-column"> <div class="mdl-cell mdl-cell--7-col task-column" *ngIf="!isStartProcessMode()">
<span>Process Details</span> <span>Process Details</span>
<activiti-process-instance-details [processInstanceId]="currentProcessInstanceId" (activitiprocesslist)="taskFormCompleted()" (processCancelled)="processCancelled()" #activitiprocessdetails></activiti-process-instance-details> <activiti-process-instance-details [processInstanceId]="currentProcessInstanceId" (activitiprocesslist)="taskFormCompleted()" (processCancelled)="processCancelled()" #activitiprocessdetails></activiti-process-instance-details>
</div> </div>
</div> <div class="mdl-cell mdl-cell--7-col task-column" *ngIf="isStartProcessMode()">
</div>
</div>
</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> <span>Start Process</span>
<activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process> <activiti-start-process [appId]="appId" (start)="onStartProcessInstance($event)"></activiti-start-process>
</div> </div>

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

@@ -22,7 +22,11 @@ import {
ActivitiApps, ActivitiApps,
ActivitiTaskList ActivitiTaskList
} from 'ng2-activiti-tasklist'; } from 'ng2-activiti-tasklist';
import { ActivitiProcessInstanceListComponent, ActivitiStartProcessInstance } from 'ng2-activiti-processlist'; import {
ActivitiProcessInstanceListComponent,
ActivitiStartProcessInstance,
ProcessInstance
} from 'ng2-activiti-processlist';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { Subscription } from 'rxjs/Rx'; import { Subscription } from 'rxjs/Rx';
import { import {
@@ -36,6 +40,8 @@ import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custo
declare let __moduleName: string; declare let __moduleName: string;
declare var componentHandler; declare var componentHandler;
const currentProcessIdNew = '__NEW__';
@Component({ @Component({
moduleId: __moduleName, moduleId: __moduleName,
selector: 'activiti-demo', selector: 'activiti-demo',
@@ -189,13 +195,17 @@ export class ActivitiDemoComponent implements AfterViewChecked {
} }
navigateStartProcess() { navigateStartProcess() {
this.changeTab('processes', 'start-process'); this.currentProcessInstanceId = currentProcessIdNew;
} }
onStartProcessInstance() { onStartProcessInstance(instance: ProcessInstance) {
this.currentProcessInstanceId = instance.id;
this.activitiprocesslist.reload(false);
this.activitiStartProcess.reset(); this.activitiStartProcess.reset();
this.activitiprocesslist.reload(); }
this.changeTab('start-process', 'processes');
isStartProcessMode() {
return this.currentProcessInstanceId === currentProcessIdNew;
} }
processCancelled(data: any) { processCancelled(data: any) {