diff options
| author | Iván Ávalos <avalos@disroot.org> | 2021-12-14 19:16:55 -0600 |
|---|---|---|
| committer | Iván Ávalos <avalos@disroot.org> | 2021-12-14 19:16:55 -0600 |
| commit | 03f9a3ef2b00b8024533e5b720861953bc79e704 (patch) | |
| tree | f461d5322b38fa2551728e9a1998af5ec1833d71 /modern/src/map | |
| parent | 1e38ec1ceceeb60693b4fe3c302ce5477caddf40 (diff) | |
| download | etbsa-traccar-web-03f9a3ef2b00b8024533e5b720861953bc79e704.tar.gz etbsa-traccar-web-03f9a3ef2b00b8024533e5b720861953bc79e704.tar.bz2 etbsa-traccar-web-03f9a3ef2b00b8024533e5b720861953bc79e704.zip | |
Fixed datetime formatting and now passing position as parameter for StatusView
Diffstat (limited to 'modern/src/map')
| -rw-r--r-- | modern/src/map/PositionsMap.js | 2 | ||||
| -rw-r--r-- | modern/src/map/StatusView.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/modern/src/map/PositionsMap.js b/modern/src/map/PositionsMap.js index 5320158..b702400 100644 --- a/modern/src/map/PositionsMap.js +++ b/modern/src/map/PositionsMap.js @@ -64,7 +64,7 @@ const PositionsMap = ({ positions }) => { position={position} deviceId={feature.properties.deviceId} onShowDetails={(positionId) => history.push(`/position/${positionId}`)} - onShowHistory={() => history.push('/replay')} + onShowHistory={(deviceId) => history.push(`/replay/${deviceId}`)} onEditClick={(deviceId) => history.push(`/device/${deviceId}`)} onCommandsClick={(deviceId) => history.push(`/device/${deviceId}/commands`) } /> diff --git a/modern/src/map/StatusView.js b/modern/src/map/StatusView.js index b451573..b892e77 100644 --- a/modern/src/map/StatusView.js +++ b/modern/src/map/StatusView.js @@ -15,7 +15,7 @@ import InfoIcon from '@material-ui/icons/Info'; import PlayCircleFilledIcon from '@material-ui/icons/PlayCircleFilled'; import { - formatSpeed, formatDate, formatHours, + formatSpeed, formatHours, formatPosition } from '../common/formatter'; import { useAttributePreference } from '../common/preferences'; import RemoveDialog from '../RemoveDialog'; @@ -84,7 +84,7 @@ const StatusView = ({ <Grid item> <List> <ListItem classes={{ container: classes.listItemContainer, root: classes.listItemRoot }} > - <ListItemText primary={t('positionDatetime')} secondary={formatDate(position.serverTime)} /> + <ListItemText primary={t('positionDatetime')} secondary={formatPosition(position, 'fixTime', t)} /> </ListItem> <ListItem classes={{ container: classes.listItemContainer, root: classes.listItemRoot }}> <ListItemText primary={t('positionSpeed')} secondary={formatSpeed(position.speed, speedUnit, t)} /> @@ -109,7 +109,7 @@ const StatusView = ({ </IconButton> </Grid> <Grid item> - <IconButton onClick={onShowHistory}> + <IconButton onClick={() => onShowHistory(deviceId)}> <PlayCircleFilledIcon /> </IconButton> </Grid> |