From 8de3b938369ea1e9437b4345d83a50e974f8a606 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Mon, 15 Mar 2021 14:32:28 +0530 Subject: Initial draft of cutome route table --- modern/src/reports/RouteReportPage.js | 77 +++++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 26 deletions(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index f2b0361..ff4a003 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -1,9 +1,10 @@ import React, { useState } from 'react'; -import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper } from '@material-ui/core'; +import { DataGrid } from '@material-ui/data-grid'; import t from '../common/localization'; -import { formatPosition } from '../common/formatter'; +import { formatPosition, formatDistance } from '../common/formatter'; import ReportFilter from './ReportFilter'; import ReportLayoutPage from './ReportLayoutPage'; +import { useAttributePreference } from '../common/preferences'; const Filter = ({ setItems }) => { @@ -26,35 +27,59 @@ const Filter = ({ setItems }) => { }; const RouteReportPage = () => { + const distanceUnit = useAttributePreference('distanceUnit'); + + const columns = [ + { + headerName: t('positionFixTime'), + field: 'fixTime', + width: 200, + valueFormatter: params => formatPosition(params.value, 'fixTime'), + }, + { + headerName: t('positionLatitude'), + field: 'latitude', + width: 130, + valueFormatter: params => formatPosition(params.value, 'latitude'), + }, + { + headerName: t('positionLongitude'), + field: 'longitude', + width: 130, + valueFormatter: params => formatPosition(params.value, 'longitude'), + }, + { + headerName: t('positionSpeed'), + field: 'speed', + width: 130, + valueFormatter: params => formatPosition(params.value, 'speed'), + }, + { + headerName: t('positionAddress'), + field: 'address', + width: 130, + valueFormatter: params => formatPosition(params.value, 'address'), + }, + { + headerName: t('positionIgnition'), + field: 'ignition', + width: 130, + valueFormatter: params => params.getValue('attributes').ignition ? 'Yes' : 'No', + }, + { + headerName: t('deviceTotalDistance'), + hide: true, + field: 'totalDistance', + width: 160, + valueFormatter: params => formatDistance(params.getValue('attributes').totalDistance, distanceUnit), + }, + ] const [items, setItems] = useState([]); return ( }> - - - - - {t('positionFixTime')} - {t('positionLatitude')} - {t('positionLongitude')} - {t('positionSpeed')} - {t('positionAddress')} - - - - {items.map((item) => ( - - {formatPosition(item, 'fixTime')} - {formatPosition(item, 'latitude')} - {formatPosition(item, 'longitude')} - {formatPosition(item, 'speed')} - {formatPosition(item, 'address')} - - ))} - -
- + ); }; -- cgit v1.2.3 From 1a8ce85b311b3e80aba5df573259e119ae18fa0c Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Tue, 16 Mar 2021 15:45:54 +0530 Subject: Minor code improvements --- modern/src/common/style.js | 1 + modern/src/reports/RouteReportPage.js | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 modern/src/common/style.js (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/common/style.js b/modern/src/common/style.js new file mode 100644 index 0000000..fa2e41e --- /dev/null +++ b/modern/src/common/style.js @@ -0,0 +1 @@ +export const columnWidthNormal = 100; \ No newline at end of file diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index ff4a003..3b9e15c 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -5,6 +5,7 @@ import { formatPosition, formatDistance } from '../common/formatter'; import ReportFilter from './ReportFilter'; import ReportLayoutPage from './ReportLayoutPage'; import { useAttributePreference } from '../common/preferences'; +import { columnWidthNormal } from '../common/style'; const Filter = ({ setItems }) => { @@ -33,44 +34,44 @@ const RouteReportPage = () => { { headerName: t('positionFixTime'), field: 'fixTime', - width: 200, + width: columnWidthNormal * 2, valueFormatter: params => formatPosition(params.value, 'fixTime'), }, { headerName: t('positionLatitude'), field: 'latitude', - width: 130, + width: columnWidthNormal, valueFormatter: params => formatPosition(params.value, 'latitude'), }, { headerName: t('positionLongitude'), field: 'longitude', - width: 130, + width: columnWidthNormal, valueFormatter: params => formatPosition(params.value, 'longitude'), }, { headerName: t('positionSpeed'), field: 'speed', - width: 130, + width: columnWidthNormal, valueFormatter: params => formatPosition(params.value, 'speed'), }, { headerName: t('positionAddress'), field: 'address', - width: 130, + width: columnWidthNormal, valueFormatter: params => formatPosition(params.value, 'address'), }, { headerName: t('positionIgnition'), field: 'ignition', - width: 130, + width: columnWidthNormal, valueFormatter: params => params.getValue('attributes').ignition ? 'Yes' : 'No', }, { headerName: t('deviceTotalDistance'), hide: true, field: 'totalDistance', - width: 160, + width: columnWidthNormal, valueFormatter: params => formatDistance(params.getValue('attributes').totalDistance, distanceUnit), }, ] @@ -79,7 +80,7 @@ const RouteReportPage = () => { return ( }> - + ); }; -- cgit v1.2.3 From fac4b2c8679f459a184c41eeee18f81edbd1ee77 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Wed, 17 Mar 2021 14:41:21 +0530 Subject: removing hardcoded width value --- modern/src/common/style.js | 1 - modern/src/reports/RouteReportPage.js | 21 ++++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) delete mode 100644 modern/src/common/style.js (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/common/style.js b/modern/src/common/style.js deleted file mode 100644 index fa2e41e..0000000 --- a/modern/src/common/style.js +++ /dev/null @@ -1 +0,0 @@ -export const columnWidthNormal = 100; \ No newline at end of file diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index 3b9e15c..48a1373 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -5,7 +5,6 @@ import { formatPosition, formatDistance } from '../common/formatter'; import ReportFilter from './ReportFilter'; import ReportLayoutPage from './ReportLayoutPage'; import { useAttributePreference } from '../common/preferences'; -import { columnWidthNormal } from '../common/style'; const Filter = ({ setItems }) => { @@ -34,44 +33,44 @@ const RouteReportPage = () => { { headerName: t('positionFixTime'), field: 'fixTime', - width: columnWidthNormal * 2, + flex: 1, valueFormatter: params => formatPosition(params.value, 'fixTime'), }, { headerName: t('positionLatitude'), field: 'latitude', - width: columnWidthNormal, + flex: 1, valueFormatter: params => formatPosition(params.value, 'latitude'), }, { headerName: t('positionLongitude'), field: 'longitude', - width: columnWidthNormal, + flex: 1, valueFormatter: params => formatPosition(params.value, 'longitude'), }, { headerName: t('positionSpeed'), field: 'speed', - width: columnWidthNormal, + flex: 1, valueFormatter: params => formatPosition(params.value, 'speed'), }, { headerName: t('positionAddress'), field: 'address', - width: columnWidthNormal, + flex: 1, valueFormatter: params => formatPosition(params.value, 'address'), }, { headerName: t('positionIgnition'), field: 'ignition', - width: columnWidthNormal, + flex: 1, valueFormatter: params => params.getValue('attributes').ignition ? 'Yes' : 'No', }, { headerName: t('deviceTotalDistance'), hide: true, field: 'totalDistance', - width: columnWidthNormal, + flex: 1, valueFormatter: params => formatDistance(params.getValue('attributes').totalDistance, distanceUnit), }, ] @@ -80,7 +79,11 @@ const RouteReportPage = () => { return ( }> - + ); }; -- cgit v1.2.3 From 04bff93e3244708471176f22b8d5c4d9f7da764f Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Thu, 18 Mar 2021 13:44:47 +0530 Subject: More code improvements --- modern/src/reports/RouteReportPage.js | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index 48a1373..6bfe993 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -29,49 +29,49 @@ const Filter = ({ setItems }) => { const RouteReportPage = () => { const distanceUnit = useAttributePreference('distanceUnit'); - const columns = [ - { + const columns = [{ headerName: t('positionFixTime'), field: 'fixTime', + type: 'dateTime', flex: 1, - valueFormatter: params => formatPosition(params.value, 'fixTime'), - }, - { + valueFormatter: ({ value }) => formatPosition(value, 'fixTime'), + }, { headerName: t('positionLatitude'), field: 'latitude', + type: 'number', flex: 1, - valueFormatter: params => formatPosition(params.value, 'latitude'), - }, - { + valueFormatter: ({ value }) => formatPosition(value, 'latitude'), + }, { headerName: t('positionLongitude'), field: 'longitude', + type: 'number', flex: 1, - valueFormatter: params => formatPosition(params.value, 'longitude'), - }, - { + valueFormatter: ({ value }) => formatPosition(value, 'longitude'), + }, { headerName: t('positionSpeed'), field: 'speed', + type: 'number', flex: 1, - valueFormatter: params => formatPosition(params.value, 'speed'), - }, - { + valueFormatter: ({ value }) => formatPosition(value, 'speed'), + }, { headerName: t('positionAddress'), field: 'address', + type: 'string', flex: 1, - valueFormatter: params => formatPosition(params.value, 'address'), - }, - { + valueFormatter: ({ value }) => formatPosition(value, 'address'), + }, { headerName: t('positionIgnition'), field: 'ignition', + type: 'boolean', flex: 1, - valueFormatter: params => params.getValue('attributes').ignition ? 'Yes' : 'No', - }, - { + valueFormatter: ({ getValue }) => getValue('attributes').ignition ? 'Yes' : 'No', + }, { headerName: t('deviceTotalDistance'), - hide: true, field: 'totalDistance', + type: 'number', + hide: true, flex: 1, - valueFormatter: params => formatDistance(params.getValue('attributes').totalDistance, distanceUnit), + valueFormatter: ({ getValue }) => formatDistance(getValue('attributes').totalDistance, distanceUnit), }, ] @@ -79,11 +79,11 @@ const RouteReportPage = () => { return ( }> - + ); }; -- cgit v1.2.3 From 25a4c399894348de8e856c27b714f86866d22e0f Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Fri, 19 Mar 2021 12:08:52 +0530 Subject: Code formatting --- modern/src/reports/RouteReportPage.js | 87 +++++++++++++++++------------------ 1 file changed, 43 insertions(+), 44 deletions(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index 6bfe993..b648503 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -30,50 +30,49 @@ const RouteReportPage = () => { const distanceUnit = useAttributePreference('distanceUnit'); const columns = [{ - headerName: t('positionFixTime'), - field: 'fixTime', - type: 'dateTime', - flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'fixTime'), - }, { - headerName: t('positionLatitude'), - field: 'latitude', - type: 'number', - flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'latitude'), - }, { - headerName: t('positionLongitude'), - field: 'longitude', - type: 'number', - flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'longitude'), - }, { - headerName: t('positionSpeed'), - field: 'speed', - type: 'number', - flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'speed'), - }, { - headerName: t('positionAddress'), - field: 'address', - type: 'string', - flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'address'), - }, { - headerName: t('positionIgnition'), - field: 'ignition', - type: 'boolean', - flex: 1, - valueFormatter: ({ getValue }) => getValue('attributes').ignition ? 'Yes' : 'No', - }, { - headerName: t('deviceTotalDistance'), - field: 'totalDistance', - type: 'number', - hide: true, - flex: 1, - valueFormatter: ({ getValue }) => formatDistance(getValue('attributes').totalDistance, distanceUnit), - }, - ] + headerName: t('positionFixTime'), + field: 'fixTime', + type: 'dateTime', + flex: 1, + valueFormatter: ({ value }) => formatPosition(value, 'fixTime'), + }, { + headerName: t('positionLatitude'), + field: 'latitude', + type: 'number', + flex: 1, + valueFormatter: ({ value }) => formatPosition(value, 'latitude'), + }, { + headerName: t('positionLongitude'), + field: 'longitude', + type: 'number', + flex: 1, + valueFormatter: ({ value }) => formatPosition(value, 'longitude'), + }, { + headerName: t('positionSpeed'), + field: 'speed', + type: 'number', + flex: 1, + valueFormatter: ({ value }) => formatPosition(value, 'speed'), + }, { + headerName: t('positionAddress'), + field: 'address', + type: 'string', + flex: 1, + valueFormatter: ({ value }) => formatPosition(value, 'address'), + }, { + headerName: t('positionIgnition'), + field: 'ignition', + type: 'boolean', + flex: 1, + valueFormatter: ({ getValue }) => getValue('attributes').ignition ? 'Yes' : 'No', + }, { + headerName: t('deviceTotalDistance'), + field: 'totalDistance', + type: 'number', + hide: true, + flex: 1, + valueFormatter: ({ getValue }) => formatDistance(getValue('attributes').totalDistance, distanceUnit), + }] const [items, setItems] = useState([]); -- cgit v1.2.3 From 7bc6f83a8d10e7bbaf9b0a8ad92117668f9ff217 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Mon, 22 Mar 2021 10:10:34 +0530 Subject: change from valueFormatter to valueGetter --- modern/src/reports/RouteReportPage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index b648503..e556a0b 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -64,14 +64,14 @@ const RouteReportPage = () => { field: 'ignition', type: 'boolean', flex: 1, - valueFormatter: ({ getValue }) => getValue('attributes').ignition ? 'Yes' : 'No', + valueGetter: ({ getValue }) => getValue('attributes').ignition ? 'Yes' : 'No', }, { headerName: t('deviceTotalDistance'), field: 'totalDistance', type: 'number', hide: true, flex: 1, - valueFormatter: ({ getValue }) => formatDistance(getValue('attributes').totalDistance, distanceUnit), + valueGetter: ({ getValue }) => formatDistance(getValue('attributes').totalDistance, distanceUnit), }] const [items, setItems] = useState([]); -- cgit v1.2.3 From fb10eae09daf7e922ee5e2d94785d55b8b5f6b4b Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Tue, 23 Mar 2021 11:40:31 +0530 Subject: More code refactoring --- modern/src/reports/RouteReportPage.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index e556a0b..1c13a13 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -64,14 +64,16 @@ const RouteReportPage = () => { field: 'ignition', type: 'boolean', flex: 1, - valueGetter: ({ getValue }) => getValue('attributes').ignition ? 'Yes' : 'No', + valueGetter: ({ row }) => row.attributes.ignition, + valueFormatter: ({ value }) => value ? 'Yes' : 'No', }, { headerName: t('deviceTotalDistance'), field: 'totalDistance', type: 'number', hide: true, flex: 1, - valueGetter: ({ getValue }) => formatDistance(getValue('attributes').totalDistance, distanceUnit), + valueGetter: ({ row }) => row.attributes.totalDistance, + valueFormatter: ({ value }) => formatDistance(value, distanceUnit), }] const [items, setItems] = useState([]); -- cgit v1.2.3 From 31d7007d6a199299e541a93477342e3eef73aa47 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Wed, 24 Mar 2021 10:40:31 +0530 Subject: Some more code improvements --- modern/src/reports/RouteReportPage.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index 1c13a13..807207d 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { DataGrid } from '@material-ui/data-grid'; import t from '../common/localization'; -import { formatPosition, formatDistance } from '../common/formatter'; +import { formatPosition, formatDistance, formatSpeed, formatBoolean, formatDate, formatNumber } from '../common/formatter'; import ReportFilter from './ReportFilter'; import ReportLayoutPage from './ReportLayoutPage'; import { useAttributePreference } from '../common/preferences'; @@ -28,31 +28,32 @@ const Filter = ({ setItems }) => { const RouteReportPage = () => { const distanceUnit = useAttributePreference('distanceUnit'); + const speedUnit = useAttributePreference('speedUnit'); const columns = [{ headerName: t('positionFixTime'), field: 'fixTime', type: 'dateTime', flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'fixTime'), + valueFormatter: ({ value }) => formatDate(value), }, { headerName: t('positionLatitude'), field: 'latitude', type: 'number', flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'latitude'), + valueFormatter: ({ value }) => formatNumber(value, 5), }, { headerName: t('positionLongitude'), field: 'longitude', type: 'number', flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'longitude'), + valueFormatter: ({ value }) => formatNumber(value, 5), }, { headerName: t('positionSpeed'), field: 'speed', type: 'number', flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'speed'), + valueFormatter: ({ value }) => formatSpeed(value, speedUnit), }, { headerName: t('positionAddress'), field: 'address', @@ -65,7 +66,7 @@ const RouteReportPage = () => { type: 'boolean', flex: 1, valueGetter: ({ row }) => row.attributes.ignition, - valueFormatter: ({ value }) => value ? 'Yes' : 'No', + valueFormatter: ({ value }) => formatBoolean(value), }, { headerName: t('deviceTotalDistance'), field: 'totalDistance', -- cgit v1.2.3 From 5b9f7db4f18d79570fa17bd61b82eec4452c2aa8 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Wed, 24 Mar 2021 11:10:20 +0530 Subject: Removing address formatting --- modern/src/reports/RouteReportPage.js | 1 - 1 file changed, 1 deletion(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index 807207d..33ccb34 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -59,7 +59,6 @@ const RouteReportPage = () => { field: 'address', type: 'string', flex: 1, - valueFormatter: ({ value }) => formatPosition(value, 'address'), }, { headerName: t('positionIgnition'), field: 'ignition', -- cgit v1.2.3 From 85fa5aed51ee16a7f5258ab29a991c9e4007fc04 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Wed, 24 Mar 2021 12:29:45 +0530 Subject: Implementing coordinate formatting --- modern/src/common/formatter.js | 25 +++++++++++++++++++++++++ modern/src/reports/RouteReportPage.js | 9 +++++---- 2 files changed, 30 insertions(+), 4 deletions(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/common/formatter.js b/modern/src/common/formatter.js index 289a6d9..b70fed3 100644 --- a/modern/src/common/formatter.js +++ b/modern/src/common/formatter.js @@ -81,3 +81,28 @@ export const formatVolume = (value, unit) => { export const formatHours = (value) => { return moment.duration(value).humanize(); }; + +export const coordinateFormatter = (key, value, unit) => { + var hemisphere, degrees, minutes, seconds; + if (key === 'latitude') { + hemisphere = value >= 0 ? 'N' : 'S'; + } else { + hemisphere = value >= 0 ? 'E' : 'W'; + } + + switch (unit) { + case 'ddm': + value = Math.abs(value); + degrees = Math.floor(value); + minutes = (value - degrees) * 60; + return degrees + '° ' + minutes.toFixed(6) + '\' ' + hemisphere; + case 'dms': + value = Math.abs(value); + degrees = Math.floor(value); + minutes = Math.floor((value - degrees) * 60); + seconds = Math.round((value - degrees - minutes / 60) * 3600); + return degrees + '° ' + minutes + '\' ' + seconds + '" ' + hemisphere; + default: + return value.toFixed(6) + '°'; + } +}; diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index 33ccb34..bbe37e2 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -1,10 +1,10 @@ import React, { useState } from 'react'; import { DataGrid } from '@material-ui/data-grid'; import t from '../common/localization'; -import { formatPosition, formatDistance, formatSpeed, formatBoolean, formatDate, formatNumber } from '../common/formatter'; +import { formatDistance, formatSpeed, formatBoolean, formatDate, formatNumber, coordinateFormatter } from '../common/formatter'; import ReportFilter from './ReportFilter'; import ReportLayoutPage from './ReportLayoutPage'; -import { useAttributePreference } from '../common/preferences'; +import { useAttributePreference, usePreference } from '../common/preferences'; const Filter = ({ setItems }) => { @@ -29,6 +29,7 @@ const Filter = ({ setItems }) => { const RouteReportPage = () => { const distanceUnit = useAttributePreference('distanceUnit'); const speedUnit = useAttributePreference('speedUnit'); + const coordinateFormat = usePreference('coordinateFormat'); const columns = [{ headerName: t('positionFixTime'), @@ -41,13 +42,13 @@ const RouteReportPage = () => { field: 'latitude', type: 'number', flex: 1, - valueFormatter: ({ value }) => formatNumber(value, 5), + valueFormatter: ({ value }) => coordinateFormatter('latitude', value, coordinateFormat), }, { headerName: t('positionLongitude'), field: 'longitude', type: 'number', flex: 1, - valueFormatter: ({ value }) => formatNumber(value, 5), + valueFormatter: ({ value }) => coordinateFormatter('longitude', value, coordinateFormat), }, { headerName: t('positionSpeed'), field: 'speed', -- cgit v1.2.3 From cfa8947f3a4adda1ed649210da4adfe21f44af21 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Thu, 25 Mar 2021 10:37:56 +0530 Subject: renaming coordinateFormatter function --- modern/src/common/formatter.js | 2 +- modern/src/reports/RouteReportPage.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'modern/src/reports/RouteReportPage.js') diff --git a/modern/src/common/formatter.js b/modern/src/common/formatter.js index b70fed3..0d8ac4c 100644 --- a/modern/src/common/formatter.js +++ b/modern/src/common/formatter.js @@ -82,7 +82,7 @@ export const formatHours = (value) => { return moment.duration(value).humanize(); }; -export const coordinateFormatter = (key, value, unit) => { +export const formatCoordinate = (key, value, unit) => { var hemisphere, degrees, minutes, seconds; if (key === 'latitude') { hemisphere = value >= 0 ? 'N' : 'S'; diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js index bbe37e2..b8bad00 100644 --- a/modern/src/reports/RouteReportPage.js +++ b/modern/src/reports/RouteReportPage.js @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import { DataGrid } from '@material-ui/data-grid'; import t from '../common/localization'; -import { formatDistance, formatSpeed, formatBoolean, formatDate, formatNumber, coordinateFormatter } from '../common/formatter'; +import { formatDistance, formatSpeed, formatBoolean, formatDate, formatCoordinate } from '../common/formatter'; import ReportFilter from './ReportFilter'; import ReportLayoutPage from './ReportLayoutPage'; import { useAttributePreference, usePreference } from '../common/preferences'; @@ -42,13 +42,13 @@ const RouteReportPage = () => { field: 'latitude', type: 'number', flex: 1, - valueFormatter: ({ value }) => coordinateFormatter('latitude', value, coordinateFormat), + valueFormatter: ({ value }) => formatCoordinate('latitude', value, coordinateFormat), }, { headerName: t('positionLongitude'), field: 'longitude', type: 'number', flex: 1, - valueFormatter: ({ value }) => coordinateFormatter('longitude', value, coordinateFormat), + valueFormatter: ({ value }) => formatCoordinate('longitude', value, coordinateFormat), }, { headerName: t('positionSpeed'), field: 'speed', -- cgit v1.2.3