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

Merge pull request #1068 from Alfresco/dev-mromano-1058

Browse Source 
#1058 fix start task not colpleted
This commit is contained in:
Vito 2016-11-11 13:57:40 +00:00 committed by GitHub
commit ac077b9b96
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,8 @@
</button> </button>
</div> </div>
<!-- ACTIVE FORM -->
<span class="activiti-label mdl-badge" <span class="activiti-label mdl-badge"
[attr.data-badge]="activeTasks?.length">{{ 'DETAILS.LABELS.TASKS_ACTIVE'|translate }}</span> [attr.data-badge]="activeTasks?.length">{{ 'DETAILS.LABELS.TASKS_ACTIVE'|translate }}</span>
@ -20,6 +22,8 @@
</ul> </ul>
</div> </div>
<!-- START FORM -->
<div *ngIf="activeTasks?.length === 0"> <div *ngIf="activeTasks?.length === 0">
{{ 'DETAILS.TASKS.NO_ACTIVE' | translate }} {{ 'DETAILS.TASKS.NO_ACTIVE' | translate }}
</div> </div>
@ -27,6 +31,7 @@
<div *ngIf="processInstanceDetails && processInstanceDetails.startFormDefined"> <div *ngIf="processInstanceDetails && processInstanceDetails.startFormDefined">
<span class="activiti-label">{{ 'DETAILS.LABELS.START_FORM'|translate }}</span> <span class="activiti-label">{{ 'DETAILS.LABELS.START_FORM'|translate }}</span>
<!--IF START TASK COMPLETED -->
<div class="menu-container" *ngIf="completedTasks?.length > 0"> <div class="menu-container" *ngIf="completedTasks?.length > 0">
<ul class='mdl-list'> <ul class='mdl-list'>
<li class="mdl-list__item mdl-list__item--two-line"> <li class="mdl-list__item mdl-list__item--two-line">
@ -40,8 +45,24 @@
</li> </li>
</ul> </ul>
</div> </div>
<!--IF START TASK NOT COMPLETED YET-->
<div class="menu-container" *ngIf="completedTasks?.length == 0 && activeTasks?.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, activeTasks[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(activeTasks[0].assignee), created: getFormatDate(activeTasks[0].created, 'mediumDate') }
}}</span>
</span>
</li>
</ul>
</div>
</div> </div>
<!-- COMPLETED FORM -->
<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>