- @QMetaDataProducingEntity(
- childTables = { @ChildTable(
- childTableEntityClass = LineItem.class,
- childJoin = @ChildJoin(enabled = true),
- childRecordListWidget = @ChildRecordListWidget(enabled = true, label = "Order Lines"))
- }
+ @QMetaDataProducingEntity( childTables = { @ChildTable(
+ childTableEntityClass = LineItem.class,
+ childJoin = @ChildJoin(enabled = true),
+ childRecordListWidget = @ChildRecordListWidget(enabled = true, label = "Order Lines"))
+ }
)
public class Order extends QRecordEntity
**
@@ -62,13 +63,16 @@ public class ChildJoinFromRecordEntityGenericMetaDataProducer implements MetaDat
private String parentTableName; // e.g., order
private String foreignKeyFieldName; // e.g., orderId
+ private ChildJoin.OrderBy[] orderBys;
+
private Class sourceClass;
+
/***************************************************************************
**
***************************************************************************/
- public ChildJoinFromRecordEntityGenericMetaDataProducer(String childTableName, String parentTableName, String foreignKeyFieldName)
+ public ChildJoinFromRecordEntityGenericMetaDataProducer(String childTableName, String parentTableName, String foreignKeyFieldName, ChildJoin.OrderBy[] orderBys)
{
Objects.requireNonNull(childTableName, "childTableName cannot be null");
Objects.requireNonNull(parentTableName, "parentTableName cannot be null");
@@ -77,6 +81,7 @@ public class ChildJoinFromRecordEntityGenericMetaDataProducer implements MetaDat
this.childTableName = childTableName;
this.parentTableName = parentTableName;
this.foreignKeyFieldName = foreignKeyFieldName;
+ this.orderBys = orderBys;
}
@@ -87,18 +92,39 @@ public class ChildJoinFromRecordEntityGenericMetaDataProducer implements MetaDat
@Override
public QJoinMetaData produce(QInstance qInstance) throws QException
{
- QTableMetaData possibleValueTable = qInstance.getTable(parentTableName);
- if(possibleValueTable == null)
+ QTableMetaData parentTable = qInstance.getTable(parentTableName);
+ if(parentTable == null)
{
throw (new QException("Could not find tableMetaData " + parentTableName));
}
+ QTableMetaData childTable = qInstance.getTable(childTableName);
+ if(childTable == null)
+ {
+ throw (new QException("Could not find tableMetaData " + childTable));
+ }
+
QJoinMetaData join = new QJoinMetaData()
.withLeftTable(parentTableName)
.withRightTable(childTableName)
.withInferredName()
.withType(JoinType.ONE_TO_MANY)
- .withJoinOn(new JoinOn(possibleValueTable.getPrimaryKeyField(), foreignKeyFieldName));
+ .withJoinOn(new JoinOn(parentTable.getPrimaryKeyField(), foreignKeyFieldName));
+
+ if(orderBys != null && orderBys.length > 0)
+ {
+ for(ChildJoin.OrderBy orderBy : orderBys)
+ {
+ join.withOrderBy(new QFilterOrderBy(orderBy.fieldName(), orderBy.isAscending()));
+ }
+ }
+ else
+ {
+ //////////////////////////////////////////////////////////
+ // by default, sort by the id of the child table... mmm //
+ //////////////////////////////////////////////////////////
+ join.withOrderBy(new QFilterOrderBy(childTable.getPrimaryKeyField()));
+ }
return (join);
}
@@ -126,6 +152,7 @@ public class ChildJoinFromRecordEntityGenericMetaDataProducer implements MetaDat
}
+
/*******************************************************************************
** Fluent setter for sourceClass
**
diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/producers/annotations/ChildJoin.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/producers/annotations/ChildJoin.java
index 2266679e..5439bf02 100644
--- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/producers/annotations/ChildJoin.java
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/producers/annotations/ChildJoin.java
@@ -35,4 +35,16 @@ import java.lang.annotation.RetentionPolicy;
public @interface ChildJoin
{
boolean enabled();
+
+ OrderBy[] orderBy() default { };
+
+ /***************************************************************************
+ **
+ ***************************************************************************/
+ @interface OrderBy
+ {
+ String fieldName();
+
+ boolean isAscending() default true;
+ }
}
diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/reporting/QReportDataSource.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/reporting/QReportDataSource.java
index 843c5241..712e1513 100644
--- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/reporting/QReportDataSource.java
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/reporting/QReportDataSource.java
@@ -40,7 +40,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
** (optionally along with queryJoins and queryInputCustomizer) is used.
** - else a staticDataSupplier is used.
*******************************************************************************/
-public class QReportDataSource
+public class QReportDataSource implements Cloneable
{
private String name;
@@ -55,6 +55,39 @@ public class QReportDataSource
+ /***************************************************************************
+ **
+ ***************************************************************************/
+ @Override
+ public QReportDataSource clone()
+ {
+ try
+ {
+ QReportDataSource clone = (QReportDataSource) super.clone();
+ if(queryFilter != null)
+ {
+ clone.queryFilter = queryFilter.clone();
+ }
+
+ if(queryJoins != null)
+ {
+ clone.queryJoins = new ArrayList<>();
+ for(QueryJoin join : queryJoins)
+ {
+ queryJoins.add(join.clone());
+ }
+ }
+
+ return clone;
+ }
+ catch(CloneNotSupportedException e)
+ {
+ throw new AssertionError();
+ }
+ }
+
+
+
/*******************************************************************************
** Getter for name
**
@@ -274,6 +307,7 @@ public class QReportDataSource
}
+
/*******************************************************************************
** Getter for customRecordSource
*******************************************************************************/
@@ -303,5 +337,4 @@ public class QReportDataSource
return (this);
}
-
}
diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/reporting/QReportMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/reporting/QReportMetaData.java
index 649de4ee..c5b9bf9f 100644
--- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/reporting/QReportMetaData.java
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/reporting/QReportMetaData.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
import com.kingsrook.qqq.backend.core.model.metadata.TopLevelMetaDataInterface;
+import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppChildMetaData;
import com.kingsrook.qqq.backend.core.model.metadata.layout.QIcon;
@@ -37,7 +38,7 @@ import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
/*******************************************************************************
** Meta-data definition of a report generated by QQQ
*******************************************************************************/
-public class QReportMetaData implements QAppChildMetaData, MetaDataWithPermissionRules, TopLevelMetaDataInterface
+public class QReportMetaData implements QAppChildMetaData, MetaDataWithPermissionRules, TopLevelMetaDataInterface, Cloneable
{
private String name;
private String label;
@@ -52,6 +53,72 @@ public class QReportMetaData implements QAppChildMetaData, MetaDataWithPermissio
private QIcon icon;
+ private QCodeReference exportStyleCustomizer;
+
+
+ /***************************************************************************
+ **
+ ***************************************************************************/
+ @Override
+ public QReportMetaData clone()
+ {
+ try
+ {
+ QReportMetaData clone = (QReportMetaData) super.clone();
+
+ //////////////////////////////
+ // Deep copy mutable fields //
+ //////////////////////////////
+ if(this.inputFields != null)
+ {
+ clone.inputFields = new ArrayList<>();
+ for(QFieldMetaData inputField : this.inputFields)
+ {
+ clone.inputFields.add(inputField.clone());
+ }
+ }
+
+ if(this.dataSources != null)
+ {
+ clone.dataSources = new ArrayList<>();
+ for(QReportDataSource dataSource : this.dataSources)
+ {
+ clone.dataSources.add(dataSource.clone());
+ }
+ }
+
+ if(this.views != null)
+ {
+ clone.views = new ArrayList<>();
+ for(QReportView view : this.views)
+ {
+ clone.views.add(view.clone());
+ }
+ }
+
+ if(this.permissionRules != null)
+ {
+ clone.permissionRules = this.permissionRules.clone();
+ }
+
+ if(this.icon != null)
+ {
+ clone.icon = this.icon.clone();
+ }
+
+ if(this.exportStyleCustomizer != null)
+ {
+ clone.exportStyleCustomizer = this.exportStyleCustomizer.clone();
+ }
+
+ return clone;
+ }
+ catch(CloneNotSupportedException e)
+ {
+ throw new AssertionError("Cloning not supported", e);
+ }
+ }
+
/*******************************************************************************
@@ -397,4 +464,35 @@ public class QReportMetaData implements QAppChildMetaData, MetaDataWithPermissio
qInstance.addReport(this);
}
+
+ /*******************************************************************************
+ ** Getter for exportStyleCustomizer
+ *******************************************************************************/
+ public QCodeReference getExportStyleCustomizer()
+ {
+ return (this.exportStyleCustomizer);
+ }
+
+
+
+ /*******************************************************************************
+ ** Setter for exportStyleCustomizer
+ *******************************************************************************/
+ public void setExportStyleCustomizer(QCodeReference exportStyleCustomizer)
+ {
+ this.exportStyleCustomizer = exportStyleCustomizer;
+ }
+
+
+
+ /*******************************************************************************
+ ** Fluent setter for exportStyleCustomizer
+ *******************************************************************************/
+ public QReportMetaData withExportStyleCustomizer(QCodeReference exportStyleCustomizer)
+ {
+ this.exportStyleCustomizer = exportStyleCustomizer;
+ return (this);
+ }
+
+
}
diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/tables/TablesCustomPossibleValueProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/tables/TablesCustomPossibleValueProvider.java
index e72d188f..e2d98b4a 100644
--- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/tables/TablesCustomPossibleValueProvider.java
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/tables/TablesCustomPossibleValueProvider.java
@@ -27,11 +27,9 @@ import java.util.ArrayList;
import java.util.List;
import com.kingsrook.qqq.backend.core.actions.permissions.PermissionCheckResult;
import com.kingsrook.qqq.backend.core.actions.permissions.PermissionsHelper;
-import com.kingsrook.qqq.backend.core.actions.values.QCustomPossibleValueProvider;
+import com.kingsrook.qqq.backend.core.actions.values.BasicCustomPossibleValueProvider;
import com.kingsrook.qqq.backend.core.context.QContext;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
-import com.kingsrook.qqq.backend.core.model.actions.values.SearchPossibleValueSourceInput;
import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValue;
import com.kingsrook.qqq.backend.core.utils.ValueUtils;
@@ -40,26 +38,16 @@ import com.kingsrook.qqq.backend.core.utils.ValueUtils;
** possible-value source provider for the `Tables` PVS - a list of all tables
** in an application/qInstance.
*******************************************************************************/
-public class TablesCustomPossibleValueProvider implements QCustomPossibleValueProviderThis is a test of converting HTML to PDF!!
+This is a line with • some entities <
(btw, is this in SF-Pro???)