From 482d0f5d2c9d6ae561d36081917beaf420971726 Mon Sep 17 00:00:00 2001 From: Ghislain Beaulac Date: Fri, 27 Nov 2020 12:50:14 -0500 Subject: [PATCH] fix(formatters): date formatters should accept ISO input & output to US - also make all Formatter arguments never undefined --- .../__tests__/alignRightFormatter.spec.ts | 12 +++--- .../arrayObjectToCsvFormatter.spec.ts | 20 ++++----- .../__tests__/arrayToCsvFormatter.spec.ts | 8 ++-- .../__tests__/boldFormatter.spec.ts | 4 +- .../__tests__/bsDropdownFormatter.spec.ts | 6 +-- .../__tests__/centerFormatter.spec.ts | 12 +++--- .../__tests__/checkboxFormatter.spec.ts | 8 ++-- .../__tests__/checkmarkFormatter.spec.ts | 38 ++++++++--------- .../collectionEditorFormatter.spec.ts | 16 +++---- .../__tests__/collectionFormatter.spec.ts | 14 +++---- .../__tests__/complexObjectFormatter.spec.ts | 18 ++++---- .../__tests__/dateEuroFormatter.spec.ts | 14 +++++-- .../__tests__/dateIsoFormatter.spec.ts | 21 ++++++---- .../dateTimeEuroAmPmFormatter.spec.ts | 14 +++++-- .../__tests__/dateTimeEuroFormatter.spec.ts | 14 +++++-- .../dateTimeIsoAmPmFormatter.spec.ts | 14 +++++-- .../__tests__/dateTimeIsoFormatter.spec.ts | 14 +++++-- .../dateTimeShortEuroFormatter.spec.ts | 14 +++++-- .../dateTimeShortIsoFormatter.spec.ts | 14 +++++-- .../dateTimeShortUsFormatter.spec.ts | 14 +++++-- .../__tests__/dateTimeUsAmPmFormatter.spec.ts | 14 +++++-- .../__tests__/dateTimeUsFormatter.spec.ts | 14 +++++-- .../__tests__/dateUsFormatter.spec.ts | 16 ++++--- .../__tests__/decimalFormatter.spec.ts | 30 ++++++------- .../__tests__/deleteIconFormatter.spec.ts | 4 +- .../dollarColoredBoldFormatter.spec.ts | 22 +++++----- .../__tests__/dollarColoredFormatter.spec.ts | 22 +++++----- .../__tests__/dollarFormatter.spec.ts | 22 +++++----- .../__tests__/editIconFormatter.spec.ts | 4 +- .../__tests__/hyperlinkFormatter.spec.ts | 38 ++++++++--------- .../__tests__/iconFormatter.spec.ts | 4 +- .../__tests__/infoIconFormatter.spec.ts | 4 +- .../__tests__/italicFormatter.spec.ts | 4 +- .../__tests__/lowercaseFormatter.spec.ts | 8 ++-- .../__tests__/maskFormatter.spec.ts | 14 +++---- .../__tests__/multipleFormatter.spec.ts | 4 +- .../percentCompleteBarFormatter.spec.ts | 16 +++---- .../percentCompleteFormatter.spec.ts | 18 ++++---- .../__tests__/percentFormatter.spec.ts | 18 ++++---- .../__tests__/percentSymbolFormatter.spec.ts | 22 +++++----- .../__tests__/progressBarFormatter.spec.ts | 16 +++---- .../translateBooleanFormatter.spec.ts | 2 +- .../__tests__/translateFormatter.spec.ts | 2 +- .../__tests__/uppercaseFormatter.spec.ts | 8 ++-- .../__tests__/yesNoFormatter.spec.ts | 6 +-- .../formatters/collectionEditorFormatter.ts | 8 ++-- .../formatters/collectionFormatter.ts | 5 ++- .../formatters/formatterUtilities.ts | 6 ++- .../avgTotalsDollarFormatters.spec.ts | 18 ++++---- .../__tests__/avgTotalsFormatter.spec.ts | 38 ++++++++--------- .../avgTotalsPercentageFormatter.spec.ts | 38 ++++++++--------- .../__tests__/maxTotalsFormatter.spec.ts | 42 +++++++++---------- .../__tests__/minTotalsFormatter.spec.ts | 42 +++++++++---------- .../__tests__/sumTotalsBoldFormatter.spec.ts | 42 +++++++++---------- .../sumTotalsColoredFormatter.spec.ts | 42 +++++++++---------- .../sumTotalsDollarBoldFormatter.spec.ts | 42 +++++++++---------- ...umTotalsDollarColoredBoldFormatter.spec.ts | 42 +++++++++---------- .../sumTotalsDollarColoredFormatter.spec.ts | 42 +++++++++---------- .../sumTotalsDollarFormatter.spec.ts | 42 +++++++++---------- .../__tests__/sumTotalsFormatter.spec.ts | 40 +++++++++--------- .../models/formatter.interface.ts | 2 +- 61 files changed, 595 insertions(+), 517 deletions(-) diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/alignRightFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/alignRightFormatter.spec.ts index b057a69a9..b2a492e71 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/alignRightFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/alignRightFormatter.spec.ts @@ -3,30 +3,30 @@ import { alignRightFormatter } from '../alignRightFormatter'; describe('Right Alignment Formatter', () => { it('should return an empty string when no value is passed', () => { - const output = alignRightFormatter(1, 1, '', {} as Column, {}); + const output = alignRightFormatter(1, 1, '', {} as Column, {}, {}); expect(output).toBe('
'); }); it('should return an empty string when value is null or undefined', () => { - const output1 = alignRightFormatter(1, 1, null, {} as Column, {}); - const output2 = alignRightFormatter(1, 1, undefined, {} as Column, {}); + const output1 = alignRightFormatter(1, 1, null, {} as Column, {}, {}); + const output2 = alignRightFormatter(1, 1, undefined, {} as Column, {}, {}); expect(output1).toBe('
'); expect(output2).toBe('
'); }); it('should return a string all in uppercase', () => { - const output = alignRightFormatter(1, 1, 'hello', {} as Column, {}); + const output = alignRightFormatter(1, 1, 'hello', {} as Column, {}, {}); expect(output).toBe('
hello
'); }); it('should return a number as a string', () => { - const output = alignRightFormatter(1, 1, 99, {} as Column, {}); + const output = alignRightFormatter(1, 1, 99, {} as Column, {}, {}); expect(output).toBe('
99
'); }); it('should return a boolean as a string all in uppercase', () => { - const output = alignRightFormatter(1, 1, false, {} as Column, {}); + const output = alignRightFormatter(1, 1, false, {} as Column, {}, {}); expect(output).toBe('
false
'); }); }); diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/arrayObjectToCsvFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/arrayObjectToCsvFormatter.spec.ts index 8eb11ea68..a43309b86 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/arrayObjectToCsvFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/arrayObjectToCsvFormatter.spec.ts @@ -11,41 +11,41 @@ describe('the ArrayObjectToCsv Formatter', () => { ]; it('should throw an error when omitting to pass "propertyNames" to "params"', () => { - expect(() => arrayObjectToCsvFormatter(0, 0, 'anything', {} as Column, {})) + expect(() => arrayObjectToCsvFormatter(0, 0, 'anything', {} as Column, {}, {})) .toThrowError('Formatters.arrayObjectToCsv requires you to pass an array of "propertyNames"'); }); it('should return original input value when the "propertyNames" is not found in the given object', () => { const params = { propertyNames: ['name'] }; - const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'roles', params } as Column, {}); + const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'roles', params } as Column, {}, {}); expect(result).toBe('anything'); }); it('should return original input value when the "propertyNames" is found to be holding an empty array', () => { const params = { propertyNames: ['name'] }; - const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'roles', params } as Column, dataset[2]); + const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'roles', params } as Column, dataset[2], {}); expect(result).toBe('anything'); }); it('should return csv string in a span (with it\'s content and title attribute to be the same) when multiple input values are passed', () => { const params = { propertyNames: ['name'] }; const expectedOutput = 'Administrator, Regular User'; - const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'roles', params } as Column, dataset[0]); + const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'roles', params } as Column, dataset[0], {}); expect(result).toBe(`${expectedOutput}`); }); it('should return regular string in a span (with it\'s content and title attribute to be the same) when 1 input value is passed', () => { const params = { propertyNames: ['name'] }; const expectedOutput = 'Regular User'; - const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'roles', params } as Column, dataset[1]); + const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'roles', params } as Column, dataset[1], {}); expect(result).toBe(`${expectedOutput}`); }); it(`should return csv string in a span when multiple input values are passed and user provide a different "dataContextProperty" to pull the data from a different field of the dataContext object`, () => { - const params = { dataContextProperty: 'roles', propertyNames: ['name'] }; - const expectedOutput = 'Administrator, Regular User'; - const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'email', params } as Column, dataset[0]); - expect(result).toBe(`${expectedOutput}`); - }); + const params = { dataContextProperty: 'roles', propertyNames: ['name'] }; + const expectedOutput = 'Administrator, Regular User'; + const result = arrayObjectToCsvFormatter(0, 0, 'anything', { field: 'email', params } as Column, dataset[0], {}); + expect(result).toBe(`${expectedOutput}`); + }); }); diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/arrayToCsvFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/arrayToCsvFormatter.spec.ts index 88ed64dc4..445cf0d7a 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/arrayToCsvFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/arrayToCsvFormatter.spec.ts @@ -4,25 +4,25 @@ import { arrayToCsvFormatter } from '../arrayToCsvFormatter'; describe('the ArrayToCsv Formatter', () => { it('should return same output when no value is passed', () => { const valueArray = null; - const result = arrayToCsvFormatter(0, 0, valueArray, {} as Column, {}); + const result = arrayToCsvFormatter(0, 0, valueArray, {} as Column, {}, {}); expect(result).toBe(null); }); it('should return an empty array when value passed is an empty array', () => { const valueArray = []; - const result = arrayToCsvFormatter(0, 0, valueArray, {} as Column, {}); + const result = arrayToCsvFormatter(0, 0, valueArray, {} as Column, {}, {}); expect(result).toEqual([]); }); it('should return original value when input is not an array', () => { const inputValue = 'anything'; - const result = arrayToCsvFormatter(0, 0, inputValue, {} as Column, {}); + const result = arrayToCsvFormatter(0, 0, inputValue, {} as Column, {}, {}); expect(result).toBe(inputValue); }); it('should return a CSV string when value passed is an array of string', () => { const valueArray = ['john', 'doe']; - const result = arrayToCsvFormatter(0, 0, valueArray, {} as Column, {}); + const result = arrayToCsvFormatter(0, 0, valueArray, {} as Column, {}, {}); expect(result).toBe(`${valueArray.join(', ')}`); }); }); diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/boldFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/boldFormatter.spec.ts index 87e9247d3..56af747cd 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/boldFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/boldFormatter.spec.ts @@ -4,13 +4,13 @@ import { boldFormatter } from '../boldFormatter'; describe('the Bold Formatter', () => { it('should return an empty string when no value is passed', () => { const value = null; - const result = boldFormatter(0, 0, value, {} as Column, {}); + const result = boldFormatter(0, 0, value, {} as Column, {}, {}); expect(result).toBe(''); }); it('should return a bold html formatted string when value is filled', () => { const value = 'john'; - const result = boldFormatter(0, 0, value, {} as Column, {}); + const result = boldFormatter(0, 0, value, {} as Column, {}, {}); expect(result).toBe(`${value}`); }); }); diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/bsDropdownFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/bsDropdownFormatter.spec.ts index 3a2b6fc08..3efffda09 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/bsDropdownFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/bsDropdownFormatter.spec.ts @@ -3,7 +3,7 @@ import { bsDropdownFormatter } from '../bsDropdownFormatter'; describe('the Bootstrap dropdown Formatter', () => { it('should throw an error when omitting to pass "propertyNames" to "params"', () => { - expect(() => bsDropdownFormatter(0, 0, 'anything', {} as Column, {})) + expect(() => bsDropdownFormatter(0, 0, 'anything', {} as Column, {}, {})) .toThrowError('You must provide the "label" or "formatterLabel" via the generic "params"'); }); @@ -12,7 +12,7 @@ describe('the Bootstrap dropdown Formatter', () => { const label = 'Action'; const row = 0; const cell = 0; - const result = bsDropdownFormatter(row, cell, input, { field: 'user', params: { label } } as Column, {}); + const result = bsDropdownFormatter(row, cell, input, { field: 'user', params: { label } } as Column, {}, {}); expect(result).toBe(``; - const output = progressBarFormatter(1, 1, inputValue, {} as Column, {}); + const output = progressBarFormatter(1, 1, inputValue, {} as Column, {}, {}); expect(output).toBe(template.replace(/\s{2,}/g, ' ').trim()); }); @@ -48,8 +48,8 @@ describe('the Progress Bar Formatter', () => { ${inputValue2}% `; - const output1 = progressBarFormatter(1, 1, inputValue1, {} as Column, {}); - const output2 = progressBarFormatter(1, 1, inputValue2, {} as Column, {}); + const output1 = progressBarFormatter(1, 1, inputValue1, {} as Column, {}, {}); + const output2 = progressBarFormatter(1, 1, inputValue2, {} as Column, {}, {}); expect(output1).toBe(template1.replace(/\s{2,}/g, ' ').trim()); expect(output2).toBe(template2.replace(/\s{2,}/g, ' ').trim()); @@ -62,7 +62,7 @@ describe('the Progress Bar Formatter', () => {
${inputValue}%
`; - const output = progressBarFormatter(1, 1, inputValue, {} as Column, {}); + const output = progressBarFormatter(1, 1, inputValue, {} as Column, {}, {}); expect(output).toBe(template.replace(/\s{2,}/g, ' ').trim()); }); @@ -74,7 +74,7 @@ describe('the Progress Bar Formatter', () => {
${inputMaxValue}%
`; - const output = progressBarFormatter(1, 1, inputValue, {} as Column, {}); + const output = progressBarFormatter(1, 1, inputValue, {} as Column, {}, {}); expect(output).toBe(template.replace(/\s{2,}/g, ' ').trim()); }); }); diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/translateBooleanFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/translateBooleanFormatter.spec.ts index 334ee781b..fcd04d11a 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/translateBooleanFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/translateBooleanFormatter.spec.ts @@ -53,7 +53,7 @@ describe('the Translate Formatter', () => { }); it('should return the translated value when value passed is a string and ngx-translate service is passed as a ColumnDef Params without any Grid object', () => { - const output = translateBooleanFormatter(1, 1, 'TRUE', { params: { i18n: translate } } as Column, {}); + const output = translateBooleanFormatter(1, 1, 'TRUE', { params: { i18n: translate } } as Column, {}, {}); expect(output).toBe('Vrai'); }); diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/translateFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/translateFormatter.spec.ts index 0164fe871..e4a046190 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/translateFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/translateFormatter.spec.ts @@ -47,7 +47,7 @@ describe('the Translate Formatter', () => { }); it('should return the translated value when value passed is a string and ngx-translate service is passed as a ColumnDef Params without any Grid object', () => { - const output = translateFormatter(1, 1, 'HELLO', { params: { i18n: translate } } as Column, {}); + const output = translateFormatter(1, 1, 'HELLO', { params: { i18n: translate } } as Column, {}, {}); expect(output).toBe('Bonjour'); }); diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/uppercaseFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/uppercaseFormatter.spec.ts index a32798a1e..e9014c9c0 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/uppercaseFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/uppercaseFormatter.spec.ts @@ -3,22 +3,22 @@ import { uppercaseFormatter } from '../uppercaseFormatter'; describe('the Uppercase Formatter', () => { it('should return an empty string when no value is passed', () => { - const output = uppercaseFormatter(1, 1, '', {} as Column, {}); + const output = uppercaseFormatter(1, 1, '', {} as Column, {}, {}); expect(output).toBe(''); }); it('should return a string all in uppercase', () => { - const output = uppercaseFormatter(1, 1, 'hello', {} as Column, {}); + const output = uppercaseFormatter(1, 1, 'hello', {} as Column, {}, {}); expect(output).toBe('HELLO'); }); it('should return a number as a string', () => { - const output = uppercaseFormatter(1, 1, 99, {} as Column, {}); + const output = uppercaseFormatter(1, 1, 99, {} as Column, {}, {}); expect(output).toBe('99'); }); it('should return a boolean as a string all in uppercase', () => { - const output = uppercaseFormatter(1, 1, false, {} as Column, {}); + const output = uppercaseFormatter(1, 1, false, {} as Column, {}, {}); expect(output).toBe('FALSE'); }); }); diff --git a/src/app/modules/angular-slickgrid/formatters/__tests__/yesNoFormatter.spec.ts b/src/app/modules/angular-slickgrid/formatters/__tests__/yesNoFormatter.spec.ts index 80361804e..2c279f4d7 100644 --- a/src/app/modules/angular-slickgrid/formatters/__tests__/yesNoFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/formatters/__tests__/yesNoFormatter.spec.ts @@ -3,17 +3,17 @@ import { yesNoFormatter } from '../yesNoFormatter'; describe('Yes/No Formatter', () => { it('should return a "Yes" string when value is passed', () => { - const output = yesNoFormatter(1, 1, 'blah', {} as Column, {}); + const output = yesNoFormatter(1, 1, 'blah', {} as Column, {}, {}); expect(output).toBe('Yes'); }); it('should return the string "No" string when empty string provided', () => { - const output = yesNoFormatter(1, 1, '', {} as Column, {}); + const output = yesNoFormatter(1, 1, '', {} as Column, {}, {}); expect(output).toBe('No'); }); it('should return the string "No" string when value is null', () => { - const output = yesNoFormatter(1, 1, null, {} as Column, {}); + const output = yesNoFormatter(1, 1, null, {} as Column, {}, {}); expect(output).toBe('No'); }); }); diff --git a/src/app/modules/angular-slickgrid/formatters/collectionEditorFormatter.ts b/src/app/modules/angular-slickgrid/formatters/collectionEditorFormatter.ts index 3e3329cad..8872cbc5e 100644 --- a/src/app/modules/angular-slickgrid/formatters/collectionEditorFormatter.ts +++ b/src/app/modules/angular-slickgrid/formatters/collectionEditorFormatter.ts @@ -5,7 +5,7 @@ import { findOrDefault } from '../services/utilities'; /** * A formatter to show the label property value of an editor collection */ -export const collectionEditorFormatter: Formatter = (row: number, cell: number, value: any, columnDef: Column, dataContext: any) => { +export const collectionEditorFormatter: Formatter = (row: number, cell: number, value: any, columnDef: Column, dataContext: any, grid: any) => { if (!value || !columnDef || !columnDef.internalColumnEditor || !columnDef.internalColumnEditor.collection || !columnDef.internalColumnEditor.collection.length) { return value; @@ -21,13 +21,15 @@ export const collectionEditorFormatter: Formatter = (row: number, cell: number, cell, value.map((v: any) => findOrDefault(collection, (c: any) => c === v)), columnDef, - dataContext); + dataContext, + grid); } else { return arrayToCsvFormatter(row, cell, value.map((v: any) => findOrDefault(collection, (c: any) => c[valueName] === v)[labelName]), columnDef, - dataContext); + dataContext, + grid); } } diff --git a/src/app/modules/angular-slickgrid/formatters/collectionFormatter.ts b/src/app/modules/angular-slickgrid/formatters/collectionFormatter.ts index 9f2b5b6f0..e9e48b5fa 100644 --- a/src/app/modules/angular-slickgrid/formatters/collectionFormatter.ts +++ b/src/app/modules/angular-slickgrid/formatters/collectionFormatter.ts @@ -5,7 +5,7 @@ import { findOrDefault } from '../services/utilities'; /** * A formatter to show the label property value of a params collection */ -export const collectionFormatter: Formatter = (row: number, cell: number, value: any, columnDef: Column, dataContext: any) => { +export const collectionFormatter: Formatter = (row: number, cell: number, value: any, columnDef: Column, dataContext: any, grid: any) => { if (!value || !columnDef || !columnDef.params || !columnDef.params.collection || !columnDef.params.collection.length) { return value; @@ -20,7 +20,8 @@ export const collectionFormatter: Formatter = (row: number, cell: number, value: cell, value.map((v: any) => findOrDefault(collection, (c: any) => c[valueName] === v)[labelName]), columnDef, - dataContext); + dataContext, + grid); } return findOrDefault(collection, (c: any) => c[valueName] === value)[labelName] || ''; diff --git a/src/app/modules/angular-slickgrid/formatters/formatterUtilities.ts b/src/app/modules/angular-slickgrid/formatters/formatterUtilities.ts index 71fa7da3d..c5d122579 100644 --- a/src/app/modules/angular-slickgrid/formatters/formatterUtilities.ts +++ b/src/app/modules/angular-slickgrid/formatters/formatterUtilities.ts @@ -25,12 +25,14 @@ export function getValueFromParamsOrFormatterOptions(optionName: string, columnD export function getAssociatedDateFormatter(fieldType: FieldType, defaultSeparator: string): Formatter { const defaultDateFormat = mapMomentDateFormatWithFieldType(fieldType); - return (row: number, cell: number, value: any, columnDef: Column, dataContext: any, grid: any) => { + return (_row: number, _cell: number, value: any, columnDef: Column, _dataContext: any, grid: any) => { const gridOptions = ((grid && typeof grid.getOptions === 'function') ? grid.getOptions() : {}) as GridOption; const customSeparator = gridOptions && gridOptions.formatterOptions && gridOptions.formatterOptions.dateSeparator || defaultSeparator; + const inputType = columnDef && columnDef.type || FieldType.date; + const inputDateFormat = mapMomentDateFormatWithFieldType(inputType); const isParsingAsUtc = columnDef && columnDef.params && columnDef.params.parseDateAsUtc || false; - const isDateValid = moment(value, defaultDateFormat, false).isValid(); + const isDateValid = moment(value, inputDateFormat, false).isValid(); let outputDate = value; if (value && isDateValid) { outputDate = isParsingAsUtc ? moment.utc(value).format(defaultDateFormat) : moment(value).format(defaultDateFormat); diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsDollarFormatters.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsDollarFormatters.spec.ts index 3ccc19ed4..347303a52 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsDollarFormatters.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsDollarFormatters.spec.ts @@ -87,8 +87,8 @@ describe('avgTotalsDollarFormatter', () => { it('should display an average number with at least 2 decimals but no more than 4 by default, and dollar sign when a positive number is provided', () => { const totals = { avg: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsDollarFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = avgTotalsDollarFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = avgTotalsDollarFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = avgTotalsDollarFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('$123.4568'); expect(output2).toBe('$345.20'); @@ -97,9 +97,9 @@ describe('avgTotalsDollarFormatter', () => { it('should display an average number with user defined minimum & maximum decimal count', () => { const totals = { avg: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = avgTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = avgTotalsDollarFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = avgTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = avgTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = avgTotalsDollarFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.46'); expect(output2).toBe('$345.2'); @@ -122,8 +122,8 @@ describe('avgTotalsDollarFormatter', () => { it('should display an average number with prefix and suffix', () => { const totals = { avg: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ' } } as Column, {}); - const output2 = avgTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)' } } as Column, {}); + const output1 = avgTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ' } } as Column, {}, {}); + const output2 = avgTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)' } } as Column, {}, {}); const output3 = avgTotalsDollarFormatter( totals, { id: 'column3', field: 'column3', @@ -138,8 +138,8 @@ describe('avgTotalsDollarFormatter', () => { it('should display an average number with prefix, suffix and thousand separator', () => { const totals = { avg: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = avgTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = avgTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = avgTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = avgTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = avgTotalsDollarFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsFormatter.spec.ts index 1bce5abeb..019154b28 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsFormatter.spec.ts @@ -36,8 +36,8 @@ describe('avgTotalsFormatter', () => { it('should display a negative average when its input is negative', () => { const totals = { avg: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-123'); expect(output2).toBe('-34.57'); @@ -46,9 +46,9 @@ describe('avgTotalsFormatter', () => { it('should display a negative average and thousand separator when its input is negative', () => { const totals = { avg: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-12,345,678'); expect(output2).toBe('-345,678.57'); @@ -58,8 +58,8 @@ describe('avgTotalsFormatter', () => { it('should display a negative average with parentheses instead of the negative sign when its input is negative', () => { const totals = { avg: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('(123)'); expect(output2).toBe('(34.57)'); @@ -68,9 +68,9 @@ describe('avgTotalsFormatter', () => { it('should display a negative average with and thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { avg: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('(12,345,678)'); expect(output2).toBe('(345,678.57)'); @@ -88,8 +88,8 @@ describe('avgTotalsFormatter', () => { it('should display a rounded average number without decimals when no min/maxDecimal is defined and when a positive number is provided', () => { const totals = { avg: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('124'); expect(output2).toBe('345'); @@ -98,9 +98,9 @@ describe('avgTotalsFormatter', () => { it('should display an average number with user defined minimum & maximum decimal count', () => { const totals = { avg: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = avgTotalsFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = avgTotalsFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123.46'); expect(output2).toBe('345.2'); @@ -123,8 +123,8 @@ describe('avgTotalsFormatter', () => { it('should display an average number a prefix and suffix', () => { const totals = { avg: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ' } } as Column, {}); - const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)' } } as Column, {}); + const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ' } } as Column, {}, {}); + const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)' } } as Column, {}, {}); const output3 = avgTotalsFormatter( totals, { id: 'column3', @@ -141,8 +141,8 @@ describe('avgTotalsFormatter', () => { it('should display an average number with prefix, suffix and thousand separator', () => { const totals = { avg: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = avgTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = avgTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = avgTotalsFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsPercentageFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsPercentageFormatter.spec.ts index 6ca194b1b..77c041917 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsPercentageFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/avgTotalsPercentageFormatter.spec.ts @@ -36,8 +36,8 @@ describe('avgTotalsPercentageFormatter', () => { it('should display a negative percentage average when its input is negative', () => { const totals = { avg: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-123%'); expect(output2).toBe('-34.57%'); @@ -46,9 +46,9 @@ describe('avgTotalsPercentageFormatter', () => { it('should display a negative percentage average and thousand separator when its input is negative', () => { const totals = { avg: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-12,345,678%'); expect(output2).toBe('-345,678.57%'); @@ -58,8 +58,8 @@ describe('avgTotalsPercentageFormatter', () => { it('should display a negative percentage average with parentheses instead of the negative sign when its input is negative', () => { const totals = { avg: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('(123%)'); expect(output2).toBe('(34.57%)'); @@ -68,9 +68,9 @@ describe('avgTotalsPercentageFormatter', () => { it('should display a negative percentage average and thousand separator with parentheses instead of the negative sign when its input is negative', () => { const totals = { avg: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('(12,345,678%)'); expect(output2).toBe('(345,678.57%)'); @@ -88,8 +88,8 @@ describe('avgTotalsPercentageFormatter', () => { it('should display a rounded percentage average number without decimals when no min/maxDecimal is defined and a number with decimals is provided', () => { const totals = { avg: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('124%'); expect(output2).toBe('345%'); @@ -98,9 +98,9 @@ describe('avgTotalsPercentageFormatter', () => { it('should display a percentage average number with user defined minimum & maximum decimal count', () => { const totals = { avg: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = avgTotalsPercentageFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = avgTotalsPercentageFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123.46%'); expect(output2).toBe('345.2%'); @@ -123,8 +123,8 @@ describe('avgTotalsPercentageFormatter', () => { it('should display a percentage average number a prefix and suffix', () => { const totals = { avg: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ' } } as Column, {}); - const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)' } } as Column, {}); + const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ' } } as Column, {}, {}); + const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)' } } as Column, {}, {}); const output3 = avgTotalsPercentageFormatter( totals, { id: 'column3', @@ -141,8 +141,8 @@ describe('avgTotalsPercentageFormatter', () => { it('should display an average number with prefix, suffix and thousand separator', () => { const totals = { avg: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = avgTotalsPercentageFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Avg: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = avgTotalsPercentageFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (avg)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = avgTotalsPercentageFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/maxTotalsFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/maxTotalsFormatter.spec.ts index 13f7b8ed8..f37d64244 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/maxTotalsFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/maxTotalsFormatter.spec.ts @@ -36,8 +36,8 @@ describe('maxTotalsFormatter', () => { it('should display a negative maximum when its input is negative', () => { const totals = { max: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-123'); expect(output2).toBe('-34.57'); @@ -46,9 +46,9 @@ describe('maxTotalsFormatter', () => { it('should display a negative maximum and thousand separator when its input is negative', () => { const totals = { max: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-12,345,678'); expect(output2).toBe('-345,678.57'); @@ -58,8 +58,8 @@ describe('maxTotalsFormatter', () => { it('should display a negative maximum with parentheses instead of the negative sign when its input is negative', () => { const totals = { max: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('(123)'); expect(output2).toBe('(34.57)'); @@ -68,9 +68,9 @@ describe('maxTotalsFormatter', () => { it('should display a negative maximum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { max: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('(12,345,678)'); expect(output2).toBe('(345,678.57)'); @@ -88,8 +88,8 @@ describe('maxTotalsFormatter', () => { it('should display a positive maximum number even when displayNegativeNumberWithParentheses is enabled', () => { const totals = { max: { column1: 123, column2: 34.5678, column3: 2.4 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123'); expect(output2).toBe('34.57'); @@ -98,8 +98,8 @@ describe('maxTotalsFormatter', () => { it('should display the same maximum value when a number with decimals is provided', () => { const totals = { max: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('123.55678'); expect(output2).toBe('345.2'); @@ -121,9 +121,9 @@ describe('maxTotalsFormatter', () => { it('should display a maximum number with user defined minimum & maximum decimal count', () => { const totals = { max: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = maxTotalsFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = maxTotalsFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123.46'); expect(output2).toBe('345.2'); @@ -133,8 +133,8 @@ describe('maxTotalsFormatter', () => { it('should display a maximum number a prefix and suffix', () => { const totals = { max: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Max: ' } } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Max: ' } } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}, {}); const output3 = maxTotalsFormatter( totals, { id: 'column3', @@ -151,8 +151,8 @@ describe('maxTotalsFormatter', () => { it('should display a max number with prefix, suffix and thousand separator', () => { const totals = { max: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Max: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = maxTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Max: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = maxTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = maxTotalsFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/minTotalsFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/minTotalsFormatter.spec.ts index a6839e145..9c2cb55cf 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/minTotalsFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/minTotalsFormatter.spec.ts @@ -36,8 +36,8 @@ describe('minTotalsFormatter', () => { it('should display a negative minimum when its input is negative', () => { const totals = { min: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-123'); expect(output2).toBe('-34.57'); @@ -46,9 +46,9 @@ describe('minTotalsFormatter', () => { it('should display a negative minimum and thousand separator when its input is negative', () => { const totals = { min: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-12,345,678'); expect(output2).toBe('-345,678.57'); @@ -58,8 +58,8 @@ describe('minTotalsFormatter', () => { it('should display a negative minimum with parentheses instead of the negative sign when its input is negative', () => { const totals = { min: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('(123)'); expect(output2).toBe('(34.57)'); @@ -68,9 +68,9 @@ describe('minTotalsFormatter', () => { it('should display a negative minimum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { min: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('(12,345,678)'); expect(output2).toBe('(345,678.57)'); @@ -88,8 +88,8 @@ describe('minTotalsFormatter', () => { it('should display a positive minimum number even when displayNegativeNumberWithParentheses is enabled', () => { const totals = { min: { column1: 123, column2: 34.5678, column3: 2.4 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123'); expect(output2).toBe('34.57'); @@ -98,8 +98,8 @@ describe('minTotalsFormatter', () => { it('should display the same minimum value when a number with decimals is provided', () => { const totals = { min: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('123.55678'); expect(output2).toBe('345.2'); @@ -121,9 +121,9 @@ describe('minTotalsFormatter', () => { it('should display a minimum number with user defined minimum & maximum decimal count', () => { const totals = { min: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = minTotalsFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = minTotalsFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123.46'); expect(output2).toBe('345.2'); @@ -133,8 +133,8 @@ describe('minTotalsFormatter', () => { it('should display a minimum number a prefix and suffix', () => { const totals = { min: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'min: ' } } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'min: ' } } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}, {}); const output3 = minTotalsFormatter( totals, { id: 'column3', @@ -151,8 +151,8 @@ describe('minTotalsFormatter', () => { it('should display a sum number with prefix, suffix and thousand separator', () => { const totals = { min: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Min: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (min)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = minTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Min: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = minTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (min)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = minTotalsFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsBoldFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsBoldFormatter.spec.ts index 5f8f2f475..19ede4e3c 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsBoldFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsBoldFormatter.spec.ts @@ -36,8 +36,8 @@ describe('sumTotalsBoldFormatter', () => { it('should display a negative sum when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-123'); expect(output2).toBe('-34.57'); @@ -46,9 +46,9 @@ describe('sumTotalsBoldFormatter', () => { it('should display a negative sum and thousand separator when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-12,345,678'); expect(output2).toBe('-345,678.57'); @@ -58,8 +58,8 @@ describe('sumTotalsBoldFormatter', () => { it('should display a negative sum with parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('(123)'); expect(output2).toBe('(34.57)'); @@ -68,9 +68,9 @@ describe('sumTotalsBoldFormatter', () => { it('should display a negative sum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('(12,345,678)'); expect(output2).toBe('(345,678.57)'); @@ -88,8 +88,8 @@ describe('sumTotalsBoldFormatter', () => { it('should display a positive sum number even when displayNegativeNumberWithParentheses is enabled', () => { const totals = { sum: { column1: 123, column2: 34.5678, column3: 2.4 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123'); expect(output2).toBe('34.57'); @@ -98,8 +98,8 @@ describe('sumTotalsBoldFormatter', () => { it('should display the same sum value when a number with decimals is provided', () => { const totals = { sum: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('123.55678'); expect(output2).toBe('345.2'); @@ -121,9 +121,9 @@ describe('sumTotalsBoldFormatter', () => { it('should display a sum number with user defined minimum & maximum decimal count', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = sumTotalsBoldFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = sumTotalsBoldFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123.46'); expect(output2).toBe('345.2'); @@ -133,8 +133,8 @@ describe('sumTotalsBoldFormatter', () => { it('should display a sum number a prefix and suffix', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ' } } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)' } } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ' } } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)' } } as Column, {}, {}); const output3 = sumTotalsBoldFormatter( totals, { id: 'column3', @@ -151,8 +151,8 @@ describe('sumTotalsBoldFormatter', () => { it('should display a sum number with prefix, suffix and thousand separator', () => { const totals = { sum: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = sumTotalsBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = sumTotalsBoldFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsColoredFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsColoredFormatter.spec.ts index 83f645ee7..06fa9180b 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsColoredFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsColoredFormatter.spec.ts @@ -36,8 +36,8 @@ describe('sumTotalsColoredFormatter', () => { it('should display a negative sum in red when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-123'); expect(output2).toBe('-34.57'); @@ -46,9 +46,9 @@ describe('sumTotalsColoredFormatter', () => { it('should display a negative sum and thousand separator when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-12,345,678'); expect(output2).toBe('-345,678.57'); @@ -58,8 +58,8 @@ describe('sumTotalsColoredFormatter', () => { it('should display a negative sum with parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('(123)'); expect(output2).toBe('(34.57)'); @@ -68,9 +68,9 @@ describe('sumTotalsColoredFormatter', () => { it('should display a negative sum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('(12,345,678)'); expect(output2).toBe('(345,678.57)'); @@ -88,8 +88,8 @@ describe('sumTotalsColoredFormatter', () => { it('should display a positive green sum number even when displayNegativeNumberWithParentheses is enabled', () => { const totals = { sum: { column1: 123, column2: 34.5678, column3: 2.4 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123'); expect(output2).toBe('34.57'); @@ -98,8 +98,8 @@ describe('sumTotalsColoredFormatter', () => { it('should display the same sum value in green when a number with decimals is provided', () => { const totals = { sum: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('123.55678'); expect(output2).toBe('345.2'); @@ -121,9 +121,9 @@ describe('sumTotalsColoredFormatter', () => { it('should display a sum number in green (or red for negative) with user defined minimum & maximum decimal count', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = sumTotalsColoredFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = sumTotalsColoredFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123.46'); expect(output2).toBe('345.2'); @@ -133,8 +133,8 @@ describe('sumTotalsColoredFormatter', () => { it('should display a sum number a prefix and suffix', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}, {}); const output3 = sumTotalsColoredFormatter( totals, { id: 'column3', @@ -151,8 +151,8 @@ describe('sumTotalsColoredFormatter', () => { it('should display a sum number with prefix, suffix and thousand separator', () => { const totals = { sum: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = sumTotalsColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = sumTotalsColoredFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarBoldFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarBoldFormatter.spec.ts index 603bcdc96..445a86378 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarBoldFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarBoldFormatter.spec.ts @@ -36,8 +36,8 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display a negative sum with at least 2 decimals in red when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-$123.00'); expect(output2).toBe('-$34.57'); @@ -46,9 +46,9 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display a negative sum and thousand separator when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-$12,345,678.00'); expect(output2).toBe('-$345,678.57'); @@ -58,8 +58,8 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display a negative sum with parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('($123.00)'); expect(output2).toBe('($34.57)'); @@ -68,9 +68,9 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display a negative sum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('($12,345,678.00)'); expect(output2).toBe('($345,678.57)'); @@ -88,8 +88,8 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display a positive sum number with at least 2 decimals, even when displayNegativeNumberWithParentheses is enabled', () => { const totals = { sum: { column1: 123, column2: 34.5678, column3: 2.4 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.00'); expect(output2).toBe('$34.57'); @@ -98,8 +98,8 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display the same sum value in green with at least 2 decimals when a number with decimals is provided', () => { const totals = { sum: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('$123.5568'); expect(output2).toBe('$345.20'); @@ -121,9 +121,9 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display a sum number in correct color with at least 2 decimals when user provided minimum & maximum decimal count', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = sumTotalsDollarBoldFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = sumTotalsDollarBoldFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.46'); expect(output2).toBe('$345.2'); @@ -133,8 +133,8 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display a sum number with at least 2 decimals with prefix and suffix', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}, {}); const output3 = sumTotalsDollarBoldFormatter( totals, { id: 'column3', @@ -151,8 +151,8 @@ describe('sumTotalsDollarBoldFormatter', () => { it('should display a sum number with prefix, suffix and thousand separator', () => { const totals = { sum: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = sumTotalsDollarBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = sumTotalsDollarBoldFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarColoredBoldFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarColoredBoldFormatter.spec.ts index 2b28340a8..8210b15b0 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarColoredBoldFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarColoredBoldFormatter.spec.ts @@ -36,8 +36,8 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display a negative sum with at least 2 decimals in red when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-$123.00'); expect(output2).toBe('-$34.57'); @@ -46,9 +46,9 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display a negative sum and thousand separator when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-$12,345,678.00'); expect(output2).toBe('-$345,678.57'); @@ -58,8 +58,8 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display a negative sum with parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('($123.00)'); expect(output2).toBe('($34.57)'); @@ -68,9 +68,9 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display a negative sum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('($12,345,678.00)'); expect(output2).toBe('($345,678.57)'); @@ -88,8 +88,8 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display a positive sum number with at least 2 decimals, even when displayNegativeNumberWithParentheses is enabled', () => { const totals = { sum: { column1: 123, column2: 34.5678, column3: 2.4 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.00'); expect(output2).toBe('$34.57'); @@ -98,8 +98,8 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display the same sum value in green with at least 2 decimals when a number with decimals is provided', () => { const totals = { sum: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('$123.5568'); expect(output2).toBe('$345.20'); @@ -121,9 +121,9 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display a sum number in correct color with at least 2 decimals when user provided minimum & maximum decimal count', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.46'); expect(output2).toBe('$345.2'); @@ -133,8 +133,8 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display a sum number with at least 2 decimals with prefix and suffix', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}, {}); const output3 = sumTotalsDollarColoredBoldFormatter( totals, { id: 'column3', @@ -151,8 +151,8 @@ describe('sumTotalsDollarColoredBoldFormatter', () => { it('should display a sum number with prefix, suffix and thousand separator', () => { const totals = { sum: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredBoldFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = sumTotalsDollarColoredBoldFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarColoredFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarColoredFormatter.spec.ts index 091519570..f5682a0a3 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarColoredFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarColoredFormatter.spec.ts @@ -36,8 +36,8 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display a negative sum with at least 2 decimals in red when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-$123.00'); expect(output2).toBe('-$34.57'); @@ -46,9 +46,9 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display a negative sum and thousand separator when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-$12,345,678.00'); expect(output2).toBe('-$345,678.57'); @@ -58,8 +58,8 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display a negative sum with parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('($123.00)'); expect(output2).toBe('($34.57)'); @@ -68,9 +68,9 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display a negative sum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('($12,345,678.00)'); expect(output2).toBe('($345,678.57)'); @@ -88,8 +88,8 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display a positive sum number with at least 2 decimals, even when displayNegativeNumberWithParentheses is enabled', () => { const totals = { sum: { column1: 123, column2: 34.5678, column3: 2.4 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.00'); expect(output2).toBe('$34.57'); @@ -98,8 +98,8 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display the same sum value in green with at least 2 decimals when a number with decimals is provided', () => { const totals = { sum: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('$123.5568'); expect(output2).toBe('$345.20'); @@ -121,9 +121,9 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display a sum number in correct color with at least 2 decimals when user provided minimum & maximum decimal count', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = sumTotalsDollarColoredFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = sumTotalsDollarColoredFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.46'); expect(output2).toBe('$345.2'); @@ -133,8 +133,8 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display a sum number with at least 2 decimals with prefix and suffix', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}, {}); const output3 = sumTotalsDollarColoredFormatter( totals, { id: 'column3', @@ -151,8 +151,8 @@ describe('sumTotalsDollarColoredFormatter', () => { it('should display a sum number with prefix, suffix and thousand separator', () => { const totals = { sum: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarColoredFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = sumTotalsDollarColoredFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = sumTotalsDollarColoredFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarFormatter.spec.ts index dfd1168dd..b730d01cc 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsDollarFormatter.spec.ts @@ -36,8 +36,8 @@ describe('sumTotalsDollarFormatter', () => { it('should display a negative sum with at least 2 decimals in red when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); expect(output1).toBe('-$123.00'); expect(output2).toBe('-$34.57'); @@ -46,9 +46,9 @@ describe('sumTotalsDollarFormatter', () => { it('should display a negative sum and thousand separator when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-$12,345,678.00'); expect(output2).toBe('-$345,678.57'); @@ -58,8 +58,8 @@ describe('sumTotalsDollarFormatter', () => { it('should display a negative sum with parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('($123.00)'); expect(output2).toBe('($34.57)'); @@ -68,9 +68,9 @@ describe('sumTotalsDollarFormatter', () => { it('should display a negative sum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('($12,345,678.00)'); expect(output2).toBe('($345,678.57)'); @@ -88,8 +88,8 @@ describe('sumTotalsDollarFormatter', () => { it('should display a positive sum number with at least 2 decimals, even when displayNegativeNumberWithParentheses is enabled', () => { const totals = { sum: { column1: 123, column2: 34.5678, column3: 2.4 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.00'); expect(output2).toBe('$34.57'); @@ -98,8 +98,8 @@ describe('sumTotalsDollarFormatter', () => { it('should display the same sum value in green with at least 2 decimals when a number with decimals is provided', () => { const totals = { sum: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('$123.5568'); expect(output2).toBe('$345.20'); @@ -121,9 +121,9 @@ describe('sumTotalsDollarFormatter', () => { it('should display a sum number in correct color with at least 2 decimals when user provided minimum & maximum decimal count', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = sumTotalsDollarFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = sumTotalsDollarFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('$123.46'); expect(output2).toBe('$345.2'); @@ -133,8 +133,8 @@ describe('sumTotalsDollarFormatter', () => { it('should display a sum number with at least 2 decimals with prefix and suffix', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}, {}); const output3 = sumTotalsDollarFormatter( totals, { id: 'column3', @@ -151,8 +151,8 @@ describe('sumTotalsDollarFormatter', () => { it('should display a sum number with prefix, suffix and thousand separator', () => { const totals = { sum: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsDollarFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = sumTotalsDollarFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = sumTotalsDollarFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsFormatter.spec.ts b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsFormatter.spec.ts index b416eb38f..55abcf94c 100644 --- a/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsFormatter.spec.ts +++ b/src/app/modules/angular-slickgrid/grouping-formatters/__tests__/sumTotalsFormatter.spec.ts @@ -36,9 +36,9 @@ describe('sumTotalsFormatter', () => { it('should display a negative sum when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}); - const output3 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',' } } as Column, {}); + const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2 } } as Column, {}, {}); + const output3 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',' } } as Column, {}, {}); expect(output1).toBe('-123'); expect(output2).toBe('-34.57'); @@ -48,9 +48,9 @@ describe('sumTotalsFormatter', () => { it('should display a negative sum and thousand separator when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); expect(output1).toBe('-12,345,678'); expect(output2).toBe('-345,678.57'); @@ -60,8 +60,8 @@ describe('sumTotalsFormatter', () => { it('should display a negative sum with parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -123, column2: -34.5678, column3: -2.4 } }; - const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}); - const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true } } as Column, {}, {}); + const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('(123)'); expect(output2).toBe('(34.57)'); @@ -70,9 +70,9 @@ describe('sumTotalsFormatter', () => { it('should display a negative sum with thousand separator and parentheses instead of the negative sign when its input is negative', () => { const totals = { sum: { column1: -12345678, column2: -345678.5678, column3: -2.4 } }; - const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}); - const output3 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: ' ' } } as Column, {}); + const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, thousandSeparator: ',' } } as Column, {}, {}); + const output3 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { maxDecimal: 2, displayNegativeNumberWithParentheses: true, decimalSeparator: ',', thousandSeparator: ' ' } } as Column, {}, {}); expect(output1).toBe('(12,345,678)'); expect(output2).toBe('(345,678.57)'); @@ -90,8 +90,8 @@ describe('sumTotalsFormatter', () => { it('should display the same sum value when a number with decimals is provided', () => { const totals = { sum: { column1: 123.55678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}); - const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}); + const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1' } as Column, {}, {}); + const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2' } as Column, {}, {}); expect(output1).toBe('123.55678'); expect(output2).toBe('345.2'); @@ -100,9 +100,9 @@ describe('sumTotalsFormatter', () => { it('should display a sum number with user defined minimum & maximum decimal count', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}); - const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}); - const output3 = sumTotalsFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}); + const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2 } } as Column, {}, {}); + const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0 } } as Column, {}, {}); + const output3 = sumTotalsFormatter(totals, { id: 'column3', field: 'column3', params: { minDecimal: 3, displayNegativeNumberWithParentheses: true } } as Column, {}, {}); expect(output1).toBe('123.46'); expect(output2).toBe('345.2'); @@ -125,8 +125,8 @@ describe('sumTotalsFormatter', () => { it('should display a sum number a prefix and suffix', () => { const totals = { sum: { column1: 123.45678, column2: 345.2, column3: -2.45 } }; - const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}); - const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}); + const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'sum: ' } } as Column, {}, {}); + const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (max)' } } as Column, {}, {}); const output3 = sumTotalsFormatter( totals, { id: 'column3', @@ -143,8 +143,8 @@ describe('sumTotalsFormatter', () => { it('should display a sum number with prefix, suffix and thousand separator', () => { const totals = { sum: { column1: 12345678.45678, column2: 345678.2, column3: -345678.45 } }; - const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); - const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}); + const output1 = sumTotalsFormatter(totals, { id: 'column1', field: 'column1', params: { maxDecimal: 2, groupFormatterPrefix: 'Sum: ', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); + const output2 = sumTotalsFormatter(totals, { id: 'column2', field: 'column2', params: { minDecimal: 0, groupFormatterSuffix: ' (sum)', decimalSeparator: ',', thousandSeparator: '_' } } as Column, {}, {}); const output3 = sumTotalsFormatter( totals, { id: 'column3', field: 'column3', diff --git a/src/app/modules/angular-slickgrid/models/formatter.interface.ts b/src/app/modules/angular-slickgrid/models/formatter.interface.ts index baa5c8d46..56bad61e7 100644 --- a/src/app/modules/angular-slickgrid/models/formatter.interface.ts +++ b/src/app/modules/angular-slickgrid/models/formatter.interface.ts @@ -1,4 +1,4 @@ import { Column } from './column.interface'; import { FormatterResultObject } from './formatterResultObject.interface'; -export declare type Formatter = (row: number, cell: number, value: any, columnDef?: Column, dataContext?: any, grid?: any) => string | FormatterResultObject; +export declare type Formatter = (row: number, cell: number, value: any, columnDef: Column, dataContext: any, grid: any) => string | FormatterResultObject;