diff --git a/resources/assets/js/home/TaskMetrics/DrillDown.vue b/resources/assets/js/home/TaskMetrics/DrillDown.vue
index 6270d0877..7eaa93d90 100644
--- a/resources/assets/js/home/TaskMetrics/DrillDown.vue
+++ b/resources/assets/js/home/TaskMetrics/DrillDown.vue
@@ -5,7 +5,7 @@
class="v-pm-drill-down vp-inline-block"
>
-
Drill Down Navigator
+ {{ $t("ID_DRILL_DOWN_NAVIGATOR") }}
diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue b/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue
index d54b108ed..7e4349bd1 100644
--- a/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue
@@ -1,7 +1,7 @@
-
Number of Tasks Status per Process
+
{{$t("ID_DRILL_DOWN_NUMBER_TASKS_PROCESS")}}
{
@@ -263,6 +263,9 @@ export default {
this.$refs["pm-task-process"].setOptions(this.optionsProcesses);
this.$refs["pm-task-process"].setSelectedOptions(this.selectedProcesses);
},
+ /**
+ * Format response form BE to chart
+ */
formatTotalCases(data) {
let serie = [],
labels = [];
@@ -272,7 +275,6 @@ export default {
});
this.$refs["LevelOneChart"].updateOptions({ labels: labels });
-
this.$apexcharts.exec("LevelOneChart", "updateSeries", [
{
data: serie,
@@ -295,6 +297,9 @@ export default {
});
this.formatTotalCases(res);
},
+ /**
+ * Update labels in chart
+ */
updateLabels(processes) {
let labels = [];
_.each(processes, (el) => {
@@ -302,6 +307,9 @@ export default {
});
this.$refs["LevelOneChart"].updateOptions({ labels: labels });
},
+ /**
+ * UPdate serie in chart
+ */
updateSerie(processes) {
let labels = [];
_.each(processes, (el) => {
diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
index a79917eab..cf4e7a123 100644
--- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
@@ -1,7 +1,7 @@
-
Risk Matrix per Process by Task Status
+
{{$t("ID_DRILL_DOWN_RISK_MATRIX")}}
-
Number of Tasks Status per Process by task status
+
{{$t("ID_DRILL_DOWN_NUMBER_TASKS_PROCESS_BY_TASK")}}
{
- console.error(err);
+ console.error(e);
});
}
},
@@ -181,7 +181,6 @@ export default {
serie.push(el["TOTAL"]);
labels.push(el["dateGroup"]);
});
- console.log("DRWAWWW");
this.$refs["LevelTwoChart"].updateOptions({
labels: labels,
title: {
@@ -196,21 +195,6 @@ export default {
},
]);
},
- generateDayWiseTimeSeries(baseval, count, yrange) {
- var i = 0;
- var series = [];
- while (i < count) {
- var y =
- Math.floor(Math.random() * (yrange.max - yrange.min + 1)) +
- yrange.min;
-
- series.push([baseval, y]);
- baseval += 86400000;
- i++;
- }
- console.log(series);
- return series;
- },
},
};
diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvZero.vue b/resources/assets/js/home/TaskMetrics/VueChartLvZero.vue
index b0e64b2b6..82e9f02b5 100644
--- a/resources/assets/js/home/TaskMetrics/VueChartLvZero.vue
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvZero.vue
@@ -1,7 +1,7 @@
-
Number of tasks per Task Status
+
{{$t("ID_DRILL_DOWN_NUMBER_TASKS")}}
= lv;
@@ -111,12 +113,15 @@ export default {
this.level = lv;
this.$emit("onChangeLevel", this.level);
},
+ /**
+ * Format data for data beadcrumbs
+ */
dataBreadCrumbs() {
let res = [],
that = this,
index = 0;
_.each(this.data, (el) => {
- if (index <= that.level) {
+ if (index <= that.level && el.data) {
res.push({
label: el.name,
onClick() {
@@ -126,7 +131,7 @@ export default {
}
});
res.push({
- label: "Select the drill option",
+ label: this.$t("ID_SELECT"),
onClick() {},
});
switch (this.level) {
diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po
index 4c1882bd9..01620c9fc 100755
--- a/workflow/engine/content/translations/english/processmaker.en.po
+++ b/workflow/engine/content/translations/english/processmaker.en.po
@@ -53078,4 +53078,40 @@ msgstr "Select the Drill option to have a Risk Matrix of the tasks or select the
# LABEL/ID_TASK_RISK_LEVEL3_INFO
#: LABEL/ID_TASK_RISK_LEVEL3_INFO
msgid "By selecting the task will be open automatically if the task is Inbox or Draft"
-msgstr "By selecting the task will be open automatically if the task is Inbox or Draft"
\ No newline at end of file
+msgstr "By selecting the task will be open automatically if the task is Inbox or Draft"
+
+# TRANSLATION
+# LABEL/ID_LEVEL
+#: LABEL/ID_LEVEL
+msgid "Level"
+msgstr "Level"
+
+# TRANSLATION
+# LABEL/ID_DRILL_DOWN_NAVIGATOR
+#: LABEL/ID_DRILL_DOWN_NAVIGATOR
+msgid "Drill Down Navigator"
+msgstr "Drill Down Navigator"
+
+# TRANSLATION
+# LABEL/ID_DRILL_DOWN_NUMBER_TASKS
+#: LABEL/ID_DRILL_DOWN_NUMBER_TASKS
+msgid "Number of tasks per Task Status"
+msgstr "Number of tasks per Task Status"
+
+# TRANSLATION
+# LABEL/ID_DRILL_DOWN_NUMBER_TASKS_PROCESS
+#: LABEL/ID_DRILL_DOWN_NUMBER_TASKS_PROCESS
+msgid "Number of Tasks Status per Process"
+msgstr "Number of Tasks Status per Process"
+
+# TRANSLATION
+# LABEL/ID_DRILL_DOWN_NUMBER_TASKS_PROCESS_BY_TASK
+#: LABEL/ID_DRILL_DOWN_NUMBER_TASKS_PROCESS_BY_TASK
+msgid "Number of Tasks Status per Process by task status"
+msgstr "Number of Tasks Status per Process by task status"
+
+# TRANSLATION
+# LABEL/ID_DRILL_DOWN_RISK_MATRIX
+#: LABEL/ID_DRILL_DOWN_RISK_MATRIX
+msgid "Risk Matrix per Process by Task Status"
+msgstr "Risk Matrix per Process by Task Status"
\ No newline at end of file
diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql
index cc6d88082..faa0c1ab7 100755
--- a/workflow/engine/data/mysql/insert.sql
+++ b/workflow/engine/data/mysql/insert.sql
@@ -57998,6 +57998,11 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_DOWN_TRIGGER','en','Down Trigger','2015-02-20') ,
( 'LABEL','ID_DRAFT','en','Draft','2014-01-15') ,
( 'LABEL','ID_DRIVE_HELP_ENABLE','en','When this option is enabled, all input, output and attached documents generated in your processes can be stored in Google Drive.','2016-01-05') ,
+( 'LABEL','ID_DRILL_DOWN_NAVIGATOR','en','Drill Down Navigator','2020-08-26') ,
+( 'LABEL','ID_DRILL_DOWN_NUMBER_TASKS','en','Number of tasks per Task Status','2020-08-26') ,
+( 'LABEL','ID_DRILL_DOWN_NUMBER_TASKS_PROCESS','en','Number of Tasks Status per Process','2020-08-26') ,
+( 'LABEL','ID_DRILL_DOWN_NUMBER_TASKS_PROCESS_BY_TASK','en','Number of Tasks Status per Process by task status','2020-08-26') ,
+( 'LABEL','ID_DRILL_DOWN_RISK_MATRIX','en','Risk Matrix per Process by Task Status','2020-08-26') ,
( 'LABEL','ID_DROP_DATABASE_EXISTS','en','Drop database if exists','2014-01-15') ,
( 'LABEL','ID_DROP_FILE_HERE','en','Drop file here...','2020-12-10') ,
( 'LABEL','ID_DUE_DATE','en','Due Date','2014-01-15') ,
@@ -58735,6 +58740,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_LEFT','en','left','2014-09-18') ,
( 'LABEL','ID_LEFT_MARGIN','en','Left Margin','2014-01-15') ,
( 'LABEL','ID_LESS_THAN','en','less than','2015-03-23') ,
+( 'LABEL','ID_LEVEL','en','Level','2021-08-26') ,
( 'LABEL','ID_LIBRARY_DOES_NOT_EXIST','en','The library with {0}: "{1}" does not exist.','2014-05-20') ,
( 'LABEL','ID_LIBRARY_FUNCTION_DOES_NOT_EXIST','en','The function with {0}: "{1}" does not exist in the library.','2014-05-20') ,
( 'LABEL','ID_LICENCE_LOGIN_TITLE','en','License','2015-12-07') ,