From 576d76652c438d5ee3c08543a0238a69e7904894 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 28 Jan 2021 19:05:33 +0000 Subject: [PATCH 01/10] update --- .../js/components/home/debugger/Debugger.vue | 61 +++++++++++++------ resources/assets/js/home/Home.vue | 10 +-- resources/assets/js/home/ModalNewRequest.vue | 1 + resources/assets/js/home/XCase.vue | 10 ++- workflow/engine/templates/cases/open.js | 8 +++ 5 files changed, 68 insertions(+), 22 deletions(-) diff --git a/resources/assets/js/components/home/debugger/Debugger.vue b/resources/assets/js/components/home/debugger/Debugger.vue index 4a641892a..4c5b8fa1e 100644 --- a/resources/assets/js/components/home/debugger/Debugger.vue +++ b/resources/assets/js/components/home/debugger/Debugger.vue @@ -30,8 +30,8 @@
@@ -47,7 +47,7 @@ import api from "../../../api/index"; export default { name: "ButtonFleft", props: { - data: Object + data: Object, }, components: { Tabs, @@ -64,15 +64,27 @@ export default { dataTable: [], dataTableTriggers: [], columns: ["key", "value"], + columnsTriggers: ["name", "execution"], options: { perPage: 200, filterable: true, pagination: { - show: false + show: false, }, headings: { key: this.$i18n.t("ID_NAME"), - value: this.$i18n.t("ID_FIELD_DYNAFORM_TEXT") + value: this.$i18n.t("ID_FIELD_DYNAFORM_TEXT"), + }, + }, + optionsTriggers: { + perPage: 200, + filterable: true, + pagination: { + show: false, + }, + headings: { + name: this.$i18n.t("ID_NAME"), + execution: this.$i18n.t("ID_EXECUTION"), }, }, optionsDebugVars: { @@ -80,14 +92,13 @@ export default { options: [ { text: this.$i18n.t("ID_OPT_ALL"), value: "all" }, { text: this.$i18n.t("ID_DYNAFORM"), value: "dyn" }, - { text: this.$i18n.t("ID_SYSTEM"), value: "sys" } - ] - } + { text: this.$i18n.t("ID_SYSTEM"), value: "sys" }, + ], + }, }; }, mounted() { - this.getDebugVars({ filter: "all" }); - this.getDebugVarsTriggers(); + this.loadData(); }, methods: { classBtn(cls) { @@ -96,6 +107,13 @@ export default { showDebugger() { this.$refs["modal-debugger"].show(); }, + /** + * Load the data for debugger + */ + loadData() { + this.getDebugVars({ filter: "all" }); + this.getDebugVarsTriggers(); + }, /** * Get debug variables */ @@ -106,7 +124,7 @@ export default { _.forIn(response.data.data[0], function (value, key) { dt.push({ key, - value + value, }); }); this.dataTable = dt; @@ -119,11 +137,11 @@ export default { let that = this, dt = []; api.cases.debugVarsTriggers(data).then((response) => { - if (response.data.length > 0) { - _.forIn(response.data.data[0], function (value, key) { + if (response.data.data.length > 0) { + _.each(response.data.data, function (o) { dt.push({ - key, - value + name: o.name, + execution: o.execution_time, }); }); this.dataTableTriggers = dt; @@ -135,14 +153,15 @@ export default { */ changeOption(opt) { this.getDebugVars({ filter: opt }); - } + }, }, }; \ No newline at end of file diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index f272713b8..d02d46ab0 100644 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -121,12 +121,14 @@ export default { eventMethod === "attachEvent" ? "onmessage" : "message"; eventer(messageEvent, function(e) { - if ( - e.data === "redirect=todo" || - e.message === "redirect=todo" - ) { + if ( e.data === "redirect=todo" || e.message === "redirect=todo"){ that.page = "todo"; } + if ( e.data === "update=debugger" || e.message === "update=debugger"){ + if(that.$refs["component"].updateView){ + that.$refs["component"].updateView(); + } + } }); }, /** diff --git a/resources/assets/js/home/ModalNewRequest.vue b/resources/assets/js/home/ModalNewRequest.vue index a87c0a507..cbe39d478 100644 --- a/resources/assets/js/home/ModalNewRequest.vue +++ b/resources/assets/js/home/ModalNewRequest.vue @@ -164,6 +164,7 @@ export default { APP_UID: data.data.APPLICATION, DEL_INDEX: 1, ACTION: "draft", + PRO_UID: data.data.PROCESS }; self.disable = false; self.$parent.$parent.page = "XCase"; diff --git a/resources/assets/js/home/XCase.vue b/resources/assets/js/home/XCase.vue index 85a2e3afb..3049e26d7 100644 --- a/resources/assets/js/home/XCase.vue +++ b/resources/assets/js/home/XCase.vue @@ -9,7 +9,7 @@ allowfullscreen @load="onLoadIframe" > - + @@ -62,6 +62,14 @@ export default { classBtn(cls) { return "btn v-btn-request " + cls; }, + /** + * update view in component + */ + updateView(){ + if(this.openDebug){ + this.$refs["debugger"].loadData(); + } + }, onLoadIframe() {}, }, }; diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index 3db76870c..a4bc651c5 100644 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -598,6 +598,14 @@ Ext.onReady(function(){ Ext.getCmp('actionMenu').hide(); Ext.getCmp('returnButton').hide(); + document.getElementById("openCaseFrame").onload = function () + { + if(window.parent){ + window.parent.postMessage("update=debugger","*"); + } + }; + + hideCaseNavigatorPanel(); if(typeof appStatus !== "undefined") { showCaseNavigatorPanel(appStatus); From 75ad0b038841cf6cd3f0c4aa02190f895cb74569 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 28 Jan 2021 19:17:27 +0000 Subject: [PATCH 02/10] update --- workflow/engine/templates/cases/open.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index a4bc651c5..8c8e2ac13 100644 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -598,6 +598,7 @@ Ext.onReady(function(){ Ext.getCmp('actionMenu').hide(); Ext.getCmp('returnButton').hide(); + // Hacky Code for update the debugger in new UI document.getElementById("openCaseFrame").onload = function () { if(window.parent){ @@ -605,7 +606,6 @@ Ext.onReady(function(){ } }; - hideCaseNavigatorPanel(); if(typeof appStatus !== "undefined") { showCaseNavigatorPanel(appStatus); From 92da3047ecd08fca8c2ecabb9ba611dcad395a67 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 28 Jan 2021 19:22:03 +0000 Subject: [PATCH 03/10] update --- .../js/components/home/debugger/Debugger.vue | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/resources/assets/js/components/home/debugger/Debugger.vue b/resources/assets/js/components/home/debugger/Debugger.vue index 36b29c5d5..7a8fc1dcf 100644 --- a/resources/assets/js/components/home/debugger/Debugger.vue +++ b/resources/assets/js/components/home/debugger/Debugger.vue @@ -47,11 +47,11 @@ import api from "../../../api/index"; export default { name: "ButtonFleft", props: { - data: Object, + data: Object }, components: { Tabs, - Tab, + Tab }, data() { return { @@ -69,31 +69,31 @@ export default { perPage: 200, filterable: true, pagination: { - show: false, + show: false }, headings: { key: this.$i18n.t("ID_NAME"), - value: this.$i18n.t("ID_FIELD_DYNAFORM_TEXT"), - }, + value: this.$i18n.t("ID_FIELD_DYNAFORM_TEXT") + } }, optionsTriggers: { perPage: 200, filterable: true, pagination: { - show: false, + show: false }, headings: { name: this.$i18n.t("ID_NAME"), - execution: this.$i18n.t("ID_EXECUTION"), - }, + execution: this.$i18n.t("ID_EXECUTION") + } }, optionsDebugVars: { selected: "all", options: [ { text: this.$i18n.t("ID_OPT_ALL"), value: "all" }, { text: this.$i18n.t("ID_DYNAFORM"), value: "dyn" }, - { text: this.$i18n.t("ID_SYSTEM"), value: "sys" }, - ], + { text: this.$i18n.t("ID_SYSTEM"), value: "sys" } + ] }, }; }, @@ -124,7 +124,7 @@ export default { _.forIn(response.data.data[0], function (value, key) { dt.push({ key, - value, + value }); }); this.dataTable = dt; @@ -153,8 +153,8 @@ export default { */ changeOption(opt) { this.getDebugVars({ filter: opt }); - }, - }, + } + } }; From b05550e74ce548434188292783ee9c6b04a64123 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 28 Jan 2021 19:25:39 +0000 Subject: [PATCH 04/10] update --- resources/assets/js/components/home/debugger/Debugger.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/home/debugger/Debugger.vue b/resources/assets/js/components/home/debugger/Debugger.vue index 7a8fc1dcf..6cc2e0f3b 100644 --- a/resources/assets/js/components/home/debugger/Debugger.vue +++ b/resources/assets/js/components/home/debugger/Debugger.vue @@ -94,7 +94,7 @@ export default { { text: this.$i18n.t("ID_DYNAFORM"), value: "dyn" }, { text: this.$i18n.t("ID_SYSTEM"), value: "sys" } ] - }, + } }; }, mounted() { @@ -141,7 +141,7 @@ export default { _.each(response.data.data, function (o) { dt.push({ name: o.name, - execution: o.execution_time, + execution: o.execution_time }); }); this.dataTableTriggers = dt; From 13fa0000652311eb95c6649b357e95c1f99e7d80 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 28 Jan 2021 20:05:22 +0000 Subject: [PATCH 05/10] update --- .../js/components/home/debugger/Debugger.vue | 27 ++++++++++++++++--- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/components/home/debugger/Debugger.vue b/resources/assets/js/components/home/debugger/Debugger.vue index 6cc2e0f3b..5e2beb458 100644 --- a/resources/assets/js/components/home/debugger/Debugger.vue +++ b/resources/assets/js/components/home/debugger/Debugger.vue @@ -33,7 +33,12 @@ :columns="columnsTriggers" :options="optionsTriggers" ref="vueTableTriggers" - /> + > + {{props.row.code}} + @@ -64,7 +69,7 @@ export default { dataTable: [], dataTableTriggers: [], columns: ["key", "value"], - columnsTriggers: ["name", "execution"], + columnsTriggers: ["name", "execution","code"], options: { perPage: 200, filterable: true, @@ -84,7 +89,8 @@ export default { }, headings: { name: this.$i18n.t("ID_NAME"), - execution: this.$i18n.t("ID_EXECUTION") + execution: this.$i18n.t("ID_EXECUTION"), + code: this.$i18n.t("ID_EXECUTION"), } }, optionsDebugVars: { @@ -141,7 +147,8 @@ export default { _.each(response.data.data, function (o) { dt.push({ name: o.name, - execution: o.execution_time + execution: o.execution_time, + code: o.code }); }); this.dataTableTriggers = dt; @@ -323,4 +330,16 @@ input[type="radio"] { line-height: 1.5; border-radius: .2rem; } + +.debugger-container .php{ + font-family: Consolas, monospace; + color: #000; + margin-bottom: 0px; + margin-top: 0px; + background: #fff; + border-radius: 0px; + padding: 0px; + line-height: 1.5; + overflow: auto; +} \ No newline at end of file From bc9fd2c6930d11d68d42eee5d856665689b40a47 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Thu, 28 Jan 2021 20:08:42 +0000 Subject: [PATCH 06/10] update --- resources/assets/js/components/home/debugger/Debugger.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/home/debugger/Debugger.vue b/resources/assets/js/components/home/debugger/Debugger.vue index 5e2beb458..1241724e4 100644 --- a/resources/assets/js/components/home/debugger/Debugger.vue +++ b/resources/assets/js/components/home/debugger/Debugger.vue @@ -90,7 +90,7 @@ export default { headings: { name: this.$i18n.t("ID_NAME"), execution: this.$i18n.t("ID_EXECUTION"), - code: this.$i18n.t("ID_EXECUTION"), + code: this.$i18n.t("ID_CAPTCHA_CODE"), } }, optionsDebugVars: { From 12786d579065f45290df4ce618536d0fb0333cc6 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Thu, 28 Jan 2021 19:49:35 +0000 Subject: [PATCH 07/10] PMCORE-2816: Direct link is not opening the case, after the task is being routed to the next task complete pause unnassigned fix unnassigned --- resources/assets/js/home/Paused.vue | 22 ++++++++++++++++++++-- resources/assets/js/home/Todo.vue | 5 ++++- resources/assets/js/home/Unassigned.vue | 21 ++++++++++++++++++++- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/home/Paused.vue b/resources/assets/js/home/Paused.vue index ff5e01d0f..976c2ee53 100644 --- a/resources/assets/js/home/Paused.vue +++ b/resources/assets/js/home/Paused.vue @@ -137,7 +137,10 @@ export default { } }; }, - mounted() {}, + mounted() { + // force to open case + this.openDefaultCase(); + }, watch: {}, computed: { /** @@ -150,7 +153,22 @@ export default { updated() {}, beforeCreate() {}, methods: { - /** + /** + * Open a case when the component was mounted + */ + openDefaultCase() { + let params; + if(this.defaultOption) { + params = utils.getAllUrlParams(this.defaultOption); + if (params && params.app_uid && params.del_index) { + this.openCase({ + APP_UID: params.app_uid, + DEL_INDEX: params.del_index + }); + } + } + }, + /** * On row click event handler * @param {object} event */ diff --git a/resources/assets/js/home/Todo.vue b/resources/assets/js/home/Todo.vue index e025695f1..a7746beb1 100644 --- a/resources/assets/js/home/Todo.vue +++ b/resources/assets/js/home/Todo.vue @@ -130,7 +130,10 @@ export default { } }; }, - mounted() {}, + mounted() { + // force to open case + this.openDefaultCase(); + }, watch: {}, computed: { /** diff --git a/resources/assets/js/home/Unassigned.vue b/resources/assets/js/home/Unassigned.vue index 3ceaed225..88bf1c4b3 100644 --- a/resources/assets/js/home/Unassigned.vue +++ b/resources/assets/js/home/Unassigned.vue @@ -58,6 +58,7 @@ import TaskCell from "../components/vuetable/TaskCell.vue"; import CasesFilter from "../components/search/CasesFilter"; import ModalClaimCase from "./modal/ModalClaimCase.vue"; import api from "./../api/index"; +import utils from "./../utils/utils"; export default { name: "Paused", @@ -130,7 +131,10 @@ export default { } }; }, - mounted() {}, + mounted() { + // force to open case + this.openDefaultCase(); + }, watch: {}, computed: { /** @@ -143,6 +147,21 @@ export default { updated() {}, beforeCreate() {}, methods: { + /** + * Open a case when the component was mounted + */ + openDefaultCase() { + let params; + if(this.defaultOption) { + params = utils.getAllUrlParams(this.defaultOption); + if (params && params.app_uid && params.del_index) { + this.openCase({ + APP_UID: params.app_uid, + DEL_INDEX: params.del_index + }); + } + } + }, /** * On row click event handler * @param {object} event From 558e6e4ddb2af9df306cc078de880024a53105bc Mon Sep 17 00:00:00 2001 From: fabio Date: Thu, 28 Jan 2021 18:38:09 -0400 Subject: [PATCH 08/10] PMCORE-2781 --- .../js/components/vuetable/GroupedCell.vue | 2 ++ resources/assets/js/home/MyCases.vue | 21 +++++++++++-------- resources/assets/js/utils/utils.js | 16 +++++++------- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/resources/assets/js/components/vuetable/GroupedCell.vue b/resources/assets/js/components/vuetable/GroupedCell.vue index 2291ea6db..93b7c55d8 100644 --- a/resources/assets/js/components/vuetable/GroupedCell.vue +++ b/resources/assets/js/components/vuetable/GroupedCell.vue @@ -18,6 +18,7 @@ variant="info" :src="item.AVATAR" size="2em" + v-show="item.UNASSIGNED" > diff --git a/resources/assets/js/home/MyCases.vue b/resources/assets/js/home/MyCases.vue index 12a55bffa..a63d54377 100644 --- a/resources/assets/js/home/MyCases.vue +++ b/resources/assets/js/home/MyCases.vue @@ -304,8 +304,15 @@ export default { */ formantPendingTask(data) { var i, + userDataFormat, dataFormat = []; for (i = 0; i < data.length; i += 1) { + userDataFormat = utils.userNameDisplayFormat({ + userName: data[i].user_tooltip.usr_username || "", + firstName: data[i].user_tooltip.usr_firstname || "", + lastName: data[i].user_tooltip.usr_lastname || "", + format: window.config.FORMATS.format || null + }); dataFormat.push( { TAS_NAME: data[i].tas_title, @@ -313,17 +320,13 @@ export default { DELAYED_TITLE: data[i].tas_status === "OVERDUE" ? this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[data[i].tas_status], DELAYED_MSG: data[i].tas_status === "OVERDUE" ? data[i].delay : "", - AVATAR: window.config.SYS_SERVER + + AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER + window.config.SYS_URI + - `users/users_ViewPhotoGrid?pUID=${data[i].user_id}`, - USERNAME: utils.userNameDisplayFormat({ - userName: data[i].user_tooltip.usr_username, - firstName: data[i].user_tooltip.usr_firstname, - lastName: data[i].user_tooltip.usr_lastname, - format: window.config.FORMATS.format || null - }), + `users/users_ViewPhotoGrid?pUID=${data[i].user_id}` : "", + USERNAME: userDataFormat !== "" ? userDataFormat : this.$i18n.t("ID_UNASSIGNED"), POSITION: data[i].user_tooltip.usr_position, - EMAIL: data[i].user_tooltip.usr_email + EMAIL: data[i].user_tooltip.usr_email, + UNASSIGNED: userDataFormat !== "" ? true : false } ); } diff --git a/resources/assets/js/utils/utils.js b/resources/assets/js/utils/utils.js index 0651f365f..6349ffd81 100644 --- a/resources/assets/js/utils/utils.js +++ b/resources/assets/js/utils/utils.js @@ -5,19 +5,21 @@ export default { * @param {object} params */ userNameDisplayFormat(params) { - let aux; - let defaultValues = { + let aux = "", + defaultValues = { userName: '', firstName: '', lastName: '', format: '(@lastName, @firstName) @userName' }; _.assignIn(defaultValues, params); - aux = defaultValues.format; - aux = aux.replace('@userName',defaultValues.userName); - aux = aux.replace('@firstName',defaultValues.firstName); - aux = aux.replace('@lastName',defaultValues.lastName); - return aux.trim(); + if (defaultValues.userName !== "" || defaultValues.firstName !== "" || defaultValues.lastName !== "") { + aux = defaultValues.format; + aux = aux.replace('@userName',defaultValues.userName); + aux = aux.replace('@firstName',defaultValues.firstName); + aux = aux.replace('@lastName',defaultValues.lastName); + } + return aux; }, /** * Parse an url string and prepare an object of the parameters From d8ca76dd8db97bda4affb177795475e75d915018 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Thu, 28 Jan 2021 19:49:35 +0000 Subject: [PATCH 09/10] PMCORE-2816: Direct link is not opening the case, after the task is being routed to the next task complete pause unnassigned fix unnassigned PMCORE-2816: after open link the draft menu does not work correctly fix case informtaion in open case fix code style 2 remove debugger fix CR notes --- resources/assets/js/home/Draft.vue | 1 + resources/assets/js/home/Home.vue | 12 ++++++++- resources/assets/js/home/MyCases.vue | 34 ++++++++++++++++++++++++- resources/assets/js/home/Paused.vue | 1 + resources/assets/js/home/Todo.vue | 1 + resources/assets/js/home/Unassigned.vue | 1 + 6 files changed, 48 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/home/Draft.vue b/resources/assets/js/home/Draft.vue index cf32f72d4..76b8cac31 100644 --- a/resources/assets/js/home/Draft.vue +++ b/resources/assets/js/home/Draft.vue @@ -141,6 +141,7 @@ export default { APP_UID: params.app_uid, DEL_INDEX: params.del_index }); + this.$emit("cleanDefaultOption"); } } }, diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index d02d46ab0..150e46f9c 100644 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -31,6 +31,7 @@ @onUpdateDataCase="onUpdateDataCase" @onLastPage="onLastPage" @onUpdateFilters="onUpdateFilters" + @cleanDefaultOption="cleanDefaultOption" > @@ -72,7 +73,7 @@ export default { data() { return { lastPage: "MyCases", - page: "MyCases", + page: null, menu: [], dataCase: {}, hideToggle: true, @@ -86,6 +87,7 @@ export default { filters: null, menuMap: { CASES_MY_CASES: "MyCases", + CASES_SENT: "MyCases", CASES_SEARCH: "advanced-search", CASES_INBOX: "todo", CASES_DRAFT: "draft", @@ -156,6 +158,8 @@ export default { if (menuItem && menuItem.href) { this.page = this.menuMap[window.config._nodeId] || "MyCases"; this.$router.push(menuItem.href); + } else { + this.page = "MyCases"; } }, /** @@ -190,6 +194,12 @@ export default { } return auxData; }, + /** + * Clean the default option property + */ + cleanDefaultOption() { + this.defaultOption = ""; + }, OnClickSidebarItem(item) { if (item.item.page && item.item.page === "/advanced-search") { this.page = "advanced-search"; diff --git a/resources/assets/js/home/MyCases.vue b/resources/assets/js/home/MyCases.vue index a63d54377..2c062944b 100644 --- a/resources/assets/js/home/MyCases.vue +++ b/resources/assets/js/home/MyCases.vue @@ -83,7 +83,7 @@ export default { GroupedCell, ModalComments, }, - props: ["filters"], + props: ["filters", "defaultOption"], data() { return { dataAlert: { @@ -157,6 +157,7 @@ export default { }, mounted() { this.getHeaders(); + this.openDefaultCase(); // force to open start cases modal // if the user has start case as a default case menu option if (window.config._nodeId === "CASES_START_CASE") { @@ -175,6 +176,22 @@ export default { updated() {}, beforeCreate() {}, methods: { + /** + * Open a case when the component was mounted + */ + openDefaultCase() { + let params; + if(this.defaultOption) { + params = utils.getAllUrlParams(this.defaultOption); + if (params && params.app_uid && params.del_index) { + this.openCase({ + APP_UID: params.app_uid, + DEL_INDEX: params.del_index + }); + this.$emit("cleanDefaultOption"); + } + } + }, /** * Row click event handler * @param {object} event @@ -192,6 +209,21 @@ export default { self.openCaseDetail(event.row); } }, + /** + * Open selected case + * + * @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/Paused.vue b/resources/assets/js/home/Paused.vue index 976c2ee53..12f885f61 100644 --- a/resources/assets/js/home/Paused.vue +++ b/resources/assets/js/home/Paused.vue @@ -165,6 +165,7 @@ export default { APP_UID: params.app_uid, DEL_INDEX: params.del_index }); + this.$emit("cleanDefaultOption"); } } }, diff --git a/resources/assets/js/home/Todo.vue b/resources/assets/js/home/Todo.vue index a7746beb1..9f5e69cff 100644 --- a/resources/assets/js/home/Todo.vue +++ b/resources/assets/js/home/Todo.vue @@ -158,6 +158,7 @@ export default { APP_UID: params.app_uid, DEL_INDEX: params.del_index }); + this.$emit("cleanDefaultOption"); } } }, diff --git a/resources/assets/js/home/Unassigned.vue b/resources/assets/js/home/Unassigned.vue index 88bf1c4b3..4737e15bd 100644 --- a/resources/assets/js/home/Unassigned.vue +++ b/resources/assets/js/home/Unassigned.vue @@ -159,6 +159,7 @@ export default { APP_UID: params.app_uid, DEL_INDEX: params.del_index }); + this.$emit("cleanDefaultOption"); } } }, From 0fd8747be5ad3d961d3beca5879f1ffb3e52622d Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Fri, 29 Jan 2021 18:05:29 +0000 Subject: [PATCH 10/10] PMCORE-2822: CaseLink does not work for parallel task remove console.log fix parallel fix parallel unassigned fix CR notes --- .../js/components/search/CasesFilter.vue | 1 + resources/assets/js/home/Draft.vue | 19 ++++++++++- resources/assets/js/home/Paused.vue | 34 ++++++++++++++++++- resources/assets/js/home/Todo.vue | 19 ++++++++++- resources/assets/js/home/Unassigned.vue | 34 ++++++++++++++++++- workflow/engine/methods/cases/viena_init.php | 4 ++- 6 files changed, 106 insertions(+), 5 deletions(-) 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'])) {