From 2b85c5802f9b88346ba7d5d73763d459815ce39a Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 4 Nov 2016 13:19:23 +0000 Subject: [PATCH 1/2] #944 fix date formatting for completed forms --- .../components/widgets/display-value/display-value.widget.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5c93995c4d..cdc9b33ee0 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 @@ -176,7 +176,7 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit { if (column.type === 'Date') { if (result) { - return moment(result.split('T')[0], 'YYYY-MM-DD').format('DD-MM-YYYY'); + return moment(result.split('T')[0], 'YYYY-MM-DD').format('D-M-YYYY'); } } From d53797cf866bb7dafe4a28927a84df7211f171ed Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 4 Nov 2016 13:21:55 +0000 Subject: [PATCH 2/2] Fix unit test --- .../widgets/display-value/display-value.widget.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e66e2ee12c..6466a6c143 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 @@ -624,7 +624,7 @@ describe('DisplayValueWidget', () => { let row = { value: { key: value } }; let column = { id: 'key', type: 'Date' }; - expect(widget.getCellValue(row, column)).toBe('04-10-2016'); + expect(widget.getCellValue(row, column)).toBe('4-10-2016'); }); it('should fallback to empty cell value for date', () => {