diff --git a/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/dto/TaskDTO.java b/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/dto/TaskDTO.java index 47f2bf0d3c9..bb4937d25a8 100644 --- a/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/dto/TaskDTO.java +++ b/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/dto/TaskDTO.java @@ -40,6 +40,13 @@ public class TaskDTO { /** The process instance id. */ private String processInstanceId; + /** The process instance id. */ + private String processDefinitionId; + + private String processDefinitionName; + + private String processInstanceBusinessKey; + /** * Gets the candidate users. * @@ -184,4 +191,48 @@ public Date getCreateTime() { public void setCreateTime(Date createTime) { this.createTime = createTime; } + + /** + * @return the processDefinitionId + */ + public String getProcessDefinitionId() { + return processDefinitionId; + } + + /** + * @param processDefinitionId the processDefinitionId to set + */ + public void setProcessDefinitionId(String processDefinitionId) { + this.processDefinitionId = processDefinitionId; + } + + /** + * @return the processDefinitionName + */ + public String getProcessDefinitionName() { + return processDefinitionName; + } + + /** + * @param processDefinitionName the processDefinitionName to set + */ + public void setProcessDefinitionName(String processDefinitionName) { + this.processDefinitionName = processDefinitionName; + } + + /** + * @return the processInstanceBusinessKey + */ + public String getProcessInstanceBusinessKey() { + return processInstanceBusinessKey; + } + + /** + * @param processInstanceBusinessKey the processInstanceBusinessKey to set + */ + public void setProcessInstanceBusinessKey(String processInstanceBusinessKey) { + this.processInstanceBusinessKey = processInstanceBusinessKey; + } + + } diff --git a/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmInboxEndpoint.java b/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmInboxEndpoint.java index 83702c24f52..15b80ccc75c 100644 --- a/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmInboxEndpoint.java +++ b/components/engine/engine-bpm-flowable/src/main/java/org/eclipse/dirigible/components/engine/bpm/flowable/endpoint/BpmInboxEndpoint.java @@ -11,6 +11,7 @@ import org.eclipse.dirigible.components.api.security.UserFacade; import org.eclipse.dirigible.components.base.endpoint.BaseEndpoint; +import org.eclipse.dirigible.components.engine.bpm.flowable.dto.ProcessInstanceData; import org.eclipse.dirigible.components.engine.bpm.flowable.dto.TaskActionData; import org.eclipse.dirigible.components.engine.bpm.flowable.dto.TaskDTO; import org.eclipse.dirigible.components.engine.bpm.flowable.service.BpmService; @@ -85,6 +86,11 @@ private TaskDTO mapToDTO(Task task) { .map(IdentityLinkInfo::getGroupId) .filter(Objects::nonNull) .collect(Collectors.joining(","))); + ProcessInstanceData processInstance = bpmService.getProcessInstanceById(task.getProcessInstanceId()); + dto.setProcessInstanceBusinessKey(processInstance.getBusinessKey()); + dto.setProcessDefinitionId(processInstance.getProcessDefinitionId()); + dto.setProcessDefinitionName(processInstance.getProcessDefinitionName()); + return dto; } diff --git a/components/resources/resources-inbox/src/main/resources/META-INF/dirigible/inbox/index.html b/components/resources/resources-inbox/src/main/resources/META-INF/dirigible/inbox/index.html index 9ed75dd5a06..13d1acc3401 100644 --- a/components/resources/resources-inbox/src/main/resources/META-INF/dirigible/inbox/index.html +++ b/components/resources/resources-inbox/src/main/resources/META-INF/dirigible/inbox/index.html @@ -48,23 +48,27 @@
{{'inbox:candidateTasks' | t:'Candid - + + + - + + + @@ -80,24 +84,28 @@
{{'inbox:assignedTasks' | t:'Assigne
{{'inbox:taskId' | t:'Task Id'}}{{'inbox:processDefinitionName' | t:'Definition Name'}}{{'inbox:processInstanceBusinessKey' | t:'Business Key'}} {{'inbox:taskName' | t:'Task Name'}} {{'inbox:assignee' | t:'Assignee'}} {{'inbox:candidateUsers' | t:'Candidate Users'}} {{'inbox:candidateGroups' | t:'Candidate Groups'}} {{'inbox:processInstanceId' | t:'Process Instance Id'}}{{'inbox:taskId' | t:'Task Id'}} {{'inbox:createTime' | t:'Create Time'}}
{{next.id}}{{next.processDefinitionName}}{{next.processInstanceBusinessKey}} {{next.name}} {{next.assignee}} {{next.candidateUsers}} {{next.candidateGroups}} {{next.processInstanceId}}{{next.id}} {{formatTime(next.createTime)}}
- + + + - + + +
{{'inbox:taskId' | t:'Task Id'}}{{'inbox:processDefinitionName' | t:'Definition Name'}}{{'inbox:processInstanceBusinessKey' | t:'Business Key'}} {{'inbox:taskName' | t:'Task Name'}} {{'inbox:assignee' | t:'Assignee'}} {{'inbox:candidateUsers' | t:'Candidate Users'}} {{'inbox:candidateGroups' | t:'Candidate Groups'}} {{'inbox:processInstanceId' | t:'Process Instance Id'}}{{'inbox:taskId' | t:'Task Id'}} {{'inbox:createTime' | t:'Create Time'}} {{'inbox:formKey' | t:'Form Key'}}
{{next.id}}{{next.processDefinitionName}}{{next.processInstanceBusinessKey}} {{next.name}} {{next.assignee}} {{next.candidateUsers}} {{next.candidateGroups}} {{next.processInstanceId}}{{next.id}} {{formatTime(next.createTime)}} Candidate tasks - + + + - + + + @@ -72,24 +76,28 @@
Assigned tasks
Task IdDefinition NameBusiness Key Task Name Assignee Candidate Users Candidate Groups Process Instance IdTask Id Create Time
{{next.id}}{{next.processDefinitionName}}{{next.processInstanceBusinessKey}} {{next.name}} {{next.assignee}} {{next.candidateUsers}} {{next.candidateGroups}} {{next.processInstanceId}}{{next.id}} {{formatTime(next.createTime)}}
- + + + - + + +
Task IdDefinition NameBusiness Key Task Name Assignee Candidate Users Candidate Groups Process Instance IdTask Id Create Time Form Key
{{next.id}}{{next.processDefinitionName}}{{next.processInstanceBusinessKey}} {{next.name}} {{next.assignee}} {{next.candidateUsers}} {{next.candidateGroups}} {{next.processInstanceId}}{{next.id}} {{formatTime(next.createTime)}}