diff options
author | Iván Ávalos <avalos@disroot.org> | 2021-12-11 16:38:03 -0600 |
---|---|---|
committer | Iván Ávalos <avalos@disroot.org> | 2021-12-11 16:38:03 -0600 |
commit | 8038f22dc100d09ff53808d4d372567a262c24ff (patch) | |
tree | cc48f422b0a6b0c226f0e5798b0e9a27cbeb9aed /modern/src/map/StatusView.js | |
parent | e490ffb046eff933a134f96323c8e6c765175cf0 (diff) | |
download | etbsa-traccar-web-8038f22dc100d09ff53808d4d372567a262c24ff.tar.gz etbsa-traccar-web-8038f22dc100d09ff53808d4d372567a262c24ff.tar.bz2 etbsa-traccar-web-8038f22dc100d09ff53808d4d372567a262c24ff.zip |
A lot of changes!
Diffstat (limited to 'modern/src/map/StatusView.js')
-rw-r--r-- | modern/src/map/StatusView.js | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/modern/src/map/StatusView.js b/modern/src/map/StatusView.js index 47a7516..ad6022e 100644 --- a/modern/src/map/StatusView.js +++ b/modern/src/map/StatusView.js @@ -14,7 +14,7 @@ import DeleteIcon from '@material-ui/icons/Delete'; import LinkIcon from '@material-ui/icons/Link'; import { - formatPosition, getStatusColor, getBatteryStatus, formatDistance, formatSpeed, + formatPosition, getStatusColor, getBatteryStatus, formatDistance, formatSpeed, formatDate, formatHours, } from '../common/formatter'; import { useAttributePreference } from '../common/preferences'; import RemoveDialog from '../RemoveDialog'; @@ -73,10 +73,10 @@ const StatusView = ({ <Grid container direction="column"> <Grid item> <List> - <ListItem classes={{ container: classes.listItemContainer }}> - <ListItemText primary={t('deviceStatus')} /> + <ListItem classes={{ container: classes.listItemContainer}}> + <ListItemText primary={t('positionDatetime')} /> <ListItemSecondaryAction> - <span className={classes[getStatusColor(device.status)]}>{device.status}</span> + {formatDate(position.serverTime)} </ListItemSecondaryAction> </ListItem> <ListItem classes={{ container: classes.listItemContainer }}> @@ -85,28 +85,13 @@ const StatusView = ({ {formatSpeed(position.speed, speedUnit, t)} </ListItemSecondaryAction> </ListItem> - {position.attributes.batteryLevel && ( + {position.attributes.hours && ( <ListItem classes={{ container: classes.listItemContainer }}> - <ListItemText primary={t('positionBattery')} /> + <ListItemText primary={t('positionHours')} /> <ListItemSecondaryAction> - <span className={classes[getBatteryStatus(position.attributes.batteryLevel)]}> - {formatPosition(position.attributes.batteryLevel, 'batteryLevel', t)} - </span> + {formatHours(position.attributes.hours, t)} </ListItemSecondaryAction> - </ListItem> - )} - <ListItem classes={{ container: classes.listItemContainer }}> - <ListItemText primary={t('positionDistance')} /> - <ListItemSecondaryAction> - {formatDistance(position.attributes.totalDistance, distanceUnit, t)} - </ListItemSecondaryAction> - </ListItem> - <ListItem classes={{ container: classes.listItemContainer }}> - <ListItemText primary={t('positionCourse')} /> - <ListItemSecondaryAction> - {formatPosition(position.course, 'course', t)} - </ListItemSecondaryAction> - </ListItem> + </ListItem>)} </List> </Grid> <Grid item container> |