adapt numbers display

gehelem · Dec 3, 2022 · 38eacba · 38eacba
1 parent 81485d5
commit 38eacba
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -13,7 +13,11 @@ import { MatToolbarModule} from '@angular/material/toolbar';
 import { MatDialogModule} from '@angular/material/dialog';
 import {MatTabsModule} from '@angular/material/tabs'; 
 import { FormsModule } from '@angular/forms';
-
+import { LOCALE_ID } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { registerLocaleData } from '@angular/common';
+import localeFr from '@angular/common/locales/fr';
+registerLocaleData(localeFr);
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { WebsocketService } from './websocket.service';
@@ -57,7 +61,9 @@ import { NgChartsModule } from 'ng2-charts';
     MatTableModule,
     NgChartsModule
   ],
-  providers: [],
+  providers: [
+    { provide: LOCALE_ID, useValue: 'fr-FR'},
+  ],
   bootstrap: [AppComponent]
 })
 export class AppModule { 

diff --git a/src/app/prop/prop.component.html b/src/app/prop/prop.component.html
@@ -57,14 +57,14 @@
 
                 <tr *ngIf="(isNumber(elt.value.value))">
                     <td style="min-width:150px"><label>{{elt.value.label}}</label></td>
-                    <td><input *ngIf="(!(this.ws.datastore.mods[mod].prps[prop].permission==0))" matInput value={{elt.value.value}} (click)="this.openEditProp(this.ws.datastore.mods[mod].prps[prop],elt.key)"></td>        
-                    <td><label *ngIf="(this.ws.datastore.mods[mod].prps[prop].permission==0)">{{elt.value.value}}</label></td>
+                    <td><input *ngIf="(!(this.ws.datastore.mods[mod].prps[prop].permission==0))" matInput value="{{elt.value.valueN | number}}" (click)="this.openEditProp(this.ws.datastore.mods[mod].prps[prop],elt.key)"></td>        
+                    <td><label *ngIf="(this.ws.datastore.mods[mod].prps[prop].permission==0)">{{elt.value.valueN | number}}</label></td>
                 </tr>    
 
             </ng-container>
         </table>
 
-        <ng-container  *ngIf="this.ws.datastore.mods[mod].prps[prop].grid2.length>10000">
+        <ng-container  *ngIf="this.ws.datastore.mods[mod].prps[prop].grid2.length>0">
 
         <table #mytable mat-table [dataSource]="this.ws.datastore.mods[mod].prps[prop].grid2" class="mat-elevation-z8 demo-table">
             <ng-container *ngFor="let e of this.ws.datastore.mods[mod].prps[prop].elts | keyvalue:originalOrderElt" [matColumnDef]="e.key">

diff --git a/src/datastructure/elt.ts b/src/datastructure/elt.ts
@@ -1,19 +1,31 @@
+
 export class Elt {
     label: string='';
     value: string | number | boolean = false;
+    valueN:number=0;
     min: number=0;
     max: number=0;
     step: number=0;
     order: string='';   
+    isNumber(val: any): boolean { 
+        return typeof val === 'number'; 
+    }
+
     setValue (json:any) {
         if (json) {
             this.value=json['value'];
+            if (this.isNumber(json['value'])) {
+                this.valueN=json['value'];
+            }
         } 
     }
     setAll (json:any) {
         if (json) {
             this.label=json['elementLabel'];
             this.value=json['value'];
+            if (this.isNumber(json['value'])) {
+                this.valueN=json['value'];
+            }
             this.min=json['min'];
             this.max=json['max'];
             this.step=json['step'];