diff options
author | Anton Tananaev <anton@traccar.org> | 2022-05-02 18:08:33 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-05-02 18:08:33 -0700 |
commit | 23189d6bc945ab4e26e336a42dce138d0bbb3523 (patch) | |
tree | ed0b1410206a1dd0bfa3dbe05be5dd799be81dd7 /modern/src/PositionPage.js | |
parent | f52be84522da7f8e1c2b19d3484250e275252799 (diff) | |
download | trackermap-web-23189d6bc945ab4e26e336a42dce138d0bbb3523.tar.gz trackermap-web-23189d6bc945ab4e26e336a42dce138d0bbb3523.tar.bz2 trackermap-web-23189d6bc945ab4e26e336a42dce138d0bbb3523.zip |
Remove position formatter
Diffstat (limited to 'modern/src/PositionPage.js')
-rw-r--r-- | modern/src/PositionPage.js | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/modern/src/PositionPage.js b/modern/src/PositionPage.js index 08502668..6a9809d4 100644 --- a/modern/src/PositionPage.js +++ b/modern/src/PositionPage.js @@ -7,9 +7,9 @@ import { import ArrowBackIcon from '@material-ui/icons/ArrowBack'; import { useHistory, useParams } from 'react-router-dom'; import { useEffectAsync } from './reactHelper'; -import { formatPosition } from './common/formatter'; import { prefixString } from './common/stringUtils'; import { useTranslation } from './LocalizationProvider'; +import PositionValue from './components/PositionValue'; const useStyles = makeStyles((theme) => ({ root: { @@ -51,11 +51,6 @@ const PositionPage = () => { return null; }); - const attributesList = () => { - const combinedList = { ...item, ...item.attributes }; - return Object.entries(combinedList).filter(([, value]) => typeof value !== 'object'); - }; - return ( <> <AppBar position="sticky" color="inherit"> @@ -79,11 +74,18 @@ const PositionPage = () => { </TableRow> </TableHead> <TableBody> - {item && attributesList().map(([key, value]) => ( - <TableRow key={key}> - <TableCell>{key}</TableCell> - <TableCell><strong>{t(prefixString('position', key))}</strong></TableCell> - <TableCell>{formatPosition(value, key, t)}</TableCell> + {item && Object.getOwnPropertyNames(item).filter((it) => it !== 'attributes').map((property) => ( + <TableRow key={property}> + <TableCell>{property}</TableCell> + <TableCell><strong>{t(prefixString('position', property))}</strong></TableCell> + <TableCell><PositionValue position={item} property={property} /></TableCell> + </TableRow> + ))} + {item && Object.getOwnPropertyNames(item.attributes).map((attribute) => ( + <TableRow key={attribute}> + <TableCell>{attribute}</TableCell> + <TableCell><strong>{t(prefixString('position', attribute)) || t(prefixString('device', attribute))}</strong></TableCell> + <TableCell><PositionValue position={item} attribute={attribute} /></TableCell> </TableRow> ))} </TableBody> |