@@ -226,6 +227,7 @@ import VueListView from "../../components/dataViews/vueListView/VueListView.vue"
import defaultMixins from "./defaultMixins";
import Ellipsis from '../../components/utils/ellipsis.vue';
import ModalReassignCase from '../modal/ModalReassignCase.vue';
+import { Event } from 'vue-tables-2';
import CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue";
export default {
@@ -245,10 +247,15 @@ export default {
ModalReassignCase,
CurrentUserCell,
},
- props: ["defaultOption", "filters"],
+ props: ["defaultOption", "settings"],
data() {
let that = this;
return {
+ columMap: {
+ case_number: "APP_NUMBER",
+ case_title: "DEL_TITLE",
+ process_name: "PRO_TITLE"
+ },
newCase: {
title: this.$i18n.t("ID_NEW_CASE"),
class: "btn-success",
@@ -256,18 +263,25 @@ export default {
this.$refs["newRequest"].show();
},
},
- columns: [
- "detail",
- "case_number",
- "case_title",
- "process_name",
- "task",
- "send_by",
- "due_date",
- "delegation_date",
- "priority",
- "actions",
- ],
+ filters:
+ this.settings && this.settings.filters
+ ? this.settings.filters
+ : {},
+ columns:
+ this.settings && this.settings.columns
+ ? this.settings.columns
+ : [
+ "detail",
+ "case_number",
+ "case_title",
+ "process_name",
+ "task",
+ "send_by",
+ "due_date",
+ "delegation_date",
+ "priority",
+ "actions"
+ ],
tableData: [],
icon:"far fa-pause-circle",
options: {
@@ -301,6 +315,8 @@ export default {
selectAllMode: "page",
programmatic: false,
},
+ sortable: ['case_number'],
+ orderBy: this.settings && this.settings.orderBy ? this.settings.orderBy: {},
requestFunction(data) {
return this.$parent.$parent.getCasesForVueTable(data);
},
@@ -337,10 +353,21 @@ export default {
this.initFilters();
},
mounted() {
+ let that = this;
// force to open case
this.openDefaultCase();
+ Event.$on('vue-tables.paused.sorted', function (data) {
+ that.$emit("updateUserSettings", "orderBy", data);
+ });
+ },
+ watch: {
+ columns: function (val) {
+ this.$emit("updateUserSettings", "columns", val);
+ },
+ filters: function (val) {
+ this.$emit("updateUserSettings", "filters", val);
+ },
},
- watch: {},
computed: {
/**
* Build our ProcessMaker apiClient
@@ -432,7 +459,8 @@ export default {
paged,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1),
- filters = {};
+ filters = {},
+ sort = "";
paged = start + "," + limit;
filters = {
@@ -444,6 +472,10 @@ export default {
filters[item.filterVar] = item.value;
}
});
+ sort = that.prepareSortString(data);
+ if (sort) {
+ filters["sort"] = sort;
+ }
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases
.paused(filters)
@@ -459,6 +491,18 @@ export default {
});
});
},
+ /**
+ * Prepare sort string to be sended in the service
+ * @param {object} data
+ * @returns {string}
+ */
+ prepareSortString(data){
+ let sort = "";
+ if (data.orderBy && this.columMap[data.orderBy]) {
+ sort = `${this.columMap[data.orderBy]},${data.ascending === 1 ? "ASC": "DESC"}`;
+ }
+ return sort;
+ },
/**
* Format Response API TODO to grid todo and columns
*/
@@ -560,7 +604,7 @@ export default {
},
onRemoveFilter(data) {},
onUpdateFilters(data) {
- this.$emit("onUpdateFilters", data.params);
+ this.filters = data.params;
if (data.refresh) {
this.$nextTick(() => {
if (this.typeView === "GRID") {
diff --git a/resources/assets/js/home/Paused/defaultMixins.js b/resources/assets/js/home/Paused/defaultMixins.js
index c385daa21..24c94a3b2 100644
--- a/resources/assets/js/home/Paused/defaultMixins.js
+++ b/resources/assets/js/home/Paused/defaultMixins.js
@@ -86,9 +86,9 @@ export default {
};
_.forIn(this.filters, function (item, key) {
- if (item.value && item.value != "") {
- filters[item.filterVar] = item.value;
- }
+ if(filters && item.value) {
+ filters[item.filterVar] = item.value;
+ }
});
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases
diff --git a/resources/assets/js/home/TaskMetrics/DrillDown.vue b/resources/assets/js/home/TaskMetrics/DrillDown.vue
index 86165d4a1..8bdb7e660 100644
--- a/resources/assets/js/home/TaskMetrics/DrillDown.vue
+++ b/resources/assets/js/home/TaskMetrics/DrillDown.vue
@@ -1,151 +1,149 @@
-
-
-
Drill Down Navigator
-
-
-
- {{ item.label }}
-
-
-
- {{ item.content }}
-
-
-
+
+
Drill Down Navigator
+
+
+
+ {{ item.label }}
+
+
+ {{ item.content }}
+
+
+
\ No newline at end of file
diff --git a/resources/assets/js/home/TaskMetrics/ProcessPopover.vue b/resources/assets/js/home/TaskMetrics/ProcessPopover.vue
new file mode 100644
index 000000000..89fc39f80
--- /dev/null
+++ b/resources/assets/js/home/TaskMetrics/ProcessPopover.vue
@@ -0,0 +1,183 @@
+
+
+
+ {{ $t("ID_PROCESSES").toUpperCase() }}
+
+
+
+
+
+
+
+ {{ $t("ID_ALL") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/assets/js/home/TaskMetrics/TaskMetrics.vue b/resources/assets/js/home/TaskMetrics/TaskMetrics.vue
index 09357856d..28e0b4ceb 100644
--- a/resources/assets/js/home/TaskMetrics/TaskMetrics.vue
+++ b/resources/assets/js/home/TaskMetrics/TaskMetrics.vue
@@ -2,13 +2,16 @@
-
Task metrics
+
+ Task metrics
+
+
@@ -32,7 +35,9 @@ export default {
props: [],
data() {
let that = this;
- return {};
+ return {
+ level: 0,
+ };
},
created() {},
mounted() {},
@@ -40,7 +45,11 @@ export default {
computed: {},
updated() {},
beforeCreate() {},
- methods: {},
+ methods: {
+ changeLevel(lv) {
+ this.level = lv;
+ },
+ },
};
\ No newline at end of file
diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue b/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue
index ce0578679..32707b8bd 100644
--- a/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue
@@ -1,216 +1,348 @@
-
-
-
Number of tasks per Task Status
-
-
{{ $t("ID_PROCESS_CATEGORY") }}
-
-
-
-
-
-
+
+
Number of Tasks Status per Process
+
+
+
+
+
+
{{
+ $t("ID_MAFE_a4ffdcf0dc1f31b9acaf295d75b51d00")
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue
new file mode 100644
index 000000000..4d7211a1f
--- /dev/null
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue
@@ -0,0 +1,315 @@
+
+
+
+
Number of Tasks Status per Process
+
+
+
+
+
+
+
+
+ {{ $t("ID_DAY") }}
+ {{
+ $t("ID_MONTH")
+ }}
+ {{ $t("ID_YEAR") }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvZero.vue b/resources/assets/js/home/TaskMetrics/VueChartLvZero.vue
index 34dd775ff..410129984 100644
--- a/resources/assets/js/home/TaskMetrics/VueChartLvZero.vue
+++ b/resources/assets/js/home/TaskMetrics/VueChartLvZero.vue
@@ -1,211 +1,239 @@
-
-
-
Number of tasks per Task Status
-
-
+
+
+
Number of tasks per Task Status
+
+
-
-
-
- View
-
-
-
-
- View
-
-
-
-
-
+
+
+
+ {{ $t("ID_VIEW") }}
+
+
+
+
+ {{ $t("ID_VIEW") }}
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/assets/js/home/TaskMetrics/VueCharts.vue b/resources/assets/js/home/TaskMetrics/VueCharts.vue
index bfd368fb0..d26c6df63 100644
--- a/resources/assets/js/home/TaskMetrics/VueCharts.vue
+++ b/resources/assets/js/home/TaskMetrics/VueCharts.vue
@@ -1,16 +1,27 @@
-