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

conflicts: merge develop

Browse Source
This commit is contained in:
Paula Quispe
2021-12-02 11:58:33 -04:00
parent 2813e32d03 5c4787ac20
commit 2a850ede19
45 changed files with 1433 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
resources/assets/js/home/CustomCaseList/CustomCaseList.vue
View File

@@ -65,12 +65,7 @@
<TaskCell :data="props.row.TASK" />
</div>
<div slot="send_by" slot-scope="props">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
<CurrentUserCell :data="props.row.USER_DATA" />
</div>
<div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -154,12 +149,7 @@
{{ props["item"]["PRIORITY"] }}
</span>
<span v-else-if="column === 'send_by'" class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
<CurrentUserCell :data="props.item.USER_DATA" />
</span>
<span v-else class="v-card-text-light">
{{ props["item"][column] }}
@@ -216,12 +206,7 @@
{{ props["item"]["PRIORITY"] }}
</span>
<span v-else-if="column === 'send_by'" class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
<CurrentUserCell :data="props.item.USER_DATA" />
</span>
<span v-else class="v-card-text-light">
{{ props["item"][column] }}
@@ -933,32 +918,31 @@ 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,
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 +
switch (data.key_name) {
case 'user_tooltip':
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");
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false,
SHOW_TOOLTIP: true
});
break;
case 'dummy_task':
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
break;
default:
dataFormat = "";
break;
}
return dataFormat;
},