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 14cd564c..71ea7397 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 @@ -350,6 +350,8 @@ public class ChartData extends QWidgetData private String label; private List data; private String color; + private String backgroundColor; + private List urls; @@ -376,12 +378,35 @@ public class ChartData extends QWidgetData /******************************************************************************* - ** Getter for color + ** Getter for backgroundColor ** *******************************************************************************/ - public String getColor() + public String getBackgroundColor() { - return color; + return backgroundColor; + } + + + + /******************************************************************************* + ** Setter for backgroundColor + ** + *******************************************************************************/ + public void setBackgroundColor(String backgroundColor) + { + this.backgroundColor = backgroundColor; + } + + + + /******************************************************************************* + ** Fluent setter for backgroundColor + ** + *******************************************************************************/ + public Dataset withBackgroundColor(String backgroundColor) + { + this.backgroundColor = backgroundColor; + return (this); } @@ -452,6 +477,40 @@ public class ChartData extends QWidgetData this.data = data; return (this); } + + + + /******************************************************************************* + ** Getter for urls + ** + *******************************************************************************/ + public List getUrls() + { + return urls; + } + + + + /******************************************************************************* + ** Setter for urls + ** + *******************************************************************************/ + public void setUrls(List urls) + { + this.urls = urls; + } + + + + /******************************************************************************* + ** Fluent setter for urls + ** + *******************************************************************************/ + public Dataset withUrls(List urls) + { + this.urls = urls; + return (this); + } } } } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/StatisticsData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/StatisticsData.java index 9610edb0..cec10f9a 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/StatisticsData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/StatisticsData.java @@ -29,6 +29,8 @@ package com.kingsrook.qqq.backend.core.model.dashboard.widgets; public class StatisticsData extends QWidgetData { private Number count; + private String countFontSize; + private String countURL; private Number percentageAmount; private String percentageLabel; private boolean isCurrency = false; @@ -59,6 +61,74 @@ public class StatisticsData extends QWidgetData + /******************************************************************************* + ** Getter for countURL + ** + *******************************************************************************/ + public String getCountURL() + { + return countURL; + } + + + + /******************************************************************************* + ** Setter for countURL + ** + *******************************************************************************/ + public void setCountURL(String countURL) + { + this.countURL = countURL; + } + + + + /******************************************************************************* + ** Fluent setter for countURL + ** + *******************************************************************************/ + public StatisticsData withCountURL(String countURL) + { + this.countURL = countURL; + return (this); + } + + + + /******************************************************************************* + ** Getter for countFontSize + ** + *******************************************************************************/ + public String getCountFontSize() + { + return countFontSize; + } + + + + /******************************************************************************* + ** Setter for countFontSize + ** + *******************************************************************************/ + public void setCountFontSize(String countFontSize) + { + this.countFontSize = countFontSize; + } + + + + /******************************************************************************* + ** Fluent setter for countFontSize + ** + *******************************************************************************/ + public StatisticsData withCountFontSize(String countFontSize) + { + this.countFontSize = countFontSize; + return (this); + } + + + /******************************************************************************* ** Getter for count ** diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/WidgetType.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/WidgetType.java index 00723c2b..f2f39d21 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/WidgetType.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/WidgetType.java @@ -45,6 +45,7 @@ public enum WidgetType QUICK_SIGHT_CHART("quickSightChart"), STATISTICS("statistics"), SIMPLE_STATISTICS("simpleStatistics"), + STACKED_BAR_CHART("stackedBarChart"), STEPPER("stepper"), TABLE("table"), USA_MAP("usaMap"), diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaData.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaData.java index 31cb48d5..3cc56ad4 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaData.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/dashboard/QWidgetMetaData.java @@ -47,7 +47,9 @@ public class QWidgetMetaData implements QWidgetMetaDataInterface private QPermissionRules permissionRules; - private List dropdowns; + private List dropdowns; + private boolean storeDropdownSelections; + protected Map defaultValues = new LinkedHashMap<>(); @@ -342,6 +344,40 @@ public class QWidgetMetaData implements QWidgetMetaDataInterface + /******************************************************************************* + ** Getter for storeDropdownSelections + ** + *******************************************************************************/ + public boolean getStoreDropdownSelections() + { + return storeDropdownSelections; + } + + + + /******************************************************************************* + ** Setter for storeDropdownSelections + ** + *******************************************************************************/ + public void setStoreDropdownSelections(boolean storeDropdownSelections) + { + this.storeDropdownSelections = storeDropdownSelections; + } + + + + /******************************************************************************* + ** Fluent setter for storeDropdownSelections + ** + *******************************************************************************/ + public QWidgetMetaData withStoreDropdownSelections(boolean storeDropdownSelections) + { + this.storeDropdownSelections = storeDropdownSelections; + return (this); + } + + + /******************************************************************************* ** Fluent setter for dropdowns ** 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 30c987aa..9186f25a 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 @@ -126,10 +126,21 @@ public interface QWidgetMetaDataInterface extends MetaDataWithPermissionRules boolean getIsCard(); /******************************************************************************* - ** Setter for type + ** Setter for isCard *******************************************************************************/ void setIsCard(boolean isCard); + + /******************************************************************************* + ** Getter for storeDropdownSelections + *******************************************************************************/ + boolean getStoreDropdownSelections(); + + /******************************************************************************* + ** Setter for storeDropdownSelections + *******************************************************************************/ + void setStoreDropdownSelections(boolean storeDropdownSelections); + /******************************************************************************* ** Getter for defaultValues *******************************************************************************/ 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 47132a26..63c41c55 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 @@ -43,6 +43,7 @@ public class QFrontendWidgetMetaData private final String icon; private final Integer gridColumns; private final boolean isCard; + private final boolean storeDropdownSelections; private boolean hasPermission; @@ -63,6 +64,7 @@ public class QFrontendWidgetMetaData this.icon = widgetMetaData.getIcon(); this.gridColumns = widgetMetaData.getGridColumns(); this.isCard = widgetMetaData.getIsCard(); + this.storeDropdownSelections = widgetMetaData.getStoreDropdownSelections(); hasPermission = PermissionsHelper.hasWidgetPermission(actionInput, name); } @@ -144,4 +146,15 @@ public class QFrontendWidgetMetaData return hasPermission; } + + + /******************************************************************************* + ** Getter for storeDropdownSelections + ** + *******************************************************************************/ + public boolean getStoreDropdownSelections() + { + return storeDropdownSelections; + } + }