diff --git a/package-lock.json b/package-lock.json
index 70a3e8db0..1fd5f775e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -257,9 +257,9 @@
       }
     },
     "apexcharts": {
-      "version": "3.28.1",
-      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.28.1.tgz",
-      "integrity": "sha512-5M1KitI/XmY2Sx6ih9vQOXyQUTmotDG/cML2N6bkBlVseF10RPSzM7dkrf7Y68apSZF6e7J581gXXu1+qkLhCA==",
+      "version": "3.29.0",
+      "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.29.0.tgz",
+      "integrity": "sha512-PhI17VayidYAbLb5/g+7WOeirgFrVopzt0qGwLq8V+cd6NXx4CeHYq3S0pDZiUGO7UFQ4YIrT8+ie9/Fnler+w==",
       "requires": {
         "svg.draggable.js": "^2.2.2",
         "svg.easing.js": "^2.0.0",
diff --git a/package.json b/package.json
index 982d59e17..7637f5383 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.35",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/vue-fontawesome": "^2.0.2",
-    "apexcharts": "^3.27.3",
+    "apexcharts": "^3.28.2",
     "axios": "^0.15.3",
     "bootstrap": "^4.5.3",
     "bootstrap-colorpicker": "^3.0.3",
diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
index bbd17f288..77c6bed58 100644
--- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
@@ -1,105 +1,107 @@
 <template>
-  <div id="v-pm-charts" ref="v-pm-charts" class="v-pm-charts vp-inline-block">
-    <div class="p-1 v-flex">
-      <h6 class="v-search-title">{{ $t("ID_DRILL_DOWN_RISK_MATRIX") }}</h6>
-      <div>
-        <BreadCrumb
-          :options="dataBreadcrumbs()"
-          :settings="settingsBreadcrumbs"
-        />
-        <div class="vp-width-p30 vp-inline-block">
-          <b-form-datepicker
-            id="date-from"
-            :date-format-options="{
-              year: '2-digit',
-              month: '2-digit',
-              day: '2-digit',
-            }"
-            size="sm"
-            :placeholder="$t('ID_DELEGATE_DATE_FROM')"
-            v-model="dateFrom"
-            @input="changeOption"
-          ></b-form-datepicker>
+    <div id="v-pm-charts" ref="v-pm-charts" class="v-pm-charts vp-inline-block">
+        <div class="p-1 v-flex">
+            <h6 class="v-search-title">
+                {{ $t("ID_DRILL_DOWN_RISK_MATRIX") }}
+            </h6>
+            <div>
+                <BreadCrumb
+                    :options="dataBreadcrumbs()"
+                    :settings="settingsBreadcrumbs"
+                />
+                <div class="vp-width-p30 vp-inline-block">
+                    <b-form-datepicker
+                        id="date-from"
+                        :date-format-options="{
+                            year: '2-digit',
+                            month: '2-digit',
+                            day: '2-digit',
+                        }"
+                        size="sm"
+                        :placeholder="$t('ID_DELEGATE_DATE_FROM')"
+                        v-model="dateFrom"
+                        @input="changeOption"
+                    ></b-form-datepicker>
+                </div>
+                <div class="vp-width-p30 vp-inline-block">
+                    <b-form-datepicker
+                        id="date-to"
+                        size="sm"
+                        :date-format-options="{
+                            year: '2-digit',
+                            month: '2-digit',
+                            day: '2-digit',
+                        }"
+                        :placeholder="$t('ID_DELEGATE_DATE_TO')"
+                        v-model="dateTo"
+                        @input="changeOption"
+                    ></b-form-datepicker>
+                </div>
+                <div class="vp-inline-block">
+                    <label class="form-label">{{ $t("ID_TOP") }}</label>
+                </div>
+                <div class="vp-inline-block">
+                    <multiselect
+                        v-model="size"
+                        :options="sizeOptions"
+                        :searchable="false"
+                        :close-on-select="true"
+                        :show-labels="false"
+                        track-by="id"
+                        label="name"
+                        @input="changeOption"
+                    ></multiselect>
+                </div>
+            </div>
+            <apexchart
+                ref="LevelThreeChart"
+                :width="width"
+                :options="options"
+                :series="series"
+            ></apexchart>
+            <div class="vp-width-p100">
+                <div class="vp-text-align-center" role="group">
+                    <button
+                        type="button"
+                        @click="
+                            riskType = 'ON_TIME';
+                            changeOption();
+                        "
+                        class="btn vp-btn-success btn-sm"
+                    >
+                        On Time
+                    </button>
+                    <button
+                        type="button"
+                        @click="
+                            riskType = 'AT_RISK';
+                            changeOption();
+                        "
+                        class="btn vp-btn-warning btn-sm"
+                    >
+                        At Risk
+                    </button>
+                    <button
+                        type="button"
+                        @click="
+                            riskType = 'OVERDUE';
+                            changeOption();
+                        "
+                        class="btn vp-btn-danger btn-sm"
+                    >
+                        Overdue
+                    </button>
+                </div>
+            </div>
+            <div class="vp-width-p100 vp-text-align-center">
+                <label class="vp-form-label">
+                    {{ $t("ID_TODAY") }} : {{ dateNow }}
+                </label>
+            </div>
+            <ModalUnpauseCase ref="modal-unpause-case"></ModalUnpauseCase>
+            <ModalClaimCase ref="modal-claim-case"></ModalClaimCase>
         </div>
