From b7c05533179946c20ddc08a5f26cb62ce0f1fc5e Mon Sep 17 00:00:00 2001
From: Denys Vuika <denis.vuyka@gmail.com>
Date: Mon, 21 Nov 2016 18:54:58 +0000
Subject: [PATCH] #885 amount validation

---
 .../src/components/widgets/amount/amount.widget.html |  1 -
 .../components/widgets/core/form-field-validator.ts  | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html
index a92dea9206..985153bc81 100644
--- a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html
+++ b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html
@@ -3,7 +3,6 @@
     <label [attr.for]="field.id">{{field.name}}, {{currency}}</label>
     <input class="mdl-textfield__input"
            type="text"
-           pattern="-?[0-9]*(\.[0-9]+)?"
            [attr.id]="field.id"
            [attr.required]="isRequired()"
            [(ngModel)]="field.value"
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 c7ad7c23d5..843e84aaec 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
@@ -103,11 +103,17 @@ export class NumberFieldValidator implements FormFieldValidator {
         if (this.isSupported(field)) {
             if (field.value === null ||
                 field.value === undefined ||
-                field.value === '' ||
-                NumberFieldValidator.isNumber(field.value)) {
+                field.value === '') {
                 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 true;