mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-05-19 17:14:57 +00:00
Retrive the form name
This commit is contained in:
parent
b96dcb7bb0
commit
3366ca43ac
@ -4,10 +4,11 @@
|
|||||||
<div *ngIf="taskDetails">
|
<div *ngIf="taskDetails">
|
||||||
<h2 class="mdl-card__title-text">{{taskDetails.name}}</h2>
|
<h2 class="mdl-card__title-text">{{taskDetails.name}}</h2>
|
||||||
<div class="mdl-grid">
|
<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">Assignee: {{taskDetails.assignee.lastName}}</div>
|
||||||
<div class="mdl-cell mdl-cell--4-col">FirstName: {{taskDetails.assignee.firstName}}</div>
|
<div *ngIf="taskDetails.dueDate" class="mdl-cell mdl-cell--4-col">Due: {{taskDetails.dueDate}}</div>
|
||||||
<div class="mdl-cell mdl-cell--4-col">LastName: {{taskDetails.assignee.lastName}}</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>
|
</div>
|
||||||
|
|
||||||
<activiti-form *ngIf="taskDetails.formKey" [taskId]="taskDetails.id" ></activiti-form>
|
<activiti-form *ngIf="taskDetails.formKey" [taskId]="taskDetails.id" #activitiForm ></activiti-form>
|
||||||
</div>
|
</div>
|
@ -19,7 +19,7 @@ import { Component, Input, OnInit, OnChanges } from '@angular/core';
|
|||||||
import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
|
import { AlfrescoTranslationService, AlfrescoAuthenticationService, AlfrescoPipeTranslate } from 'ng2-alfresco-core';
|
||||||
import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
|
import { ActivitiTaskListService } from './../services/activiti-tasklist.service';
|
||||||
import { TaskDetailsModel } from '../models/task-details.model';
|
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;
|
declare let componentHandler: any;
|
||||||
@ -30,7 +30,7 @@ declare let __moduleName: string;
|
|||||||
moduleId: __moduleName,
|
moduleId: __moduleName,
|
||||||
templateUrl: './activiti-task-details.component.html',
|
templateUrl: './activiti-task-details.component.html',
|
||||||
styleUrls: ['./activiti-task-details.component.css'],
|
styleUrls: ['./activiti-task-details.component.css'],
|
||||||
providers: [ActivitiTaskListService],
|
providers: [ActivitiTaskListService, FormService],
|
||||||
directives: [ActivitiForm],
|
directives: [ActivitiForm],
|
||||||
pipes: [ AlfrescoPipeTranslate ]
|
pipes: [ AlfrescoPipeTranslate ]
|
||||||
|
|
||||||
@ -42,6 +42,8 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
|
|||||||
|
|
||||||
taskDetails: TaskDetailsModel;
|
taskDetails: TaskDetailsModel;
|
||||||
|
|
||||||
|
taskForm: FormModel;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
* @param auth
|
* @param auth
|
||||||
@ -49,7 +51,8 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
|
|||||||
*/
|
*/
|
||||||
constructor(private auth: AlfrescoAuthenticationService,
|
constructor(private auth: AlfrescoAuthenticationService,
|
||||||
private translate: AlfrescoTranslationService,
|
private translate: AlfrescoTranslationService,
|
||||||
public activiti: ActivitiTaskListService) {
|
private activitiForm: FormService,
|
||||||
|
private activitiTaskList: ActivitiTaskListService) {
|
||||||
|
|
||||||
if (translate) {
|
if (translate) {
|
||||||
translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
|
translate.addTranslationFolder('node_modules/ng2-activiti-tasklist');
|
||||||
@ -58,7 +61,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
|
|||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
if (this.taskId) {
|
if (this.taskId) {
|
||||||
this.activiti.getTaskDetails(this.taskId).subscribe(
|
this.activitiTaskList.getTaskDetails(this.taskId).subscribe(
|
||||||
(res: TaskDetailsModel) => {
|
(res: TaskDetailsModel) => {
|
||||||
this.taskDetails = res;
|
this.taskDetails = res;
|
||||||
console.log(this.taskDetails);
|
console.log(this.taskDetails);
|
||||||
@ -72,10 +75,18 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
|
|||||||
}
|
}
|
||||||
|
|
||||||
loadDetails(id: string) {
|
loadDetails(id: string) {
|
||||||
|
this.taskForm = null;
|
||||||
if (id) {
|
if (id) {
|
||||||
this.activiti.getTaskDetails(id).subscribe(
|
this.activitiTaskList.getTaskDetails(id).subscribe(
|
||||||
(res: TaskDetailsModel) => {
|
(res: TaskDetailsModel) => {
|
||||||
this.taskDetails = res;
|
this.taskDetails = res;
|
||||||
|
if (this.taskDetails && this.taskDetails.formKey) {
|
||||||
|
this.activitiForm.getTaskForm(this.taskDetails.id).subscribe(
|
||||||
|
(response) => {
|
||||||
|
this.taskForm = response;
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
console.log(this.taskDetails);
|
console.log(this.taskDetails);
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -83,7 +94,7 @@ export class ActivitiTaskDetails implements OnInit, OnChanges {
|
|||||||
}
|
}
|
||||||
|
|
||||||
onComplete() {
|
onComplete() {
|
||||||
this.activiti.completeTask(this.taskId).subscribe(
|
this.activitiTaskList.completeTask(this.taskId).subscribe(
|
||||||
(res) => {
|
(res) => {
|
||||||
console.log(res);
|
console.log(res);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user