Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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;
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,23 +48,27 @@ <h6 bk-title header-size="6" wrap="true"><b>{{'inbox:candidateTasks' | t:'Candid
<table bk-table display-mode="compact" outer-borders="horizontal">
<thead bk-table-header sticky="true">
<tr bk-table-row>
<th bk-table-header-cell>{{'inbox:taskId' | t:'Task Id'}}</th>
<th bk-table-header-cell>{{'inbox:processDefinitionName' | t:'Definition Name'}}</th>
<th bk-table-header-cell>{{'inbox:processInstanceBusinessKey' | t:'Business Key'}}</th>
<th bk-table-header-cell>{{'inbox:taskName' | t:'Task Name'}}</th>
<th bk-table-header-cell>{{'inbox:assignee' | t:'Assignee'}}</th>
<th bk-table-header-cell>{{'inbox:candidateUsers' | t:'Candidate Users'}}</th>
<th bk-table-header-cell>{{'inbox:candidateGroups' | t:'Candidate Groups'}}</th>
<th bk-table-header-cell>{{'inbox:processInstanceId' | t:'Process Instance Id'}}</th>
<th bk-table-header-cell>{{'inbox:taskId' | t:'Task Id'}}</th>
<th bk-table-header-cell>{{'inbox:createTime' | t:'Create Time'}}</th>
</tr>
</thead>
<tbody bk-table-body>
<tr activable="true" bk-table-row selected="next.selected" hoverable="true" ng-click="selectionClaimChanged(next)" ng-repeat="next in tasksList track by next.id">
<td bk-table-cell>{{next.id}}</td>
<td bk-table-cell>{{next.processDefinitionName}}</td>
<td bk-table-cell>{{next.processInstanceBusinessKey}}</td>
<td bk-table-cell>{{next.name}}</td>
<td bk-table-cell>{{next.assignee}}</td>
<td bk-table-cell>{{next.candidateUsers}}</td>
<td bk-table-cell>{{next.candidateGroups}}</td>
<td bk-table-cell>{{next.processInstanceId}}</td>
<td bk-table-cell>{{next.id}}</td>
<td bk-table-cell>{{formatTime(next.createTime)}}</td>
</tr>
<tr bk-table-row ng-if="tasksList.length === 0">
Expand All @@ -80,24 +84,28 @@ <h6 bk-title header-size="6" wrap="true"><b>{{'inbox:assignedTasks' | t:'Assigne
<table bk-table display-mode="compact" outer-borders="horizontal">
<thead bk-table-header sticky="true">
<tr bk-table-row>
<th bk-table-header-cell>{{'inbox:taskId' | t:'Task Id'}}</th>
<th bk-table-header-cell>{{'inbox:processDefinitionName' | t:'Definition Name'}}</th>
<th bk-table-header-cell>{{'inbox:processInstanceBusinessKey' | t:'Business Key'}}</th>
<th bk-table-header-cell>{{'inbox:taskName' | t:'Task Name'}}</th>
<th bk-table-header-cell>{{'inbox:assignee' | t:'Assignee'}}</th>
<th bk-table-header-cell>{{'inbox:candidateUsers' | t:'Candidate Users'}}</th>
<th bk-table-header-cell>{{'inbox:candidateGroups' | t:'Candidate Groups'}}</th>
<th bk-table-header-cell>{{'inbox:processInstanceId' | t:'Process Instance Id'}}</th>
<th bk-table-header-cell>{{'inbox:taskId' | t:'Task Id'}}</th>
<th bk-table-header-cell>{{'inbox:createTime' | t:'Create Time'}}</th>
<th bk-table-header-cell>{{'inbox:formKey' | t:'Form Key'}}</th>
</tr>
</thead>
<tbody bk-table-body>
<tr activable="true" bk-table-row hoverable="true" ng-click="selectionUnclaimChanged(next)" ng-repeat="next in tasksListAssignee track by next.id">
<td bk-table-cell>{{next.id}}</td>
<td bk-table-cell>{{next.processDefinitionName}}</td>
<td bk-table-cell>{{next.processInstanceBusinessKey}}</td>
<td bk-table-cell>{{next.name}}</td>
<td bk-table-cell>{{next.assignee}}</td>
<td bk-table-cell>{{next.candidateUsers}}</td>
<td bk-table-cell>{{next.candidateGroups}}</td>
<td bk-table-cell>{{next.processInstanceId}}</td>
<td bk-table-cell>{{next.id}}</td>
<td bk-table-cell>{{formatTime(next.createTime)}}</td>
<td bk-table-cell>
<bk-button aria-label="{{'inbox:openForm' | t:'Open Form'}}" label="{{'inbox:openForm' | t:'Open Form'}}" ng-click="openForm(next.formKey + '?taskId=' + next.id + '&processInstanceId=' + next.processInstanceId)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
"claim": "Заяви",
"unclaim": "Отказжи заявката",
"candidateTasks": "Кандидат задачи",
"taskId": "Идентификатор На Задачата",
"taskId": "Ид. на Задачата",
"taskName": "Име На Задачата",
"assignee": "Правоприемник",
"candidateUsers": "Потребители-Кандидати",
"candidateGroups": "Кандидатски Групи",
"processInstanceId": "Идентификатор На Инстанцията На Процес",
"processInstanceId": "Инстанцията На Процес",
"processDefinitionName": "Процес Дефиниция",
"processInstanceBusinessKey": "Бизнес Ключ",
"createTime": "Време На Създаване",
"formKey": "Ключ За Формуляра",
"noTasks": "Няма намерени задачи.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"candidateUsers": "Candidate Users",
"candidateGroups": "Candidate Groups",
"processInstanceId": "Process Instance Id",
"processDefinitionName": "Definition Name",
"processInstanceBusinessKey": "Business Key",
"createTime": "Create Time",
"formKey": "Form Key",
"noTasks": "No tasks found.",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,27 @@ <h6 bk-title wrap="true" header-size="6"><b>Candidate tasks</b></h6>
<table bk-table outer-borders="horizontal" display-mode="compact">
<thead bk-table-header sticky="true" interactive="false">
<tr bk-table-row>
<th bk-table-header-cell>Task Id</th>
<th bk-table-header-cell>Definition Name</th>
<th bk-table-header-cell>Business Key</th>
<th bk-table-header-cell>Task Name</th>
<th bk-table-header-cell>Assignee</th>
<th bk-table-header-cell>Candidate Users</th>
<th bk-table-header-cell>Candidate Groups</th>
<th bk-table-header-cell>Process Instance Id</th>
<th bk-table-header-cell>Task Id</th>
<th bk-table-header-cell>Create Time</th>
</tr>
</thead>
<tbody bk-table-body>
<tr bk-table-row ng-repeat="next in tasksList track by next.id" hoverable="true" activable="true" selected="next.selected" ng-click="selectionClaimChanged(next)">
<td bk-table-cell>{{next.id}}</td>
<td bk-table-cell>{{next.processDefinitionName}}</td>
<td bk-table-cell>{{next.processInstanceBusinessKey}}</td>
<td bk-table-cell>{{next.name}}</td>
<td bk-table-cell>{{next.assignee}}</td>
<td bk-table-cell>{{next.candidateUsers}}</td>
<td bk-table-cell>{{next.candidateGroups}}</td>
<td bk-table-cell>{{next.processInstanceId}}</td>
<td bk-table-cell>{{next.id}}</td>
<td bk-table-cell>{{formatTime(next.createTime)}}</td>
</td>
</tr>
Expand All @@ -72,24 +76,28 @@ <h6 bk-title wrap="true" header-size="6"><b>Assigned tasks</b></h6>
<table bk-table outer-borders="horizontal" display-mode="compact">
<thead bk-table-header sticky="true" interactive="false">
<tr bk-table-row>
<th bk-table-header-cell>Task Id</th>
<th bk-table-header-cell>Definition Name</th>
<th bk-table-header-cell>Business Key</th>
<th bk-table-header-cell>Task Name</th>
<th bk-table-header-cell>Assignee</th>
<th bk-table-header-cell>Candidate Users</th>
<th bk-table-header-cell>Candidate Groups</th>
<th bk-table-header-cell>Process Instance Id</th>
<th bk-table-header-cell>Task Id</th>
<th bk-table-header-cell>Create Time</th>
<th bk-table-header-cell>Form Key</th>
</tr>
</thead>
<tbody bk-table-body>
<tr bk-table-row ng-repeat="next in tasksListAssignee track by next.id" hoverable="true" activable="true" ng-click="selectionUnclaimChanged(next)">
<td bk-table-cell>{{next.id}}</td>
<td bk-table-cell>{{next.processDefinitionName}}</td>
<td bk-table-cell>{{next.processInstanceBusinessKey}}</td>
<td bk-table-cell>{{next.name}}</td>
<td bk-table-cell>{{next.assignee}}</td>
<td bk-table-cell>{{next.candidateUsers}}</td>
<td bk-table-cell>{{next.candidateGroups}}</td>
<td bk-table-cell>{{next.processInstanceId}}</td>
<td bk-table-cell>{{next.id}}</td>
<td bk-table-cell>{{formatTime(next.createTime)}}</td>
<td bk-table-cell>
<bk-button label="Open Form" title="Open Form" aria-label="Open Form" ng-click="openForm($window.location.origin + next.formKey + '?taskId=' + next.id + '&processInstanceId=' + next.processInstanceId)">
Expand Down
Loading