micord/evru-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/SUPPORT-9206_label_for_each_data' into develop

Browse source
This commit is contained in:
Рауф Латыпов 2025-06-09 08:33:15 +03:00
commit 316421f514
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backend/src/main/java/ru/micord/ervu_dashboard/component/chart/RoundSingleChartDataSetService.java
View file

@ -93,6 +93,7 @@ public class RoundSingleChartDataSetService extends AbstractChartDatasetService
List<SingleChartDataSetDto> datasets = new ArrayList<>();
List<ChartLabelModel> centerLabelModels = new ArrayList<>();
List<Object> labels = new ArrayList<>();
List<List<Object>> dataLabels = new ArrayList<>();
for (Future<RoundChartDataSetDtoWrapper> 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();

5
backend/src/main/java/ru/micord/ervu_dashboard/model/chart/round/RoundChartDataDto.java
View file

@ -12,13 +12,16 @@ import ru.micord.ervu_dashboard.model.chart.round.label.ChartLabelModel;
public class RoundChartDataDto extends SingleChartDataDto {
public List<ChartLabelModel> centerLabels;
public List<List<Object>> dataLabels;
public RoundChartDataDto(
List<SingleChartDataSetDto> datasets,
List<Object> labels,
List<ChartLabelModel> centerLabels
List<ChartLabelModel> centerLabels,
List<List<Object>> dataLabels
) {
super(datasets, labels);
this.centerLabels = centerLabels;
this.dataLabels = dataLabels;
}
}