From 1a2b777ca3672c984a626a8bc65b63aad53d1775 Mon Sep 17 00:00:00 2001 From: Roly Gutierrez Date: Thu, 9 Sep 2021 17:00:01 -0400 Subject: [PATCH 1/6] PMCORE-3301 Custom cases list: Can not import a JSON related to the custom Caselist --- .../admin/settings/customCaseList/Tables.vue | 6 +++--- .../translations/english/processmaker.en.po | 18 ++++++++++++++++++ workflow/engine/data/mysql/insert.sql | 3 +++ 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/admin/settings/customCaseList/Tables.vue b/resources/assets/js/admin/settings/customCaseList/Tables.vue index 2fa03fb0c..8c6a92531 100644 --- a/resources/assets/js/admin/settings/customCaseList/Tables.vue +++ b/resources/assets/js/admin/settings/customCaseList/Tables.vue @@ -249,8 +249,8 @@ export default { * @param {Array} data */ filterDataToExport(data) { - var dataExport = []; - dataExport.push({ + var dataExport; + dataExport = { type: data['type'], name: data['name'], description: data['description'], @@ -263,7 +263,7 @@ export default { iconColorScreen: data['iconColorScreen'], createDate: data['createDate'], updateDate: data['updateDate'] - }); + }; return dataExport; }, /** diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 980870add..b2e960e67 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -10145,6 +10145,12 @@ msgstr "Import connection" msgid "CSV Import" msgstr "CSV Import" +# TRANSLATION +# LABEL/ID_IMPORT_CUSTOM_CASE_LIST +#: LABEL/ID_IMPORT_CUSTOM_CASE_LIST +msgid "Import Custom Case List" +msgstr "Import Custom Case List" + # TRANSLATION # LABEL/ID_IMPORT_DATA_CSV #: LABEL/ID_IMPORT_DATA_CSV @@ -20153,6 +20159,12 @@ msgstr "New case" msgid "% New Cases" msgstr "% New Cases" +# TRANSLATION +# LABEL/ID_NEW_CASES_LISTS +#: LABEL/ID_NEW_CASES_LISTS +msgid "New Case List" +msgstr "New Case List" + # TRANSLATION # LABEL/ID_NEW_CASE_PANEL #: LABEL/ID_NEW_CASE_PANEL @@ -21587,6 +21599,12 @@ msgstr "The PIN is invalid" msgid "please" msgstr "please" +# TRANSLATION +# LABEL/ID_PLEASE_ADD_THE_CUSTOM_LIST_FILE_TO_BE_UPLOADED +#: LABEL/ID_PLEASE_ADD_THE_CUSTOM_LIST_FILE_TO_BE_UPLOADED +msgid "Please add the Custom List File to be uploaded" +msgstr "Please add the Custom List File to be uploaded" + # TRANSLATION # LABEL/ID_PLEASE_ADD_THE_FILE_SETTINGS_TO_BE_UPLOADED #: LABEL/ID_PLEASE_ADD_THE_FILE_SETTINGS_TO_BE_UPLOADED diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 5fbf9db3f..cc93a4965 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -58548,6 +58548,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_IMPORT_BPMN','en','Import BPMN','2015-02-20') , ( 'LABEL','ID_IMPORT_CONNECTION','en','Import connection','2020-12-10') , ( 'LABEL','ID_IMPORT_CSV','en','CSV Import','2014-01-15') , +( 'LABEL','ID_IMPORT_CUSTOM_CASE_LIST','en','Import Custom Case List','2021-09-09') , ( 'LABEL','ID_IMPORT_DATA_CSV','en','Import Data from CSV file','2014-01-15') , ( 'LABEL','ID_IMPORT_LICENSE','en','Import license','2014-09-18') , ( 'LABEL','ID_IMPORT_PMT','en','Import PM Table','2014-01-15') , @@ -60258,6 +60259,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_NEW_BPMN_PROJECT','en','New BPMN Project','2015-08-18') , ( 'LABEL','ID_NEW_CASE','en','New case','2014-01-15') , ( 'LABEL','ID_NEW_CASES','en','% New Cases','2015-04-06') , +( 'LABEL','ID_NEW_CASES_LISTS','en','New Case List','2021-09-09') , ( 'LABEL','ID_NEW_CASE_PANEL','en','New Case Panel','2014-01-15') , ( 'LABEL','ID_NEW_CASE_SCHEDULER','en','New Case Scheduler','2014-01-15') , ( 'LABEL','ID_NEW_CATEGORY','en','Create New Category','2014-01-15') , @@ -60506,6 +60508,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_PIN','en','Pin','2015-05-08') , ( 'LABEL','ID_PIN_INVALID','en','The PIN is invalid','2014-01-15') , ( 'LABEL','ID_PLEASE','en','please','2014-01-15') , +( 'LABEL','ID_PLEASE_ADD_THE_CUSTOM_LIST_FILE_TO_BE_UPLOADED','en','Please add the Custom List File to be uploaded','2021-09-09') , ( 'LABEL','ID_PLEASE_ADD_THE_FILE_SETTINGS_TO_BE_UPLOADED','en','Please add the file settings to be uploaded','2020-12-10') , ( 'LABEL','ID_PLEASE_CHANGE_PASSWORD_POLICY','en','Please change your password to one that complies with these policies.','2014-01-15') , ( 'LABEL','ID_PLEASE_CONFIGURE_ESTIMATED_DURATION_TASK','en','Please, configure the estimated duration of the task.','2014-10-23') , From 78bf39579d9e619753d50039224c73b467c90c34 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Fri, 10 Sep 2021 22:58:21 +0000 Subject: [PATCH 2/6] PMCORE-3304 --- resources/assets/js/home/Home.vue | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) mode change 100644 => 100755 resources/assets/js/home/Home.vue diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue old mode 100644 new mode 100755 index a13a97cad..cd271742e --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -59,6 +59,7 @@ import CustomCaseList from "./CustomCaseList/CustomCaseList.vue" import api from "./../api/index"; import eventBus from './EventBus/eventBus' +import _ from "lodash"; export default { name: "Home", components: { @@ -158,7 +159,8 @@ export default { eventer(messageEvent, function(e) { if ( e.data === "redirect=todo" || e.message === "redirect=todo"){ - that.page = "inbox"; + console.log("JONN"); + that.OnClickSidebarItem(that.getItemMenuByValue("page","inbox")); } if ( e.data === "update=debugger" || e.message === "update=debugger"){ if(that.$refs["component"].updateView){ @@ -563,6 +565,23 @@ export default { console.error(e); }); } + }, + /** + * Search in menu Items by value, return the item + * @param {string} key - Key for search in object + * @param {string} value - value for search in key + */ + getItemMenuByValue(key, value) { + let obj = _.find(this.menu, function(o) { + if(o.component){ + return o.props.item[key] == value; + } + return o[key] == value; + }); + if(obj.component){ + return obj.props; + } + return obj; } } }; From 3230a875f64d9b51e6319ac393740f78bd528f19 Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Fri, 10 Sep 2021 23:00:00 +0000 Subject: [PATCH 3/6] PMCORE-3304 update --- resources/assets/js/home/Home.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index cd271742e..55aea4272 100755 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -159,8 +159,7 @@ export default { eventer(messageEvent, function(e) { if ( e.data === "redirect=todo" || e.message === "redirect=todo"){ - console.log("JONN"); - that.OnClickSidebarItem(that.getItemMenuByValue("page","inbox")); + that.OnClickSidebarItem(that.getItemMenuByValue("page","inbox")); } if ( e.data === "update=debugger" || e.message === "update=debugger"){ if(that.$refs["component"].updateView){ From 57a2030854f56026f05702a86b1300f7b2a1a8ac Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 13 Sep 2021 11:11:33 -0400 Subject: [PATCH 4/6] PMCORE-3310:My cases and Paused case: please correct the color blue for PAUSED cases --- resources/assets/js/components/vuetable/GroupedCell.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/components/vuetable/GroupedCell.vue b/resources/assets/js/components/vuetable/GroupedCell.vue index 93b7c55d8..dfd0d85b2 100644 --- a/resources/assets/js/components/vuetable/GroupedCell.vue +++ b/resources/assets/js/components/vuetable/GroupedCell.vue @@ -54,7 +54,7 @@ export default { data() { return { //Color map for ["In Progress", "overdue", "inDraft", "paused", "unnasigned"] - colorMap: ["green", "red", "orange", "aqua", "silver"], + colorMap: ["green", "red", "orange", "blue", "silver"], id: "avatar-" + _.random(1000000), statusId: "status-" + _.random(1000000) }; From c280604a07bef3c68df54b5d7f2bbf4deae97078 Mon Sep 17 00:00:00 2001 From: fabio Date: Mon, 13 Sep 2021 15:00:29 -0400 Subject: [PATCH 5/6] PMCORE-3311:Tooltip empty PendignTask --- resources/assets/js/components/vuetable/TaskCell.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/components/vuetable/TaskCell.vue b/resources/assets/js/components/vuetable/TaskCell.vue index b8fd56ad3..748dde102 100644 --- a/resources/assets/js/components/vuetable/TaskCell.vue +++ b/resources/assets/js/components/vuetable/TaskCell.vue @@ -1,13 +1,21 @@