diff --git a/resources/assets/js/components/vuetable/TaskCell.vue b/resources/assets/js/components/vuetable/TaskCell.vue index 1dd179c9c..b8fd56ad3 100644 --- a/resources/assets/js/components/vuetable/TaskCell.vue +++ b/resources/assets/js/components/vuetable/TaskCell.vue @@ -1,48 +1,65 @@ - diff --git a/resources/assets/js/home/AdvancedSearch.vue b/resources/assets/js/home/AdvancedSearch.vue index 4f6c076d1..588f25c4d 100644 --- a/resources/assets/js/home/AdvancedSearch.vue +++ b/resources/assets/js/home/AdvancedSearch.vue @@ -159,7 +159,14 @@ export default { }, pmDateFormat: window.config.FORMATS.dateFormat, clickCount: 0, - singleClickTimer: null + singleClickTimer: null, + statusTitle: { + "ON_TIME": this.$i18n.t("ID_IN_PROGRESS"), + "OVERDUE": this.$i18n.t("ID_TASK_OVERDUE"), + "DRAFT": this.$i18n.t("ID_IN_DRAFT"), + "PAUSED": this.$i18n.t("ID_PAUSED"), + "UNASSIGNED": this.$i18n.t("ID_UNASSIGNED") + } }; }, watch: { @@ -252,9 +259,14 @@ export default { dataFormat.push({ TITLE: data[i].tas_title, CODE_COLOR: 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 : "" + }); } return dataFormat; + }, formatUser(data) { var i, @@ -267,8 +279,8 @@ export default { lastName: data[i].usr_username, format: window.config.FORMATS.format || null }), - EMAIL: data[i].usr_email, - POSITION: data[i].usr_position, + EMAIL: data[i].user_tooltip.usr_email, + POSITION: data[i].user_tooltip.usr_position, AVATAR: window.config.SYS_SERVER + window.config.SYS_URI + `users/users_ViewPhotoGrid?pUID=${data[i].user_id}` diff --git a/resources/assets/js/home/Draft.vue b/resources/assets/js/home/Draft.vue index 816da1484..99bd65bdd 100644 --- a/resources/assets/js/home/Draft.vue +++ b/resources/assets/js/home/Draft.vue @@ -104,7 +104,14 @@ export default { }, pmDateFormat: "Y-m-d H:i:s", clickCount: 0, - singleClickTimer: null + singleClickTimer: null, + statusTitle: { + "ON_TIME": this.$i18n.t("ID_IN_PROGRESS"), + "OVERDUE": this.$i18n.t("ID_TASK_OVERDUE"), + "DRAFT": this.$i18n.t("ID_IN_DRAFT"), + "PAUSED": this.$i18n.t("ID_PAUSED"), + "UNASSIGNED": this.$i18n.t("ID_UNASSIGNED") + } }; }, mounted() { @@ -202,6 +209,9 @@ export default { TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, + DELAYED_TITLE: v.TAS_STATUS === "OVERDUE" ? + this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[v.TAS_STATUS], + DELAYED_MSG: v.TAS_STATUS === "OVERDUE" ? v.DELAY : "" }], PRIORITY: v.DEL_PRIORITY_LABEL, PRO_UID: v.PRO_UID, diff --git a/resources/assets/js/home/Paused.vue b/resources/assets/js/home/Paused.vue index 25a35d90e..ff5e01d0f 100644 --- a/resources/assets/js/home/Paused.vue +++ b/resources/assets/js/home/Paused.vue @@ -127,7 +127,14 @@ export default { }, pmDateFormat: "Y-m-d H:i:s", clickCount: 0, - singleClickTimer: null + singleClickTimer: null, + statusTitle: { + "ON_TIME": this.$i18n.t("ID_IN_PROGRESS"), + "OVERDUE": this.$i18n.t("ID_TASK_OVERDUE"), + "DRAFT": this.$i18n.t("ID_IN_DRAFT"), + "PAUSED": this.$i18n.t("ID_PAUSED"), + "UNASSIGNED": this.$i18n.t("ID_UNASSIGNED") + } }; }, mounted() {}, @@ -208,6 +215,9 @@ export default { TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, + DELAYED_TITLE: v.TAS_STATUS === "OVERDUE" ? + this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[v.TAS_STATUS], + DELAYED_MSG: v.TAS_STATUS === "OVERDUE" ? v.DELAY : "" }], USERNAME_DISPLAY_FORMAT: utils.userNameDisplayFormat({ userName: v.USR_LASTNAME, diff --git a/resources/assets/js/home/Todo.vue b/resources/assets/js/home/Todo.vue index edff12d94..3f41dd609 100644 --- a/resources/assets/js/home/Todo.vue +++ b/resources/assets/js/home/Todo.vue @@ -120,7 +120,14 @@ export default { }, pmDateFormat: "Y-m-d H:i:s", clickCount: 0, - singleClickTimer: null + singleClickTimer: null, + statusTitle: { + "ON_TIME": this.$i18n.t("ID_IN_PROGRESS"), + "OVERDUE": this.$i18n.t("ID_TASK_OVERDUE"), + "DRAFT": this.$i18n.t("ID_IN_DRAFT"), + "PAUSED": this.$i18n.t("ID_PAUSED"), + "UNASSIGNED": this.$i18n.t("ID_UNASSIGNED") + } }; }, mounted() {}, @@ -216,6 +223,9 @@ export default { TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, + DELAYED_TITLE: v.TAS_STATUS === "OVERDUE" ? + this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[v.TAS_STATUS], + DELAYED_MSG: v.TAS_STATUS === "OVERDUE" ? v.DELAY : "" }], USERNAME_DISPLAY_FORMAT: utils.userNameDisplayFormat({ userName: v.USR_LASTNAME, diff --git a/resources/assets/js/home/Unassigned.vue b/resources/assets/js/home/Unassigned.vue index 32ce6029e..3ceaed225 100644 --- a/resources/assets/js/home/Unassigned.vue +++ b/resources/assets/js/home/Unassigned.vue @@ -120,7 +120,14 @@ export default { }, pmDateFormat: "Y-m-d H:i:s", clickCount: 0, - singleClickTimer: null + singleClickTimer: null, + statusTitle: { + "ON_TIME": this.$i18n.t("ID_IN_PROGRESS"), + "OVERDUE": this.$i18n.t("ID_TASK_OVERDUE"), + "DRAFT": this.$i18n.t("ID_IN_DRAFT"), + "PAUSED": this.$i18n.t("ID_PAUSED"), + "UNASSIGNED": this.$i18n.t("ID_UNASSIGNED") + } }; }, mounted() {}, @@ -201,6 +208,9 @@ export default { TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, + DELAYED_TITLE: v.TAS_STATUS === "OVERDUE" ? + this.$i18n.t("ID_DELAYED") + ":" : this.statusTitle[v.TAS_STATUS], + DELAYED_MSG: v.TAS_STATUS === "OVERDUE" ? v.DELAY : "" }], DUE_DATE: v.DEL_TASK_DUE_DATE_LABEL, DELEGATION_DATE: v.DEL_DELEGATE_DATE_LABEL,