PMCORE-3328

resources/assets/js/home/Inbox/Inbox.vue

@@ -666,7 +666,6 @@ export default {
      * @param {object} data
      */
     onUpdateFilters(data) {
-      console.log("jonas");
       this.filters = data.params;
       this.prepareAndUpdate(data);
       if (data.refresh) {

resources/assets/js/home/TaskMetrics/VueChartLvOne.vue

@@ -28,7 +28,7 @@
             @select="changeOption"
           ></multiselect>
         </div>
-        <label class="vp-inline-block vp-padding-l20">{{ $t("ID_TOP") }}</label>
+        <label class="vp-inline-block vp-padding-l20">{{ $t("ID_TOP10") }}</label>
         <div class="vp-inline-block">
           <b-form-checkbox
             v-model="top"

resources/assets/js/home/TaskMetrics/VueChartLvThree.vue

@@ -127,8 +127,8 @@ export default {
     let that = this;
     return {
       currentSelection: null,
-      dateFrom: "",
+      dateFrom: moment().format("YYYY-MM-DD"),
-      dateTo: "",
+      dateTo: moment().add(30, "d").format("YYYY-MM-DD"),
       dateNow: "",
       size: { name: this.$t("ID_ALL"), id: "all" },
       riskType: "ON_TIME",

resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue

@@ -1,7 +1,9 @@
 <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_NUMBER_TASKS_PROCESS_BY_TASK")}}</h6>
+      <h6 class="v-search-title">
+        {{ $t("ID_DRILL_DOWN_NUMBER_TASKS_PROCESS_BY_TASK") }}
+      </h6>
       <div>
         <BreadCrumb
           :options="breadCrumbs.data"
@@ -54,6 +56,24 @@
         :options="options"
         :series="series"
       ></apexchart>
+      <div class="row">
+        <div class="col-sm vp-align-right">
+          <button
+            @click="onClickDrillDown()"
+            type="button"
+            class="btn btn-primary"
+          >
+            <i class="fas fa-chart-line"></i
+            ><span class="vp-padding-l10">{{ $t("ID_DRILL") }}</span>
+          </button>
+        </div>
+        <div class="col-sm">
+          <button @click="onClickData()" type="button" class="btn btn-primary">
+            <i class="fas fa-th"></i
+            ><span class="vp-padding-l10">{{ $t("ID_DATA") }}</span>
+          </button>
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -64,6 +84,7 @@ import Api from "../../api/index";
 import Multiselect from "vue-multiselect";
 import BreadCrumb from "../../components/utils/BreadCrumb.vue";
 import moment from "moment";
+import eventBus from "./../EventBus/eventBus";
 export default {
   name: "VueChartLvTwo",
   mixins: [],
@@ -75,9 +96,9 @@ export default {
   data() {
     let that = this;
     return {
-      dateFrom: "",
+      dateFrom: moment().format("YYYY-MM-DD"),
-      dateTo: "",
+      dateTo: moment().add(30, "d").format("YYYY-MM-DD"),
-      period: "",
+      period: "day",
       periodOptions: [
         { text: this.$t("ID_DAY"), value: "day" },
         { text: this.$t("ID_MONTH"), value: "month" },
@@ -100,15 +121,7 @@ export default {
           },
           id: "LevelTwoChart",
           events: {
-            markerClick: function (event, chartContext, config) {
+            markerClick: function (event, chartContext, config) {},
-              that.currentSelection = that.dataCasesByRange[config.seriesIndex];
-              that.$emit("updateDataLevel", {
-                id: that.currentSelection["PRO_ID"],
-                name: that.currentSelection["PRO_TITLE"],
-                level: 2,
-                data: null,
-              });
-            },
           },
         },
         dataLabels: {
@@ -136,6 +149,7 @@ export default {
   created() {},
   mounted() {
     this.getBodyHeight();
+    this.changeOption();
   },
   watch: {},
   computed: {},
@@ -199,6 +213,59 @@ export default {
         },
       ]);
     },
+    /**
+     * Show popover drill down options
+     */
+    onClickDrillDown() {
+      this.$emit("updateDataLevel", {
+        id: this.data[1]["id"],
+        name: this.data[1]["name"],
+        level: 2,
+        data: null,
+      });
+    },
+    /**
+     * Show popover data options
+     */
+    onClickData() {
+      let taskList = this.data[0].id.toLowerCase(),
+        obj = [
+          {
+            autoshow: false,
+            fieldId: "processName",
+            filterVar: "process",
+            label: "",
+            options: {
+              label: this.data[1]["name"],
+              value: this.data[1]["id"],
+            },
+            value: this.data[1]["id"],
+          },
+          {
+            autoShow: false,
+            fieldId: "delegationDate",
+            filterVar: "delegateFrom",
+            label: "",
+            options: [],
+            value: this.dateFrom,
+          },
+          {
+            autoShow: false,
+            fieldId: "delegationDate",
+            filterVar: "delegateTo",
+            label: "",
+            options: [],
+            value: this.dateTo,
+          },
+        ];
+      eventBus.$emit("home::update-settings", {
+        data: obj,
+        key: "filters",
+        page: taskList,
+        type: "normal",
+      });
+      eventBus.$emit("home::sidebar::click-item", taskList);
+    },
   },
 };
 </script>

workflow/engine/content/translations/english/processmaker.en.po

@@ -53247,6 +53247,12 @@ msgstr "Risk Matrix per Process by Task Status"
 msgid "Top"
 msgstr "Top"
 
+# TRANSLATION
+# LABEL/ID_TOP10
+#: LABEL/ID_TOP10
+msgid "Top 10"
+msgstr "Top 10"
+
  # TRANSLATION
 # LABEL/ID_CASE_THREAD_TITLE
 #: LABEL/ID_CASE_THREAD_TITLE

workflow/engine/data/mysql/insert.sql

@@ -61452,6 +61452,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
 ( 'LABEL','ID_TOO_MANY_REQUESTS','en','Upon configurations, you have reached the maximum number of files to upload.','2018-12-17') ,
 ( 'LABEL','ID_TOP_MARGIN','en','Top Margin','2014-01-15') ,
 ( 'LABEL','ID_TOP','en','Top','2020-08-27') ,
+( 'LABEL','ID_TOP10','en','Top 10','2020-08-27') ,
 ( 'LABEL','ID_TOTAL_CASES','en','Total Cases','2014-01-15') ,
 ( 'LABEL','ID_TOTAL_CASES_REASSIGNED','en','Total Cases Reassigned','2014-01-15') ,
 ( 'LABEL','ID_TO_DELEGATION_DATE','en','To Delegation Date','2021-08-31') ,