From 4dbe654290c3d1f6051ea9650549f7c254d321b4 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Thu, 4 Feb 2021 16:33:02 +0530 Subject: Initial Maintenance Screen --- modern/src/MainToolbar.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'modern/src/MainToolbar.js') diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js index 91b3d69..8f420e1 100644 --- a/modern/src/MainToolbar.js +++ b/modern/src/MainToolbar.js @@ -30,6 +30,7 @@ import FormatListBulletedIcon from '@material-ui/icons/FormatListBulleted'; import TrendingUpIcon from '@material-ui/icons/TrendingUp'; import FolderIcon from '@material-ui/icons/Folder'; import ReplayIcon from '@material-ui/icons/Replay'; +import PublishIcon from '@material-ui/icons/Publish'; import t from './common/localization'; const useStyles = makeStyles(theme => ({ @@ -185,6 +186,12 @@ const MainToolbar = () => { + history.push('/settings/maintenances')}> + + + + + {adminEnabled && ( <> -- cgit v1.2.3 From 240518c0fc8b5237557affe8e28b9b94ef46a081 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Sat, 6 Feb 2021 17:35:34 +0530 Subject: Maintenance screen working --- modern/src/MainToolbar.js | 3 ++- modern/src/attributes/positionAttributes.js | 7 +++++- modern/src/common/converter.js | 18 ++++++++++++++ modern/src/settings/MaintenancePage.js | 37 ++++++++++++++++++++++++----- modern/src/settings/MaintenancesPage.js | 26 ++++++++++++++++++-- 5 files changed, 81 insertions(+), 10 deletions(-) (limited to 'modern/src/MainToolbar.js') diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js index 8f420e1..cfbdab9 100644 --- a/modern/src/MainToolbar.js +++ b/modern/src/MainToolbar.js @@ -31,6 +31,7 @@ import TrendingUpIcon from '@material-ui/icons/TrendingUp'; import FolderIcon from '@material-ui/icons/Folder'; import ReplayIcon from '@material-ui/icons/Replay'; import PublishIcon from '@material-ui/icons/Publish'; +import BuildIcon from '@material-ui/icons/Build'; import t from './common/localization'; const useStyles = makeStyles(theme => ({ @@ -188,7 +189,7 @@ const MainToolbar = () => { history.push('/settings/maintenances')}> - + diff --git a/modern/src/attributes/positionAttributes.js b/modern/src/attributes/positionAttributes.js index 4492683..c5665da 100644 --- a/modern/src/attributes/positionAttributes.js +++ b/modern/src/attributes/positionAttributes.js @@ -12,5 +12,10 @@ export default { 'ignition': { name: t('positionIgnition'), type: 'boolean', - }, + }, + 'serviceOdometer': { + name: t('positionServiceOdometer'), + type: 'number', + dataType: 'distance', + }, }; diff --git a/modern/src/common/converter.js b/modern/src/common/converter.js index e48b076..8193e77 100644 --- a/modern/src/common/converter.js +++ b/modern/src/common/converter.js @@ -3,11 +3,29 @@ export const speedConverter = (value, unit) => { switch (unit) { case 'kmh': factor = 1.852; + break; case 'mph': factor = 1.15078; + break; case 'kn': default: factor = 1; } return (value * factor).toFixed(2); }; + +export const distanceConverter = (value, unit) => { + let factor; + switch (unit) { + case 'mi': + factor = 0.000621371; + break; + case 'nmi': + factor = 0.000539957; + break; + case 'km': + default: + factor = 0.001; + } + return (value * factor).toFixed(2); +} \ No newline at end of file diff --git a/modern/src/settings/MaintenancePage.js b/modern/src/settings/MaintenancePage.js index 8c4cdf4..9c27459 100644 --- a/modern/src/settings/MaintenancePage.js +++ b/modern/src/settings/MaintenancePage.js @@ -1,11 +1,12 @@ import React, { useState } from 'react'; - import t from '../common/localization'; import EditItemView from '../EditItemView'; import { Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography, TextField, FormControl, InputLabel, MenuItem, Select, } from '@material-ui/core'; +import InputAdornment from '@material-ui/core/InputAdornment'; import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import EditAttributesView from '../attributes/EditAttributesView'; import positionAttributes from '../attributes/positionAttributes'; +import { useAttributePreference } from '../common/preferences'; const useStyles = makeStyles(() => ({ details: { @@ -14,22 +15,40 @@ const useStyles = makeStyles(() => ({ })); const MaintenancePage = () => { + const classes = useStyles(); - const [item, setItem] = useState(); + const [labels, setLabels] = useState({start: '', period: ''}); + + const speedUnit = useAttributePreference('speedUnit'); + const distanceUnit = useAttributePreference('distanceUnit'); const options = []; Object.entries(positionAttributes).map(([key, value]) => { if (value.type === 'number') { - options.push({ key, name: value.name, type: value.type }) + options.push({key, name: value.name, type: value.type}) } }); const handleChange = event => { const newValue = event.target.value; setItem({...item, type: newValue}); - } + + const attribute = positionAttributes[newValue]; + if (attribute && attribute.dataType) { + switch (attribute.dataType) { + case 'distance': + setLabels({ ...labels, start: distanceUnit, period: distanceUnit}); + break; + case 'speed': + setLabels({ ...labels, start: speedUnit, period: speedUnit}); + break; + default: + break; + } + } + } return ( @@ -64,14 +83,20 @@ const MaintenancePage = () => { value={item.start || ''} onChange={event => setItem({...item, start: event.target.value})} label={t('maintenanceStart')} - variant="filled" /> + variant="filled" + InputProps={{ + endAdornment: {labels.start}, + }} /> setItem({...item, period: event.target.value})} label={t('maintenancePeriod')} - variant="filled" /> + variant="filled" + InputProps={{ + endAdornment: {labels.period}, + }} /> diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.js index 9cbf51a..5e74e5a 100644 --- a/modern/src/settings/MaintenancesPage.js +++ b/modern/src/settings/MaintenancesPage.js @@ -6,6 +6,10 @@ import t from '../common/localization'; import { useEffectAsync } from '../reactHelper'; import EditCollectionView from '../EditCollectionView'; +import positionAttributes from '../attributes/positionAttributes'; +import { formatDistance, formatSpeed } from '../common/formatter'; +import { useAttributePreference } from '../common/preferences'; + const useStyles = makeStyles(theme => ({ columnAction: { width: theme.spacing(1), @@ -17,6 +21,8 @@ const MaintenancesView = ({ updateTimestamp, onMenuClick }) => { const classes = useStyles(); const [items, setItems] = useState([]); + const speedUnit = useAttributePreference('speedUnit'); + const distanceUnit = useAttributePreference('distanceUnit'); useEffectAsync(async () => { const response = await fetch('/api/maintenance'); @@ -25,6 +31,22 @@ const MaintenancesView = ({ updateTimestamp, onMenuClick }) => { } }, [updateTimestamp]); + const convertAttribute = (key, value) => { + const attribute = positionAttributes[key]; + if (attribute && attribute.dataType) { + switch (attribute.dataType) { + case 'speed': + return formatSpeed(value, speedUnit); + case 'distance': + return formatDistance(value, distanceUnit); + default: + return value; + } + } + + return value; + } + return ( @@ -47,8 +69,8 @@ const MaintenancesView = ({ updateTimestamp, onMenuClick }) => { {item.name}{item.type} - {item.start} - {item.period} + {convertAttribute(item.type, item.start)} + {convertAttribute(item.type, item.period)} ))} -- cgit v1.2.3 From 3e5ef37008fd009821181b1d539622a44b8cd745 Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Wed, 10 Feb 2021 12:13:13 +0530 Subject: completed maintenance screen --- modern/src/MainToolbar.js | 1 - modern/src/common/converter.js | 8 +++--- modern/src/settings/MaintenancePage.js | 46 ++++++++++++++++++++++++++++++---- 3 files changed, 45 insertions(+), 10 deletions(-) (limited to 'modern/src/MainToolbar.js') diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js index cfbdab9..ebe2efd 100644 --- a/modern/src/MainToolbar.js +++ b/modern/src/MainToolbar.js @@ -30,7 +30,6 @@ import FormatListBulletedIcon from '@material-ui/icons/FormatListBulleted'; import TrendingUpIcon from '@material-ui/icons/TrendingUp'; import FolderIcon from '@material-ui/icons/Folder'; import ReplayIcon from '@material-ui/icons/Replay'; -import PublishIcon from '@material-ui/icons/Publish'; import BuildIcon from '@material-ui/icons/Build'; import t from './common/localization'; diff --git a/modern/src/common/converter.js b/modern/src/common/converter.js index 8193e77..930dba1 100644 --- a/modern/src/common/converter.js +++ b/modern/src/common/converter.js @@ -1,4 +1,4 @@ -export const speedConverter = (value, unit) => { +export const speedConverter = (value, unit, back = false) => { let factor; switch (unit) { case 'kmh': @@ -11,10 +11,10 @@ export const speedConverter = (value, unit) => { default: factor = 1; } - return (value * factor).toFixed(2); + return back ? (value / factor).toFixed(2):(value * factor).toFixed(2); }; -export const distanceConverter = (value, unit) => { +export const distanceConverter = (value, unit, back = false) => { let factor; switch (unit) { case 'mi': @@ -27,5 +27,5 @@ export const distanceConverter = (value, unit) => { default: factor = 0.001; } - return (value * factor).toFixed(2); + return back ? value / factor : value * factor; } \ No newline at end of file diff --git a/modern/src/settings/MaintenancePage.js b/modern/src/settings/MaintenancePage.js index 9c27459..b5486f7 100644 --- a/modern/src/settings/MaintenancePage.js +++ b/modern/src/settings/MaintenancePage.js @@ -7,6 +7,7 @@ import ExpandMoreIcon from '@material-ui/icons/ExpandMore'; import EditAttributesView from '../attributes/EditAttributesView'; import positionAttributes from '../attributes/positionAttributes'; import { useAttributePreference } from '../common/preferences'; +import { distanceConverter, speedConverter } from '../common/converter'; const useStyles = makeStyles(() => ({ details: { @@ -33,7 +34,7 @@ const MaintenancePage = () => { const handleChange = event => { const newValue = event.target.value; - setItem({...item, type: newValue}); + setItem({...item, type: newValue, start: 0, period: 0}); const attribute = positionAttributes[newValue]; if (attribute && attribute.dataType) { @@ -50,6 +51,41 @@ const MaintenancePage = () => { } } + const rawToValue = (rawValue) => { + + const attribute = positionAttributes[item.type]; + if (attribute && attribute.dataType) { + switch (attribute.dataType) { + case 'speed': + return speedConverter(rawValue, speedUnit, false); + case 'distance': + return distanceConverter(rawValue, distanceUnit, false); + default: + return rawValue; + } + } + + return rawValue; + + } + + const valueToRaw = (value) => { + + const attribute = positionAttributes[item.type]; + if (attribute && attribute.dataType) { + switch (attribute.dataType) { + case 'speed': + return speedConverter(value, speedUnit, true); + case 'distance': + return distanceConverter(value, distanceUnit, true); + default: + return value; + } + } + + return value; + } + return ( {item && @@ -80,8 +116,8 @@ const MaintenancePage = () => { setItem({...item, start: event.target.value})} + value={rawToValue(item.start) || ''} + onChange={event => setItem({...item, start: valueToRaw(event.target.value)})} label={t('maintenanceStart')} variant="filled" InputProps={{ @@ -90,8 +126,8 @@ const MaintenancePage = () => { setItem({...item, period: event.target.value})} + value={rawToValue(item.period) || ''} + onChange={event => setItem({...item, period: valueToRaw(event.target.value)})} label={t('maintenancePeriod')} variant="filled" InputProps={{ -- cgit v1.2.3