diff --git a/resources/assets/js/components/search/CasesFilter.vue b/resources/assets/js/components/search/CasesFilter.vue index 525fea6ae..fc4e53193 100644 --- a/resources/assets/js/components/search/CasesFilter.vue +++ b/resources/assets/js/components/search/CasesFilter.vue @@ -236,6 +236,7 @@ export default { self.searchTags.push(component.id); self.selected = component.id; self.itemModel[component.id] = component; + self.itemModel[component.id].autoShow = typeof item.autoShow !== "undefined" ? item.autoShow : true } }); }, diff --git a/resources/assets/js/home/Draft.vue b/resources/assets/js/home/Draft.vue index 76b8cac31..2a5f3ab4b 100644 --- a/resources/assets/js/home/Draft.vue +++ b/resources/assets/js/home/Draft.vue @@ -143,6 +143,23 @@ export default { }); this.$emit("cleanDefaultOption"); } + //force to search in the parallel tasks + if (params && params.openapplicationuid) { + this.onUpdateFilters({ + params: [ + { + fieldId: "caseNumber", + filterVar: "caseNumber", + label: "", + options:[], + value: params.openapplicationuid, + autoShow: false + } + ], + refresh: true + }); + this.$emit("cleanDefaultOption"); + } } }, /** @@ -234,7 +251,7 @@ export default { DEL_INDEX: item.DEL_INDEX, PRO_UID: item.PRO_UID, TAS_UID: item.TAS_UID, - ACTION: "draft", + ACTION: "draft" }); this.$emit("onUpdatePage", "XCase"); }, diff --git a/resources/assets/js/home/Paused.vue b/resources/assets/js/home/Paused.vue index 12f885f61..008796a0e 100644 --- a/resources/assets/js/home/Paused.vue +++ b/resources/assets/js/home/Paused.vue @@ -76,7 +76,7 @@ export default { ModalUnpauseCase, CasesFilter, }, - props: {}, + props: ["defaultOption"], data() { return { newCase: { @@ -166,6 +166,23 @@ export default { DEL_INDEX: params.del_index }); this.$emit("cleanDefaultOption"); + } + //force to search in the parallel tasks + if (params && params.openapplicationuid) { + this.onUpdateFilters({ + params: [ + { + fieldId: "caseNumber", + filterVar: "caseNumber", + label: "", + options:[], + value: params.openapplicationuid, + autoShow: false + } + ], + refresh: true + }); + this.$emit("cleanDefaultOption"); } } }, @@ -255,6 +272,21 @@ export default { }); return data; }, + /** + * Open selected cases in the inbox + * + * @param {object} item + */ + openCase(item) { + this.$emit("onUpdateDataCase", { + APP_UID: item.APP_UID, + DEL_INDEX: item.DEL_INDEX, + PRO_UID: item.PRO_UID, + TAS_UID: item.TAS_UID, + ACTION: "todo" + }); + this.$emit("onUpdatePage", "XCase"); + }, /** * Open case detail * diff --git a/resources/assets/js/home/Todo.vue b/resources/assets/js/home/Todo.vue index 9f5e69cff..649eedc4e 100644 --- a/resources/assets/js/home/Todo.vue +++ b/resources/assets/js/home/Todo.vue @@ -160,6 +160,23 @@ export default { }); this.$emit("cleanDefaultOption"); } + //force to search in the parallel tasks + if (params && params.openapplicationuid) { + this.onUpdateFilters({ + params: [ + { + fieldId: "caseNumber", + filterVar: "caseNumber", + label: "", + options:[], + value: params.openapplicationuid, + autoShow: false + } + ], + refresh: true + }); + this.$emit("cleanDefaultOption"); + } } }, /** @@ -259,7 +276,7 @@ export default { DEL_INDEX: item.DEL_INDEX, PRO_UID: item.PRO_UID, TAS_UID: item.TAS_UID, - ACTION: "todo", + ACTION: "todo" }); this.$emit("onUpdatePage", "XCase"); }, diff --git a/resources/assets/js/home/Unassigned.vue b/resources/assets/js/home/Unassigned.vue index 4737e15bd..8701511b0 100644 --- a/resources/assets/js/home/Unassigned.vue +++ b/resources/assets/js/home/Unassigned.vue @@ -70,7 +70,7 @@ export default { ModalClaimCase, CasesFilter, }, - props: {}, + props: ["defaultOption"], data() { return { newCase: { @@ -161,6 +161,23 @@ export default { }); this.$emit("cleanDefaultOption"); } + //force to search in the parallel tasks + if (params && params.openapplicationuid) { + this.onUpdateFilters({ + params: [ + { + fieldId: "caseNumber", + filterVar: "caseNumber", + label: "", + options:[], + value: params.openapplicationuid, + autoShow: false + } + ], + refresh: true + }); + this.$emit("cleanDefaultOption"); + } } }, /** @@ -257,6 +274,21 @@ export default { }); }); }, + /** + * Open selected cases in the inbox + * + * @param {object} item + */ + openCase(item) { + this.$emit("onUpdateDataCase", { + APP_UID: item.APP_UID, + DEL_INDEX: item.DEL_INDEX, + PRO_UID: item.PRO_UID, + TAS_UID: item.TAS_UID, + ACTION: "todo" + }); + this.$emit("onUpdatePage", "XCase"); + }, /** * Open case detail * diff --git a/workflow/engine/methods/cases/viena_init.php b/workflow/engine/methods/cases/viena_init.php index 3dd09e401..607ec9a8b 100644 --- a/workflow/engine/methods/cases/viena_init.php +++ b/workflow/engine/methods/cases/viena_init.php @@ -3,6 +3,7 @@ use Eusebiu\JavaScript\Facades\ScriptVariables; use Illuminate\Support\Facades\View; use ProcessMaker\Core\System; +use ProcessMaker\Model\Application; $conf = new Configurations(); @@ -95,8 +96,9 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) { $openCaseIE = true; $defaultOption = '../cases/open?APP_UID=' . $openAppUid . '&DEL_INDEX=' . $arrayDelIndex[0] . '&action=' . $action; } else { + $appNumber = Application::getCaseNumber($openAppUid); //We will to show the list: more than one thread - $defaultOption = '../cases/casesListExtJs?action=' . $action . '&openApplicationUid=' . $openAppUid; + $defaultOption = '../cases/casesListExtJs?action=' . $action . '&openApplicationUid=' . $appNumber; } } else { if (isset($_GET['id'])) {