inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #965 from Alfresco/dev-denys-964

Browse Source 
#964 support currency symbols for amount column
This commit is contained in:
Mario Romano 2016-11-01 14:11:59 +00:00 committed by GitHub
commit 774ffd6a75
2 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.spec.ts
View File

@ -641,4 +641,33 @@ describe('DisplayValueWidget', () => {
expect(widget.getCellValue(row, column)).toBe(''); expect(widget.getCellValue(row, column)).toBe('');
}); });
it('should prepend default amount currency', () => {
const value = '10';
let row = <DynamicTableRow> { value: { key: value } };
let column = <DynamicTableColumn> { 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 = <DynamicTableRow> { value: { key: value } };
let column = <DynamicTableColumn> { 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 = <DynamicTableRow> { value: { key: value } };
let column = <DynamicTableColumn> { id: 'key', type: 'Amount', amountCurrency: currency };
const expected = `${currency} 0`;
expect(widget.getCellValue(row, column)).toBe(expected);
});
}); });

4
ng2-components/ng2-activiti-form/src/components/widgets/display-value/display-value.widget.ts
View File

@ -180,6 +180,10 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit {
} }
} }
if (column.type === 'Amount') {
return (column.amountCurrency || '$') + ' ' + (result || 0);
}
return result || ''; return result || '';
} }
} }