diff --git a/resources/assets/js/components/vuetable/GroupedCell.vue b/resources/assets/js/components/vuetable/GroupedCell.vue
index 06519dba9..2291ea6db 100644
--- a/resources/assets/js/components/vuetable/GroupedCell.vue
+++ b/resources/assets/js/components/vuetable/GroupedCell.vue
@@ -3,10 +3,13 @@
+
+ {{ item.DELAYED_TITLE }} {{ item.DELAYED_MSG }}
+
{{ item.TAS_NAME }}
@@ -50,7 +53,8 @@ export default {
return {
//Color map for ["In Progress", "overdue", "inDraft", "paused", "unnasigned"]
colorMap: ["green", "red", "orange", "aqua", "silver"],
- id: "avatar-" + _.random(1000000)
+ id: "avatar-" + _.random(1000000),
+ statusId: "status-" + _.random(1000000)
};
},
methods: {
diff --git a/resources/assets/js/home/MyCases.vue b/resources/assets/js/home/MyCases.vue
index e01c746b8..823f8bd2e 100644
--- a/resources/assets/js/home/MyCases.vue
+++ b/resources/assets/js/home/MyCases.vue
@@ -145,7 +145,14 @@ export default {
translations: null,
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")
+ }
};
},
mounted() {
@@ -302,7 +309,9 @@ export default {
{
TAS_NAME: data[i].tas_title,
STATUS: data[i].tas_color,
- DELAYED_MSG: data[i].delay,
+ 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 : "",
AVATAR: window.config.SYS_SERVER +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data[i].user_id}`,
diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index 63939991c..8f9fb761b 100755
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -5915,6 +5915,12 @@ msgstr "Definition"
msgid "Delay Field"
msgstr "Delay Field"
+# TRANSLATION
+# LABEL/ID_DELAYED
+#: LABEL/ID_DELAYED
+msgid "Delayed"
+msgstr "Delayed"
+
# TRANSLATION
# LABEL/ID_DELEGATE_DATE_FROM
#: LABEL/ID_DELEGATE_DATE_FROM
@@ -10721,6 +10727,12 @@ msgstr "Invalid value for '{0}'. It must be a string."
msgid "Invalid value for \"{0}\". This value must be an array."
msgstr "Invalid value for \"{0}\". This value must be an array."
+# TRANSLATION
+# LABEL/ID_IN_DRAFT
+#: LABEL/ID_IN_DRAFT
+msgid "In Draft"
+msgstr "In Draft"
+
# TRANSLATION
# LABEL/ID_IN_PROGRESS
#: LABEL/ID_IN_PROGRESS
diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql
index 46f11484c..38f288b44 100755
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -57811,6 +57811,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_DEFAULT_SKIN','en','Default Skin','2014-01-15') ,
( 'LABEL','ID_DEFINITION','en','Definition','2014-01-15') ,
( 'LABEL','ID_DELAY_FIELD','en','Delay Field','2014-01-15') ,
+( 'LABEL','ID_DELAYED','en','Delayed','2021-01-20') ,
( 'LABEL','ID_DELEGATE_DATE_FROM','en','Date from','2017-10-18') ,
( 'LABEL','ID_DELEGATE_DATE_TO','en','to','2014-01-15') ,
( 'LABEL','ID_DELEGATE_USER','en','Delegated User','2014-01-15') ,
@@ -58643,6 +58644,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_INVALID_VALUE_ONLY_ACCEPTS_VALUES','en','Invalid value for "{0}". It only accepts values: "{1}".','2014-10-21') ,
( 'LABEL','ID_INVALID_VALUE_STRING','en','Invalid value for ''{0}''. It must be a string.','2014-10-21') ,
( 'LABEL','ID_INVALID_VALUE_THIS_MUST_BE_ARRAY','en','Invalid value for "{0}". This value must be an array.','2014-10-21') ,
+( 'LABEL','ID_IN_DRAFT','en','In Draft','2021-01-20') ,
( 'LABEL','ID_IN_PROGRESS','en','In Progress','2014-01-15') ,
( 'LABEL','ID_IP','en','IP Client','2014-10-08') ,
( 'LABEL','ID_ISNT_LICENSE','en','This isn''t the correct license.','2014-01-15') ,