Numbers fix

Author: Gid733

eform-client/src/app/modules/cases/cases.module.ts

@@ -1,6 +1,6 @@
 import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
-import {FormsModule} from '@angular/forms';
+import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {NgSelectModule} from '@ng-select/ng-select';
 import {GalleryModule} from '@ngx-gallery/core';
 import {GallerizeModule} from '@ngx-gallery/gallerize';
@@ -52,7 +52,8 @@ import {
     OwlDateTimeModule,
     OwlNativeDateTimeModule,
     OwlMomentDateTimeModule,
-    FormsModule
+    FormsModule,
+    ReactiveFormsModule
   ],
   declarations: [
     CasesTableComponent,

eform-client/src/app/modules/cases/components/case-elements/element-number/element-number.component.html

@@ -1,7 +1,11 @@
-<div class="md-form md-form-case-elem">
-  <input mdbInputDirective type="number"
-         [(ngModel)]="fieldValueObj.value"
-         [mdbValidate]="false"
-         id="numberElement{{fieldValueObj.fieldId}}" name="numberElement" class="form-control">
-  <label for="numberElement{{fieldValueObj.fieldId}}">{{'Value' | translate}}</label>
-</div>
+<form [formGroup]="numberForm">
+  <div class="md-form md-form-case-elem">
+    <input mdbInputDirective type="number"
+           formControlName="numberControl"
+           [mdbValidate]="false"
+           id="numberElement{{fieldValueObj.fieldId}}"
+           name="numberElement" class="form-control">
+    <label for="numberElement{{fieldValueObj.fieldId}}">{{'Value' | translate}}</label>
+  </div>
+</form>
+

eform-client/src/app/modules/cases/components/case-elements/element-number/element-number.component.ts

@@ -1,26 +1,34 @@
 import {Component, Input, OnInit} from '@angular/core';
+import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
 import {FieldValueDto} from 'src/app/common/models';
 
 @Component({
   selector: 'element-number',
   templateUrl: './element-number.component.html',
   styleUrls: ['./element-number.component.scss']
 })
-export class ElementNumberComponent  {
+export class ElementNumberComponent implements OnInit {
   fieldValueObj: FieldValueDto = new FieldValueDto();
-
+  numberForm: FormGroup;
   @Input()
   get fieldValue() {
+    this.fieldValueObj.value = this.numberForm.getRawValue().numberControl;
     return this.fieldValueObj;
   }
 
   set fieldValue(val) {
     this.fieldValueObj = val;
+    this.numberForm.setValue({numberControl: val.value});
   }
 
-  constructor() {
+  constructor(private formBuilder: FormBuilder) {
+
   }
 
   ngOnInit() {
+    this.numberForm = this.formBuilder.group({
+      numberControl: ['', Validators.required,
+        Validators.pattern('^[1-9][\\.\\d]*(,\\d+)?$')]
+    });
   }
 }