diff --git a/resources/assets/js/components/vuetable/GroupedCell.vue b/resources/assets/js/components/vuetable/GroupedCell.vue index 2291ea6db..93b7c55d8 100644 --- a/resources/assets/js/components/vuetable/GroupedCell.vue +++ b/resources/assets/js/components/vuetable/GroupedCell.vue @@ -18,6 +18,7 @@ variant="info" :src="item.AVATAR" size="2em" + v-show="item.UNASSIGNED" > diff --git a/resources/assets/js/home/MyCases.vue b/resources/assets/js/home/MyCases.vue index 12a55bffa..a63d54377 100644 --- a/resources/assets/js/home/MyCases.vue +++ b/resources/assets/js/home/MyCases.vue @@ -304,8 +304,15 @@ export default { */ formantPendingTask(data) { var i, + userDataFormat, dataFormat = []; for (i = 0; i < data.length; i += 1) { + userDataFormat = utils.userNameDisplayFormat({ + userName: data[i].user_tooltip.usr_username || "", + firstName: data[i].user_tooltip.usr_firstname || "", + lastName: data[i].user_tooltip.usr_lastname || "", + format: window.config.FORMATS.format || null + }); dataFormat.push( { TAS_NAME: data[i].tas_title, @@ -313,17 +320,13 @@ export default { DELAYED_TITLE: data[i].tas_status === "OVERDUE" ? this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[data[i].tas_status], DELAYED_MSG: data[i].tas_status === "OVERDUE" ? data[i].delay : "", - AVATAR: window.config.SYS_SERVER + + AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER + window.config.SYS_URI + - `users/users_ViewPhotoGrid?pUID=${data[i].user_id}`, - USERNAME: utils.userNameDisplayFormat({ - userName: data[i].user_tooltip.usr_username, - firstName: data[i].user_tooltip.usr_firstname, - lastName: data[i].user_tooltip.usr_lastname, - format: window.config.FORMATS.format || null - }), + `users/users_ViewPhotoGrid?pUID=${data[i].user_id}` : "", + USERNAME: userDataFormat !== "" ? userDataFormat : this.$i18n.t("ID_UNASSIGNED"), POSITION: data[i].user_tooltip.usr_position, - EMAIL: data[i].user_tooltip.usr_email + EMAIL: data[i].user_tooltip.usr_email, + UNASSIGNED: userDataFormat !== "" ? true : false } ); } diff --git a/resources/assets/js/utils/utils.js b/resources/assets/js/utils/utils.js index 0651f365f..6349ffd81 100644 --- a/resources/assets/js/utils/utils.js +++ b/resources/assets/js/utils/utils.js @@ -5,19 +5,21 @@ export default { * @param {object} params */ userNameDisplayFormat(params) { - let aux; - let defaultValues = { + let aux = "", + defaultValues = { userName: '', firstName: '', lastName: '', format: '(@lastName, @firstName) @userName' }; _.assignIn(defaultValues, params); - aux = defaultValues.format; - aux = aux.replace('@userName',defaultValues.userName); - aux = aux.replace('@firstName',defaultValues.firstName); - aux = aux.replace('@lastName',defaultValues.lastName); - return aux.trim(); + if (defaultValues.userName !== "" || defaultValues.firstName !== "" || defaultValues.lastName !== "") { + aux = defaultValues.format; + aux = aux.replace('@userName',defaultValues.userName); + aux = aux.replace('@firstName',defaultValues.firstName); + aux = aux.replace('@lastName',defaultValues.lastName); + } + return aux; }, /** * Parse an url string and prepare an object of the parameters