diff --git a/resources/assets/js/home/Inbox/Inbox.vue b/resources/assets/js/home/Inbox/Inbox.vue index d8e7386f6..5d90393f2 100644 --- a/resources/assets/js/home/Inbox/Inbox.vue +++ b/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) { diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue b/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue index 8b63e16d8..27ab76dd9 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvOne.vue @@ -28,7 +28,7 @@ @select="changeOption" > - +
-
{{$t("ID_DRILL_DOWN_NUMBER_TASKS_PROCESS_BY_TASK")}}
+
+ {{ $t("ID_DRILL_DOWN_NUMBER_TASKS_PROCESS_BY_TASK") }} +
+
+
+ +
+
+ +
+
@@ -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: "", - dateTo: "", - period: "", + dateFrom: moment().format("YYYY-MM-DD"), + dateTo: moment().add(30, "d").format("YYYY-MM-DD"), + 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) { - that.currentSelection = that.dataCasesByRange[config.seriesIndex]; - that.$emit("updateDataLevel", { - id: that.currentSelection["PRO_ID"], - name: that.currentSelection["PRO_TITLE"], - level: 2, - data: null, - }); - }, + markerClick: function (event, chartContext, config) {}, }, }, 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); + }, }, }; diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 4a411730b..ee4313ed9 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/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 diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 7a3db69d3..280eaba33 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/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') ,