From 0f71bc1ba95a2657ef53f8b23ac2fa66b3502eac Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Mon, 5 Sep 2016 14:25:42 +0100
Subject: [PATCH] #638 disable outcomes for readonly form

- disable outcome buttons for readonly form
- activiti-task-details now detect completed forms and make them
readonly (i.e. completed tasks filter)
---
 .../src/components/activiti-form.component.html           | 1 +
 .../src/components/activiti-form.component.ts             | 3 +--
 .../ng2-activiti-form/src/components/widgets/.gitignore   | 1 -
 .../src/components/activiti-task-details.component.html   | 1 +
 .../src/components/activiti-task-details.component.ts     | 8 ++++++++
 5 files changed, 11 insertions(+), 3 deletions(-)
 delete mode 100644 ng2-components/ng2-activiti-form/src/components/widgets/.gitignore

diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
index 7bb2551e8a..82866342a4 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.html
@@ -19,6 +19,7 @@
             <div *ngIf="form.hasOutcomes()" class="mdl-card__actions mdl-card--border">
                 <button *ngFor="let outcome of form.outcomes"
                         alfresco-mdl-button
+                        [disabled]="readOnly"
                         [class.mdl-button--colored]="!outcome.isSystem"
                         [class.activiti-form-hide-button]="!isOutcomeButtonEnabled(outcome)"
                         (click)="onOutcomeClicked(outcome, $event)">
diff --git a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
index d763eb0128..dc700a10cb 100644
--- a/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
+++ b/ng2-components/ng2-activiti-form/src/components/activiti-form.component.ts
@@ -23,7 +23,7 @@ import {
     Output,
     EventEmitter
 } 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 { FormService } from './../services/form.service';
 import { NodeService } from './../services/node.service';
@@ -148,7 +148,6 @@ export class ActivitiForm implements OnInit, AfterViewChecked, OnChanges {
 
     constructor(private formService: FormService,
                 private visibilityService: WidgetVisibilityService,
-                private authService: AlfrescoAuthenticationService,
                 private ecmModelService: EcmModelService,
                 private nodeService: NodeService) {
     }
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/.gitignore b/ng2-components/ng2-activiti-form/src/components/widgets/.gitignore
deleted file mode 100644
index 3a6691d8d4..0000000000
--- a/ng2-components/ng2-activiti-form/src/components/widgets/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/widget.model.ts
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
index ef26457a86..365e135e6c 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.html
@@ -18,6 +18,7 @@
                    [showRefreshButton]="showRefreshButton"
                    [showCompleteButton]="showCompleteButton"
                    [showSaveButton]="showSaveButton"
+                   [readOnly]="readOnly"
                    (formSaved)='formSavedEmitter($event)'
                    (formCompleted)='formCompletedEmitter($event)'
                    (formLoaded)='formLoadedEmitter($event)'
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
index 025043f400..39f49a780b 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
+++ b/ng2-components/ng2-activiti-tasklist/src/components/activiti-task-details.component.ts
@@ -109,6 +109,14 @@ export class ActivitiTaskDetails implements OnInit {
             this.activitiTaskList.getTaskDetails(taskId).subscribe(
                 (res: TaskDetailsModel) => {
                     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) {
                         this.taskDetails.involvedPeople.forEach((user) => {
                             this.taskPeople.push(new User(user.id, user.email, user.firstName, user.lastName));