diff --git a/resources/assets/js/components/iconPicker/IconPicker.vue b/resources/assets/js/components/iconPicker/IconPicker.vue index e682f29ff..abfc98e76 100644 --- a/resources/assets/js/components/iconPicker/IconPicker.vue +++ b/resources/assets/js/components/iconPicker/IconPicker.vue @@ -166,7 +166,6 @@ export default { }, watch: { color() { - console.log("colores"); }, }, methods: { diff --git a/resources/assets/js/home/TaskMetrics/TaskMetrics.vue b/resources/assets/js/home/TaskMetrics/TaskMetrics.vue index cadf60465..430e5a908 100644 --- a/resources/assets/js/home/TaskMetrics/TaskMetrics.vue +++ b/resources/assets/js/home/TaskMetrics/TaskMetrics.vue @@ -65,7 +65,9 @@ export default { * Change level in drill down */ changeLevel(data) { - let item = _.findIndex(this.visited, data); + let item = _.findIndex(this.visited, (el) => { + return el.id == data.id; + }); this.visited.forEach(function (elem) { elem.active = false; }); diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue index ccb120931..d81f91f47 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvThree.vue @@ -125,11 +125,23 @@ export default { let that = this; return { currentSelection: null, - dateFrom: moment().format("YYYY-MM-DD"), - dateTo: moment().add(30, "d").format("YYYY-MM-DD"), - dateNow: "", - size: { name: this.$t("ID_ALL"), id: "all" }, - riskType: "ON_TIME", + dateFrom: + this.data[3] && this.data[3].data.dateFromRisk + ? this.data[3].data.dateFromRisk + : moment().format("YYYY-MM-DD"), + dateTo: + this.data[3] && this.data[3].data.dateToRisk + ? this.data[3].data.dateToRisk + : moment().add(30, "d").format("YYYY-MM-DD"), + dateNow: moment().format("DD/MM/YYYY 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", @@ -225,9 +237,10 @@ export default { .totalCasesByRisk(dt) .then((response) => { that.formatDataRange(response.data); + that.updateSettings(); }) .catch((e) => { - console.error(err); + console.error(e); }); } }, @@ -440,6 +453,25 @@ export default { } return res; }, + /** + * UPdate settings user config + */ + updateSettings() { + this.$emit("updateDataLevel", { + id: "level3", + name: this.data[2]["name"], + level: 3, + data: { + dateFrom: this.data[3].data.dateFrom, + dateTo: this.data[3].data.dateTo, + period: this.data[3].data.period, + dateFromRisk: this.dateFrom, + dateToRisk: this.dateTo, + size: this.size, + riskType: this.riskType, + }, + }); + }, }, }; diff --git a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue index 2608c77e9..9101782c5 100644 --- a/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue +++ b/resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue @@ -98,9 +98,13 @@ export default { data() { let that = this; return { - dateFrom: moment().format("YYYY-MM-DD"), - dateTo: moment().add(30, "d").format("YYYY-MM-DD"), - period: "day", + dateFrom: this.data[3] + ? this.data[3].data.dateFrom + : moment().format("YYYY-MM-DD"), + dateTo: this.data[3] + ? this.data[3].data.dateTo + : moment().add(30, "d").format("YYYY-MM-DD"), + period: this.data[3] ? this.data[3].data.period : "day", periodOptions: [ { text: this.$t("ID_DAY"), value: "day" }, { text: this.$t("ID_MONTH"), value: "month" }, @@ -230,10 +234,14 @@ export default { */ onClickDrillDown() { this.$emit("updateDataLevel", { - id: this.data[2]["id"], + id: "level2", name: this.data[2]["name"], level: 3, - data: null, + data: { + dateFrom: this.dateFrom, + dateTo: this.dateTo, + period: this.period, + }, }); }, /** diff --git a/resources/assets/js/home/TaskMetrics/VueCharts.vue b/resources/assets/js/home/TaskMetrics/VueCharts.vue index f01fbfada..08e8fbaa0 100644 --- a/resources/assets/js/home/TaskMetrics/VueCharts.vue +++ b/resources/assets/js/home/TaskMetrics/VueCharts.vue @@ -1,9 +1,6 @@ @@ -40,13 +38,13 @@ export default { VueChartLvTwo, VueChartLvThree, }, - props: ["levels"], + props: ["levels"], data() { - let that = this; + let that = this; return { - key1: _.random(0,100), - key2: _.random(0,100), - key3: _.random(0,100), + key1: _.random(0, 100), + key2: _.random(0, 100), + key3: _.random(0, 100), settingsBreadCrumbs: [ { class: "fas fa-info-circle", @@ -59,9 +57,9 @@ export default { mounted() {}, watch: {}, computed: { - level: function () { - return _.find(this.levels, {'active': true }).level; - } + level: function () { + return _.find(this.levels, { active: true }).level; + }, }, updated() {}, beforeCreate() {}, @@ -100,7 +98,7 @@ export default { res.push({ label: el.name, onClick() { - this.$emit("onChangeLevel", el); + this.$emit("onChangeLevel", el); }, data: el, }); @@ -120,7 +118,7 @@ export default { }; break; } - } + }, }, }; diff --git a/resources/assets/js/home/modal/ModalPauseCase.vue b/resources/assets/js/home/modal/ModalPauseCase.vue index 4392c66ae..014d25ad1 100644 --- a/resources/assets/js/home/modal/ModalPauseCase.vue +++ b/resources/assets/js/home/modal/ModalPauseCase.vue @@ -164,7 +164,6 @@ export default { this.data.reasonPause = this.pauseData.reasonPause; api.cases.pauseCase(this.data) .then((response) => { - console.log(response); if (response.statusText == "OK" || response.status === 200) { that.$refs["modal-pause-case"].hide(); that.$parent.$refs['ellipsis-' + that.data.TAS_UID].hideActionButtons()