fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-2781

Browse Source
This commit is contained in:
fabio
2021-01-28 18:38:09 -04:00
parent 2aa44889cd
commit 558e6e4ddb
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components/vuetable/GroupedCell.vue
View File

@@ -18,6 +18,7 @@
variant="info" variant="info"
:src="item.AVATAR" :src="item.AVATAR"
size="2em" size="2em"
v-show="item.UNASSIGNED"
></b-avatar> ></b-avatar>
</div> </div>
<b-popover <b-popover
@@ -32,6 +33,7 @@
variant="info" variant="info"
:src="item.AVATAR" :src="item.AVATAR"
size="4em" size="4em"
v-show="item.UNASSIGNED"
></b-avatar> ></b-avatar>
</b-col> </b-col>
<b-col md="9"> <b-col md="9">

21
resources/assets/js/home/MyCases.vue
View File

@@ -304,8 +304,15 @@ export default {
*/ */
formantPendingTask(data) { formantPendingTask(data) {
var i, var i,
userDataFormat,
dataFormat = []; dataFormat = [];
for (i = 0; i < data.length; i += 1) { 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( dataFormat.push(
{ {
TAS_NAME: data[i].tas_title, TAS_NAME: data[i].tas_title,
@@ -313,17 +320,13 @@ export default {
DELAYED_TITLE: data[i].tas_status === "OVERDUE" ? DELAYED_TITLE: data[i].tas_status === "OVERDUE" ?
this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[data[i].tas_status], this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[data[i].tas_status],
DELAYED_MSG: data[i].tas_status === "OVERDUE" ? data[i].delay : "", 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 + window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data[i].user_id}`, `users/users_ViewPhotoGrid?pUID=${data[i].user_id}` : "",
USERNAME: utils.userNameDisplayFormat({ USERNAME: userDataFormat !== "" ? userDataFormat : this.$i18n.t("ID_UNASSIGNED"),
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
}),
POSITION: data[i].user_tooltip.usr_position, 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
} }
); );
} }

16
resources/assets/js/utils/utils.js
View File

@@ -5,19 +5,21 @@ export default {
* @param {object} params * @param {object} params
*/ */
userNameDisplayFormat(params) { userNameDisplayFormat(params) {
let aux; let aux = "",
let defaultValues = { defaultValues = {
userName: '', userName: '',
firstName: '', firstName: '',
lastName: '', lastName: '',
format: '(@lastName, @firstName) @userName' format: '(@lastName, @firstName) @userName'
}; };
_.assignIn(defaultValues, params); _.assignIn(defaultValues, params);
aux = defaultValues.format; if (defaultValues.userName !== "" || defaultValues.firstName !== "" || defaultValues.lastName !== "") {
aux = aux.replace('@userName',defaultValues.userName); aux = defaultValues.format;
aux = aux.replace('@firstName',defaultValues.firstName); aux = aux.replace('@userName',defaultValues.userName);
aux = aux.replace('@lastName',defaultValues.lastName); aux = aux.replace('@firstName',defaultValues.firstName);
return aux.trim(); aux = aux.replace('@lastName',defaultValues.lastName);
}
return aux;
}, },
/** /**
* Parse an url string and prepare an object of the parameters * Parse an url string and prepare an object of the parameters