diff --git a/src/components/ADempiere/Dashboard/charts/AreaChart.vue b/src/components/ADempiere/Dashboard/charts/AreaChart.vue index 73e13631..afabbfdd 100644 --- a/src/components/ADempiere/Dashboard/charts/AreaChart.vue +++ b/src/components/ADempiere/Dashboard/charts/AreaChart.vue @@ -99,13 +99,17 @@ export default { }) }, loadChartMetrics(metrics) { - let xAxisValues = [] + const xAxisValues = [] let seriesToShow = [] let legendToShow = [] if (!this.isEmptyValue(metrics.series)) { if (metrics.series.length > 0) { metrics.series.forEach(serie => { - xAxisValues = xAxisValues.concat(serie.data_set.map(set => set.name)) + serie.data_set.forEach(set => { + if (!xAxisValues.find(value => value === set.name)) { + xAxisValues.push(set.name) + } + }) }) } seriesToShow = metrics.series.map(serie => { diff --git a/src/components/ADempiere/Dashboard/charts/BarChart.vue b/src/components/ADempiere/Dashboard/charts/BarChart.vue index 37e37759..10fba5ff 100644 --- a/src/components/ADempiere/Dashboard/charts/BarChart.vue +++ b/src/components/ADempiere/Dashboard/charts/BarChart.vue @@ -87,12 +87,16 @@ export default { }) }, loadChartMetrics(metrics) { - let xAxisValues = [] + const xAxisValues = [] let seriesToShow = [] if (!this.isEmptyValue(metrics.series)) { if (metrics.series.length > 0) { metrics.series.forEach(serie => { - xAxisValues = xAxisValues.concat(serie.data_set.map(set => set.name)) + serie.data_set.forEach(set => { + if (!xAxisValues.find(value => value === set.name)) { + xAxisValues.push(set.name) + } + }) }) } seriesToShow = metrics.series.map(serie => { diff --git a/src/components/ADempiere/Dashboard/charts/LineChart.vue b/src/components/ADempiere/Dashboard/charts/LineChart.vue index 6389a63a..aa1b6aee 100644 --- a/src/components/ADempiere/Dashboard/charts/LineChart.vue +++ b/src/components/ADempiere/Dashboard/charts/LineChart.vue @@ -99,13 +99,17 @@ export default { }) }, loadChartMetrics(metrics) { - let xAxisValues = [] + const xAxisValues = [] let seriesToShow = [] let legendToShow = [] if (!this.isEmptyValue(metrics.series)) { if (metrics.series.length > 0) { metrics.series.forEach(serie => { - xAxisValues = xAxisValues.concat(serie.data_set.map(set => set.name)) + serie.data_set.forEach(set => { + if (!xAxisValues.find(value => value === set.name)) { + xAxisValues.push(set.name) + } + }) }) } seriesToShow = metrics.series.map(serie => { diff --git a/src/components/ADempiere/Dashboard/charts/PieChart.vue b/src/components/ADempiere/Dashboard/charts/PieChart.vue index ec71c625..e60d07d9 100644 --- a/src/components/ADempiere/Dashboard/charts/PieChart.vue +++ b/src/components/ADempiere/Dashboard/charts/PieChart.vue @@ -87,12 +87,16 @@ export default { }) }, loadChartMetrics(metrics) { - let xAxisValues = [] + const xAxisValues = [] let seriesToShow = [] if (!this.isEmptyValue(metrics.series)) { if (metrics.series.length > 0) { metrics.series.forEach(serie => { - xAxisValues = xAxisValues.concat(serie.data_set.map(set => set.name)) + serie.data_set.forEach(set => { + if (!xAxisValues.find(value => value === set.name)) { + xAxisValues.push(set.name) + } + }) }) } seriesToShow = metrics.series.map(serie => { diff --git a/src/components/ADempiere/Dashboard/charts/WaterfallChart.vue b/src/components/ADempiere/Dashboard/charts/WaterfallChart.vue index 783adaf9..fe8f8e83 100644 --- a/src/components/ADempiere/Dashboard/charts/WaterfallChart.vue +++ b/src/components/ADempiere/Dashboard/charts/WaterfallChart.vue @@ -85,13 +85,17 @@ export default { }) }, loadChartMetrics(metrics) { - let xAxisValues = [] + const xAxisValues = [] let seriesToShow = [] let legendToShow = [] if (!this.isEmptyValue(metrics.series)) { if (metrics.series.length > 0) { metrics.series.forEach(serie => { - xAxisValues = xAxisValues.concat(serie.data_set.map(set => set.name)) + serie.data_set.forEach(set => { + if (!xAxisValues.find(value => value === set.name)) { + xAxisValues.push(set.name) + } + }) }) } seriesToShow = metrics.series.map(serie => {