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

PMCORE-3509:In version 3.7.0 the inbox the send by field displays the undefined username after a script task

Browse Source 
Corrections

miss data
This commit is contained in:
fabio
2021-11-22 12:46:07 -04:00
committed by Fabio Guachalla
parent 90948c3473
commit a756893047
5 changed files with 170 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
resources/assets/js/admin/Modals/ModalPreview.vue
View File

@@ -29,7 +29,12 @@
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
<div slot="send_by" slot-scope="props"> <div slot="send_by" slot-scope="props">
<CurrentUserCell :data="props.row.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
</div> </div>
<div slot="current_user" slot-scope="props"> <div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }} {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -106,6 +111,7 @@ export default {
PAUSED: this.$i18n.t("ID_PAUSED"), PAUSED: this.$i18n.t("ID_PAUSED"),
UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"), UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"),
}, },
showUserTooltip: true
} }
}, },
mounted() { mounted() {
@@ -248,24 +254,33 @@ export default {
* @return {array} dataFormat * @return {array} dataFormat
*/ */
formatUser(data) { formatUser(data) {
var dataFormat = [], var dataFormat = [],
userDataFormat; userDataFormat;
userDataFormat = utils.userNameDisplayFormat({ if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
userName: data.user_tooltip.usr_firstname, this.showUserTooltip = true;
firstName: data.user_tooltip.usr_lastname, userDataFormat = utils.userNameDisplayFormat({
lastName: data.user_tooltip.usr_username, userName: data.user_tooltip.usr_firstname,
format: window.config.FORMATS.format || null firstName: data.user_tooltip.usr_lastname,
}); lastName: data.user_tooltip.usr_username,
dataFormat.push({ format: window.config.FORMATS.format || null
USERNAME_DISPLAY_FORMAT: userDataFormat, });
EMAIL: data.user_tooltip.usr_email, dataFormat.push({
POSITION: data.user_tooltip.usr_position, USERNAME_DISPLAY_FORMAT: userDataFormat,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX + EMAIL: data.user_tooltip.usr_email,
window.config.SYS_URI + POSITION: data.user_tooltip.usr_position,
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "", AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
UNASSIGNED: userDataFormat !== "" ? true : false window.config.SYS_URI +
}); `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
return dataFormat; 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;
} }
} }
} }

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

@@ -63,7 +63,12 @@
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
<div slot="send_by" slot-scope="props"> <div slot="send_by" slot-scope="props">
<CurrentUserCell :data="props.row.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
</div> </div>
<div slot="current_user" slot-scope="props"> <div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }} {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -144,7 +149,12 @@
{{ props["item"]["PRIORITY"] }} {{ props["item"]["PRIORITY"] }}
</span> </span>
<span v-else-if="column === 'send_by'" class="v-card-text-light"> <span v-else-if="column === 'send_by'" class="v-card-text-light">
<CurrentUserCell :data="props.item.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span> </span>
<span v-else class="v-card-text-light"> <span v-else class="v-card-text-light">
{{ props["item"][column] }} {{ props["item"][column] }}
@@ -198,7 +208,12 @@
{{ props["item"]["PRIORITY"] }} {{ props["item"]["PRIORITY"] }}
</span> </span>
<span v-else-if="column === 'send_by'" class="v-card-text-light"> <span v-else-if="column === 'send_by'" class="v-card-text-light">
<CurrentUserCell :data="props.item.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span> </span>
<span v-else class="v-card-text-light"> <span v-else class="v-card-text-light">
{{ props["item"][column] }} {{ props["item"][column] }}
@@ -576,7 +591,8 @@ export default {
makeTagText: function (params, data) { makeTagText: function (params, data) {
return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`; return `${this.tagPrefix} ${data[0].options && data[0].options.label || ''}`;
} }
} },
showUserTooltip: true
} }
}; };
}, },
@@ -884,24 +900,33 @@ export default {
formatUser(data) { formatUser(data) {
var dataFormat = [], var dataFormat = [],
userDataFormat; userDataFormat;
userDataFormat = utils.userNameDisplayFormat({ if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
userName: data.user_tooltip.usr_firstname, this.showUserTooltip = true;
firstName: data.user_tooltip.usr_lastname, userDataFormat = utils.userNameDisplayFormat({
lastName: data.user_tooltip.usr_username, userName: data.user_tooltip.usr_firstname,
format: window.config.FORMATS.format || null, firstName: data.user_tooltip.usr_lastname,
}); lastName: data.user_tooltip.usr_username,
dataFormat.push({ format: window.config.FORMATS.format || null,
USERNAME_DISPLAY_FORMAT: userDataFormat, });
EMAIL: data.user_tooltip.usr_email, dataFormat.push({
POSITION: data.user_tooltip.usr_position, USERNAME_DISPLAY_FORMAT: userDataFormat,
AVATAR: EMAIL: data.user_tooltip.usr_email,
userDataFormat !== "" POSITION: data.user_tooltip.usr_position,
? window.config.SYS_SERVER_AJAX + AVATAR:
window.config.SYS_URI + userDataFormat !== ""
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` ? window.config.SYS_SERVER_AJAX +
: "", window.config.SYS_URI +
UNASSIGNED: userDataFormat !== "" ? true : false, `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; return dataFormat;
}, },
/** /**

33
resources/assets/js/home/Inbox/Inbox.vue
View File

@@ -54,7 +54,12 @@
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
<div slot="send_by" slot-scope="props"> <div slot="send_by" slot-scope="props">
<CurrentUserCell :data="props.row.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
</div> </div>
<div slot="current_user" slot-scope="props"> <div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }} {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -149,7 +154,12 @@
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
> >
<span class="v-card-text-light"> <span class="v-card-text-light">
<CurrentUserCell :data="props.item.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span> </span>
</div> </div>
</VueCardView> </VueCardView>
@@ -230,7 +240,12 @@
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
> >
<span class="v-card-text-light"> <span class="v-card-text-light">
<CurrentUserCell :data="props.item.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span> </span>
</div> </div>
</VueListView> </VueListView>
@@ -383,7 +398,8 @@ export default {
buttons: {} buttons: {}
}, },
showEllipsis: false, showEllipsis: false,
dataSubtitle: null dataSubtitle: null,
showUserTooltip: true
}; };
}, },
created() { created() {
@@ -595,6 +611,8 @@ export default {
formatUser(data) { formatUser(data) {
var dataFormat = [], var dataFormat = [],
userDataFormat; userDataFormat;
if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
this.showUserTooltip = true;
userDataFormat = utils.userNameDisplayFormat({ userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname, userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname, firstName: data.user_tooltip.usr_lastname,
@@ -610,6 +628,13 @@ export default {
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "", `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false 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; return dataFormat;
}, },
/** /**

36
resources/assets/js/home/Paused/Paused.vue
View File

@@ -48,12 +48,16 @@
<div slot="process_name" slot-scope="props"> <div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }} {{ props.row.PROCESS_NAME }}
</div> </div>
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
<div slot="send_by" slot-scope="props"> <div slot="send_by" slot-scope="props">
<CurrentUserCell :data="props.row.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
</div> </div>
<div slot="current_user" slot-scope="props"> <div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }} {{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -148,7 +152,12 @@
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
> >
<span class="v-card-text-light"> <span class="v-card-text-light">
<CurrentUserCell :data="props.item.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span> </span>
</div> </div>
</VueCardView> </VueCardView>
@@ -229,7 +238,12 @@
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
> >
<span class="v-card-text-light"> <span class="v-card-text-light">
<CurrentUserCell :data="props.item.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span> </span>
</div> </div>
</VueListView> </VueListView>
@@ -383,7 +397,8 @@ export default {
buttons: {} buttons: {}
}, },
showEllipsis: false, showEllipsis: false,
dataSubtitle: null dataSubtitle: null,
showUserTooltip: true
}; };
}, },
created() { created() {
@@ -590,6 +605,8 @@ export default {
formatUser(data) { formatUser(data) {
var dataFormat = [], var dataFormat = [],
userDataFormat; userDataFormat;
if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
this.showUserTooltip = true;
userDataFormat = utils.userNameDisplayFormat({ userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname, userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname, firstName: data.user_tooltip.usr_lastname,
@@ -604,7 +621,14 @@ export default {
window.config.SYS_URI + window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "", `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false 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; return dataFormat;
}, },
/** /**

36
resources/assets/js/home/Unassigned/Unassigned.vue
View File

@@ -46,12 +46,16 @@
<div slot="process_name" slot-scope="props"> <div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }} {{ props.row.PROCESS_NAME }}
</div> </div>
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
<div slot="send_by" slot-scope="props"> <div slot="send_by" slot-scope="props">
<CurrentUserCell :data="props.row.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
</div> </div>
<div slot="due_date" slot-scope="props"> <div slot="due_date" slot-scope="props">
{{ props.row.DUE_DATE }} {{ props.row.DUE_DATE }}
@@ -143,7 +147,12 @@
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
> >
<span class="v-card-text-light"> <span class="v-card-text-light">
<CurrentUserCell :data="props.item.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span> </span>
</div> </div>
</VueCardView> </VueCardView>
@@ -224,7 +233,12 @@
>{{ props["headings"][props.column] }} :</span >{{ props["headings"][props.column] }} :</span
> >
<span class="v-card-text-light"> <span class="v-card-text-light">
<CurrentUserCell :data="props.item.USER_DATA" /> <template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span> </span>
</div> </div>
</VueListView> </VueListView>
@@ -375,7 +389,8 @@ export default {
buttons: {} buttons: {}
}, },
showEllipsis: false, showEllipsis: false,
dataSubtitle: null dataSubtitle: null,
showUserTooltip: true
}; };
}, },
mounted() { mounted() {
@@ -547,6 +562,8 @@ export default {
formatUser(data) { formatUser(data) {
var dataFormat = [], var dataFormat = [],
userDataFormat; userDataFormat;
if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
this.showUserTooltip = true;
userDataFormat = utils.userNameDisplayFormat({ userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname, userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname, firstName: data.user_tooltip.usr_lastname,
@@ -561,7 +578,14 @@ export default {
window.config.SYS_URI + window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "", `users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false 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; return dataFormat;
}, },
/** /**