Merged release/3.7.0 into feature/PMCORE-3312

resources/assets/js/admin/settings/customCaseList/Tables.vue

@@ -250,8 +250,8 @@ export default {
          * @param {Array} data
          */
         filterDataToExport(data) {
-            var dataExport = [];
-            dataExport.push({
+            var dataExport;
+            dataExport = {
                 type: data['type'],
                 name: data['name'],
                 description: data['description'],
@@ -264,7 +264,7 @@ export default {
                 iconColorScreen: data['iconColorScreen'],
                 createDate: data['createDate'],
                 updateDate: data['updateDate']
-            });
+            };
             return dataExport;
         },
         /**

resources/assets/js/components/vuetable/GroupedCell.vue

@@ -54,7 +54,7 @@ export default {
     data() {
         return {
             //Color map for ["In Progress", "overdue", "inDraft", "paused", "unnasigned"]
-            colorMap: ["green", "red", "orange", "aqua", "silver"],
+            colorMap: ["green", "red", "orange", "blue", "silver"],
             id: "avatar-" + _.random(1000000),
             statusId: "status-" + _.random(1000000)
         };

resources/assets/js/components/vuetable/TaskCell.vue

@@ -1,13 +1,21 @@
 <template>
     <div v-if="data.length" class="task-cell">
-        <div v-for="(item, index) in data" class="d-flex mb-3">
+        <div 
+            v-for="(item, index) in data"
+            v-bind:key = index
+            class="d-flex mb-3">
             <div
                 v-bind:style="{ color: activeColor(item.CODE_COLOR) }"
                 :id="statusId + index"
             >
                 <i class="fas fa-square"></i>
             </div>
-            <b-popover :target="statusId + index" triggers="hover" placement="top">
+            <b-popover
+                v-if="item.DELAYED_TITLE && item.DELAYED_MSG"
+                :target="statusId + index"
+                triggers="hover"
+                placement="top"
+            >
                 <b> {{ item.DELAYED_TITLE }} </b> {{ item.DELAYED_MSG }}
             </b-popover>
             <div class="col ellipsis" v-b-popover.hover.top="item.TITLE">

resources/assets/js/home/Home.vue

@@ -59,6 +59,7 @@ import CustomCaseList from "./CustomCaseList/CustomCaseList.vue"
 
 import api from "./../api/index";
 import eventBus from './EventBus/eventBus'
+import _ from "lodash";
 export default {
     name: "Home",
     components: {
@@ -158,7 +159,7 @@ export default {
 
             eventer(messageEvent, function(e) {
                 if ( e.data === "redirect=todo" || e.message === "redirect=todo"){
-                    that.page = "inbox";
+                    that.OnClickSidebarItem(that.getItemMenuByValue("page","inbox"));
                 }
                 if ( e.data === "update=debugger" || e.message === "update=debugger"){
                     if(that.$refs["component"].updateView){
@@ -563,6 +564,23 @@ export default {
                 console.error(e);
             });
             }
+        },
+        /**
+         * Search in menu Items by value, return the item
+         * @param {string} key - Key for search in object
+         * @param {string} value - value for search in key
+         */
+        getItemMenuByValue(key, value) {
+            let obj = _.find(this.menu, function(o) {
+                if(o.component){
+                  return o.props.item[key] == value;
+                }
+                return o[key] == value; 
+            });
+            if(obj.component){
+              return obj.props;
+            }
+            return obj;
         }
     }
 };