diff --git a/resources/assets/js/admin/Modals/ModalPreview.vue b/resources/assets/js/admin/Modals/ModalPreview.vue index ad2ca0a7a..1013426a7 100644 --- a/resources/assets/js/admin/Modals/ModalPreview.vue +++ b/resources/assets/js/admin/Modals/ModalPreview.vue @@ -29,7 +29,12 @@
- + +
{{ props.row.USERNAME_DISPLAY_FORMAT }} @@ -106,6 +111,7 @@ export default { PAUSED: this.$i18n.t("ID_PAUSED"), UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"), }, + showUserTooltip: true } }, mounted() { @@ -248,24 +254,33 @@ export default { * @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.usr_id}` : "", - UNASSIGNED: userDataFormat !== "" ? true : false - }); - return dataFormat; + var dataFormat = [], + userDataFormat; + if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) { + this.showUserTooltip = true; + 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.usr_id}` : "", + UNASSIGNED: userDataFormat !== "" ? true : false + }); + } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) { + this.showUserTooltip = false; + dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name; + } else { + this.showUserTooltip = false; + dataFormat = this.$i18n.t("ID_ANONYMOUS_USER"); + } + return dataFormat; } } } diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue index 5acf6dbd4..75ddc2859 100644 --- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue +++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue @@ -63,7 +63,12 @@
- + +
{{ props.row.USERNAME_DISPLAY_FORMAT }} @@ -144,7 +149,12 @@ {{ props["item"]["PRIORITY"] }} - + + {{ props["item"][column] }} @@ -198,7 +208,12 @@ {{ props["item"]["PRIORITY"] }} - + + {{ props["item"][column] }} @@ -576,7 +591,8 @@ export default { makeTagText: function (params, data) { return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`; } - } + }, + showUserTooltip: true } }; }, @@ -884,24 +900,33 @@ export default { 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.usr_id}` - : "", - UNASSIGNED: userDataFormat !== "" ? true : false, - }); + if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) { + this.showUserTooltip = true; + 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.usr_id}` + : "", + UNASSIGNED: userDataFormat !== "" ? true : false, + }); + } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) { + this.showUserTooltip = false; + dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name; + } else { + this.showUserTooltip = false; + dataFormat = this.$i18n.t("ID_ANONYMOUS_USER"); + } return dataFormat; }, /** diff --git a/resources/assets/js/home/Inbox/Inbox.vue b/resources/assets/js/home/Inbox/Inbox.vue index 5822f4313..c8d134ee2 100644 --- a/resources/assets/js/home/Inbox/Inbox.vue +++ b/resources/assets/js/home/Inbox/Inbox.vue @@ -54,7 +54,12 @@
- + +
{{ props.row.USERNAME_DISPLAY_FORMAT }} @@ -149,7 +154,12 @@ >{{ props["headings"][props.column] }} : - + +
@@ -230,7 +240,12 @@ >{{ props["headings"][props.column] }} : - + + @@ -383,7 +398,8 @@ export default { buttons: {} }, showEllipsis: false, - dataSubtitle: null + dataSubtitle: null, + showUserTooltip: true }; }, created() { @@ -595,6 +611,8 @@ export default { formatUser(data) { var dataFormat = [], userDataFormat; + if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) { + this.showUserTooltip = true; userDataFormat = utils.userNameDisplayFormat({ userName: data.user_tooltip.usr_firstname, firstName: data.user_tooltip.usr_lastname, @@ -610,6 +628,13 @@ export default { `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "", UNASSIGNED: userDataFormat !== "" ? true : false }); + } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) { + this.showUserTooltip = false; + dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name; + } else { + this.showUserTooltip = false; + dataFormat = this.$i18n.t("ID_ANONYMOUS_USER"); + } return dataFormat; }, /** diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index e5469d9ca..7af75ca65 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -48,12 +48,16 @@
{{ props.row.PROCESS_NAME }}
-
- + +
{{ props.row.USERNAME_DISPLAY_FORMAT }} @@ -148,7 +152,12 @@ >{{ props["headings"][props.column] }} : - + +
@@ -229,7 +238,12 @@ >{{ props["headings"][props.column] }} : - + + @@ -383,7 +397,8 @@ export default { buttons: {} }, showEllipsis: false, - dataSubtitle: null + dataSubtitle: null, + showUserTooltip: true }; }, created() { @@ -590,6 +605,8 @@ export default { formatUser(data) { var dataFormat = [], userDataFormat; + if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) { + this.showUserTooltip = true; userDataFormat = utils.userNameDisplayFormat({ userName: data.user_tooltip.usr_firstname, firstName: data.user_tooltip.usr_lastname, @@ -604,7 +621,14 @@ export default { window.config.SYS_URI + `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "", UNASSIGNED: userDataFormat !== "" ? true : false - }); + }); + } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) { + this.showUserTooltip = false; + dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name; + } else { + this.showUserTooltip = false; + dataFormat = this.$i18n.t("ID_ANONYMOUS_USER"); + } return dataFormat; }, /** diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue index 835252f4b..5da720e18 100644 --- a/resources/assets/js/home/Unassigned/Unassigned.vue +++ b/resources/assets/js/home/Unassigned/Unassigned.vue @@ -46,12 +46,16 @@
{{ props.row.PROCESS_NAME }}
-
- + +
{{ props.row.DUE_DATE }} @@ -143,7 +147,12 @@ >{{ props["headings"][props.column] }} : - + +
@@ -224,7 +233,12 @@ >{{ props["headings"][props.column] }} : - + + @@ -375,7 +389,8 @@ export default { buttons: {} }, showEllipsis: false, - dataSubtitle: null + dataSubtitle: null, + showUserTooltip: true }; }, mounted() { @@ -547,6 +562,8 @@ export default { formatUser(data) { var dataFormat = [], userDataFormat; + if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) { + this.showUserTooltip = true; userDataFormat = utils.userNameDisplayFormat({ userName: data.user_tooltip.usr_firstname, firstName: data.user_tooltip.usr_lastname, @@ -561,7 +578,14 @@ export default { window.config.SYS_URI + `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "", UNASSIGNED: userDataFormat !== "" ? true : false - }); + }); + } else if (data.dummy_task && !_.isEmpty(data.dummy_task)) { + this.showUserTooltip = false; + dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name; + } else { + this.showUserTooltip = false; + dataFormat = this.$i18n.t("ID_ANONYMOUS_USER"); + } return dataFormat; }, /**