andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 07:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge changes from Michael for #600

Browse Source
This commit is contained in:
Proddy
2023-04-30 20:35:29 +02:00
parent c34208c3df
commit 8a01a1e471
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interface/src/project/SettingsEntities.tsx
View File

@@ -199,10 +199,12 @@ const SettingsEntities: FC = () => {
setDialogOpen(true);
};
function formatValue(value: any, uom: any) {
function formatValue(value: any, uom: number) {
return value === undefined || uom === undefined
? ''
: new Intl.NumberFormat().format(value) + (uom === 0 ? '' : ' ' + DeviceValueUOM_s[uom]);
: typeof value === 'number'
? new Intl.NumberFormat().format(value) + (uom === 0 ? '' : ' ' + DeviceValueUOM_s[uom])
: value;
}
function showHex(value: number, digit: number) {

8
interface/src/project/types.ts
View File

@@ -346,12 +346,12 @@ export interface EntityItem {
device_id: number | string;
type_id: number | string;
offset: number;
factor?: number; // optional
uom?: number; // optional
factor: number;
uom: number;
value_type: number;
value?: number; // optional
value?: any;
writeable: boolean;
deleted?: boolean; // optional
deleted?: boolean;
o_id?: number;
o_name?: string;
o_device_id?: number | string;