-        <div class="vp-width-p30 vp-inline-block">
-          <b-form-datepicker
-            id="date-to"
-            size="sm"
-            :date-format-options="{
-              year: '2-digit',
-              month: '2-digit',
-              day: '2-digit',
-            }"
-            :placeholder="$t('ID_DELEGATE_DATE_TO')"
-            v-model="dateTo"
-            @input="changeOption"
-          ></b-form-datepicker>
-        </div>
-        <div class="vp-inline-block">
-          <label class="form-label">{{ $t("ID_TOP") }}</label>
-        </div>
-        <div class="vp-inline-block">
-          <multiselect
-            v-model="size"
-            :options="sizeOptions"
-            :searchable="false"
-            :close-on-select="true"
-            :show-labels="false"
-            track-by="id"
-            label="name"
-            @input="changeOption"
-          ></multiselect>
-        </div>
-      </div>
-      <apexchart
-        ref="LevelThreeChart"
-        :width="width"
-        :options="options"
-        :series="series"
-      ></apexchart>
-      <div class="vp-width-p100">
-        <div class="vp-text-align-center" role="group">
-          <button
-            type="button"
-            @click="
-              riskType = 'ON_TIME';
-              changeOption();
-            "
-            class="btn vp-btn-success btn-sm"
-          >
-            On Time
-          </button>
-          <button
-            type="button"
-            @click="
-              riskType = 'AT_RISK';
-              changeOption();
-            "
-            class="btn vp-btn-warning btn-sm"
-          >
-            At Risk
-          </button>
-          <button
-            type="button"
-            @click="
-              riskType = 'OVERDUE';
-              changeOption();
-            "
-            class="btn vp-btn-danger btn-sm"
-          >
-            Overdue
-          </button>
-        </div>
-      </div>
-      <div class="vp-width-p100 vp-text-align-center">
-        <label class="vp-form-label">
-          {{ $t("ID_TODAY") }} : {{ dateNow }}
-        </label>
-      </div>
-      <ModalUnpauseCase ref="modal-unpause-case"></ModalUnpauseCase>
-      <ModalClaimCase ref="modal-claim-case"></ModalClaimCase>
     </div>
-  </div>
 </template>
 
 <script>
