Skip to content
Snippets Groups Projects
Commit 4237810a authored by S.Listl's avatar S.Listl
Browse files

WorkflowTask better message after task completion

parent b07e462b
No related branches found
No related tags found
No related merge requests found
......@@ -105,6 +105,10 @@
<linkedContextProcess>%aditoprj%/entity/WorkflowTask_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
<state>READONLY</state>
</entityField>
<entityParameter>
<name>TaskTitle_param</name>
<expose v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
......
......@@ -3,7 +3,15 @@ import("system.vars");
import("system.workflow");
var formDefinition = vars.get("$field.FORMDEFINITION");
var uids = [vars.get("$field.UID")];
var params = {
"TaskTitle_param" : vars.get("$field.NAME")
};
if (formDefinition)
neon.openContext("WorkflowTask", null, [vars.get("$field.UID")], neon.OPERATINGSTATE_EDIT, {});
neon.openContext("WorkflowTask", null, uids, neon.OPERATINGSTATE_EDIT, params);
else
{
workflow.completeTask(vars.get("$field.UID"), {});
//if you try to open the task now, it will display "Task done"
neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", uids, neon.OPERATINGSTATE_VIEW, params);
}
\ No newline at end of file
......@@ -11,7 +11,7 @@ import("Workflow_lib");
import("system.vars");
import("system.workflow");
var isOnlyForCurrentUser = vars.get("$param.OnlyForCurrentUser_param") == "true";
var isOnlyForCurrentUser = vars.exists("$param.OnlyForCurrentUser_param") && vars.get("$param.OnlyForCurrentUser_param") == "true";
var loadConfig = workflow.createConfigForLoadingTasks();
var tasks, dummyTask;
......@@ -30,7 +30,8 @@ if (vars.get("$local.idvalues") && vars.get("$local.idvalues")[0])
{
//This can happen if the task is done, then it can't be loaded. If that's the case, return a dummy row
tasks = [];
dummyTask = [taskId, translate.text("Task done"), "", "", vars.get("$sys.date"), "", "", "", "", "", "", "", "", "", "", "", ""];
var taskTitle = vars.exists("$param.TaskTitle_param") && vars.get("$param.TaskTitle_param") || "";
dummyTask = [taskId, translate.text("Task done"), taskTitle, "", vars.get("$sys.date"), "", "", "", "", "", "", "", "", "", "", "", ""];
}
}
else
......
......@@ -41,7 +41,13 @@ function _openNextTaskIfExists (pProcessInstanceId, pCreateTime)
}, startVal);
if (newestTask.id !== null)
{
neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [newestTask.id], neon.OPERATINGSTATE_VIEW, null);
else
{
var params = {
"TaskTitle_param" : rowData["NAME.value"]
};
//if you try to open the task now, it will display "Task done"
neon.openContext("WorkflowTask", "WorkflowTaskPreview_view", [rowData["UID.value"]], neon.OPERATINGSTATE_VIEW, params);
}
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment