From 0f800f0d9f13079b8da310d2cb8e3a11305617df Mon Sep 17 00:00:00 2001
From: Rodrigo Quelca <rodrigo@processmaker.com>
Date: Tue, 9 Feb 2021 17:24:13 +0000
Subject: [PATCH] PMCORE-2783: When the case is COMPLETED the status legend
 does not make sense

PMCORE-2783

fix commented code
---
 resources/assets/js/home/MyCases.vue          | 26 +++++++++++++++----
 .../translations/english/processmaker.en.po   |  4 +--
 workflow/engine/data/mysql/insert.sql         |  2 +-
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/home/MyCases.vue b/resources/assets/js/home/MyCases.vue
index 2c062944b..87330ca22 100644
--- a/resources/assets/js/home/MyCases.vue
+++ b/resources/assets/js/home/MyCases.vue
@@ -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
          *
diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index dacf41ec8..a8e352c35 100755
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -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
diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql
index 716e0e100..4116c68ee 100755
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -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') ,