@@ -112,137 +114,132 @@ import ModalUnpauseCase from "../modal/ModalUnpauseCase.vue";
 import ModalClaimCase from "../modal/ModalClaimCase.vue";
 
 export default {
-  name: "VueChartLvThree",
-  mixins: [],
-  components: {
-    Multiselect,
-    BreadCrumb,
-    ModalUnpauseCase,
-    ModalClaimCase,
-  },
-  props: ["data", "breadCrumbs"],
-  data() {
-    let that = this;
-    return {
-      currentSelection: null,
-      dateFrom:
-        this.data[3] && this.data[3].data.dateFrom
-          ? this.data[3].data.dateFrom
-          : moment().subtract(30, "d").format("YYYY-MM-DD"),
-      dateTo:
-        this.data[3] && this.data[3].data.dateTo
-          ? this.data[3].data.dateTo
-          : moment().format("YYYY-MM-DD"),
-      dateNow: moment().format("YYYY-MM-DD h:mm:ss a"),
-      size:
-        this.data[3] && this.data[3].data.size
-          ? this.data[3].data.size
-          : { name: this.$t("ID_ALL"), id: "all" },
-      riskType:
-        this.data[3] && this.data[3].data.riskType
-          ? this.data[3].data.riskType
-          : "ON_TIME",
-      settingsBreadcrumbs: [
-        {
-          class: "fas fa-info-circle",
-          tooltip: this.$t("ID_TASK_RISK_LEVEL3_INFO"),
-          onClick() {},
-        },
-      ],
-      sizeOptions: [
-        { name: this.$t("ID_ALL"), id: "all" },
-        { name: "5", id: "5" },
-        { name: "10", id: "10" },
-        { name: "15", id: "15" },
-        { name: "20", id: "20" },
-      ],
-      dataCasesByRisk: [],
-      width: 0,
-      series: [],
-      options: {
-        chart: {
-          height: 350,
-          type: "bubble",
-          zoom: {
-            enabled: true,
-            type: "xy",
-          },
-          id: "LevelThreeChart",
-          events: {
-            markerClick: function (event, chartContext, config) {
-              that.currentSelection = that.dataCasesByRisk[config.seriesIndex];
-              that.onClickCaseMarker(that.currentSelection);
+    name: "VueChartLvThree",
+    mixins: [],
+    components: {
+        Multiselect,
+        BreadCrumb,
+        ModalUnpauseCase,
+        ModalClaimCase,
+    },
+    props: ["data", "breadCrumbs"],
+    data() {
+        let that = this;
+        return {
+            currentSelection: null,
+            dateFrom:
+                this.data[3] && this.data[3].data.dateFrom
+                    ? this.data[3].data.dateFrom
+                    : moment()
+                          .subtract(30, "d")
+                          .format("YYYY-MM-DD"),
+            dateTo:
+                this.data[3] && this.data[3].data.dateTo
+                    ? this.data[3].data.dateTo
+                    : moment().format("YYYY-MM-DD"),
+            dateNow: moment().format("YYYY-MM-DD h:mm:ss a"),
+            size:
+                this.data[3] && this.data[3].data.size
+                    ? this.data[3].data.size
+                    : { name: "20", id: "20" },
+            riskType:
+                this.data[3] && this.data[3].data.riskType
+                    ? this.data[3].data.riskType
+                    : "ON_TIME",
+            settingsBreadcrumbs: [
+                {
+                    class: "fas fa-info-circle",
+                    tooltip: this.$t("ID_TASK_RISK_LEVEL3_INFO"),
+                    onClick() {},
+                },
+            ],
+            sizeOptions: [
+                { name: "10", id: "10" },
+                { name: "20", id: "20" },
+                { name: "30", id: "30" },
+                { name: "40", id: "40" },
+                { name: "50", id: "50" },
+            ],
+            dataCasesByRisk: [],
+            width: 0,
+            series: [],
+            options: {
+                chart: {
+                    height: 350,
+                    type: "bubble",
+                    zoom: {
+                        enabled: true,
+                        type: "xy",
+                    },
+                    id: "LevelThreeChart",
+                    events: {
+                        markerClick: function(event, chartContext, config) {
+                            that.currentSelection =
+                                that.dataCasesByRisk[config.seriesIndex];
+                            that.onClickCaseMarker(that.currentSelection);
+                        },
+                    },
+                },
+                legend: {
+                    show: false,
+                },
+                dataLabels: {
+                    enabled: true,
+                    formatter: function(val, opt) {
+                        if (that.dataCasesByRisk.length > 0) {
+                            return that.dataCasesByRisk[opt["seriesIndex"]][
+                                "number_case"
+                            ];
+                        }
+                        return "";
+                    },
+                    offsetX: 0,
+                },
+                xaxis: {
+                    type: "datetime",
+                },
+                yaxis: {
+                    tickAmount: 7,
+                },
+                tooltip: {
+                    custom: function({
+                        series,
+                        seriesIndex,
+                        dataPointIndex,
+                        w,
+                    }) {
+                        return that.customTooltip(
+                            series,
+                            seriesIndex,
+                            dataPointIndex,
+                            w
+                        );
+                    },
+                },
             },
-          },
-        },
-        legend: {
-          show: false,
-        },
-        dataLabels: {
-          enabled: true,
-          formatter: function (val, opt) {
-            if (that.dataCasesByRisk.length > 0) {
-              return that.dataCasesByRisk[opt["seriesIndex"]]["number_case"];
-            }
-            return "";
-          },
-          offsetX: 0,
-        },
-        xaxis: {
-          type: "datetime",
-        },
-        yaxis: {
-          tickAmount: 7,
-        },
-        tooltip: {
-          custom: function ({ series, seriesIndex, dataPointIndex, w }) {
-            return that.customTooltip(series, seriesIndex, dataPointIndex, w);
-          },
-        },
-      },
-    };
-  },
-  created() {},
-  mounted() {
-    this.getBodyHeight();
-    this.loadOption();
-  },
-  watch: {},
-  computed: {},
-  updated() {},
-  beforeCreate() {},
-  methods: {
-    /**
-     * Return the height for Vue Card View body
-     */
-    getBodyHeight() {
-      this.width = window.innerHeight * 0.95;
+        };
     },
-    /**
-     * Change datepickers or radio button
-     */
-    changeOption() {
-        let dt;
-        if (this.dateFrom && this.dateTo) {
-            dt = {
-                process: this.data[2].id,
-                caseList: this.data[1].id.toLowerCase(),
-                dateFrom: moment(this.dateFrom).format("YYYY-MM-DD"),
-                dateTo: moment(this.dateTo).format("YYYY-MM-DD"),
-                riskStatus: this.riskType,
-            };
-            this.size.id != "all" ? (dt["topCases"] = this.size.id) : null;
-            this.dateNow = moment().format("YYYY-MM-DD h:mm:ss a");
-            this.updateSettings();
-        }
+    created() {},
+    mounted() {
+        this.getBodyHeight();
+        this.loadOption();
     },
-    /**
-     * Load option saved in userConfig
-     */
-    loadOption() {
-        let that = this,
-            dt;
-        if (this.data.length > 2) {
+    watch: {},
+    computed: {},
+    updated() {},
+    beforeCreate() {},
+    methods: {
+        /**
+         * Return the height for Vue Card View body
+         */
+        getBodyHeight() {
+            this.width = window.innerHeight * 0.95;
+        },
+        /**
+         * Change datepickers or radio button
+         */
+        changeOption() {
+            let dt;
             if (this.dateFrom && this.dateTo) {
                 dt = {
                     process: this.data[2].id,
@@ -253,106 +250,146 @@ export default {
                 };
                 this.size.id != "all" ? (dt["topCases"] = this.size.id) : null;
                 this.dateNow = moment().format("YYYY-MM-DD h:mm:ss a");
-                Api.process
-                  .totalCasesByRisk(dt)
-                  .then((response) => {
-                      that.formatDataRange(response.data);
-                  })
-                  .catch((e) => {
-                      console.error(e);
-                  });
+                this.updateSettings();
             }
-        }
-    },
-    /**
-     * Format response fromn API
-     * @param {object} data
-     */
-    formatDataRange(data) {
-      let that = this,
-        serie = [];
-      this.dataCasesByRisk = data;
-      _.each(data, (el) => {
-        //Format the response to risk type Overdue/At risk/ On time
-        switch (that.riskType) {
-          case "OVERDUE":
-            serie.push({
-              name: el["number_case"].toString(),
-              data: [
-                [moment(el["due_date"]).toDate().getTime(), el["days"], 20],
-              ],
+        },
+        /**
+         * Load option saved in userConfig
+         */
+        loadOption() {
+            let that = this,
+                dt;
+            if (this.data.length > 2) {
+                if (this.dateFrom && this.dateTo) {
+                    dt = {
+                        process: this.data[2].id,
+                        caseList: this.data[1].id.toLowerCase(),
+                        dateFrom: moment(this.dateFrom).format("YYYY-MM-DD"),
+                        dateTo: moment(this.dateTo).format("YYYY-MM-DD"),
+                        riskStatus: this.riskType,
+                    };
+                    this.size.id != "all"
+                        ? (dt["topCases"] = this.size.id)
+                        : null;
+                    this.dateNow = moment().format("YYYY-MM-DD h:mm:ss a");
+                    Api.process
+                        .totalCasesByRisk(dt)
+                        .then((response) => {
+                            that.formatDataRange(response.data);
+                        })
+                        .catch((e) => {
+                            console.error(e);
+                        });
+                }
+            }
+        },
+        /**
+         * Format response fromn API
+         * @param {object} data
+         */
+        formatDataRange(data) {
+            let that = this,
+                serie = [];
+            this.dataCasesByRisk = data;
+            _.each(data, (el) => {
+                //Format the response to risk type Overdue/At risk/ On time
+                switch (that.riskType) {
+                    case "OVERDUE":
+                        serie.push({
+                            name: el["number_case"].toString(),
+                            data: [
+                                [
+                                    moment(el["due_date"])
+                                        .toDate()
+                                        .getTime(),
+                                    el["days"],
+                                    20,
+                                ],
+                            ],
+                        });
+                        break;
+                    case "AT_RISK":
+                        serie.push({
+                            name: el["number_case"].toString(),
+                            data: [
+                                [
+                                    moment(el["delegated"])
+                                        .toDate()
+                                        .getTime(),
+                                    -el["days"],
+                                    20,
+                                ],
+                            ],
+                        });
+                        break;
+                    case "ON_TIME":
+                        serie.push({
+                            name: el["number_case"].toString(),
+                            data: [
+                                [
+                                    moment(el["delegated"])
+                                        .toDate()
+                                        .getTime(),
+                                    -el["days"],
+                                    20,
+                                ],
+                            ],
+                        });
+                        break;
+                }
             });
-            break;
-          case "AT_RISK":
-            serie.push({
-              name: el["number_case"].toString(),
-              data: [
-                [moment(el["delegated"]).toDate().getTime(), -el["days"], 20],
-              ],
-            });
-            break;
-          case "ON_TIME":
-            serie.push({
-              name: el["number_case"].toString(),
-              data: [
-                [moment(el["delegated"]).toDate().getTime(), -el["days"], 20],
-              ],
-            });
-            break;
-        }
-      });
 
-      this.updateApexchartAxis();
-      if (this.data[1].id.toLowerCase() !== "draft") {
-        this.series = serie;
-      }
-    },
-    /**
-     * Update axis chart
-     */
-    updateApexchartAxis() {
-      switch (this.riskType) {
-        case "OVERDUE":
-          this.$refs["LevelThreeChart"].updateOptions({
-            yaxis: {
-              min: 0,
-              tickAmount: 7,
-            },
-            title: {
-              text: "Overdue days",
-            },
-          });
-          break;
-        case "AT_RISK":
-          this.$refs["LevelThreeChart"].updateOptions({
-            yaxis: {
-              max: 0,
-              tickAmount: 7,
-            },
-            title: {
-              text: "Days before being Overdue",
-            },
-          });
-          break;
-        case "ON_TIME":
-          this.$refs["LevelThreeChart"].updateOptions({
-            yaxis: {
-              max: 0,
-              tickAmount: 7,
-            },
-            title: {
-              text: "Days before being At-Risk",
-            },
-          });
-          break;
-      }
-    },
-    /**
-     * Create custom tooltip
-     */
-    customTooltip(series, seriesIndex, dataPointIndex, w) {
-      let obj = this.dataCasesByRisk[seriesIndex];
-      return `<div class="apexcharts-theme-light">
+            this.updateApexchartAxis();
+            if (this.data[1].id.toLowerCase() !== "draft") {
+                this.series = serie;
+            }
+        },
+        /**
+         * Update axis chart
+         */
+        updateApexchartAxis() {
+            switch (this.riskType) {
+                case "OVERDUE":
+                    this.$refs["LevelThreeChart"].updateOptions({
+                        yaxis: {
+                            min: 0,
+                            tickAmount: 7,
+                        },
+                        title: {
+                            text: "Overdue days",
+                        },
+                    });
+                    break;
+                case "AT_RISK":
+                    this.$refs["LevelThreeChart"].updateOptions({
+                        yaxis: {
+                            max: 0,
+                            tickAmount: 7,
+                        },
+                        title: {
+                            text: "Days before being Overdue",
+                        },
+                    });
+                    break;
+                case "ON_TIME":
+                    this.$refs["LevelThreeChart"].updateOptions({
+                        yaxis: {
+                            max: 0,
+                            tickAmount: 7,
+                        },
+                        title: {
+                            text: "Days before being At-Risk",
+                        },
+                    });
+                    break;
+            }
+        },
+        /**
+         * Create custom tooltip
+         */
+        customTooltip(series, seriesIndex, dataPointIndex, w) {
+            let obj = this.dataCasesByRisk[seriesIndex];
+            return `<div class="apexcharts-theme-light">
                   <div class="apexcharts-tooltip-title" style="font-family: Helvetica, Arial, sans-serif; font-size: 12px;">
                     ${"Number Case"} : ${obj["number_case"]}
                   </div>
@@ -361,203 +398,207 @@ export default {
                   <div class="apexcharts-tooltip-y-group">
                     <span class="" style="background-color: #28a745;"></span>
                     <span class="apexcharts-tooltip-text-y-label">Delegated</span> : <span class="apexcharts-tooltip-text-y-value">${
-                      obj["delegated"]
+                        obj["delegated"]
                     }</span>
                   </div>
                    <div class="apexcharts-tooltip-y-group">
                     <span class="" style="background-color: #28a745;"></span>
                     <span class="apexcharts-tooltip-text-y-label">At Risk</span> : <span class="apexcharts-tooltip-text-y-value">${
-                      obj["at_risk"]
+                        obj["at_risk"]
                     }</span>
                   </div>
                    <div class="apexcharts-tooltip-y-group">
                     <span class="" style="background-color: #28a745;"></span>
                     <span class="apexcharts-tooltip-text-y-label">Due Date</span> : <span class="apexcharts-tooltip-text-y-value">${
-                      obj["due_date"]
+                        obj["due_date"]
                     }</span>
                   </div>
                 </div>
               </div>
             </div>`;
-    },
-    /**
-     * Open selected cases in the inbox
-     * @param {object} item
-     */
-    openCase(item) {
-      this.$parent.$parent.$emit("onUpdateDataCase", {
-        APP_UID: item.APP_UID,
-        DEL_INDEX: item.DEL_INDEX,
-        PRO_UID: item.PRO_UID,
-        TAS_UID: item.TAS_UID,
-        ACTION: "todo",
-      });
-      this.$parent.$parent.$emit("onUpdatePage", "XCase");
-    },
-    /**
-     * Click in marker chart
-     * @param {object} selection
-     */
-    onClickCaseMarker(selection) {
-      let process = this.data[0].id,
-        caseList = this.data[1].id.toLowerCase();
-      switch (caseList) {
-        case "inbox":
-        case "draft":
-          this.openCase({
-            APP_UID: selection["app_uid"],
-            DEL_INDEX: selection["del_index"],
-            PRO_UID: process,
-            TAS_UID: selection["tas_uid"],
-          });
-          break;
-        case "paused":
-          this.showModalUnpauseCase({
-            APP_UID: selection["app_uid"],
-            DEL_INDEX: selection["del_index"],
-            PRO_UID: process,
-            TAS_UID: selection["tas_uid"],
-          });
-          break;
-        case "unassigned":
-          this.showModalClaimCase({
-            APP_UID: selection["app_uid"],
-            DEL_INDEX: selection["del_index"],
-            PRO_UID: process,
-            TAS_UID: selection["tas_uid"],
-          });
-          break;
-      }
-    },
-    /**
-     * Show modal unpause
-     * @param {object} item
-     */
-    showModalUnpauseCase(item) {
-      this.$refs["modal-unpause-case"].data = item;
-      this.$refs["modal-unpause-case"].show();
-    },
-    /**
-     * Claim case
-     * @param {object} item
-     */
-    showModalClaimCase(item) {
-      let that = this;
-      api.cases.open(_.extend({ ACTION: "unassigned" }, item)).then(() => {
-        api.cases.cases_open(_.extend({ ACTION: "todo" }, item)).then(() => {
-          that.$refs["modal-claim-case"].data = item;
-          that.$refs["modal-claim-case"].show();
-        });
-      });
-    },
-    /**
-     * Return the breadcrumbs
-     */
-    dataBreadcrumbs() {
-      let res = [];
-      if (this.data[1]) {
-        res.push({
-          label: this.data[1]["name"],
-          onClick() {},
-          color: this.data[1]["color"],
-        });
-      }
-      if (this.data[2]) {
-        res.push({
-          label: this.data[2]["name"],
-          onClick() {},
-          color: null,
-        });
-      }
-      return res;
-    },
-    /**
-     * UPdate settings user config
-     */
-    updateSettings() {
-      this.$emit("updateDataLevel", {
-        id: "level3",
-        name: this.data[2]["name"],
-        level: 3,
-        data: {
-          dateFrom: this.dateFrom,
-          dateTo: this.dateTo,
-          period: this.data[3].data.period,
-          size: this.size,
-          riskType: this.riskType,
         },
-      });
+        /**
+         * Open selected cases in the inbox
+         * @param {object} item
+         */
+        openCase(item) {
+            this.$parent.$parent.$emit("onUpdateDataCase", {
+                APP_UID: item.APP_UID,
+                DEL_INDEX: item.DEL_INDEX,
+                PRO_UID: item.PRO_UID,
+                TAS_UID: item.TAS_UID,
+                ACTION: "todo",
+            });
+            this.$parent.$parent.$emit("onUpdatePage", "XCase");
+        },
+        /**
+         * Click in marker chart
+         * @param {object} selection
+         */
+        onClickCaseMarker(selection) {
+            let process = this.data[0].id,
+                caseList = this.data[1].id.toLowerCase();
+            switch (caseList) {
+                case "inbox":
+                case "draft":
+                    this.openCase({
+                        APP_UID: selection["app_uid"],
+                        DEL_INDEX: selection["del_index"],
+                        PRO_UID: process,
+                        TAS_UID: selection["tas_uid"],
+                    });
+                    break;
+                case "paused":
+                    this.showModalUnpauseCase({
+                        APP_UID: selection["app_uid"],
+                        DEL_INDEX: selection["del_index"],
+                        PRO_UID: process,
+                        TAS_UID: selection["tas_uid"],
+                    });
+                    break;
+                case "unassigned":
+                    this.showModalClaimCase({
+                        APP_UID: selection["app_uid"],
+                        DEL_INDEX: selection["del_index"],
+                        PRO_UID: process,
+                        TAS_UID: selection["tas_uid"],
+                    });
+                    break;
+            }
+        },
+        /**
+         * Show modal unpause
+         * @param {object} item
+         */
+        showModalUnpauseCase(item) {
+            this.$refs["modal-unpause-case"].data = item;
+            this.$refs["modal-unpause-case"].show();
+        },
+        /**
+         * Claim case
+         * @param {object} item
+         */
+        showModalClaimCase(item) {
+            let that = this;
+            api.cases
+                .open(_.extend({ ACTION: "unassigned" }, item))
+                .then(() => {
+                    api.cases
+                        .cases_open(_.extend({ ACTION: "todo" }, item))
+                        .then(() => {
+                            that.$refs["modal-claim-case"].data = item;
+                            that.$refs["modal-claim-case"].show();
+                        });
+                });
+        },
+        /**
+         * Return the breadcrumbs
+         */
+        dataBreadcrumbs() {
+            let res = [];
+            if (this.data[1]) {
+                res.push({
+                    label: this.data[1]["name"],
+                    onClick() {},
+                    color: this.data[1]["color"],
+                });
+            }
+            if (this.data[2]) {
+                res.push({
+                    label: this.data[2]["name"],
+                    onClick() {},
+                    color: null,
+                });
+            }
+            return res;
+        },
+        /**
+         * UPdate settings user config
+         */
+        updateSettings() {
+            this.$emit("updateDataLevel", {
+                id: "level3",
+                name: this.data[2]["name"],
+                level: 3,
+                data: {
+                    dateFrom: this.dateFrom,
+                    dateTo: this.dateTo,
+                    period: this.data[3].data.period,
+                    size: this.size,
+                    riskType: this.riskType,
+                },
+            });
+        },
     },
-  },
 };
 </script>
 <style>
 .vp-task-metrics-label {
-  display: inline-block;
+    display: inline-block;
 }
 
 .vp-width-p30 {
-  width: 30%;
+    width: 30%;
 }
 
 .vp-inline-block {
-  display: inline-block;
+    display: inline-block;
 }
 
 .vp-padding-l20 {
-  padding-left: 20px;
+    padding-left: 20px;
 }
 
 .vp-width-p100 {
-  width: 100%;
+    width: 100%;
 }
 
 .vp-text-align-center {
-  text-align: center;
+    text-align: center;
 }
 
 .vp-btn-success {
-  color: #fff;
-  background-color: #368b48;
-  border-color: #368b48;
+    color: #fff;
+    background-color: #368b48;
+    border-color: #368b48;
 }
 .vp-btn-success:hover {
-  color: #fff;
-  background-color: #255a30;
-  border-color: #368b48;
+    color: #fff;
+    background-color: #255a30;
+    border-color: #368b48;
 }
 
 .vp-btn-warning {
-  color: #fff;
-  background-color: #c99e11;
-  border-color: #a1831d;
+    color: #fff;
+    background-color: #c99e11;
+    border-color: #a1831d;
 }
 .vp-btn-warning:hover {
-  color: #fff;
-  background-color: #886c0e;
-  border-color: #a1831d;
+    color: #fff;
+    background-color: #886c0e;
+    border-color: #a1831d;
 }
 .vp-btn-danger {
-  color: #fff;
-  background-color: #b63b32;
-  border-color: #b63b32;
+    color: #fff;
+    background-color: #b63b32;
+    border-color: #b63b32;
 }
 
 .vp-btn-danger:hover {
-  color: #fff;
-  background-color: #832923;
-  border-color: #b63b32;
+    color: #fff;
+    background-color: #832923;
+    border-color: #b63b32;
 }
 
 .vp-form-label {
-  display: inline-block;
-  font-family: Helvetica, Arial, sans-serif;
-  text-anchor: start;
-  font-size: 14px;
-  font-weight: 900;
-  fill: rgb(15 17 18);
-  margin-top: 0.5rem;
-  color: #7d7f93;
+    display: inline-block;
+    font-family: Helvetica, Arial, sans-serif;
+    text-anchor: start;
+    font-size: 14px;
+    font-weight: 900;
+    fill: rgb(15 17 18);
+    margin-top: 0.5rem;
+    color: #7d7f93;
 }
 </style>
-<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
\ No newline at end of file
+<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>
diff --git a/workflow/engine/classes/model/AppDelegation.php b/workflow/engine/classes/model/AppDelegation.php
index 095fae749..71a40b45d 100644
--- a/workflow/engine/classes/model/AppDelegation.php
+++ b/workflow/engine/classes/model/AppDelegation.php
@@ -50,7 +50,8 @@ class AppDelegation extends BaseAppDelegation
     {
         try {
             // This value needs to have a value like 0.x
-            $risk = 0.2;
+            $systemConfiguration = Bootstrap::getSystemConfiguration();
+            $risk = $systemConfiguration['at_risk_delegation_max_time'];
 
             return $risk;
         } catch (Exception $e) {
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php
index e9ea2cfd7..c70465f2f 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Home.php
@@ -278,6 +278,7 @@ class Home
             ->first();
         if (!empty($caseList)) {
             $tableName = $caseList->ADD_TAB_NAME;
+            $proUid = $caseList->PRO_UID;
 
             //this gets the configured columns
             $columns = json_decode($caseList->CAL_COLUMNS);
@@ -300,13 +301,18 @@ class Home
             }
 
             //this modifies the query
-            if (!empty($tableName) && !empty($fields)) {
-                $arguments[] = function ($query) use ($tableName, $fields, $customFilters, $types) {
+            if (!empty($tableName)) {
+                $arguments[] = function ($query) use ($tableName, $fields, $customFilters, $types, $proUid) {
+                    //setting the related process
+                    $query->where('PROCESS.PRO_UID', '=', $proUid);
+
+                    //setting columns data from report table
                     $query->leftJoin($tableName, "{$tableName}.APP_UID", "=", "APP_DELEGATION.APP_UID");
                     foreach ($fields as $value) {
                         $query->addSelect($value);
                     }
-                    //filters for custom case list
+
+                    //setting filters for custom case list
                     foreach ($customFilters as $key => $filter) {
                         if (in_array($key, $fields)) {
                             //special case for date range
diff --git a/workflow/engine/src/ProcessMaker/Core/System.php b/workflow/engine/src/ProcessMaker/Core/System.php
index 8c3e69bb3..1fd30c670 100644
--- a/workflow/engine/src/ProcessMaker/Core/System.php
+++ b/workflow/engine/src/ProcessMaker/Core/System.php
@@ -84,7 +84,8 @@ class System
         'report_table_double_number' => 4,
         'ext_ajax_timeout' => 600000,
         'disable_task_manager_routing_async' => '0',
-        'on_one_server_enable' => 0
+        'on_one_server_enable' => 0,
+        'at_risk_delegation_max_time' => '0.2',
     ];
 
     /**
@@ -1246,6 +1247,11 @@ class System
             $config['disable_task_manager_routing_async'] = self::$defaultConfig['disable_task_manager_routing_async'];
         }
 
+        $value = $config['at_risk_delegation_max_time'];
+        if ($value > 0 && $value < 1) {
+            $config['at_risk_delegation_max_time'] = self::$defaultConfig['at_risk_delegation_max_time'];
+        }
+
         return $config;
     }