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

#1058 add start form

Browse Source
This commit is contained in:
Mario Romano
2016-11-11 00:03:24 +00:00
parent 69d37024ac
commit bb40dc3a6f
4 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-details.component.html
View File

@@ -4,7 +4,7 @@
<activiti-process-instance-header [processInstance]="processInstanceDetails" (processCancelled)="bubbleProcessCancelled()" #activitiprocessheader></activiti-process-instance-header> <activiti-process-instance-header [processInstance]="processInstanceDetails" (processCancelled)="bubbleProcessCancelled()" #activitiprocessheader></activiti-process-instance-header>
<div class="mdl-grid"> <div class="mdl-grid">
<div class="mdl-cell mdl-cell--8-col"> <div class="mdl-cell mdl-cell--8-col">
<activiti-process-instance-tasks [processInstanceId]="processInstanceDetails.id" (taskFormCompleted)="bubbleTaskFormCompleted()" #activitiprocesstasks></activiti-process-instance-tasks> <activiti-process-instance-tasks [processInstanceDetails]="processInstanceDetails" (taskFormCompleted)="bubbleTaskFormCompleted()" #activitiprocesstasks></activiti-process-instance-tasks>
</div> </div>
<div class="mdl-cell mdl-cell--4-col"> <div class="mdl-cell mdl-cell--4-col">
<activiti-process-instance-comments [processInstanceId]="processInstanceDetails.id" #activitiprocesscomments></activiti-process-instance-comments> <activiti-process-instance-comments [processInstanceId]="processInstanceDetails.id" #activitiprocesscomments></activiti-process-instance-comments>

20
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.html
View File

@@ -19,10 +19,29 @@
</li> </li>
</ul> </ul>
</div> </div>
<div *ngIf="activeTasks?.length === 0"> <div *ngIf="activeTasks?.length === 0">
{{ 'DETAILS.TASKS.NO_ACTIVE' | translate }} {{ 'DETAILS.TASKS.NO_ACTIVE' | translate }}
</div> </div>
<div *ngIf="processInstanceDetails && processInstanceDetails.startFormDefined">
<span class="activiti-label">{{ 'DETAILS.LABELS.START_FORM'|translate }}</span>
<div class="menu-container" *ngIf="completedTasks?.length > 0">
<ul class='mdl-list'>
<li class="mdl-list__item mdl-list__item--two-line">
<span class="mdl-list__item-primary-content" (click)="clickTask($event, completedTasks[0])">
<i class="material-icons mdl-list__item-icon">assignment</i>
<span>{{ 'DETAILS.LABELS.START_FORM'|translate }}</span>
<span class="mdl-list__item-sub-title">{{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:
getUserFullName(completedTasks[0].assignee), created: getFormatDate(completedTasks[0].created, 'mediumDate') }
}}</span>
</span>
</li>
</ul>
</div>
</div>
<span class="activiti-label mdl-badge" <span class="activiti-label mdl-badge"
[attr.data-badge]="completedTasks?.length">{{ 'DETAILS.LABELS.TASKS_COMPLETED'|translate }}</span> [attr.data-badge]="completedTasks?.length">{{ 'DETAILS.LABELS.TASKS_COMPLETED'|translate }}</span>
@@ -38,6 +57,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div *ngIf="completedTasks?.length === 0"> <div *ngIf="completedTasks?.length === 0">
{{ 'DETAILS.TASKS.NO_COMPLETED' | translate }} {{ 'DETAILS.TASKS.NO_COMPLETED' | translate }}
</div> </div>

13
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.ts
View File

@@ -21,6 +21,7 @@ import { ActivitiProcessService } from './../services/activiti-process.service';
import { TaskDetailsModel } from 'ng2-activiti-tasklist'; import { TaskDetailsModel } from 'ng2-activiti-tasklist';
import { Observable, Observer } from 'rxjs/Rx'; import { Observable, Observer } from 'rxjs/Rx';
import { DatePipe } from '@angular/common'; import { DatePipe } from '@angular/common';
import { ProcessInstance } from '../models/process-instance';
declare let componentHandler: any; declare let componentHandler: any;
@@ -33,7 +34,7 @@ declare let componentHandler: any;
export class ActivitiProcessInstanceTasks implements OnInit { export class ActivitiProcessInstanceTasks implements OnInit {
@Input() @Input()
processInstanceId: string; processInstanceDetails: ProcessInstance;
@Input() @Input()
showRefreshButton: boolean = true; showRefreshButton: boolean = true;
@@ -78,8 +79,8 @@ export class ActivitiProcessInstanceTasks implements OnInit {
this.completedTasks.push(task); this.completedTasks.push(task);
}); });
if (this.processInstanceId) { if (this.processInstanceDetails && this.processInstanceDetails.id) {
this.load(this.processInstanceId); this.load(this.processInstanceDetails.id);
} }
} }
@@ -166,11 +167,11 @@ export class ActivitiProcessInstanceTasks implements OnInit {
public taskFormCompleted() { public taskFormCompleted() {
this.closeDialog(); this.closeDialog();
this.load(this.processInstanceId); this.load(this.processInstanceDetails.id);
this.taskFormCompletedEmitter.emit(this.processInstanceId); this.taskFormCompletedEmitter.emit(this.processInstanceDetails.id);
} }
public onRefreshClicked() { public onRefreshClicked() {
this.load(this.processInstanceId); this.load(this.processInstanceDetails.id);
} }
} }

1
ng2-components/ng2-activiti-processlist/src/i18n/en.json
View File

@@ -17,6 +17,7 @@
"STARTED_BY": "Started by", "STARTED_BY": "Started by",
"STARTED": "Started", "STARTED": "Started",
"COMMENTS": "Comments", "COMMENTS": "Comments",
"START_FORM": "Start Form",
"TASKS_ACTIVE": "Active Tasks", "TASKS_ACTIVE": "Active Tasks",
"TASKS_COMPLETED": "Completed Tasks", "TASKS_COMPLETED": "Completed Tasks",
"TASK_SUBTITLE": "Assigned to {{user}}, created {{created}}" "TASK_SUBTITLE": "Assigned to {{user}}, created {{created}}"