diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ChartData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ChartData.java index 71ea7397..9d64fd79 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ChartData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ChartData.java @@ -265,6 +265,7 @@ public class ChartData extends QWidgetData public static class Data { private List labels; + private List urls; private List datasets; @@ -303,6 +304,40 @@ public class ChartData extends QWidgetData + /******************************************************************************* + ** Getter for urls + ** + *******************************************************************************/ + public List getUrls() + { + return urls; + } + + + + /******************************************************************************* + ** Setter for urls + ** + *******************************************************************************/ + public void setUrls(List urls) + { + this.urls = urls; + } + + + + /******************************************************************************* + ** Fluent setter for urls + ** + *******************************************************************************/ + public Data withUrls(List urls) + { + this.urls = urls; + return (this); + } + + + /******************************************************************************* ** Getter for datasets ** diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaDataInterface.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaDataInterface.java index 9186f25a..dfecc869 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaDataInterface.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaDataInterface.java @@ -23,6 +23,7 @@ package com.kingsrook.qqq.backend.core.model.metadata.dashboard; import java.io.Serializable; +import java.util.List; import java.util.Map; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; import com.kingsrook.qqq.backend.core.model.metadata.permissions.MetaDataWithPermissionRules; @@ -173,5 +174,28 @@ public interface QWidgetMetaDataInterface extends MetaDataWithPermissionRules *******************************************************************************/ void setPermissionRules(QPermissionRules permissionRules); + + /******************************************************************************* + ** Getter for dropdowns + *******************************************************************************/ + List getDropdowns(); + + + /******************************************************************************* + ** Setter for dropdowns + *******************************************************************************/ + void setDropdowns(List dropdowns); + + + /******************************************************************************* + ** Fluent setter for dropdowns + *******************************************************************************/ + QWidgetMetaData withDropdowns(List dropdowns); + + + /******************************************************************************* + ** Fluent setter for dropdowns + *******************************************************************************/ + QWidgetMetaData withDropdown(WidgetDropdownData dropdown); } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendWidgetMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendWidgetMetaData.java index 63c41c55..f31445e3 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendWidgetMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/frontend/QFrontendWidgetMetaData.java @@ -22,11 +22,13 @@ package com.kingsrook.qqq.backend.core.model.metadata.frontend; +import java.util.List; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.kingsrook.qqq.backend.core.actions.permissions.PermissionsHelper; import com.kingsrook.qqq.backend.core.model.actions.AbstractActionInput; import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface; +import com.kingsrook.qqq.backend.core.model.metadata.dashboard.WidgetDropdownData; /******************************************************************************* @@ -37,15 +39,16 @@ import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataIn @JsonInclude(Include.NON_NULL) public class QFrontendWidgetMetaData { - private final String name; - private final String label; - private final String type; - private final String icon; - private final Integer gridColumns; - private final boolean isCard; - private final boolean storeDropdownSelections; + private final String name; + private final String label; + private final String type; + private final String icon; + private final Integer gridColumns; + private final boolean isCard; + private final boolean storeDropdownSelections; + private final List dropdowns; - private boolean hasPermission; + private final boolean hasPermission; ////////////////////////////////////////////////////////////////////////////////// // do not add setters. take values from the source-object in the constructor!! // @@ -64,6 +67,7 @@ public class QFrontendWidgetMetaData this.icon = widgetMetaData.getIcon(); this.gridColumns = widgetMetaData.getGridColumns(); this.isCard = widgetMetaData.getIsCard(); + this.dropdowns = widgetMetaData.getDropdowns(); this.storeDropdownSelections = widgetMetaData.getStoreDropdownSelections(); hasPermission = PermissionsHelper.hasWidgetPermission(actionInput, name); @@ -126,6 +130,17 @@ public class QFrontendWidgetMetaData + /******************************************************************************* + ** Getter for isCard + ** + *******************************************************************************/ + public List getDropdowns() + { + return dropdowns; + } + + + /******************************************************************************* ** Getter for icon **