From 57a585741da285079cd1a3accd99d4e0f6cdf906 Mon Sep 17 00:00:00 2001 From: Proddy Date: Sat, 2 Sep 2023 13:40:33 +0200 Subject: [PATCH] addd missing translations and show value type in table --- interface/src/project/SettingsEntities.tsx | 13 +++++++++---- interface/src/project/SettingsEntitiesDialog.tsx | 4 ++-- interface/src/project/types.ts | 13 +++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/interface/src/project/SettingsEntities.tsx b/interface/src/project/SettingsEntities.tsx index 2efe981fa..526754df7 100644 --- a/interface/src/project/SettingsEntities.tsx +++ b/interface/src/project/SettingsEntities.tsx @@ -13,7 +13,7 @@ import { toast } from 'react-toastify'; import SettingsEntitiesDialog from './SettingsEntitiesDialog'; import * as EMSESP from './api'; -import { DeviceValueUOM_s } from './types'; +import { DeviceValueTypeNames, DeviceValueUOM_s } from './types'; import { entityItemValidation } from './validators'; import type { EntityItem } from './types'; import type { FC } from 'react'; @@ -57,7 +57,7 @@ const SettingsEntities: FC = () => { const entity_theme = useTheme({ Table: ` - --data-table-library_grid-template-columns: repeat(1, minmax(60px, 1fr)) minmax(80px, auto) 80px 80px 80px; + --data-table-library_grid-template-columns: repeat(1, minmax(60px, 1fr)) minmax(80px, auto) 80px 80px 80px 90px; `, BaseRow: ` font-size: 14px; @@ -81,6 +81,9 @@ const SettingsEntities: FC = () => { &:nth-of-type(5) { text-align: center; } + &:nth-of-type(6) { + text-align: center; + } `, HeaderRow: ` text-transform: uppercase; @@ -208,8 +211,9 @@ const SettingsEntities: FC = () => { {LL.NAME(0)} {LL.ID_OF(LL.DEVICE())} {LL.ID_OF(LL.TYPE(1))} - Offset - {LL.VALUE(0)} + {LL.OFFSET()} + {LL.VALUE(1) + ' ' + LL.TYPE(1)} + {LL.VALUE(1)} @@ -219,6 +223,7 @@ const SettingsEntities: FC = () => { {showHex(ei.device_id as number, 2)} {showHex(ei.type_id as number, 3)} {ei.offset} + {DeviceValueTypeNames[ei.value_type]} {formatValue(ei.value, ei.uom)} ))} diff --git a/interface/src/project/SettingsEntitiesDialog.tsx b/interface/src/project/SettingsEntitiesDialog.tsx index 7006e92d6..061eab8c5 100644 --- a/interface/src/project/SettingsEntitiesDialog.tsx +++ b/interface/src/project/SettingsEntitiesDialog.tsx @@ -148,7 +148,7 @@ const SettingsEntitiesDialog = ({