QRunIO/qqq-frontend-material-dashboard
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq-frontend-material-dashboard.git synced 2025-07-17 21:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

CE-798 more flexibility (+1 style) in getValuesString

Browse Source
This commit is contained in:
darin.kelkhoff
2024-02-09 15:39:18 -06:00
parent 7a32d20acb
commit 0ca6f36bc2
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/qqq/utils/qqq/FilterUtils.tsx
View File

@ -319,7 +319,7 @@ class FilterUtils
** get the values associated with a criteria as a string, e.g., for showing ** get the values associated with a criteria as a string, e.g., for showing
** in a tooltip. ** in a tooltip.
*******************************************************************************/ *******************************************************************************/
public static getValuesString(fieldMetaData: QFieldMetaData, criteria: QFilterCriteria, maxValuesToShow: number = 3): string public static getValuesString(fieldMetaData: QFieldMetaData, criteria: QFilterCriteria, maxValuesToShow: number = 3, andMoreFormat: "andNOther" | "+N" = "andNOther"): string
{ {
let valuesString = ""; let valuesString = "";
@ -340,6 +340,10 @@ class FilterUtils
{ {
maxLoops = maxValuesToShow; maxLoops = maxValuesToShow;
} }
else if(maxValuesToShow == 1 && criteria.values.length > 1)
{
maxLoops = 1;
}
for (let i = 0; i < maxLoops; i++) for (let i = 0; i < maxLoops; i++)
{ {
@ -383,7 +387,16 @@ class FilterUtils
if (maxLoops < criteria.values.length) if (maxLoops < criteria.values.length)
{ {
labels.push(" and " + (criteria.values.length - maxLoops) + " other values."); const n = criteria.values.length - maxLoops;
switch (andMoreFormat)
{
case "andNOther":
labels.push(` and ${n} other value${n == 1 ? "" : "s"}.`);
break;
case "+N":
labels[labels.length-1] += ` +${n}`;
break;
}
} }
valuesString = (labels.join(", ")); valuesString = (labels.join(", "));