diff --git a/index.html b/index.html index f75c0a0f..51d1c0d9 100644 --- a/index.html +++ b/index.html @@ -7871,7 +7871,7 @@ - + diff --git a/modules/dynamic/overview/charts-overview.js b/modules/dynamic/overview/charts-overview.js index 4d5e14fb..35a83b5e 100644 --- a/modules/dynamic/overview/charts-overview.js +++ b/modules/dynamic/overview/charts-overview.js @@ -426,19 +426,18 @@ function renderChart({id, entity, plotBy, groupBy, sorting, type}) { }) .flat(); + const sortedData = sortData(chartData, sorting); const colors = getColors(); const {offset, formatX = formatTicks} = plotTypeMap[type]; - const $chart = createStackedBarChart(chartData, {sorting, colors, tooltip, offset, formatX}); - insertChart(id, $chart, title); + const $chart = createStackedBarChart(sortedData, {colors, tooltip, offset, formatX}); + insertChart(id, sortedData, $chart, title); byId("chartsOverview__charts").lastChild.scrollIntoView(); } // based on observablehq.com/@d3/stacked-horizontal-bar-chart -function createStackedBarChart(data, {sorting, colors, tooltip, offset, formatX}) { - const sortedData = sortData(data, sorting); - +function createStackedBarChart(sortedData, {colors, tooltip, offset, formatX}) { const X = sortedData.map(d => d.value); const Y = sortedData.map(d => d.name); const Z = sortedData.map(d => d.group); @@ -568,7 +567,7 @@ function createStackedBarChart(data, {sorting, colors, tooltip, offset, formatX} return svg.node(); } -function insertChart(id, $chart, title) { +function insertChart(id, sortedData, $chart, title) { const $chartContainer = byId("chartsOverview__charts"); const $figure = document.createElement("figure"); @@ -580,7 +579,8 @@ function insertChart(id, $chart, title) { Figure ${figureNo}. ${title}