From 94781c370fe73745f0a2d587f9dee881a11e4152 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Tue, 20 Dec 2016 11:46:24 +0000 Subject: [PATCH] #1331 Add date required validation (#1338) --- .../widgets/core/form-field-validator.spec.ts | 24 +++++++++++++++++++ .../widgets/core/form-field-validator.ts | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts index 245fdf1b6a..576b393d25 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.spec.ts @@ -134,6 +134,30 @@ describe('FormFieldValidator', () => { expect(validator.validate(field)).toBeFalsy(); }); + it('should succeed for date', () => { + let field = new FormFieldModel(new FormModel(), { + type: FormFieldTypes.DATE, + value: '2016-12-31', + required: true + }); + + expect(validator.validate(field)).toBeTruthy(); + }); + + it('should fail for date', () => { + let field = new FormFieldModel(new FormModel(), { + type: FormFieldTypes.DATE, + value: null, + required: true + }); + + field.value = null; + expect(validator.validate(field)).toBeFalsy(); + + field.value = ''; + expect(validator.validate(field)).toBeFalsy(); + }); + it('should succeed for text', () => { let field = new FormFieldModel(new FormModel(), { type: FormFieldTypes.TEXT, diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts index 79dcf67d82..12f84889b4 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts @@ -39,7 +39,8 @@ export class RequiredFieldValidator implements FormFieldValidator { FormFieldTypes.RADIO_BUTTONS, FormFieldTypes.UPLOAD, FormFieldTypes.AMOUNT, - FormFieldTypes.DYNAMIC_TABLE + FormFieldTypes.DYNAMIC_TABLE, + FormFieldTypes.DATE ]; isSupported(field: FormFieldModel): boolean {