micord/ervu-business-metrics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/SUPPORT-8716_stacked_group_bar_charts' into test/SUPPORT-8716_stacked_bar_charts

Browse source
This commit is contained in:
Рауф Латыпов 2024-11-29 00:21:24 +03:00
commit 3c640cf196
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backend/src/main/java/ervu_business_metrics/component/chart/ErvuMultiChartDataSetService.java
View file

@ -127,6 +127,7 @@ public class ErvuMultiChartDataSetService extends AbstractChartDatasetService im
chartDataSetDto.setyAxisID(aggFuncData.yAxesId);
chartDataSetDto.setTension(aggFuncData.tension);
chartDataSetDto.setOrder(aggFuncData.drawOrder);
chartDataSetDto.setStack(aggFuncData.stack);
return chartDataSetDto;
}).collect(Collectors.toList())).flatMap(Collection::stream).collect(Collectors.toList());
}
@ -164,6 +165,7 @@ public class ErvuMultiChartDataSetService extends AbstractChartDatasetService im
chartDataSetDto.setyAxisID(staticChartData.yAxesId);
chartDataSetDto.setTension(staticChartData.tension);
chartDataSetDto.setOrder(staticChartData.drawOrder);
chartDataSetDto.setStack(staticChartData.stack);
return chartDataSetDto;
}).collect(Collectors.toList());
}
@ -204,6 +206,7 @@ public class ErvuMultiChartDataSetService extends AbstractChartDatasetService im
chartDataSetDto.setyAxisID(dataSet.yAxesId);
chartDataSetDto.setTension(dataSet.tension);
chartDataSetDto.setOrder(dataSet.drawOrder);
chartDataSetDto.setStack(dataSet.stack);
chartDataSetDto.setBorderRadius(dataSet.borderRadius);
chartDataSetDto.setBarPercentage(dataSet.barPercentage);

2
backend/src/main/java/ervu_business_metrics/model/chart/ColumnAggregationDataSet.java
View file

@ -33,4 +33,6 @@ public class ColumnAggregationDataSet {
public Float tension;
public Integer drawOrder;
public String stack;
}