diff options
| author | Kieran Dodson <128472473+K-J-Dod24@users.noreply.github.com> | 2023-05-17 08:59:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-17 08:59:34 +0100 |
| commit | 1cc52221d7962367622a88416cc0f1aef0ce7203 (patch) | |
| tree | 931500079a3060643afc98ec3c82645ba619cac6 /modern/src/common/attributes | |
| parent | e5f04f968af12035fe1291267567ea976fa16a17 (diff) | |
| parent | eb364d8726f6e79cede10b168ea2ae31bbbe696e (diff) | |
| download | trackermap-web-1cc52221d7962367622a88416cc0f1aef0ce7203.tar.gz trackermap-web-1cc52221d7962367622a88416cc0f1aef0ce7203.tar.bz2 trackermap-web-1cc52221d7962367622a88416cc0f1aef0ce7203.zip | |
Merge branch 'traccar:master' into Teltonika-io32-coolantTemp
Diffstat (limited to 'modern/src/common/attributes')
| -rw-r--r-- | modern/src/common/attributes/usePositionAttributes.js | 4 | ||||
| -rw-r--r-- | modern/src/common/attributes/useServerAttributes.js | 18 |
2 files changed, 22 insertions, 0 deletions
diff --git a/modern/src/common/attributes/usePositionAttributes.js b/modern/src/common/attributes/usePositionAttributes.js index 2c3aa0f7..e08e91d5 100644 --- a/modern/src/common/attributes/usePositionAttributes.js +++ b/modern/src/common/attributes/usePositionAttributes.js @@ -152,6 +152,10 @@ export default (t) => useMemo(() => ({ name: t('positionSteps'), type: 'number', }, + heartRate: { + name: t('positionHeartRate'), + type: 'number', + }, input: { name: t('positionInput'), type: 'number', diff --git a/modern/src/common/attributes/useServerAttributes.js b/modern/src/common/attributes/useServerAttributes.js index ba49e44d..76d5a157 100644 --- a/modern/src/common/attributes/useServerAttributes.js +++ b/modern/src/common/attributes/useServerAttributes.js @@ -1,6 +1,24 @@ import { useMemo } from 'react'; export default (t) => useMemo(() => ({ + title: { + name: t('serverName'), + type: 'string', + }, + description: { + name: t('serverDescription'), + type: 'string', + }, + colorPrimary: { + name: t('serverColorPrimary'), + type: 'string', + subtype: 'color', + }, + colorSecondary: { + name: t('serverColorSecondary'), + type: 'string', + subtype: 'color', + }, 'ui.disableLoginLanguage': { name: t('attributeUiDisableLoginLanguage'), type: 'boolean', |