From 51b3f208a6bd63402d2bd67dae8ce2c0d9a023e9 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Mon, 20 Sep 2021 14:30:27 +0000 Subject: [PATCH 1/9] PMCORE-3354: Case List Settings > The change of order is not automatically saved per user restore props fix custom cases list --- .../js/home/CustomCaseList/CustomCaseList.vue | 6 +-- resources/assets/js/home/Draft/Draft.vue | 6 +-- resources/assets/js/home/Home.vue | 38 +++++++++++-------- resources/assets/js/home/Inbox/Inbox.vue | 6 +-- resources/assets/js/home/MyCases/MyCases.vue | 6 +-- resources/assets/js/home/Paused/Paused.vue | 6 +-- .../assets/js/home/Unassigned/Unassigned.vue | 7 ++-- 7 files changed, 40 insertions(+), 35 deletions(-) diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue index dc746c53b..d58cd9a3b 100644 --- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue +++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue @@ -673,7 +673,7 @@ export default { that.$emit("updateSettings", { data: data, key: "orderBy", - parent: that.data.pageParent, + page: that.data.pageParent, type: "custom", id: that.data.customListId }); @@ -687,7 +687,7 @@ export default { this.$emit("updateSettings", { data: val, key: "columns", - parent: this.data.pageParent, + page: this.data.pageParent, type: "custom", id: this.data.customListId }); @@ -1024,7 +1024,7 @@ export default { this.$emit("updateSettings", { data: newFilters, key: "filters", - parent: this.data.pageParent, + page: this.data.pageParent, type: "custom", id: this.data.customListId }); diff --git a/resources/assets/js/home/Draft/Draft.vue b/resources/assets/js/home/Draft/Draft.vue index 2bea8e1f0..d712a34c1 100644 --- a/resources/assets/js/home/Draft/Draft.vue +++ b/resources/assets/js/home/Draft/Draft.vue @@ -326,7 +326,7 @@ export default { that.$emit("updateSettings", { data: data, key: "orderBy", - parent: this.page, + page: "draft", type: "normal", id: this.id }); @@ -337,7 +337,7 @@ export default { this.$emit("updateSettings", { data: val, key: "columns", - parent: this.page, + page: "draft", type: "normal", id: this.id }); @@ -562,7 +562,7 @@ export default { this.$emit("updateSettings", { data: newFilters, key: "filters", - parent: this.page, + page: "draft", type: "normal", id: this.id }); diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index 84e2e3072..255e430ec 100755 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -127,13 +127,19 @@ export default { parseInt(window.config.FORMATS.casesListRefreshTime) * 1000 ); // adding eventBus listener - eventBus.$on('sort-menu', (data) => { + eventBus.$on('sort-menu', (data) => { + let page; let newData = []; - data.forEach(item => newData.push({id: item.id})); + data.forEach(item => { + newData.push({id: item.id}); + if (!page) { + page = item.page; + } + }); that.updateSettings({ data: newData, key: "customCaseListOrder", - parent: this.page, + page: page, type: "normal", id: this.id }); @@ -227,21 +233,21 @@ export default { */ updateSettings (params){ if (params.type === "custom") { - if (!this.config.setting[params.parent]) { - this.config.setting[params.parent] = {}; + if (!this.config.setting[params.page]) { + this.config.setting[params.page] = {}; } - if (!this.config.setting[params.parent]["customCaseList"]) { - this.config.setting[params.parent]["customCaseList"] = {}; + if (!this.config.setting[params.page]["customCaseList"]) { + this.config.setting[params.page]["customCaseList"] = {}; } - if (!this.config.setting[params.parent].customCaseList[params.id]) { - this.config.setting[params.parent].customCaseList[params.id] = {} + if (!this.config.setting[params.page].customCaseList[params.id]) { + this.config.setting[params.page].customCaseList[params.id] = {} } - this.config.setting[params.parent].customCaseList[params.id][params.key] = params.data; + this.config.setting[params.page].customCaseList[params.id][params.key] = params.data; } else { - if (!this.config.setting[this.page]) { - this.config.setting[this.page] = {}; + if (!this.config.setting[params.page]) { + this.config.setting[params.page] = {}; } - this.config.setting[this.page][params.key] = params.data; + this.config.setting[params.page][params.key] = params.data; } api.config .put(this.config) @@ -308,9 +314,9 @@ export default { if (data[i].customCasesList) { data[i]["child"] = this.sortCustomCasesList( data[i].customCasesList, - this.config.setting[this.page] && - this.config.setting[this.page].customCaseListOrder - ? this.config.setting[this.page].customCaseListOrder + this.config.setting[data[i]["page"]] && + this.config.setting[data[i]["page"]].customCaseListOrder + ? this.config.setting[data[i]["page"]].customCaseListOrder : [] ); data[i]["sortable"] = data[i].customCasesList.length > 1; diff --git a/resources/assets/js/home/Inbox/Inbox.vue b/resources/assets/js/home/Inbox/Inbox.vue index 42155e9b7..c501982b3 100644 --- a/resources/assets/js/home/Inbox/Inbox.vue +++ b/resources/assets/js/home/Inbox/Inbox.vue @@ -361,7 +361,7 @@ export default { that.$emit("updateSettings", { data: data, key: "orderBy", - parent: this.page, + page: "inbox", type: "normal", id: this.id }); @@ -372,7 +372,7 @@ export default { this.$emit("updateSettings", { data: val, key: "columns", - parent: this.page, + page: "inbox", type: "normal", id: this.id }); @@ -634,7 +634,7 @@ export default { this.$emit("updateSettings", { data: newFilters, key: "filters", - parent: this.page, + page: "inbox", type: "normal", id: this.id }); diff --git a/resources/assets/js/home/MyCases/MyCases.vue b/resources/assets/js/home/MyCases/MyCases.vue index c5906e98b..338b82ef6 100644 --- a/resources/assets/js/home/MyCases/MyCases.vue +++ b/resources/assets/js/home/MyCases/MyCases.vue @@ -236,7 +236,7 @@ export default { that.$emit("updateSettings", { data: data, key: "orderBy", - parent: this.page, + page: "MyCases", type: "normal", id: this.id }); @@ -247,7 +247,7 @@ export default { this.$emit("updateSettings", { data: val, key: "columns", - parent: this.page, + page: "MyCases", type: "normal", id: this.id }); @@ -674,7 +674,7 @@ export default { this.$emit("updateSettings", { data: newFilters, key: "filters", - parent: this.page, + page: "MyCases", type: "normal", id: this.id }); diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index 16d42471b..e8e7b40a5 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -360,7 +360,7 @@ export default { that.$emit("updateSettings", { data: data, key: "orderBy", - parent: this.page, + page: "paused", type: "normal", id: this.id }); @@ -371,7 +371,7 @@ export default { this.$emit("updateSettings", { data: val, key: "columns", - parent: this.page, + page: "paused", type: "normal", id: this.id }); @@ -632,7 +632,7 @@ export default { this.$emit("updateSettings", { data: newFilters, key: "filters", - parent: this.page, + page: "paused", type: "normal", id: this.id }); diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue index f6d347401..d1d41a954 100644 --- a/resources/assets/js/home/Unassigned/Unassigned.vue +++ b/resources/assets/js/home/Unassigned/Unassigned.vue @@ -352,8 +352,7 @@ export default { that.$emit("updateSettings", { data: data, key: "orderBy", - parent: this.page, - type: "normal", + page: "unassigned", id: this.id }); }); @@ -363,7 +362,7 @@ export default { this.$emit("updateSettings", { data: val, key: "columns", - parent: this.page, + page: "unassigned", type: "normal", id: this.id }); @@ -602,7 +601,7 @@ export default { this.$emit("updateSettings", { data: newFilters, key: "filters", - parent: this.page, + page: "unassigned", type: "normal", id: this.id }); From 719c3f8a3701ef26f7834432cdd7f95a239b638b Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Mon, 20 Sep 2021 14:53:11 +0000 Subject: [PATCH 2/9] PMCORE-3323: List options should not have borders PMCORE_3.7.0 build restore color --- resources/assets/js/components/headers/MultiviewHeader.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/headers/MultiviewHeader.vue b/resources/assets/js/components/headers/MultiviewHeader.vue index 9c8e4257a..006383ce1 100644 --- a/resources/assets/js/components/headers/MultiviewHeader.vue +++ b/resources/assets/js/components/headers/MultiviewHeader.vue @@ -14,19 +14,20 @@ - + From b434108a0a278e8b1b253bb72d50ac3c8fe52fea Mon Sep 17 00:00:00 2001 From: Fabio Guachalla Date: Mon, 20 Sep 2021 12:16:15 -0400 Subject: [PATCH 3/9] PMCORE-3347:Processes list has the same style as the Cards view --- .../assets/js/components/dataViews/vueCardView/VueCard.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/dataViews/vueCardView/VueCard.vue b/resources/assets/js/components/dataViews/vueCardView/VueCard.vue index 2183d77dd..075894476 100644 --- a/resources/assets/js/components/dataViews/vueCardView/VueCard.vue +++ b/resources/assets/js/components/dataViews/vueCardView/VueCard.vue @@ -1,7 +1,7 @@ @@ -193,6 +206,7 @@ import HeaderCounter from "../../components/home/HeaderCounter.vue"; import ButtonFleft from "../../components/home/ButtonFleft.vue"; import ModalNewRequest from "../ModalNewRequest.vue"; +import ModalComments from "../modal/ModalComments.vue"; import CasesFilter from "../../components/search/CasesFilter"; import TaskCell from "../../components/vuetable/TaskCell.vue"; import api from "../../api/index"; @@ -216,12 +230,19 @@ export default { Ellipsis, MultiviewHeader, VueCardView, - VueListView + VueListView, + ModalComments }, props: ["defaultOption", "settings"], data() { let that = this; return { + dataAlert: { + dismissSecs: 5, + dismissCountDown: 0, + message: "", + variant: "info", + }, columMap: { case_number: "APP_NUMBER", case_title: "DEL_TITLE", @@ -624,13 +645,48 @@ export default { name: "case note", icon: "far fa-comments", fn: function() { - that.openCaseDetail(data); + that.openComments(data); } }, } } } }, + /** + * Show the alert message + * @param {string} message - message to be displayen in the body + * @param {string} type - alert type + */ + showAlert(message, type) { + this.dataAlert.message = message; + this.dataAlert.variant = type || "info"; + this.dataAlert.dismissCountDown = this.dataAlert.dismissSecs; + }, + /** + * Updates the alert dismiss value to update + * dismissCountDown and decrease + * @param {mumber} + */ + countDownChanged(dismissCountDown) { + this.dataAlert.dismissCountDown = dismissCountDown; + }, + /** + * Open the case notes modal + * @param {object} data - needed to create the data + */ + openComments(data) { + let that = this; + api.cases.open(_.extend({ ACTION: "todo" }, data)).then(() => { + that.$refs["modal-comments"].dataCase = data; + that.$refs["modal-comments"].show(); + }); + }, + /** + * Post notes event handler + */ + onPostNotes() { + this.$refs["vueTable"].getData(); + }, }, }; diff --git a/resources/assets/js/home/Inbox/Inbox.vue b/resources/assets/js/home/Inbox/Inbox.vue index 42155e9b7..6a4c0acd3 100644 --- a/resources/assets/js/home/Inbox/Inbox.vue +++ b/resources/assets/js/home/Inbox/Inbox.vue @@ -4,6 +4,15 @@ + + {{ dataAlert.message }} + + @@ -227,6 +240,7 @@ import defaultMixins from "./defaultMixins"; import Ellipsis from '../../components/utils/ellipsis.vue'; import ModalPauseCase from '../modal/ModalPauseCase.vue'; import ModalReassignCase from '../modal/ModalReassignCase.vue'; +import ModalComments from "../modal/ModalComments.vue"; import { Event } from 'vue-tables-2'; import CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue"; @@ -246,11 +260,18 @@ export default { ModalPauseCase, ModalReassignCase, CurrentUserCell, + ModalComments }, props: ["defaultOption", "settings"], data() { let that = this; return { + dataAlert: { + dismissSecs: 5, + dismissCountDown: 0, + message: "", + variant: "info", + }, columMap: { case_number: "APP_NUMBER", case_title: "DEL_TITLE", @@ -712,7 +733,7 @@ export default { name: "case note", icon: "far fa-comments", fn: function() { - that.openCaseDetail(data); + that.openComments(data); } }, reassign: { @@ -733,6 +754,41 @@ export default { } } }, + /** + * Show the alert message + * @param {string} message - message to be displayen in the body + * @param {string} type - alert type + */ + showAlert(message, type) { + this.dataAlert.message = message; + this.dataAlert.variant = type || "info"; + this.dataAlert.dismissCountDown = this.dataAlert.dismissSecs; + }, + /** + * Updates the alert dismiss value to update + * dismissCountDown and decrease + * @param {mumber} + */ + countDownChanged(dismissCountDown) { + this.dataAlert.dismissCountDown = dismissCountDown; + }, + /** + * Open the case notes modal + * @param {object} data - needed to create the data + */ + openComments(data) { + let that = this; + api.cases.open(_.extend({ ACTION: "todo" }, data)).then(() => { + that.$refs["modal-comments"].dataCase = data; + that.$refs["modal-comments"].show(); + }); + }, + /** + * Post notes event handler + */ + onPostNotes() { + this.$refs["vueTable"].getData(); + }, }, }; diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index 16d42471b..9c2d61b32 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -3,6 +3,15 @@ + + {{ dataAlert.message }} + + @@ -227,6 +240,7 @@ import VueListView from "../../components/dataViews/vueListView/VueListView.vue" import defaultMixins from "./defaultMixins"; import Ellipsis from '../../components/utils/ellipsis.vue'; import ModalReassignCase from '../modal/ModalReassignCase.vue'; +import ModalComments from "../modal/ModalComments.vue"; import { Event } from 'vue-tables-2'; import CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue"; @@ -246,11 +260,18 @@ export default { VueListView, ModalReassignCase, CurrentUserCell, + ModalComments }, props: ["defaultOption", "settings"], data() { let that = this; return { + dataAlert: { + dismissSecs: 5, + dismissCountDown: 0, + message: "", + variant: "info", + }, columMap: { case_number: "APP_NUMBER", case_title: "DEL_TITLE", @@ -695,7 +716,7 @@ export default { name: "case note", icon: "far fa-comments", fn: function() { - that.openCaseDetail(data); + that.openComments(data); } }, play: { @@ -716,6 +737,41 @@ export default { } } }, + /** + * Show the alert message + * @param {string} message - message to be displayen in the body + * @param {string} type - alert type + */ + showAlert(message, type) { + this.dataAlert.message = message; + this.dataAlert.variant = type || "info"; + this.dataAlert.dismissCountDown = this.dataAlert.dismissSecs; + }, + /** + * Updates the alert dismiss value to update + * dismissCountDown and decrease + * @param {mumber} + */ + countDownChanged(dismissCountDown) { + this.dataAlert.dismissCountDown = dismissCountDown; + }, + /** + * Open the case notes modal + * @param {object} data - needed to create the data + */ + openComments(data) { + let that = this; + api.cases.open(_.extend({ ACTION: "todo" }, data)).then(() => { + that.$refs["modal-comments"].dataCase = data; + that.$refs["modal-comments"].show(); + }); + }, + /** + * Post notes event handler + */ + onPostNotes() { + this.$refs["vueTable"].getData(); + }, }, }; diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue index f6d347401..713f62991 100644 --- a/resources/assets/js/home/Unassigned/Unassigned.vue +++ b/resources/assets/js/home/Unassigned/Unassigned.vue @@ -9,6 +9,15 @@ @onRemoveFilter="onRemoveFilter" @onUpdateFilters="onUpdateFilters" /> + + {{ dataAlert.message }} + + @@ -223,6 +236,7 @@ import VueCardView from "../../components/dataViews/vueCardView/VueCardView.vue" import VueListView from "../../components/dataViews/vueListView/VueListView.vue"; import defaultMixins from "./defaultMixins"; import ModalPauseCase from '../modal/ModalPauseCase.vue'; +import ModalComments from "../modal/ModalComments.vue"; import { Event } from 'vue-tables-2'; import CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue"; @@ -242,11 +256,18 @@ export default { VueListView, ModalPauseCase, CurrentUserCell, + ModalComments }, props: ["defaultOption", "settings"], data() { let that = this; return { + dataAlert: { + dismissSecs: 5, + dismissCountDown: 0, + message: "", + variant: "info", + }, columMap: { case_number: "APP_NUMBER", case_title: "DEL_TITLE", @@ -665,7 +686,7 @@ export default { name: "case note", icon: "far fa-comments", fn: function() { - that.openCaseDetail(data); + that.openComments(data); } }, pause: { @@ -686,6 +707,41 @@ export default { } } }, + /** + * Show the alert message + * @param {string} message - message to be displayen in the body + * @param {string} type - alert type + */ + showAlert(message, type) { + this.dataAlert.message = message; + this.dataAlert.variant = type || "info"; + this.dataAlert.dismissCountDown = this.dataAlert.dismissSecs; + }, + /** + * Updates the alert dismiss value to update + * dismissCountDown and decrease + * @param {mumber} + */ + countDownChanged(dismissCountDown) { + this.dataAlert.dismissCountDown = dismissCountDown; + }, + /** + * Open the case notes modal + * @param {object} data - needed to create the data + */ + openComments(data) { + let that = this; + api.cases.open(_.extend({ ACTION: "todo" }, data)).then(() => { + that.$refs["modal-comments"].dataCase = data; + that.$refs["modal-comments"].show(); + }); + }, + /** + * Post notes event handler + */ + onPostNotes() { + this.$refs["vueTable"].getData(); + }, }, }; From 633385b8c34ca412c6678a392be6b91a35a646a1 Mon Sep 17 00:00:00 2001 From: Fabio Guachalla Date: Mon, 20 Sep 2021 15:54:16 -0400 Subject: [PATCH 6/9] PMCORE-3356:Custom cases list does not display its tooltip --- resources/assets/js/api/Menu.js | 20 ++++++++++++++- .../components/menu/CustomSidebarMenuItem.vue | 13 +++------- .../js/components/utils/CustomTooltip.vue | 25 +++++++++++++++---- 3 files changed, 43 insertions(+), 15 deletions(-) diff --git a/resources/assets/js/api/Menu.js b/resources/assets/js/api/Menu.js index aa1a1be45..e7467c530 100644 --- a/resources/assets/js/api/Menu.js +++ b/resources/assets/js/api/Menu.js @@ -40,9 +40,27 @@ export let menu = { headers: { 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken, "Accept-Language": window.config.SYS_LANG - } + } }); }, + /** + * Get the counter of a specific custom case list + * @param {Object} data + * @returns + */ + getTooltipCaseList(data) { + return axios.get( + window.config.SYS_SERVER_API + + '/api/1.0/' + + window.config.SYS_WORKSPACE + + '/home/' + data.page + '/counter/caseList/' + data.id, { + headers: { + 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken, + "Accept-Language": window.config.SYS_LANG + } + } + ); + }, /** * Get the highlight * @returns diff --git a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue index 1e528adff..29189883a 100644 --- a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue +++ b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue @@ -39,15 +39,10 @@ " > - - + {{ labelTooltip }} +

+ {{ labelDescription }} +

@@ -27,6 +30,7 @@ export default { data() { return { labelTooltip: "", + labelDescription: "", hovering: "", show: false, menuMap: { @@ -54,6 +58,7 @@ export default { */ unhoverHandler() { this.labelTooltip = ""; + this.labelDescription = ""; this.showTooltip = false; this.isLoading = false; clearTimeout(this.hovering); @@ -63,11 +68,21 @@ export default { */ setTooltip() { let that = this; - api.menu.getTooltip(that.data.page).then((response) => { - that.showTooltip = true; - that.isLoading = false; - that.labelTooltip = response.data.label; - }); + if (this.menuMap[this.data.id]) { + api.menu.getTooltip(that.data.page).then((response) => { + that.showTooltip = true; + that.isLoading = false; + that.labelTooltip = response.data.label; + }); + } else { + api.menu.getTooltipCaseList(that.data) + .then((response) => { + that.showTooltip = true; + that.isLoading = false; + that.labelTooltip = response.data.label; + that.labelDescription = response.data.description; + }); + } }, /** * Set bold the label From d331b169e8cdf50fed0594b0433457e7c0c30ba7 Mon Sep 17 00:00:00 2001 From: Fabio Guachalla Date: Mon, 20 Sep 2021 17:43:12 -0400 Subject: [PATCH 7/9] PMCORE-3351:Case list settings is not highlighted when the mouse is over that icon SQL translation --- .../components/menu/CustomSidebarMenuItem.vue | 28 +++++++++++++++---- .../translations/english/processmaker.en.po | 6 ++++ workflow/engine/data/mysql/insert.sql | 1 + 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue index 29189883a..849862eba 100644 --- a/resources/assets/js/components/menu/CustomSidebarMenuItem.vue +++ b/resources/assets/js/components/menu/CustomSidebarMenuItem.vue @@ -43,11 +43,22 @@ :data="item" ref="tooltip" > - + + + + {{ $t("ID_CASES_LIST_SETTINGS") }} + + @@ -233,6 +244,7 @@ export default { CASES_PAUSED: "paused", CASES_SELFSERVICE: "unassigned" }, + sortColor: "white", }; }, mounted() { @@ -563,6 +575,12 @@ export default { event.stopPropagation(); this.$refs["modal"].show(); }, + hoverHandler() { + this.sortColor = '#02feff'; + }, + unhoverHandler() { + this.sortColor = 'white'; + } }, inject: ["emitActiveShow", "emitItemClick", "emitItemUpdate"], }; diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index e4a95a988..5acc786aa 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -3767,6 +3767,12 @@ msgstr "Case List Fields" msgid "Loading Cases List, please wait..." msgstr "Loading Cases List, please wait..." +# TRANSLATION +# LABEL/ID_CASES_LIST_SETTINGS +#: LABEL/ID_CASES_LIST_SETTINGS +msgid "Cases List Settings" +msgstr "Cases List Settings" + # TRANSLATION # LABEL/ID_CASES_LIST_SETUP #: LABEL/ID_CASES_LIST_SETUP diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index eb68885c4..2f6085465 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -57439,6 +57439,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_CASES_LIST','en','Cases Lists','2015-04-28') , ( 'LABEL','ID_CASES_LIST_FIELDS','en','Case List Fields','2017-02-21') , ( 'LABEL','ID_CASES_LIST_GRID_LOADING','en','Loading Cases List, please wait...','2014-01-15') , +( 'LABEL','ID_CASES_LIST_SETTINGS','en','Cases List Settings','2021-09-20') , ( 'LABEL','ID_CASES_LIST_SETUP','en','Case Lists','2017-02-21') , ( 'LABEL','ID_CASES_MENU_ADMIN','en','Process Supervisor','2014-01-15') , ( 'LABEL','ID_CASES_MENU_FOLDERS','en','Cases','2014-01-15') , From e0cdb89f43a6aa0204fb73f835a59321f9dba385 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Tue, 21 Sep 2021 07:43:58 -0400 Subject: [PATCH 8/9] PMCORE-3352 The dynaform chosen in 'case summary' is not displayed --- workflow/engine/methods/cases/cases_CatchExecute.php | 10 ++++++++-- workflow/engine/templates/cases/open.js | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/workflow/engine/methods/cases/cases_CatchExecute.php b/workflow/engine/methods/cases/cases_CatchExecute.php index 0cf3cf475..941cfe0d6 100644 --- a/workflow/engine/methods/cases/cases_CatchExecute.php +++ b/workflow/engine/methods/cases/cases_CatchExecute.php @@ -42,7 +42,7 @@ $appDelegation = new AppDelegation(); $delegation = $appDelegation->load($appUid, $delIndex); // if there are no user in the delegation row, this case is still in selfservice -if (empty($delegation['USR_UID'])) { +if ($delegation['USR_UID'] == "") { $case->setCatchUser($_SESSION['APPLICATION'], $_SESSION['INDEX'], $_SESSION['USER_LOGGED']); /*----------------------------------********---------------------------------*/ $licensedFeatures = PMLicensedFeatures::getSingleton(); @@ -71,7 +71,13 @@ if (empty($delegation['USR_UID'])) { '); } } else { - G::SendMessageText(G::LoadTranslation('ID_CASE_ALREADY_DERIVATED'), 'error'); + $hideMessage = false; + if (isset($_REQUEST['hideMessage'])) { + $hideMessage = $_REQUEST['hideMessage'] === 'true' ? true : false; + } + if ($hideMessage === false) { + G::SendMessageText(G::LoadTranslation('ID_CASE_ALREADY_DERIVATED'), 'error'); + } } $validation = (SYS_SKIN != 'uxs') ? 'true' : 'false'; diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index adca3bdf9..1e4a91057 100644 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -457,7 +457,7 @@ Ext.onReady(function(){ */ function claimCase() { Ext.Ajax.request({ - url: 'cases_CatchExecute', + url: 'cases_CatchExecute?hideMessage=true', success: function (response, opts) { Ext.Ajax.request({ url: 'ajaxListener', From 11d2377f85f146d88ac36bf299d02283f32759d8 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Tue, 21 Sep 2021 11:28:39 -0400 Subject: [PATCH 9/9] PMCORE-3321 --- workflow/engine/src/ProcessMaker/Model/Delegation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/src/ProcessMaker/Model/Delegation.php b/workflow/engine/src/ProcessMaker/Model/Delegation.php index c34b79e25..42038116a 100644 --- a/workflow/engine/src/ProcessMaker/Model/Delegation.php +++ b/workflow/engine/src/ProcessMaker/Model/Delegation.php @@ -2015,7 +2015,7 @@ class Delegation extends Model $results = $query->get(); $results->transform(function ($item) { $abs = new AbstractCases(); - $item['TAS_COLOR'] = $abs->getTaskColor($item['DEL_TASK_DUE_DATE']); + $item['TAS_COLOR'] = $abs->getTaskColor($item['DEL_TASK_DUE_DATE'], $item['DEL_THREAD_STATUS']); $item['TAS_COLOR_LABEL'] = AbstractCases::TASK_COLORS[$item['TAS_COLOR']]; $item['UNASSIGNED'] = ($item['TAS_ASSIGN_TYPE'] === 'SELF_SERVICE' ? true : false); $userInfo = User::getInformation($item['USR_ID']);