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

Merge pull request #675 from Alfresco/dev-denys-638

Browse Source 
Disable save and/or complete within an Activiti form for completed tasks #638
This commit is contained in:
Mario Romano 2016-09-05 15:23:55 +01:00 committed by GitHub
commit e66b0ad516
7 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
View File

@ -19,6 +19,7 @@
<div *ngIf="form.hasOutcomes()" class="mdl-card__actions mdl-card--border"> <div *ngIf="form.hasOutcomes()" class="mdl-card__actions mdl-card--border">
<button *ngFor="let outcome of form.outcomes" <button *ngFor="let outcome of form.outcomes"
alfresco-mdl-button alfresco-mdl-button
[disabled]="readOnly"
[class.mdl-button--colored]="!outcome.isSystem" [class.mdl-button--colored]="!outcome.isSystem"
[class.activiti-form-hide-button]="!isOutcomeButtonEnabled(outcome)" [class.activiti-form-hide-button]="!isOutcomeButtonEnabled(outcome)"
(click)="onOutcomeClicked(outcome, $event)"> (click)="onOutcomeClicked(outcome, $event)">

2
ng2-components/ng2-activiti-form/src/components/activiti-form.component.spec.ts
View File

@ -41,7 +41,7 @@ describe('ActivitiForm', () => {
window['componentHandler'] = componentHandler; window['componentHandler'] = componentHandler;
formService = new FormService(null, null); formService = new FormService(null, null);
formComponent = new ActivitiForm(formService, visibilityService, null, null, null); formComponent = new ActivitiForm(formService, visibilityService, null, null);
}); });
it('should upgrade MDL content on view checked', () => { it('should upgrade MDL content on view checked', () => {

3
ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
View File

@ -23,7 +23,7 @@ import {
Output, Output,
EventEmitter EventEmitter
} from '@angular/core'; } from '@angular/core';
import { MATERIAL_DESIGN_DIRECTIVES, AlfrescoAuthenticationService } from 'ng2-alfresco-core'; import { MATERIAL_DESIGN_DIRECTIVES } from 'ng2-alfresco-core';
import { EcmModelService } from './../services/ecm-model.service'; import { EcmModelService } from './../services/ecm-model.service';
import { FormService } from './../services/form.service'; import { FormService } from './../services/form.service';
import { NodeService } from './../services/node.service'; import { NodeService } from './../services/node.service';
@ -148,7 +148,6 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
constructor(private formService: FormService, constructor(private formService: FormService,
private visibilityService: WidgetVisibilityService, private visibilityService: WidgetVisibilityService,
private authService: AlfrescoAuthenticationService,
private ecmModelService: EcmModelService, private ecmModelService: EcmModelService,
private nodeService: NodeService) { private nodeService: NodeService) {
} }

1
ng2-components/ng2-activiti-form/src/components/widgets/.gitignore vendored
View File

@ -1 +0,0 @@
/widget.model.ts

2
ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html
View File

@ -2,7 +2,7 @@
<label [attr.for]="field.id">{{field.name}}</label> <label [attr.for]="field.id">{{field.name}}</label>
<div> <div>
<i class="material-icons upload-widget__icon">image</i> <i *ngIf="hasFile" class="material-icons upload-widget__icon">attachment</i>
<span *ngIf="hasFile" class="upload-widget__file">{{getUploadedFileName()}}</span> <span *ngIf="hasFile" class="upload-widget__file">{{getUploadedFileName()}}</span>
<input *ngIf="!hasFile" <input *ngIf="!hasFile"
#file #file

1
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
View File

@ -18,6 +18,7 @@
[showRefreshButton]="showRefreshButton" [showRefreshButton]="showRefreshButton"
[showCompleteButton]="showCompleteButton" [showCompleteButton]="showCompleteButton"
[showSaveButton]="showSaveButton" [showSaveButton]="showSaveButton"
[readOnly]="readOnly"
(formSaved)='formSavedEmitter($event)' (formSaved)='formSavedEmitter($event)'
(formCompleted)='formCompletedEmitter($event)' (formCompleted)='formCompletedEmitter($event)'
(formLoaded)='formLoadedEmitter($event)' (formLoaded)='formLoadedEmitter($event)'

8
ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
View File

@ -109,6 +109,14 @@ export class ActivitiTaskDetails implements OnInit {
this.activitiTaskList.getTaskDetails(taskId).subscribe( this.activitiTaskList.getTaskDetails(taskId).subscribe(
(res: TaskDetailsModel) => { (res: TaskDetailsModel) => {
this.taskDetails = res; this.taskDetails = res;
let endDate: any = res.endDate;
if (endDate && !isNaN(endDate.getTime())) {
this.readOnly = true;
} else {
this.readOnly = false;
}
if (this.taskDetails && this.taskDetails.involvedPeople) { if (this.taskDetails && this.taskDetails.involvedPeople) {
this.taskDetails.involvedPeople.forEach((user) => { this.taskDetails.involvedPeople.forEach((user) => {
this.taskPeople.push(new User(user.id, user.email, user.firstName, user.lastName)); this.taskPeople.push(new User(user.id, user.email, user.firstName, user.lastName));