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

Merged in bugfix/PMCORE-2783 (pull request #7810)

Browse Source 
PMCORE-2783

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Rodrigo Quelca
2021-02-09 18:54:12 +00:00
committed by Julio Cesar Laura Avendaño
parent cc0b9e257e 0f800f0d9f
commit b789470fb9
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -320,7 +320,7 @@ export default {
STATUS: v.APP_STATUS,
START_DATE: v.APP_CREATE_DATE_LABEL || "",
FINISH_DATE: v.APP_FINISH_DATE_LABEL || "",
PENDING_TASKS: that.formantPendingTask(v.PENDING),
PENDING_TASKS: that.formantPendingTask(v.PENDING, v.APP_STATUS),
DURATION: v.DURATION,
DEL_INDEX: v.DEL_INDEX,
APP_UID: v.APP_UID,
@@ -334,7 +334,7 @@ export default {
/**
* Format data for pending task.
*/
formantPendingTask(data) {
formantPendingTask(data, status) {
var i,
userDataFormat,
dataFormat = [];
@@ -349,9 +349,8 @@ export default {
{
TAS_NAME: data[i].tas_title,
STATUS: data[i].tas_color,
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 : "",
DELAYED_TITLE: this.delayedTitle(data[i], status),
DELAYED_MSG: data[i].tas_status === "OVERDUE" && status !== "COMPLETED" ? data[i].delay : "",
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data[i].user_id}` : "",
@@ -364,6 +363,23 @@ export default {
}
return dataFormat;
},
/**
* Prepare the delayed title
* @param {object} data
* @param {string} status
* @returns {string}
*/
delayedTitle(data, status) {
let title = "";
if (status === "COMPLETED") {
title = this.$i18n.t("ID_COMPLETED") + ": ";
title += data.tas_status === "ON_TIME" ? this.$i18n.t("ID_ON_TIME"): this.$i18n.t("ID_TASK_OVERDUE");
} else {
title = data.tas_status === "OVERDUE" ?
this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[data.tas_status];
}
return title;
},
/**
* Convert string to date format
*

4
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -20684,8 +20684,8 @@ msgstr "On"
# TRANSLATION
# LABEL/ID_ON_TIME
#: LABEL/ID_ON_TIME
msgid "On Time"
msgstr "On Time"
msgid "On-time"
msgstr "On-time"
# TRANSLATION
# LABEL/ID_OPEN

2
workflow/engine/data/mysql/insert.sql
View File

@@ -60339,7 +60339,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_OK','en','Ok','2015-09-17') ,
( 'LABEL','ID_OLD_VERSION','en','old version','2014-01-15') ,
( 'LABEL','ID_ON','en','On','2014-01-15') ,
( 'LABEL','ID_ON_TIME','en','On Time','2014-01-15') ,
( 'LABEL','ID_ON_TIME','en','On-time','2014-01-15') ,
( 'LABEL','ID_ONCE_PER_DAY','en','Once per day','2015-03-10') ,
( 'LABEL','ID_OPEN','en','Open','2014-01-15') ,
( 'LABEL','ID_OPENSSL_OPTIONAL','en','OpenSSL is optional.','2014-01-15') ,