From a5569900b44f951ff41e75889092eacd3fcfd57e Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Fri, 9 Feb 2024 15:40:33 -0600 Subject: [PATCH] CE-798 change style of on-button critetria descriptions (don't say equals or in; only show 1 value for in-lists, then +x) --- src/qqq/components/query/QuickFilter.tsx | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/qqq/components/query/QuickFilter.tsx b/src/qqq/components/query/QuickFilter.tsx index f881f56..d73ded5 100644 --- a/src/qqq/components/query/QuickFilter.tsx +++ b/src/qqq/components/query/QuickFilter.tsx @@ -400,16 +400,18 @@ export default function QuickFilter({tableMetaData, fullFieldName, fieldMetaData buttonAdditionalStyles.color = "white !important"; buttonClassName = "filterActive"; - let valuesString = FilterUtils.getValuesString(fieldMetaData, criteria); - if(fieldMetaData.type == QFieldType.BOOLEAN) + let valuesString = FilterUtils.getValuesString(fieldMetaData, criteria, 1, "+N"); + + /////////////////////////////////////////// + // don't show the Equals or In operators // + /////////////////////////////////////////// + let operatorString = (<>{operatorSelectedValue.label} ); + if(operatorSelectedValue.value == QCriteriaOperator.EQUALS || operatorSelectedValue.value == QCriteriaOperator.IN) { - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // for booleans, in here, the operator-label is "equals yes" or "equals no", so we don't want the values string // - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - valuesString = ""; + operatorString = (<>) } - buttonContent = (<>{buttonContent}: {operatorSelectedValue.label} {valuesString}); + buttonContent = (<>{buttonContent}: {operatorString}{valuesString}); } const mouseEvents =