SPRINT-21: added min height

This commit is contained in:
Tim Chamberlain
2023-02-23 11:10:34 -06:00
parent 7ea1750800
commit 8440536d35
5 changed files with 92 additions and 2 deletions

View File

@ -25,7 +25,6 @@ package com.kingsrook.qqq.backend.core.actions.dashboard.widgets;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -122,7 +121,6 @@ public abstract class AbstractWidgetRenderer
////////////////////////////////////////// //////////////////////////////////////////
Set<String> exists = new HashSet<>(); Set<String> exists = new HashSet<>();
output.getResults().removeIf(pvs -> !exists.add(pvs.getLabel())); output.getResults().removeIf(pvs -> !exists.add(pvs.getLabel()));
output.getResults().sort(Comparator.comparing(QPossibleValue::getLabel));
for(QPossibleValue<?> possibleValue : output.getResults()) for(QPossibleValue<?> possibleValue : output.getResults())
{ {
dropdownOptionList.add(Map.of( dropdownOptionList.add(Map.of(

View File

@ -32,6 +32,7 @@ import java.util.List;
public class ParentWidgetData extends QWidgetData public class ParentWidgetData extends QWidgetData
{ {
private List<String> childWidgetNameList; private List<String> childWidgetNameList;
private boolean omitReloadWidgetCallback;
@ -87,4 +88,38 @@ public class ParentWidgetData extends QWidgetData
return (this); return (this);
} }
/*******************************************************************************
** Getter for omitReloadWidgetCallback
**
*******************************************************************************/
public boolean getOmitReloadWidgetCallback()
{
return omitReloadWidgetCallback;
}
/*******************************************************************************
** Setter for omitReloadWidgetCallback
**
*******************************************************************************/
public void setOmitReloadWidgetCallback(boolean omitReloadWidgetCallback)
{
this.omitReloadWidgetCallback = omitReloadWidgetCallback;
}
/*******************************************************************************
** Fluent setter for omitReloadWidgetCallback
**
*******************************************************************************/
public ParentWidgetData withOmitReloadWidgetCallback(boolean omitReloadWidgetCallback)
{
this.omitReloadWidgetCallback = omitReloadWidgetCallback;
return (this);
}
} }

View File

@ -41,6 +41,7 @@ public class QWidgetMetaData implements QWidgetMetaDataInterface
protected String icon; protected String icon;
protected String label; protected String label;
protected String type; protected String type;
protected String minHeight;
protected boolean isCard; protected boolean isCard;
protected Integer gridColumns; protected Integer gridColumns;
protected QCodeReference codeReference; protected QCodeReference codeReference;
@ -428,6 +429,40 @@ public class QWidgetMetaData implements QWidgetMetaDataInterface
/*******************************************************************************
** Getter for minHeight
**
*******************************************************************************/
public String getMinHeight()
{
return minHeight;
}
/*******************************************************************************
** Setter for minHeight
**
*******************************************************************************/
public void setMinHeight(String minHeight)
{
this.minHeight = minHeight;
}
/*******************************************************************************
** Fluent setter for minHeight
**
*******************************************************************************/
public QWidgetMetaData withMinHeight(String minHeight)
{
this.minHeight = minHeight;
return (this);
}
/******************************************************************************* /*******************************************************************************
** Getter for permissionRules ** Getter for permissionRules
*******************************************************************************/ *******************************************************************************/

View File

@ -131,6 +131,15 @@ public interface QWidgetMetaDataInterface extends MetaDataWithPermissionRules
*******************************************************************************/ *******************************************************************************/
void setIsCard(boolean isCard); void setIsCard(boolean isCard);
/*******************************************************************************
** Getter for minHeight
*******************************************************************************/
String getMinHeight();
/*******************************************************************************
** Setter for minHeight
*******************************************************************************/
void setMinHeight(String minHeight);
/******************************************************************************* /*******************************************************************************
** Getter for storeDropdownSelections ** Getter for storeDropdownSelections

View File

@ -45,6 +45,7 @@ public class QFrontendWidgetMetaData
private final String icon; private final String icon;
private final Integer gridColumns; private final Integer gridColumns;
private final boolean isCard; private final boolean isCard;
private final String minHeight;
private final boolean storeDropdownSelections; private final boolean storeDropdownSelections;
private final List<WidgetDropdownData> dropdowns; private final List<WidgetDropdownData> dropdowns;
@ -67,6 +68,7 @@ public class QFrontendWidgetMetaData
this.icon = widgetMetaData.getIcon(); this.icon = widgetMetaData.getIcon();
this.gridColumns = widgetMetaData.getGridColumns(); this.gridColumns = widgetMetaData.getGridColumns();
this.isCard = widgetMetaData.getIsCard(); this.isCard = widgetMetaData.getIsCard();
this.minHeight = widgetMetaData.getMinHeight();
this.dropdowns = widgetMetaData.getDropdowns(); this.dropdowns = widgetMetaData.getDropdowns();
this.storeDropdownSelections = widgetMetaData.getStoreDropdownSelections(); this.storeDropdownSelections = widgetMetaData.getStoreDropdownSelections();
@ -130,6 +132,17 @@ public class QFrontendWidgetMetaData
/*******************************************************************************
** Getter for minHeight
**
*******************************************************************************/
public String getMinHeight()
{
return minHeight;
}
/******************************************************************************* /*******************************************************************************
** Getter for isCard ** Getter for isCard
** **