diff --git a/resources/assets/js/components/dataViews/vueCardView/VueCardView.vue b/resources/assets/js/components/dataViews/vueCardView/VueCardView.vue index ef5bf1860..141249b70 100644 --- a/resources/assets/js/components/dataViews/vueCardView/VueCardView.vue +++ b/resources/assets/js/components/dataViews/vueCardView/VueCardView.vue @@ -15,9 +15,18 @@ :column="column" :headings="options.headings" > + - + @@ -45,12 +54,20 @@ export default { }; }, mounted() { - + this.filterOptions(); }, methods: { classBtn(cls) { return "btn btn-slim btn-force-radius v-btn-header " + cls; }, + /** + * Filter the column send_by + */ + filterOptions() { + this.options.columns = this.options.columns.filter(function(item) { + return item !== "send_by"; + }); + } }, }; diff --git a/resources/assets/js/components/dataViews/vueListView/VueListView.vue b/resources/assets/js/components/dataViews/vueListView/VueListView.vue index be32ad834..872077c9c 100644 --- a/resources/assets/js/components/dataViews/vueListView/VueListView.vue +++ b/resources/assets/js/components/dataViews/vueListView/VueListView.vue @@ -7,7 +7,7 @@ > - + + + + - + @@ -46,12 +57,20 @@ export default { }; }, mounted() { - + this.filterOptions(); }, methods: { classBtn(cls) { return "btn btn-slim btn-force-radius v-btn-header " + cls; }, + /** + * Filter the column send_by + */ + filterOptions() { + this.options.columns = this.options.columns.filter(function(item) { + return item !== "send_by"; + }); + } }, }; diff --git a/resources/assets/js/components/vuetable/CurrentUserCell.vue b/resources/assets/js/components/vuetable/CurrentUserCell.vue index 3d6b94bd7..681dc281d 100644 --- a/resources/assets/js/components/vuetable/CurrentUserCell.vue +++ b/resources/assets/js/components/vuetable/CurrentUserCell.vue @@ -69,7 +69,7 @@ export default { .ellipsis { white-space: nowrap; - width: 140px; + width: auto; overflow: hidden; text-overflow: ellipsis; } diff --git a/resources/assets/js/home/Inbox/Todo.vue b/resources/assets/js/home/Inbox/Todo.vue index fa6b06b26..17ad97db3 100644 --- a/resources/assets/js/home/Inbox/Todo.vue +++ b/resources/assets/js/home/Inbox/Todo.vue @@ -39,6 +39,9 @@
+
+ +
{{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -68,7 +71,7 @@ -
+
@@ -119,7 +122,14 @@
- +
+ {{ props["headings"][props.column] }} : + + + +
-
+
@@ -185,6 +195,14 @@
+
+ {{ props["headings"][props.column] }} : + + + +
@@ -204,7 +222,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 CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue"; export default { name: "Todo", @@ -221,6 +239,7 @@ export default { Ellipsis, ModalPauseCase, ModalReassignCase, + CurrentUserCell, }, props: ["defaultOption", "filters"], data() { @@ -239,6 +258,7 @@ export default { "case_title", "process_name", "task", + "send_by", "due_date", "delegation_date", "priority", @@ -253,6 +273,7 @@ export default { case_title: this.$i18n.t("ID_CASE_TITLE"), process_name: this.$i18n.t("ID_PROCESS_NAME"), task: this.$i18n.t("ID_TASK"), + send_by: this.$i18n.t("ID_SEND_BY"), due_date: this.$i18n.t("ID_DUE_DATE"), delegation_date: this.$i18n.t("ID_DELEGATION_DATE"), priority: this.$i18n.t("ID_PRIORITY"), @@ -454,6 +475,7 @@ export default { DELAYED_MSG: v.TAS_STATUS === "OVERDUE" ? v.DELAY : "", }, ], + USER_DATA: this.formatUser(v.SEND_BY_INFO), USERNAME_DISPLAY_FORMAT: utils.userNameDisplayFormat({ userName: v.USR_LASTNAME, firstName: v.USR_LASTNAME, @@ -471,6 +493,30 @@ export default { }); return data; }, + /** + * Set the format to show user's information + * @return {array} dataFormat + */ + formatUser(data) { + var dataFormat = [], + userDataFormat; + userDataFormat = utils.userNameDisplayFormat({ + userName: data.user_tooltip.usr_firstname, + firstName: data.user_tooltip.usr_lastname, + lastName: data.user_tooltip.usr_username, + format: window.config.FORMATS.format || null + }); + dataFormat.push({ + USERNAME_DISPLAY_FORMAT: userDataFormat, + EMAIL: data.user_tooltip.usr_email, + POSITION: data.user_tooltip.usr_position, + AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX + + window.config.SYS_URI + + `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.user_id}` : "", + UNASSIGNED: userDataFormat !== "" ? true : false + }); + return dataFormat; + }, /** * Open selected cases in the inbox * diff --git a/resources/assets/js/home/Inbox/defaultMixins.js b/resources/assets/js/home/Inbox/defaultMixins.js index 9440d2db8..4d5daf3f7 100644 --- a/resources/assets/js/home/Inbox/defaultMixins.js +++ b/resources/assets/js/home/Inbox/defaultMixins.js @@ -40,25 +40,25 @@ export default { this.openCase(item); }, headings: { - detail: "", case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_title: this.$i18n.t("ID_CASE_TITLE"), process_name: this.$i18n.t("ID_PROCESS_NAME"), task: this.$i18n.t("ID_TASK"), + send_by: this.$i18n.t("ID_SEND_BY"), current_user: this.$i18n.t("ID_CURRENT_USER"), due_date: this.$i18n.t("ID_DUE_DATE"), delegation_date: this.$i18n.t("ID_DELEGATION_DATE"), priority: this.$i18n.t("ID_PRIORITY") }, columns: [ - "detail", "case_number", "case_title", "process_name", "due_date", "delegation_date", "priority", - "task" + "task", + "send_by", ], requestFunction(data) { return that.getCases(data); diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index 9dd4dbfc3..7a8935e41 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -38,6 +38,9 @@
+
+ +
{{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -67,7 +70,7 @@
-
+
@@ -118,7 +121,14 @@
- +
+ {{ props["headings"][props.column] }} : + + + +
-
+
@@ -184,6 +194,14 @@
+
+ {{ props["headings"][props.column] }} : + + + +
@@ -204,6 +222,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 CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue"; export default { name: "Paused", @@ -220,6 +239,7 @@ export default { VueCardView, VueListView, ModalReassignCase, + CurrentUserCell, }, props: ["defaultOption", "filters"], data() { @@ -238,6 +258,7 @@ export default { "case_title", "process_name", "task", + "send_by", "due_date", "delegation_date", "priority", @@ -252,6 +273,7 @@ export default { case_title: this.$i18n.t("ID_CASE_TITLE"), process_name: this.$i18n.t("ID_PROCESS_NAME"), task: this.$i18n.t("ID_TASK"), + send_by: this.$i18n.t("ID_SEND_BY"), due_date: this.$i18n.t("ID_DUE_DATE"), delegation_date: this.$i18n.t("ID_DELEGATION_DATE"), priority: this.$i18n.t("ID_PRIORITY"), @@ -449,6 +471,7 @@ export default { this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[v.TAS_STATUS], DELAYED_MSG: v.TAS_STATUS === "OVERDUE" ? v.DELAY : "" }], + USER_DATA: this.formatUser(v.SEND_BY_INFO), USERNAME_DISPLAY_FORMAT: utils.userNameDisplayFormat({ userName: v.USR_LASTNAME, firstName: v.USR_LASTNAME, @@ -466,6 +489,30 @@ export default { }); return data; }, + /** + * Set the format to show user's information + * @return {array} dataFormat + */ + formatUser(data) { + var dataFormat = [], + userDataFormat; + userDataFormat = utils.userNameDisplayFormat({ + userName: data.user_tooltip.usr_firstname, + firstName: data.user_tooltip.usr_lastname, + lastName: data.user_tooltip.usr_username, + format: window.config.FORMATS.format || null + }); + dataFormat.push({ + USERNAME_DISPLAY_FORMAT: userDataFormat, + EMAIL: data.user_tooltip.usr_email, + POSITION: data.user_tooltip.usr_position, + AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX + + window.config.SYS_URI + + `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.user_id}` : "", + UNASSIGNED: userDataFormat !== "" ? true : false + }); + return dataFormat; + }, /** * Open selected cases in the inbox * diff --git a/resources/assets/js/home/Paused/defaultMixins.js b/resources/assets/js/home/Paused/defaultMixins.js index 70ed7e29c..c385daa21 100644 --- a/resources/assets/js/home/Paused/defaultMixins.js +++ b/resources/assets/js/home/Paused/defaultMixins.js @@ -39,25 +39,25 @@ export default { this.openCase(item); }, headings: { - detail: "", case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_title: this.$i18n.t("ID_CASE_TITLE"), process_name: this.$i18n.t("ID_PROCESS_NAME"), task: this.$i18n.t("ID_TASK"), + send_by: this.$i18n.t("ID_SEND_BY"), current_user: this.$i18n.t("ID_CURRENT_USER"), due_date: this.$i18n.t("ID_DUE_DATE"), delegation_date: this.$i18n.t("ID_DELEGATION_DATE"), priority: this.$i18n.t("ID_PRIORITY") }, columns: [ - "detail", "case_number", "case_title", "process_name", "due_date", "delegation_date", "priority", - "task" + "task", + "send_by", ], requestFunction(data) { return that.getCases(data); diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue index 557ce8f95..168e9a885 100644 --- a/resources/assets/js/home/Unassigned/Unassigned.vue +++ b/resources/assets/js/home/Unassigned/Unassigned.vue @@ -36,6 +36,9 @@
+
+ +
{{ props.row.DUE_DATE }}
@@ -62,7 +65,7 @@
-
+
@@ -113,6 +116,14 @@
+
+ {{ props["headings"][props.column] }} : + + + +
-
+
@@ -178,6 +189,14 @@
+
+ {{ props["headings"][props.column] }} : + + + +
@@ -199,6 +218,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 CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue"; export default { name: "Unassigned", @@ -215,6 +235,7 @@ export default { VueCardView, VueListView, ModalPauseCase, + CurrentUserCell, }, props: ["defaultOption", "filters"], data() { @@ -233,6 +254,7 @@ export default { "case_title", "process_name", "task", + "send_by", "due_date", "delegation_date", "priority", @@ -246,6 +268,7 @@ export default { case_title: this.$i18n.t("ID_CASE_TITLE"), process_name: this.$i18n.t("ID_PROCESS_NAME"), task: this.$i18n.t("ID_TASK"), + send_by: this.$i18n.t("ID_SEND_BY"), due_date: this.$i18n.t("ID_DUE_DATE"), delegation_date: this.$i18n.t("ID_DELEGATION_DATE"), priority: this.$i18n.t("ID_PRIORITY"), @@ -413,6 +436,7 @@ export default { this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[v.TAS_STATUS], DELAYED_MSG: v.TAS_STATUS === "OVERDUE" ? v.DELAY : "" }], + USER_DATA: this.formatUser(v.SEND_BY_INFO), DUE_DATE: v.DEL_TASK_DUE_DATE_LABEL, DELEGATION_DATE: v.DEL_DELEGATE_DATE_LABEL, PRIORITY: v.DEL_PRIORITY_LABEL, @@ -424,6 +448,30 @@ export default { }); return data; }, + /** + * Set the format to show user's information + * @return {array} dataFormat + */ + formatUser(data) { + var dataFormat = [], + userDataFormat; + userDataFormat = utils.userNameDisplayFormat({ + userName: data.user_tooltip.usr_firstname, + firstName: data.user_tooltip.usr_lastname, + lastName: data.user_tooltip.usr_username, + format: window.config.FORMATS.format || null + }); + dataFormat.push({ + USERNAME_DISPLAY_FORMAT: userDataFormat, + EMAIL: data.user_tooltip.usr_email, + POSITION: data.user_tooltip.usr_position, + AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX + + window.config.SYS_URI + + `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.user_id}` : "", + UNASSIGNED: userDataFormat !== "" ? true : false + }); + return dataFormat; + }, /** * Claim case * diff --git a/resources/assets/js/home/Unassigned/defaultMixins.js b/resources/assets/js/home/Unassigned/defaultMixins.js index 50292a00f..8da3f1637 100644 --- a/resources/assets/js/home/Unassigned/defaultMixins.js +++ b/resources/assets/js/home/Unassigned/defaultMixins.js @@ -39,25 +39,25 @@ export default { this.openCase(item); }, headings: { - detail: "", case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_title: this.$i18n.t("ID_CASE_TITLE"), process_name: this.$i18n.t("ID_PROCESS_NAME"), task: this.$i18n.t("ID_TASK"), + send_by: this.$i18n.t("ID_SEND_BY"), current_user: this.$i18n.t("ID_CURRENT_USER"), due_date: this.$i18n.t("ID_DUE_DATE"), delegation_date: this.$i18n.t("ID_DELEGATION_DATE"), priority: this.$i18n.t("ID_PRIORITY") }, columns: [ - "detail", "case_number", "case_title", "process_name", "due_date", "delegation_date", "priority", - "task" + "task", + "send_by", ], requestFunction(data) { return that.getCases(data); diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 53ee48ccf..8d825507e 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -24677,6 +24677,12 @@ msgstr "An error has occurred, please verify on which server \"SendMail\" has be msgid "send at" msgstr "send at" +# TRANSLATION +# LABEL/ID_SEND_BY +#: LABEL/ID_SEND_BY +msgid "Send By" +msgstr "Send By" + # TRANSLATION # LABEL/ID_SEND_EMAIL_CASE_PARTICIPANTS #: LABEL/ID_SEND_EMAIL_CASE_PARTICIPANTS diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 0ec19efeb..b40a740d7 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -61027,6 +61027,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_SENDING_REQUEST_SALES_DEPARTMENT','en','Sending request to ProcessMaker Sales Department, please wait...','2014-09-18') , ( 'LABEL','ID_SENDMAIL_NOT_INSTALLED','en','An error has occured, please verify on which server "SendMail" has been installed or any other mail service, and if it has been configured correctly.','2014-01-15') , ( 'LABEL','ID_SEND_AT','en','send at','2014-01-15') , +( 'LABEL','ID_SEND_BY','en','Send By','2021-08-02') , ( 'LABEL','ID_SEND_EMAIL_CASE_PARTICIPANTS','en','Send Email (Case Participants)','2014-01-15') , ( 'LABEL','ID_SEND_EMAIL_TO_PARTICIPANTS','en','Send email to participants','2020-12-01') , ( 'LABEL','ID_SENT','en','Participated','2016-07-11') ,