diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/component/chart/RoundSingleChartDataSetService.java b/backend/src/main/java/ru/micord/ervu_dashboard/component/chart/RoundSingleChartDataSetService.java index f7ffe3aa..f151a476 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/component/chart/RoundSingleChartDataSetService.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/component/chart/RoundSingleChartDataSetService.java @@ -93,6 +93,7 @@ public class RoundSingleChartDataSetService extends AbstractChartDatasetService List datasets = new ArrayList<>(); List centerLabelModels = new ArrayList<>(); List labels = new ArrayList<>(); + List> dataLabels = new ArrayList<>(); for (Future future : dataSetFutures) { RoundChartDataSetDtoWrapper chartDataSetDto = future.get(); @@ -101,6 +102,7 @@ public class RoundSingleChartDataSetService extends AbstractChartDatasetService datasets.add(chartDataSetDto.getRoundChartDataSetDto()); } labels.addAll(chartDataSetDto.getLabels()); + dataLabels.add(chartDataSetDto.getLabels()); } executorService.shutdown(); @@ -108,7 +110,7 @@ public class RoundSingleChartDataSetService extends AbstractChartDatasetService centerLabelModels.add(future.get()); } - return new RoundChartDataDto(datasets, labels, centerLabelModels); + return new RoundChartDataDto(datasets, labels, centerLabelModels, dataLabels); } catch (InterruptedException | ExecutionException e) { executorService.shutdownNow(); diff --git a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java index 9d8307ef..c510b41a 100644 --- a/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java +++ b/backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java @@ -12,13 +12,16 @@ import ru.micord.ervu_dashboard.model.chart.round.label.ChartLabelModel; public class RoundChartDataDto extends SingleChartDataDto { public List centerLabels; + public List> dataLabels; public RoundChartDataDto( List datasets, List labels, - List centerLabels + List centerLabels, + List> dataLabels ) { super(datasets, labels); this.centerLabels = centerLabels; + this.dataLabels = dataLabels; } }