From 3366ca43ac2e0c69fdffd1a166d95fa3e1ec2fdb Mon Sep 17 00:00:00 2001
From: mauriziovitale84 <maurizio.vitale@alfresco.com>
Date: Tue, 26 Jul 2016 11:20:45 +0100
Subject: [PATCH] Retrive the form name

---
 .../activiti-task-details.component.html      |  9 ++++----
 .../activiti-task-details.component.ts        | 23 ++++++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

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 b415d64a64..371288afe5 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
@@ -4,10 +4,11 @@
 <div *ngIf="taskDetails">
     <h2 class="mdl-card__title-text">{{taskDetails.name}}</h2>
     <div class="mdl-grid">
-        <div class="mdl-cell mdl-cell--4-col">Email: {{taskDetails.assignee.email}}</div>
-        <div class="mdl-cell mdl-cell--4-col">FirstName: {{taskDetails.assignee.firstName}}</div>
-        <div class="mdl-cell mdl-cell--4-col">LastName: {{taskDetails.assignee.lastName}}</div>
+        <div class="mdl-cell mdl-cell--4-col">Assignee: {{taskDetails.assignee.lastName}}</div>
+        <div *ngIf="taskDetails.dueDate" class="mdl-cell mdl-cell--4-col">Due: {{taskDetails.dueDate}}</div>
+        <div *ngIf="!taskDetails.dueDate" class="mdl-cell mdl-cell--4-col">Due: No due date</div>
+        <div class="mdl-cell mdl-cell--4-col">Form: {{taskForm?.name}}</div>
     </div>
 
-    <activiti-form *ngIf="taskDetails.formKey" [taskId]="taskDetails.id" ></activiti-form>
+    <activiti-form *ngIf="taskDetails.formKey" [taskId]="taskDetails.id" #activitiForm ></activiti-form>
 </div>
\ No newline at end of file
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 7bacb64ec3..a82f962ae5 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
@@ -19,7 +19,7 @@ import { Component, Input, OnInit, OnChanges } from '@angular/core';
 import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
 import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
 import { TaskDetailsModel } from '../models/task-details.model';
-import { ActivitiForm } from 'ng2-activiti-form';
+import { ActivitiForm, FormModel, FormService } from 'ng2-activiti-form';
 
 
 declare let componentHandler: any;
@@ -30,7 +30,7 @@ declare let __moduleName: string;
     moduleId: __moduleName,
     templateUrl: './activiti-task-details.component.html',
     styleUrls: ['./activiti-task-details.component.css'],
-    providers: [ActivitiTaskListService],
+    providers: [ActivitiTaskListService, FormService],
     directives: [ActivitiForm],
     pipes: [ AlfrescoPipeTranslate ]
 
@@ -42,6 +42,8 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
 
     taskDetails: TaskDetailsModel;
 
+    taskForm: FormModel;
+
     /**
      * Constructor
      * @param auth
@@ -49,7 +51,8 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
      */
     constructor(private auth: AlfrescoAuthenticationService,
                 private translate: AlfrescoTranslationService,
-                public activiti: ActivitiTaskListService) {
+                private activitiForm: FormService,
+                private activitiTaskList: ActivitiTaskListService) {
 
         if (translate) {
             translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
@@ -58,7 +61,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
 
     ngOnInit() {
         if (this.taskId) {
-            this.activiti.getTaskDetails(this.taskId).subscribe(
+            this.activitiTaskList.getTaskDetails(this.taskId).subscribe(
                 (res: TaskDetailsModel) => {
                     this.taskDetails = res;
                     console.log(this.taskDetails);
@@ -72,10 +75,18 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
     }
 
     loadDetails(id: string) {
+        this.taskForm = null;
         if (id) {
-            this.activiti.getTaskDetails(id).subscribe(
+            this.activitiTaskList.getTaskDetails(id).subscribe(
                 (res: TaskDetailsModel) => {
                     this.taskDetails = res;
+                    if (this.taskDetails && this.taskDetails.formKey) {
+                        this.activitiForm.getTaskForm(this.taskDetails.id).subscribe(
+                            (response) => {
+                                this.taskForm = response;
+                            }
+                        );
+                    }
                     console.log(this.taskDetails);
                 }
             );
@@ -83,7 +94,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
     }
 
     onComplete() {
-        this.activiti.completeTask(this.taskId).subscribe(
+        this.activitiTaskList.completeTask(this.taskId).subscribe(
             (res) => {
                 console.log(res);
             }