diff options
author | Anton Tananaev <anton@traccar.org> | 2022-05-15 16:18:01 -0700 |
---|---|---|
committer | Anton Tananaev <anton@traccar.org> | 2022-05-15 16:18:01 -0700 |
commit | 18bf43634ba99e8a77571b6bcf650f4687c6df68 (patch) | |
tree | 82eaabfffb159c729c1bdfec1a26574f9c2dce5c /modern/src/reports/RouteReportPage.js | |
parent | dbf6e8127733414b1f25b6c033bfc5437801414d (diff) | |
download | trackermap-web-18bf43634ba99e8a77571b6bcf650f4687c6df68.tar.gz trackermap-web-18bf43634ba99e8a77571b6bcf650f4687c6df68.tar.bz2 trackermap-web-18bf43634ba99e8a77571b6bcf650f4687c6df68.zip |
Combine position attributes
Diffstat (limited to 'modern/src/reports/RouteReportPage.js')
-rw-r--r-- | modern/src/reports/RouteReportPage.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index e1dd59a0..cd2c3694 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -9,15 +9,12 @@ import ReportsMenu from './components/ReportsMenu'; import usePersistedState from '../common/util/usePersistedState'; import PositionValue from '../common/components/PositionValue'; import ColumnSelect from './components/ColumnSelect'; -import usePositionProperties from '../common/attributes/usePositionProperties'; import usePositionAttributes from '../common/attributes/usePositionAttributes'; const RouteReportPage = () => { const t = useTranslation(); - const positionProperties = usePositionProperties(t); const positionAttributes = usePositionAttributes(t); - const columnsObject = { ...positionProperties, ...positionAttributes }; const [columns, setColumns] = usePersistedState('routeColumns', ['fixTime', 'latitude', 'longitude', 'speed', 'address']); const [items, setItems] = useState([]); @@ -45,14 +42,14 @@ const RouteReportPage = () => { <ColumnSelect columns={columns} setColumns={setColumns} - columnsObject={columnsObject} + columnsObject={positionAttributes} /> </ReportFilter> <TableContainer> <Table> <TableHead> <TableRow> - {columns.map((key) => (<TableCell>{columnsObject[key].name}</TableCell>))} + {columns.map((key) => (<TableCell>{positionAttributes[key].name}</TableCell>))} </TableRow> </TableHead> <TableBody> |