Browse Source

Merge 25ecb0011a into 3f3ae2a5d4

pull/536/merge
linquize 5 years ago committed by GitHub
parent
commit
a6e6a3bc53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 26
      src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs

26
src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs

@ -62,14 +62,12 @@ namespace ICSharpCode.Reporting.PageBuilder
void BuildDetail(){ void BuildDetail(){
CurrentSection = ReportModel.DetailSection; CurrentSection = ReportModel.DetailSection;
if(DataSourceContainsData()) { CurrentLocation = DetailStart;
CurrentLocation = DetailStart; var converter = new ContainerConverter(DetailStart);
var converter = new ContainerConverter(DetailStart); if (IsGrouped()) {
if (IsGrouped()) { BuildGroupedDetails(converter,DetailStart);
BuildGroupedDetails(converter,DetailStart); } else {
} else { BuildSortedDetails(converter,DetailStart);
BuildSortedDetails(converter,DetailStart);
}
} }
} }
@ -235,17 +233,7 @@ namespace ICSharpCode.Reporting.PageBuilder
void CreateDataSource(){ void CreateDataSource(){
DataSource = new CollectionDataSource(List, ReportModel.ReportSettings); DataSource = new CollectionDataSource(List, ReportModel.ReportSettings);
if (DataSourceContainsData()) { DataSource.Bind();
DataSource.Bind();
}
}
bool DataSourceContainsData () {
if (DataSource.Count > 0) {
return true;
}
return false;
} }

Loading…
Cancel
Save