From 0417afeb513e5f28e0bd4f4ef9632143221824ec Mon Sep 17 00:00:00 2001 From: Henry Jordan Date: Wed, 5 Jan 2022 17:07:21 +0000 Subject: [PATCH] PMCORE-3615 update update --- .../js/home/TaskMetrics/VueChartLvOne.vue | 7 +- .../js/home/TaskMetrics/VueChartLvThree.vue | 15 ++-- .../js/home/TaskMetrics/VueChartLvTwo.vue | 3 +- .../js/home/TaskMetrics/mixinsLocales.js | 78 +++++++++++++++++++ .../translations/english/processmaker.en.po | 72 +++++++++++++++++ workflow/engine/data/mysql/insert.sql | 13 +++- 6 files changed, 176 insertions(+), 12 deletions(-) create mode 100644 resources/assets/js/home/TaskMetrics/mixinsLocales.js diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue b/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue index 719ffe16c..5e82acd4c 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue @@ -85,7 +85,7 @@ @@ -100,10 +100,11 @@ import BreadCrumb from "../../components/utils/BreadCrumb.vue"; import ProcessPopover from "./ProcessPopover.vue"; import Multiselect from "vue-multiselect"; import eventBus from "./../EventBus/eventBus"; +import mixinLocales from "./mixinsLocales"; export default { name: "VueChartLvOne", - mixins: [], + mixins: [mixinLocales], components: { Multiselect, BreadCrumb, @@ -137,7 +138,7 @@ export default { data: [], }, ], - optionsBar: { + options: { chart: { type: "bar", id: "LevelOneChart", diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue index 054744647..ca7fd3edd 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue @@ -69,7 +69,7 @@ " class="btn vp-btn-success btn-sm" > - On Time + {{ $t("ID_TASK_ON_TIME") }} @@ -112,10 +112,11 @@ import BreadCrumb from "../../components/utils/BreadCrumb.vue"; import moment from "moment"; import ModalUnpauseCase from "../modal/ModalUnpauseCase.vue"; import ModalClaimCase from "../modal/ModalClaimCase.vue"; +import mixinLocales from "./mixinsLocales"; export default { name: "VueChartLvThree", - mixins: [], + mixins: [mixinLocales], components: { Multiselect, BreadCrumb, @@ -357,7 +358,7 @@ export default { tickAmount: 7, }, title: { - text: "Overdue days", + text: this.$t("ID_TASK_OVERDUE_DAYS"), }, }); break; @@ -369,7 +370,7 @@ export default { tickAmount: 7, }, title: { - text: "Days before being Overdue", + text: this.$t("ID_TASK_DAYS_BEFORE_OVERDUE"), }, }); break; @@ -381,7 +382,7 @@ export default { tickAmount: 7, }, title: { - text: "Days before being At-Risk", + text: this.$t("ID_TASK_DAYS_BEFORE_AT_RISK"), }, }); break; diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue index 10ddd3c28..f972dec09 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue @@ -87,9 +87,10 @@ import Multiselect from "vue-multiselect"; import BreadCrumb from "../../components/utils/BreadCrumb.vue"; import moment from "moment"; import eventBus from "./../EventBus/eventBus"; +import mixinLocales from "./mixinsLocales"; export default { name: "VueChartLvTwo", - mixins: [], + mixins: [mixinLocales], components: { Multiselect, BreadCrumb, diff --git a/resources/assets/js/home/TaskMetrics/mixinsLocales.js b/resources/assets/js/home/TaskMetrics/mixinsLocales.js new file mode 100644 index 000000000..72c240183 --- /dev/null +++ b/resources/assets/js/home/TaskMetrics/mixinsLocales.js @@ -0,0 +1,78 @@ +export default { + data() { + let that = this; + return { + options: { + chart: { + locales: [ + { + name: "en", + options: { + months: [ + this.$t("ID_MONTH_1"), + this.$t("ID_MONTH_2"), + this.$t("ID_MONTH_3"), + this.$t("ID_MONTH_4"), + this.$t("ID_MONTH_5"), + this.$t("ID_MONTH_6"), + this.$t("ID_MONTH_7"), + this.$t("ID_MONTH_8"), + this.$t("ID_MONTH_9"), + this.$t("ID_MONTH_10"), + this.$t("ID_MONTH_11"), + this.$t("ID_MONTH_12"), + ], + shortMonths: [ + this.$t("ID_MONTH_ABB_1"), + this.$t("ID_MONTH_ABB_2"), + this.$t("ID_MONTH_ABB_3"), + this.$t("ID_MONTH_ABB_4"), + this.$t("ID_MONTH_ABB_5"), + this.$t("ID_MONTH_ABB_6"), + this.$t("ID_MONTH_ABB_7"), + this.$t("ID_MONTH_ABB_8"), + this.$t("ID_MONTH_ABB_9"), + this.$t("ID_MONTH_ABB_10"), + this.$t("ID_MONTH_ABB_11"), + this.$t("ID_MONTH_ABB_12"), + ], + days: [ + this.$t("ID_WEEKDAY_0"), + this.$t("ID_WEEKDAY_1"), + this.$t("ID_WEEKDAY_2"), + this.$t("ID_WEEKDAY_3"), + this.$t("ID_WEEKDAY_4"), + this.$t("ID_WEEKDAY_5"), + this.$t("ID_WEEKDAY_6"), + ], + shortDays: [ + this.$t("ID_WEEKDAY_ABB_0"), + this.$t("ID_WEEKDAY_ABB_1"), + this.$t("ID_WEEKDAY_ABB_2"), + this.$t("ID_WEEKDAY_ABB_3"), + this.$t("ID_WEEKDAY_ABB_4"), + this.$t("ID_WEEKDAY_ABB_5"), + this.$t("ID_WEEKDAY_ABB_6"), + ], + toolbar: { + exportToSVG: this.$t("ID_DOWNLOAD_SVG"), + exportToPNG: this.$t("ID_DOWNLOAD_PNG"), + menu: this.$t("ID_MENU"), + selection: this.$t( + "ID_PROCESSMAP_SELECTION" + ), + selectionZoom: this.$t("ID_SELECTION_ZOOM"), + zoomIn: this.$t("ID_ZOOM_IN"), + zoomOut: this.$t("ID_ZOOM_OUT"), + pan: this.$t("ID_PANNING"), + reset: this.$t("ID_RESET"), + }, + }, + }, + ], + defaultLocale: "en", + }, + }, + }; + }, +}; diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 8283aff90..6fb10543d 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -7019,6 +7019,18 @@ msgstr "Down" msgid "Download" msgstr "Download" +# TRANSLATION +# LABEL/ID_DOWNLOAD_SVG +#: LABEL/ID_DOWNLOAD_SVG +msgid "Download SVG" +msgstr "Download SVG" + +# TRANSLATION +# LABEL/ID_DOWNLOAD_PNG +#: LABEL/ID_DOWNLOAD_PNG +msgid "Download PNG" +msgstr "Download PNG" + # TRANSLATION # LABEL/ID_DOWNLOADING_FILE #: LABEL/ID_DOWNLOADING_FILE @@ -19211,6 +19223,12 @@ msgstr "Memory Limit (MB)" msgid "Memory Limit value has to be either a positive integer or -1" msgstr "Memory Limit value has to be either a positive integer or -1" +# TRANSLATION +# LABEL/ID_MENU +#: LABEL/ID_MENU +msgid "Menu" +msgstr "Menu" + # TRANSLATION # LABEL/ID_MENU_COLOR #: LABEL/ID_MENU_COLOR @@ -21299,6 +21317,12 @@ msgstr "Page" msgid "Page Size" msgstr "Page Size" +# TRANSLATION +# LABEL/ID_PANNING +#: LABEL/ID_PANNING +msgid "Panning" +msgstr "Panning" + # TRANSLATION # LABEL/ID_PARALLEL_TASK #: LABEL/ID_PARALLEL_TASK @@ -24587,6 +24611,12 @@ msgstr "See complete list" msgid "Select" msgstr "Select" +# TRANSLATION +# LABEL/ID_SELECTION_ZOOM +#: LABEL/ID_SELECTION_ZOOM +msgid "Selection zoom" +msgstr "Selection zoom" + # TRANSLATION # LABEL/ID_SELECTED #: LABEL/ID_SELECTED @@ -26201,6 +26231,12 @@ msgstr "Task in Progress" msgid "Task Name" msgstr "Task Name" +# TRANSLATION +# LABEL/ID_TASK_METRICS +#: LABEL/ID_TASK_METRICS +msgid "Task metrics" +msgstr "Task metrics" + # TRANSLATION # LABEL/ID_TASK_NOT_EXIST #: LABEL/ID_TASK_NOT_EXIST @@ -26231,6 +26267,30 @@ msgstr "The task doesn't have any steps" msgid "Overdue" msgstr "Overdue" +# TRANSLATION +# LABEL/ID_TASK_OVERDUE_DAYS +#: LABEL/ID_TASK_OVERDUE_DAYS +msgid "Overdue days" +msgstr "Overdue days" + +# TRANSLATION +# LABEL/ID_TASK_DAYS_BEFORE_AT_RISK +#: LABEL/ID_TASK_DAYS_BEFORE_AT_RISK +msgid "Days before being At-Risk" +msgstr "Days before being At-Risk" + +# TRANSLATION +# LABEL/ID_TASK_DAYS_BEFORE_OVERDUE +#: LABEL/ID_TASK_DAYS_BEFORE_OVERDUE +msgid "Days before being Overdue" +msgstr "Days before being Overdue" + +# TRANSLATION +# LABEL/ID_TASK_ON_TIME +#: LABEL/ID_TASK_ON_TIME +msgid "On time" +msgstr "On time" + # TRANSLATION # LABEL/ID_TASK_PROPERTIES_SAVE #: LABEL/ID_TASK_PROPERTIES_SAVE @@ -29051,6 +29111,18 @@ msgstr "You uploaded an unsupported file extension, please review the permitted msgid "Zip Code" msgstr "Zip Code" +# TRANSLATION +# LABEL/ID_ZOOM_IN +#: LABEL/ID_ZOOM_IN +msgid "Zoom in" +msgstr "Zoom in" + +# TRANSLATION +# LABEL/ID_ZOOM_OUT +#: LABEL/ID_ZOOM_OUT +msgid "Zoom out" +msgstr "Zoom out" + # TRANSLATION # LABEL/IMAGE_DETAIL #: LABEL/IMAGE_DETAIL diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 408812c16..5e94762a8 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -58001,6 +58001,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_DONT_MODIFY_PK_VALUE','en','You can not modify the primary key value for "{0}" field.','2014-01-15') , ( 'LABEL','ID_DOWN','en','Down','2014-01-15') , ( 'LABEL','ID_DOWNLOAD','en','Download','2014-01-15') , +( 'LABEL','ID_DOWNLOAD_SVG','en','Download SVG','2022-01-07') , +( 'LABEL','ID_DOWNLOAD_PNG','en','Download PNG','2022-01-07') , ( 'LABEL','ID_DOWNLOADING_FILE','en','Downloading file','2014-01-15') , ( 'LABEL','ID_DOWNLOADING_UPGRADE','en','Downloading upgrade:','2014-09-18') , ( 'LABEL','ID_DOWNLOAD_MANUALLY','en','You can download it manually here','2014-09-18') , @@ -60097,6 +60099,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_MEMBER_OF','en','MEMBER OF','2014-01-15') , ( 'LABEL','ID_MEMORY_LIMIT','en','Memory Limit (MB)','2014-01-15') , ( 'LABEL','ID_MEMORY_LIMIT_VALIDATE','en','Memory Limit value has to be either a positive integer or -1','2017-04-05') , +( 'LABEL','ID_MENU','en','Menu','2022-01-07') , ( 'LABEL','ID_MENU_COLOR','en','Menu Color','2021-08-10') , ( 'LABEL','ID_MENU_NAME','en','Enterprise Manager','2014-10-17') , ( 'LABEL','ID_MESSAGE','en','Message','2014-01-15') , @@ -60457,6 +60460,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_OWNER_TYPE','en','Owner type','2015-05-08') , ( 'LABEL','ID_PAGE','en','Page','2014-01-15') , ( 'LABEL','ID_PAGE_SIZE','en','Page Size','2014-01-15') , +( 'LABEL','ID_PANNING','en','Panning','2022-01-07') , ( 'LABEL','ID_PARALLEL_TASK','en','Parallel Task','2014-01-15') , ( 'LABEL','ID_PARAMETERS','en','Parameters','2014-01-15') , ( 'LABEL','ID_PARENT_DEPARTMENT_NOT_EXIST','en','Parent department doesn''t exist','2014-01-15') , @@ -61023,6 +61027,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_SEE','en','See','2014-01-15') , ( 'LABEL','ID_SEE_FULL_LIST','en','See complete list','2016-02-29') , ( 'LABEL','ID_SELECT','en','Select','2014-01-15') , +( 'LABEL','ID_SELECTION_ZOOM','en','Selection zoom','2022-01-07') , ( 'LABEL','ID_SELECTED','en','selected','2014-01-15') , ( 'LABEL','ID_SELECTED_FIELD','en','selected field','2014-01-15') , ( 'LABEL','ID_SELECTED_IMAGE_DELETED','en','The selected image has been deleted.','2014-01-15') , @@ -61306,12 +61311,16 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_TASK_IN_PROGRESS','en','Task in Progress','2014-01-15') , ( 'LABEL','ID_TASK_NAME','en','Task Name','2020-12-16') , -( 'LABEL','ID_TASK_METRICS','en','Task metrics','2021-01-05') , +( 'LABEL','ID_TASK_METRICS','en','Task metrics','2022-01-05') , ( 'LABEL','ID_TASK_NOT_EXIST','en','The task with {0}: ''{1}'' does not exist.','2014-05-29') , ( 'LABEL','ID_TASK_NOT_FOUND','en','Task not found for id: {0}','2014-05-21') , ( 'LABEL','ID_TASK_NOT_RELATED','en','[Not related to a task]','2014-01-15') , ( 'LABEL','ID_TASK_NO_STEPS','en','The task doesn''t have any steps','2014-01-15') , ( 'LABEL','ID_TASK_OVERDUE','en','Overdue','2015-06-09') , +( 'LABEL','ID_TASK_OVERDUE_DAYS','en','Overdue days','2022-01-07') , +( 'LABEL','ID_TASK_DAYS_BEFORE_AT_RISK','en','Days before being At-Risk','2022-01-07') , +( 'LABEL','ID_TASK_DAYS_BEFORE_OVERDUE','en','Days before being Overdue','2022-01-07') , +( 'LABEL','ID_TASK_ON_TIME','en','On time','2022-01-07') , ( 'LABEL','ID_TASK_PROPERTIES_SAVE','en','Task properties has been saved successfully','2014-01-15') , ( 'LABEL','ID_TASK_REASSIGNMENTS','en','Task Reassignments','2020-12-07') , ( 'LABEL','ID_TASK_TITLE','en','Task Title','2020-12-17') , @@ -61835,6 +61844,8 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_YOU_HAVE_ERROR','en','you have an error','2014-01-15') , ( 'LABEL','ID_YOU_UPLOADED_AN_UNSUPPORTED_FILE_EXTENSION','en','You uploaded an unsupported file extension, please review the permitted files uploaded in the wiki of ProcessMaker for the cases notes.','2020-06-12') , ( 'LABEL','ID_ZIP_CODE','en','Zip Code','2014-01-15') , +( 'LABEL','ID_ZOOM_IN','en','Zoom in','2022-01-07') , +( 'LABEL','ID_ZOOM_OUT','en','Zoom out','2022-01-07') , ( 'LABEL','IMAGE_DETAIL','en','Image detail','2014-01-15') , ( 'LABEL','IMPORT_LANGUAGE_ERR_NO_WRITABLE','en','The XML forms directory is not writable','2014-01-15') , ( 'LABEL','IMPORT_LANGUAGE_ERR_NO_WRITABLE2','en','Some files within XMLFORM directory are not writable, to install or update the translations the system requires that all files are writable. Contact your system administrator please.','2014-01-15') ,