[Minor] GenericReport fixes

- allowMissingColumns is now default enabled
- make sure direct criteria is always available on the filter criteria
This commit is contained in:
Robert von Burg 2023-11-09 14:05:36 +01:00
parent f105147ec1
commit 1bd986d755
Signed by: eitch
GPG Key ID: 75DB9C85C74331F7
1 changed files with 2 additions and 1 deletions

View File

@ -96,7 +96,7 @@ public class GenericReport extends ReportPolicy {
this.parallel = this.reportRes.getBoolean(PARAM_PARALLEL);
this.descending = this.reportRes.getBoolean(PARAM_DESCENDING);
this.allowMissingColumns = this.reportRes.getBoolean(PARAM_ALLOW_MISSING_COLUMNS);
this.allowMissingColumns = !this.reportRes.hasParameter(PARAM_ALLOW_MISSING_COLUMNS) || this.reportRes.getBoolean(PARAM_ALLOW_MISSING_COLUMNS);
this.filterMissingValuesAsTrue = this.reportRes.getBoolean(PARAM_FILTER_MISSING_VALUES_AS_TRUE);
this.dateRangeSelP = this.reportRes.getParameter(BAG_PARAMETERS, PARAM_DATE_RANGE_SEL);
@ -583,6 +583,7 @@ public class GenericReport extends ReportPolicy {
.sorted(comparing(StringParameter::getIndex)) //
.map(StringParameter::getUom) //
.collect(toList());
criteria.addAll(this.directCriteria);
int maxRowsForFacetGeneration = this.reportRes.getInteger(PARAM_MAX_ROWS_FOR_FACET_GENERATION);