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

#885 amount validation

Browse Source
This commit is contained in:
Denys Vuika 2016-11-21 18:54:58 +00:00 committed by Mario Romano
parent deb2915262
commit b7c0553317
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html
View File

@ -3,7 +3,6 @@
<label [attr.for]="field.id">{{field.name}}, {{currency}}</label> <label [attr.for]="field.id">{{field.name}}, {{currency}}</label>
<input class="mdl-textfield__input" <input class="mdl-textfield__input"
type="text" type="text"
pattern="-?[0-9]*(\.[0-9]+)?"
[attr.id]="field.id" [attr.id]="field.id"
[attr.required]="isRequired()" [attr.required]="isRequired()"
[(ngModel)]="field.value" [(ngModel)]="field.value"

12
ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts
View File

@ -103,11 +103,17 @@ export class NumberFieldValidator implements FormFieldValidator {
if (this.isSupported(field)) { if (this.isSupported(field)) {
if (field.value === null || if (field.value === null ||
field.value === undefined || field.value === undefined ||
field.value === '' || field.value === '') {
NumberFieldValidator.isNumber(field.value)) {
return true; return true;
} }
field.validationSummary = 'Input must be a number'; let pattern = new RegExp(/^-?\d+$/);
if (field.enableFractions) {
pattern = new RegExp(/^-?[0-9]+(\.[0-9]{1,2})?$/);
}
if (field.value.match(pattern)) {
return true;
}
field.validationSummary = 'Incorrect number format';
return false; return false;
} }
return true; return true;