From 5d2adb76e0610851283d36b7eea516dce676984c Mon Sep 17 00:00:00 2001 From: Tim Chamberlain Date: Wed, 19 Feb 2025 17:10:46 -0600 Subject: [PATCH] CE-2261: added grid widths to field metadata --- .../qqq/backend/core/model/data/QField.java | 5 +++ .../model/metadata/fields/QFieldMetaData.java | 33 +++++++++++++++++++ .../frontend/QFrontendFieldMetaData.java | 14 +++++++- 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QField.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QField.java index 13ead81c..f8fbfbe8 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QField.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QField.java @@ -89,6 +89,11 @@ public @interface QField *******************************************************************************/ int maxLength() default Integer.MAX_VALUE; + /******************************************************************************* + ** + *******************************************************************************/ + int gridColumns() default -1; + /******************************************************************************* ** *******************************************************************************/ diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/QFieldMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/QFieldMetaData.java index 5e5e61f0..a24bb992 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/QFieldMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/fields/QFieldMetaData.java @@ -81,6 +81,7 @@ public class QFieldMetaData implements Cloneable private QQueryFilter possibleValueSourceFilter; private QPossibleValueSource inlinePossibleValueSource; + private Integer gridColumns; private Integer maxLength; private Set> behaviors; @@ -198,6 +199,7 @@ public class QFieldMetaData implements Cloneable setIsRequired(fieldAnnotation.isRequired()); setIsEditable(fieldAnnotation.isEditable()); setIsHidden(fieldAnnotation.isHidden()); + setGridColumns(fieldAnnotation.gridColumns()); if(StringUtils.hasContent(fieldAnnotation.label())) { @@ -1062,6 +1064,7 @@ public class QFieldMetaData implements Cloneable } + /******************************************************************************* ** Getter for inlinePossibleValueSource *******************************************************************************/ @@ -1092,4 +1095,34 @@ public class QFieldMetaData implements Cloneable } + + /******************************************************************************* + ** Getter for gridColumns + *******************************************************************************/ + public Integer getGridColumns() + { + return (this.gridColumns); + } + + + + /******************************************************************************* + ** Setter for gridColumns + *******************************************************************************/ + public void setGridColumns(Integer gridColumns) + { + this.gridColumns = gridColumns; + } + + + + /******************************************************************************* + ** Fluent setter for gridColumns + *******************************************************************************/ + public QFieldMetaData withGridColumns(Integer gridColumns) + { + this.gridColumns = gridColumns; + return (this); + } + } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendFieldMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendFieldMetaData.java index 653c1dcc..c6c6014f 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendFieldMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendFieldMetaData.java @@ -51,6 +51,7 @@ public class QFrontendFieldMetaData implements Serializable private boolean isRequired; private boolean isEditable; private boolean isHeavy; + private Integer gridColumns; private String possibleValueSourceName; private String displayFormat; private Serializable defaultValue; @@ -66,7 +67,6 @@ public class QFrontendFieldMetaData implements Serializable ////////////////////////////////////////////////////////////////////////////////// - /******************************************************************************* ** Constructor *******************************************************************************/ @@ -78,6 +78,7 @@ public class QFrontendFieldMetaData implements Serializable this.isRequired = fieldMetaData.getIsRequired(); this.isEditable = fieldMetaData.getIsEditable(); this.isHeavy = fieldMetaData.getIsHeavy(); + this.gridColumns = fieldMetaData.getGridColumns(); this.possibleValueSourceName = fieldMetaData.getPossibleValueSourceName(); this.displayFormat = fieldMetaData.getDisplayFormat(); this.adornments = fieldMetaData.getAdornments(); @@ -166,6 +167,17 @@ public class QFrontendFieldMetaData implements Serializable + /******************************************************************************* + ** Getter for gridColumns + ** + *******************************************************************************/ + public Integer getGridColumns() + { + return gridColumns; + } + + + /******************************************************************************* ** Getter for displayFormat **