Added Decimal places to numbers

Author: volkmarnissen

src/app/specification/entity/entity.component.html

@@ -183,23 +183,23 @@
                         </mat-form-field>
                     </div>
                     <div class="flexrows">
-                        <mat-form-field class="smallfield width150pt">
+                        <mat-form-field class="smallfield width100pt">
                             <mat-label>Multiplier</mat-label>
                             <input #propMultiplier matInput type="number" formControlName="multiplier"
                                 (change)="onConverterValueChange()">
                             <mat-error *ngIf="numberPropertiesFormGroup.get('multiplier')!.hasError('required')">
                                 This field is required
                             </mat-error>
                         </mat-form-field>
-                        <mat-form-field class="smallfield width100pt">
+                        <mat-form-field class="smallfield width80pt">
                             <mat-label>Offset</mat-label>
                             <input #propOffset matInput type="number" formControlName="offset"
                                 (change)="onConverterValueChange()">
                             <mat-error *ngIf="numberPropertiesFormGroup.get('offset')!.hasError('required')">
                                 This field is required
                             </mat-error>
                         </mat-form-field>
-                        <mat-form-field class="smallfield width150pt">
+                        <mat-form-field class="smallfield width130pt">
                             <mat-label>Number Format</mat-label>
                             <mat-select matInput formControlName="numberFormat" [errorStateMatcher]="errorStateMatcher"
                                 (selectionChange)="onConverterValueChange()" [compareWith]="compareNumber">
@@ -211,6 +211,18 @@
                                 This field is required
                             </mat-error>
                         </mat-form-field>
+                        <mat-form-field class="smallfield width100pt">
+                            <mat-label>Decimals</mat-label>
+                            <mat-select matInput formControlName="decimals" 
+                                (selectionChange)="onConverterValueChange()" [compareWith]="compareNumber">
+                                <mat-option [value]="-1"></mat-option>
+                                <mat-option [value]="0">0</mat-option>
+                                <mat-option [value]="1">1</mat-option>
+                                <mat-option [value]="2">2</mat-option>
+                                <mat-option [value]="3">3</mat-option>
+                                <mat-option [value]="4">4</mat-option>
+                            </mat-select>
+                        </mat-form-field>
 
                     </div>
                     <h3 class="smallfield width150pt"> Identification{{entity.readonly?"":"/step"}}</h3>

src/app/specification/entity/entity.component.ts

@@ -242,6 +242,7 @@ export class EntityComponent
       stateClass: [null as EnumStateClasses | null],
       multiplier: [1, Validators.required],
       offset: [0, Validators.required],
+      decimals:[2],
       numberFormat: [EnumNumberFormat.default, Validators.required],
       uom: [null as string | null],
       min: [null as string | null],
@@ -438,6 +439,9 @@ export class EntityComponent
         this.numberPropertiesFormGroup
           .get("offset")!
           .setValue(np.offset ? np.offset : 0);
+          this.numberPropertiesFormGroup
+          .get("decimals")!
+          .setValue(np.decimals != undefined ? np.decimals : -1);
         let dc = this.getDeviceClass(np.device_class)
         this.numberPropertiesFormGroup
           .get("deviceClass")!
@@ -730,6 +734,10 @@ export class EntityComponent
           enumber.offset =
             this.numberPropertiesFormGroup.get("offset")!.value;
         else enumber.offset = 0;
+        if (this.numberPropertiesFormGroup.get("decimals")!.value != null)
+          enumber.decimals =
+            this.numberPropertiesFormGroup.get("decimals")!.value;
+        else enumber.decimals = 2;        
         if (this.numberPropertiesFormGroup.get("numberFormat")!.value != null)
           enumber.numberFormat =
             this.numberPropertiesFormGroup.get("numberFormat")!.value;
@@ -998,7 +1006,7 @@ export class EntityComponent
   }
   getMqttValue(rc: ImodbusEntity): string {
     if (rc)
-      if (rc.converter.name === "number" && rc.mqttValue) {
+      if (rc.converter.name === "number" && rc.mqttValue!= undefined) {
         return (rc.mqttValue as number).toString();
       } else return rc.mqttValue as string;
     return "N/A";