inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move the adf start task component in a different zone (#2099)

Browse Source
This commit is contained in:
Maurizio Vitale 2017-07-19 10:10:31 +01:00 committed by Eugenio Romano
parent d8d2dde96c
commit 6bde12f770
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,10 +20,10 @@
<div class="mdl-grid"> <div class="mdl-grid">
<div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp"> <div class="mdl-cell mdl-cell--2-col task-column mdl-shadow--2dp">
<div class="list-buttons"> <div class="list-buttons">
<activiti-start-task <button md-raised-button data-automation-id="btn-start-task" (click)="navigateStartTask()">
[appId]="appId" <md-icon>add</md-icon>
(onSuccess)="onStartTaskSuccess($event)"> <span>START TASK</span>
</activiti-start-task> </button>
</div> </div>
<adf-accordion> <adf-accordion>
<adf-accordion-group [heading]="'Tasks'" [isSelected]="true" [isOpen]="true" [headingIcon]="'assignment'"> <adf-accordion-group [heading]="'Tasks'" [isSelected]="true" [isOpen]="true" [headingIcon]="'assignment'">
@ -38,7 +38,7 @@
</adf-accordion-group> </adf-accordion-group>
</adf-accordion> </adf-accordion>
</div> </div>
<div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp list-column"> <div class="mdl-cell mdl-cell--3-col task-column mdl-shadow--2dp list-column" *ngIf="taskFilter && !isStartTaskMode()">
<activiti-tasklist <activiti-tasklist
[appId]="taskFilter?.appId" [appId]="taskFilter?.appId"
[processDefinitionKey]="taskFilter?.filter?.processDefinitionKey" [processDefinitionKey]="taskFilter?.filter?.processDefinitionKey"
@ -62,7 +62,9 @@
--> -->
</activiti-tasklist> </activiti-tasklist>
</div> </div>
<div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp"> <div class="mdl-cell mdl-cell--7-col task-column mdl-shadow--2dp" *ngIf="!isStartTaskMode()"
[class.mdl-cell--7-col]="taskFilter && !isStartTaskMode()"
[class.mdl-cell--10-col]="!taskFilter || isStartTaskMode()">
<activiti-task-details #activitidetails <activiti-task-details #activitidetails
[debugMode]="true" [debugMode]="true"
[taskId]="currentTaskId" [taskId]="currentTaskId"
@ -76,6 +78,12 @@
[taskId]="currentTaskId"> [taskId]="currentTaskId">
</activiti-task-attachments> </activiti-task-attachments>
</div> </div>
<div class="mdl-cell mdl-cell--10-col task-column mdl-shadow--2dp" *ngIf="isStartTaskMode()">
<activiti-start-task
[appId]="appId"
(onSuccess)="onStartTaskSuccess($event)">
</activiti-start-task>
</div>
</div> </div>
</div> </div>
</section> </section>

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

@ -47,6 +47,7 @@ import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custo
declare var componentHandler; declare var componentHandler;
const currentProcessIdNew = '__NEW__'; const currentProcessIdNew = '__NEW__';
const currentTaskIdNew = '__NEW__';
@Component({ @Component({
selector: 'activiti-demo', selector: 'activiti-demo',
@ -235,6 +236,12 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
this.currentProcessInstanceId = currentProcessIdNew; this.currentProcessInstanceId = currentProcessIdNew;
} }
navigateStartTask(): void {
this.resetTaskFilters();
this.reloadTaskFilters();
this.currentTaskId = currentTaskIdNew;
}
onStartProcessInstance(instance: ProcessInstance): void { onStartProcessInstance(instance: ProcessInstance): void {
this.currentProcessInstanceId = instance.id; this.currentProcessInstanceId = instance.id;
this.activitiStartProcess.reset(); this.activitiStartProcess.reset();
@ -245,6 +252,10 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
return this.currentProcessInstanceId === currentProcessIdNew; return this.currentProcessInstanceId === currentProcessIdNew;
} }
isStartTaskMode(): boolean {
return this.currentTaskId === currentTaskIdNew;
}
processCancelled(data: any): void { processCancelled(data: any): void {
this.currentProcessInstanceId = null; this.currentProcessInstanceId = null;
this.processList.reload(); this.processList.reload();
@ -318,10 +329,18 @@ export class ActivitiDemoComponent implements AfterViewInit, OnDestroy, OnInit {
this.processFilter = null; this.processFilter = null;
} }
private resetTaskFilters(): void {
this.taskFilter = null;
}
private reloadProcessFilters(): void { private reloadProcessFilters(): void {
this.activitiprocessfilter.selectFilter(null); this.activitiprocessfilter.selectFilter(null);
} }
private reloadTaskFilters(): void {
this.activitifilter.selectFilter(null);
}
onRowClick(event): void { onRowClick(event): void {
console.log(event); console.log(event);
} }