From 41d14048e75319af42cd067eb1462a6a2d9b112c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luciana=20Nu=C3=B1ez?= Date: Fri, 6 Jan 2023 12:34:09 -0400 Subject: [PATCH 1/4] PMCORE-4087 --- resources/assets/js/api/Cases.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index 13d737ffb..83f5e7dc5 100755 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -313,7 +313,7 @@ export let cases = { return Api.update({ service: "ASSIGN_CASE", data: { - reason: data.reasonReassign, + reason: data.reasonAssign, sendMail: data.notifyUser, index: data.DEL_INDEX }, From 5c0b7ef74d7789f9a99a5cba9421f761333196c3 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Fri, 6 Jan 2023 13:53:32 -0400 Subject: [PATCH 2/4] PMCORE-4086 Supervisor > multiple step > the `Case Details` is not displayed when the last dynaform passed --- resources/assets/js/home/Home.vue | 16 +++++++++++++++- resources/assets/js/home/MyCases/MyCases.vue | 1 + 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index 9dc059851..2f5f22d93 100755 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -41,6 +41,7 @@ @onRemoveFilter="onRemoveFilter" @onUpdatePage="onUpdatePage" @onUpdateDataCase="onUpdateDataCase" + @onOpenCaseDetail="onOpenCaseDetail" @onLastPage="onLastPage" @onUpdateFilters="onUpdateFilters" @cleanDefaultOption="cleanDefaultOption" @@ -95,6 +96,7 @@ export default { page: null, menu: [], dataCase: {}, + selectedItem: {}, hideToggle: true, collapsed: false, selectedTheme: "", @@ -193,7 +195,16 @@ export default { that.OnClickSidebarItem(that.getItemMenuByValue("page","inbox")); } if ( e.data === "redirect=MyCases" || e.message === "redirect=MyCases"){ - that.OnClickSidebarItem(that.getItemMenuByValue("page","MyCases")); + that.onUpdateDataCase({ + APP_UID: that.selectedItem.APP_UID, + DEL_INDEX: that.selectedItem.DEL_INDEX, + PRO_UID: that.selectedItem.PRO_UID, + TAS_UID: that.selectedItem.TAS_UID, + APP_NUMBER: that.selectedItem.CASE_NUMBER, + FLAG: "SUPERVISING", + ACTION:"to_revise" + }); + that.onUpdatePage("case-detail"); } if ( e.data === "update=debugger" || e.message === "update=debugger"){ if(that.$refs["component"].updateView){ @@ -564,6 +575,9 @@ export default { onUpdateDataCase(data) { this.dataCase = data; }, + onOpenCaseDetail(item){ + this.selectedItem = item; + }, onLastPage() { this.page = this.lastPage; this.lastPage = "MyCases"; diff --git a/resources/assets/js/home/MyCases/MyCases.vue b/resources/assets/js/home/MyCases/MyCases.vue index 957dff815..5a2b9cc72 100755 --- a/resources/assets/js/home/MyCases/MyCases.vue +++ b/resources/assets/js/home/MyCases/MyCases.vue @@ -348,6 +348,7 @@ export default { */ openCaseDetail(item) { let that = this; + that.$emit("onOpenCaseDetail", item); api.cases.open(_.extend({ ACTION: "todo" }, item)).then(() => { api.cases .cases_open(_.extend({ ACTION: "todo" }, item)) From 5b3224c4f193e31faef2da1a029b3f06e31832b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luciana=20Nu=C3=B1ez?= Date: Fri, 6 Jan 2023 14:50:43 -0400 Subject: [PATCH 3/4] PMCORE-4095 --- resources/assets/js/home/modal/ModalAssignCase.vue | 3 +++ resources/assets/js/home/modal/ModalReassignCase.vue | 3 +++ 2 files changed, 6 insertions(+) diff --git a/resources/assets/js/home/modal/ModalAssignCase.vue b/resources/assets/js/home/modal/ModalAssignCase.vue index e83518ae3..2e74c6ff1 100755 --- a/resources/assets/js/home/modal/ModalAssignCase.vue +++ b/resources/assets/js/home/modal/ModalAssignCase.vue @@ -107,6 +107,9 @@ export default { */ show() { this.users = []; + this.reasonReassign = null; + this.userSelected = null; + this.notifyUser = false; this.getUsers(); this.$refs["modal-assign-case"].show(); }, diff --git a/resources/assets/js/home/modal/ModalReassignCase.vue b/resources/assets/js/home/modal/ModalReassignCase.vue index e475e6a49..ae8eaafbb 100755 --- a/resources/assets/js/home/modal/ModalReassignCase.vue +++ b/resources/assets/js/home/modal/ModalReassignCase.vue @@ -108,6 +108,9 @@ export default { */ show() { this.users = []; + this.reasonReassign = null; + this.userSelected = null; + this.notifyUser = false; this.getUsersReassign(); this.$refs["modal-reassign-case"].show(); if (this.data.FLAG){ From 8f2512dde0a9b91f0f2e6bd0d4f2ea348cf42975 Mon Sep 17 00:00:00 2001 From: Fabio Guachalla Date: Mon, 9 Jan 2023 08:57:55 -0400 Subject: [PATCH 4/4] PMCORE-3683:Community > Old view appears when a case is routed --- .../engine/methods/cases/casesListExtJsRedirector.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/workflow/engine/methods/cases/casesListExtJsRedirector.php b/workflow/engine/methods/cases/casesListExtJsRedirector.php index 0d4dfdf69..0b21cd7da 100644 --- a/workflow/engine/methods/cases/casesListExtJsRedirector.php +++ b/workflow/engine/methods/cases/casesListExtJsRedirector.php @@ -30,15 +30,7 @@ if (isset($_GET['ux'])) { if (isset($_GET['ux'])) { echo 'if (typeof window.parent.ux_env != \'undefined\') {'; } -/*----------------------------------********---------------------------------*/ -if (true) { - echo ' parent.parent.postMessage("redirect=todo","*");'; -} else { -/*----------------------------------********---------------------------------*/ - echo " window.parent.location.href = '$url';"; -/*----------------------------------********---------------------------------*/ -} -/*----------------------------------********---------------------------------*/ +echo ' parent.parent.postMessage("redirect=todo","*");'; if (isset($_GET['ux'])) { /*----------------------------------********---------------------------------*/ if (PMLicensedFeatures::getSingleton()->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09') && $statusPMGmail) {