QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 13:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to use column labels, when specified, in reports

Browse Source
This commit is contained in:
darin.kelkhoff
2022-09-26 11:27:50 -05:00
parent 3402a20b04
commit c002522cb8
2 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java
View File

@ -106,8 +106,14 @@ public class GenerateReportAction
reportFormat = reportInput.getReportFormat(); reportFormat = reportInput.getReportFormat();
reportStreamer = reportFormat.newReportStreamer(); reportStreamer = reportFormat.newReportStreamer();
////////////////////////////////////////////////////////////////////////////////////////////////
// foreach data source, do a query (possibly more than 1, if it goes to multiple table views) //
////////////////////////////////////////////////////////////////////////////////////////////////
for(QReportDataSource dataSource : report.getDataSources()) for(QReportDataSource dataSource : report.getDataSources())
{ {
//////////////////////////////////////////////////////////////////////////////
// make a list of the views that use this data source for various purposes. //
//////////////////////////////////////////////////////////////////////////////
List<QReportView> dataSourceTableViews = report.getViews().stream() List<QReportView> dataSourceTableViews = report.getViews().stream()
.filter(v -> v.getType().equals(ReportType.TABLE)) .filter(v -> v.getType().equals(ReportType.TABLE))
.filter(v -> v.getDataSourceName().equals(dataSource.getName())) .filter(v -> v.getDataSourceName().equals(dataSource.getName()))
@ -123,6 +129,9 @@ public class GenerateReportAction
.filter(v -> v.getVarianceDataSourceName() != null && v.getVarianceDataSourceName().equals(dataSource.getName())) .filter(v -> v.getVarianceDataSourceName() != null && v.getVarianceDataSourceName().equals(dataSource.getName()))
.toList(); .toList();
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// if this data source isn't used for any table views, but it is used for one or more pivot views (possibly as a variant), then run the query, gathering pivot data. //
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
if(dataSourceTableViews.isEmpty()) if(dataSourceTableViews.isEmpty())
{ {
if(!dataSourcePivotViews.isEmpty() || !dataSourceVariantViews.isEmpty()) if(!dataSourcePivotViews.isEmpty() || !dataSourceVariantViews.isEmpty())
@ -132,8 +141,14 @@ public class GenerateReportAction
} }
else else
{ {
////////////////////////////////////////////////////////////////////////////////////////
// else, foreach table view this data source is used for, run the data source's query //
////////////////////////////////////////////////////////////////////////////////////////
for(QReportView dataSourceTableView : dataSourceTableViews) for(QReportView dataSourceTableView : dataSourceTableViews)
{ {
/////////////////////////////////////////////////////////////////////////////////////////
// if there's a view customizer, run it (e.g., to customize the columns in the report) //
/////////////////////////////////////////////////////////////////////////////////////////
if(dataSourceTableView.getViewCustomizer() != null) if(dataSourceTableView.getViewCustomizer() != null)
{ {
Function<QReportView, QReportView> viewCustomizerFunction = QCodeLoader.getFunction(dataSourceTableView.getViewCustomizer()); Function<QReportView, QReportView> viewCustomizerFunction = QCodeLoader.getFunction(dataSourceTableView.getViewCustomizer());
@ -141,9 +156,12 @@ public class GenerateReportAction
{ {
reportViewCustomizer.setReportInput(reportInput); reportViewCustomizer.setReportInput(reportInput);
} }
dataSourceTableView = viewCustomizerFunction.apply(dataSourceTableView.clone()); // todo - will this throw concurrent mod exception?? dataSourceTableView = viewCustomizerFunction.apply(dataSourceTableView.clone());
} }
////////////////////////////////////////////////////////////////////////////////////
// start the table-view (e.g., open this tab in xlsx) and then run the query-loop //
////////////////////////////////////////////////////////////////////////////////////
startTableView(reportInput, dataSource, dataSourceTableView); startTableView(reportInput, dataSource, dataSourceTableView);
gatherData(reportInput, dataSource, dataSourceTableView, dataSourcePivotViews, dataSourceVariantViews); gatherData(reportInput, dataSource, dataSourceTableView, dataSourcePivotViews, dataSourceVariantViews);
} }
@ -168,8 +186,6 @@ public class GenerateReportAction
exportInput.setFilename(reportInput.getFilename()); exportInput.setFilename(reportInput.getFilename());
exportInput.setReportOutputStream(reportInput.getReportOutputStream()); exportInput.setReportOutputStream(reportInput.getReportOutputStream());
// todo! reportStreamer.setDisplayFormats(getDisplayFormatMap(view));
List<QFieldMetaData> fields; List<QFieldMetaData> fields;
if(CollectionUtils.nullSafeHasContents(reportView.getColumns())) if(CollectionUtils.nullSafeHasContents(reportView.getColumns()))
{ {
@ -182,7 +198,12 @@ public class GenerateReportAction
} }
else else
{ {
fields.add(table.getField(column.getName())); QFieldMetaData field = table.getField(column.getName()).clone();
if(StringUtils.hasContent(column.getLabel()))
{
field.setLabel(column.getLabel());
}
fields.add(field);
} }
} }
} }

25
qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/QFieldMetaData.java
View File

@ -38,7 +38,7 @@ import com.kingsrook.qqq.backend.core.utils.StringUtils;
** Meta-data to represent a single field in a table. ** Meta-data to represent a single field in a table.
** **
*******************************************************************************/ *******************************************************************************/
public class QFieldMetaData public class QFieldMetaData implements Cloneable
{ {
private String name; private String name;
private String label; private String label;
@ -60,6 +60,29 @@ public class QFieldMetaData
/*******************************************************************************
**
*******************************************************************************/
@Override
public QFieldMetaData clone()
{
try
{
QFieldMetaData clone = (QFieldMetaData) super.clone();
if(adornments != null)
{
clone.setAdornments(new ArrayList<>(adornments));
}
return (clone);
}
catch(CloneNotSupportedException e)
{
throw new RuntimeException(e);
}
}
/******************************************************************************* /*******************************************************************************
** **
*******************************************************************************/ *******************************************************************************/