diff --git a/capabilities.json b/capabilities.json index ada173b..4ac0c5d 100644 --- a/capabilities.json +++ b/capabilities.json @@ -314,7 +314,7 @@ { "displayName" : "DD", "value" : "DD" }, { "displayName" : "Thurs DD", "value" : "Thurs DD" }, { "displayName" : "Thursday DD", "value" : "Thursday DD" }, - { "displayName" : "(blank)", "value" : "blank" } + { "displayName" : "(blank)", "value" : "(blank)" } ] } }, @@ -325,7 +325,7 @@ { "displayName" : "MM", "value" : "MM" }, { "displayName" : "Mon", "value" : "Mon" }, { "displayName" : "Month", "value" : "Month" }, - { "displayName" : "(blank)", "value" : "blank" } + { "displayName" : "(blank)", "value" : "(blank)" } ] } }, @@ -335,7 +335,7 @@ "enumeration" : [ { "displayName" : "YYYY", "value" : "YYYY" }, { "displayName" : "YY", "value" : "YY" }, - { "displayName" : "(blank)", "value" : "blank" } + { "displayName" : "(blank)", "value" : "(blank)" } ] } }, diff --git a/src/Functions/dateSettingsToFormatOptions.ts b/src/Functions/dateSettingsToFormatOptions.ts index cdf3bc3..50aaccc 100644 --- a/src/Functions/dateSettingsToFormatOptions.ts +++ b/src/Functions/dateSettingsToFormatOptions.ts @@ -5,27 +5,27 @@ const weekdayDateMap: Record = { "DD" : null, "Thurs DD" : "short", "Thursday DD" : "long", - "blank" : null + "(blank)" : null } const monthDateMap: Record = { "MM" : "2-digit", "Mon" : "short", "Month" : "long", - "blank" : null + "(blank)" : null } const yearDateMap: Record = { "YYYY" : "numeric", "YY" : "2-digit", - "blank" : null + "(blank)" : null } const dayDateMap = { "DD" : "2-digit", "Thurs DD" : "2-digit", "Thursday DD" : "2-digit", - "blank" : null + "(blank)" : null } const dateOptionsLookup = { diff --git a/src/Functions/extractDataColumn.ts b/src/Functions/extractDataColumn.ts index cb9971f..44db26d 100644 --- a/src/Functions/extractDataColumn.ts +++ b/src/Functions/extractDataColumn.ts @@ -23,8 +23,11 @@ function extractKeys(inputView: DataViewCategorical, inputSettings: defaultSetti return null } const dateParts = datePartsToRecord(formatter.formatToParts(value)) - const quarter: string = inputDates.quarters?.[idx] ?? "" - return `${dateParts.weekday} ${dateParts.day}${delim}${dateParts.month}${delim}${quarter}${delim}${dateParts.year}` + const datePartStrings: string[] = [dateParts.weekday + " " + dateParts.day, + dateParts.month, + inputDates.quarters?.[idx] ?? "", + dateParts.year]; + return datePartStrings.filter(d => String(d).trim()).join(delim) }) }