From da2208090b338a608e6897a50411840ebf2ec80e Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 1 Nov 2016 11:53:43 +0000 Subject: [PATCH] #964 support currency symbols for amount column --- .../display-value.widget.spec.ts | 29 +++++++++++++++++++ .../display-value/display-value.widget.ts | 4 +++ 2 files changed, 33 insertions(+) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts index 284a02b03b..e66e2ee12c 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts @@ -641,4 +641,33 @@ describe('DisplayValueWidget', () => { expect(widget.getCellValue(row, column)).toBe(''); }); + it('should prepend default amount currency', () => { + const value = '10'; + let row = { value: { key: value } }; + let column = { id: 'key', type: 'Amount' }; + + const expected = `$ ${value}`; + expect(widget.getCellValue(row, column)).toBe(expected); + }); + + it('should prepend custom amount currency', () => { + const value = '10'; + const currency = 'GBP'; + let row = { value: { key: value } }; + let column = { id: 'key', type: 'Amount', amountCurrency: currency }; + + const expected = `${currency} ${value}`; + expect(widget.getCellValue(row, column)).toBe(expected); + }); + + it('should use zero for missing amount', () => { + const value = null; + const currency = 'GBP'; + let row = { value: { key: value } }; + let column = { id: 'key', type: 'Amount', amountCurrency: currency }; + + const expected = `${currency} 0`; + expect(widget.getCellValue(row, column)).toBe(expected); + }); + }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts index 567d995fd3..5c93995c4d 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts @@ -180,6 +180,10 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit { } } + if (column.type === 'Amount') { + return (column.amountCurrency || '$') + ' ' + (result || 0); + } + return result || ''; } }