diff options
| -rw-r--r-- | modern/src/App.js | 2 | ||||
| -rw-r--r-- | modern/src/reports/SummaryReportPage.js | 67 |
2 files changed, 69 insertions, 0 deletions
diff --git a/modern/src/App.js b/modern/src/App.js index bbcab3e6..8a308c17 100644 --- a/modern/src/App.js +++ b/modern/src/App.js @@ -20,6 +20,7 @@ import { useSelector } from 'react-redux'; import { LinearProgress } from '@material-ui/core'; import TripReportPage from './reports/TripReportPage'; import StopReportPage from './reports/StopReportPage'; +import SummaryReportPage from './reports/SummaryReportPage'; const App = () => { const initialized = useSelector(state => !!state.session.server && !!state.session.user); @@ -48,6 +49,7 @@ const App = () => { <Route exact path='/reports/event' component={EventReportPage} /> <Route exact path='/reports/trip' component={TripReportPage} /> <Route exact path='/reports/stop' component={StopReportPage} /> + <Route exact path='/reports/summary' component={SummaryReportPage} /> </Switch> )} </Route> diff --git a/modern/src/reports/SummaryReportPage.js b/modern/src/reports/SummaryReportPage.js index e69de29b..e482d0fa 100644 --- a/modern/src/reports/SummaryReportPage.js +++ b/modern/src/reports/SummaryReportPage.js @@ -0,0 +1,67 @@ +import React, { useState } from 'react'; +import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper } from '@material-ui/core'; +import t from '../common/localization'; +import { formatDistance, formatHours, formatDate, formatSpeed, formatVolume } from '../common/formatter'; +import ReportFilter from './ReportFilter'; +import ReportLayoutPage from './ReportLayoutPage'; +import { useAttributePreference } from '../common/preferences'; + +const ReportFilterForm = ({ onResult }) => { + + const handleSubmit = async (deviceId, from, to) => { + const query = new URLSearchParams({ + deviceId, + from: from.toISOString(), + to: to.toISOString(), + }); + const response = await fetch(`/api/reports/summary?${query.toString()}`, { headers: { Accept: 'application/json' } }); + if (response.ok) { + onResult(await response.json()); + } + } + return <ReportFilter handleSubmit={handleSubmit} />; +} + +const SummaryReportPage = () => { + + const distanceUnit = useAttributePreference('distanceUnit'); + const speedUnit = useAttributePreference('speedUnit'); + const [items, setItems] = useState([]); + + return ( + <ReportLayoutPage reportFilterForm={ReportFilterForm} setItems={setItems}> + <TableContainer component={Paper}> + <Table> + <TableHead> + <TableRow> + <TableCell>{t('reportStartDate')}</TableCell> + <TableCell>{t('sharedDistance')}</TableCell> + <TableCell>{t('reportStartOdometer')}</TableCell> + <TableCell>{t('reportEndOdometer')}</TableCell> + <TableCell>{t('reportAverageSpeed')}</TableCell> + <TableCell>{t('reportMaximumSpeed')}</TableCell> + <TableCell>{t('reportEngineHours')}</TableCell> + <TableCell>{t('reportSpentFuel')}</TableCell> + </TableRow> + </TableHead> + <TableBody> + {items.map((item) => ( + <TableRow key={item.id}> + <TableCell>{formatDate(item.startTime, 'YYYY-MM-DD')}</TableCell> + <TableCell>{formatDistance(item.distance, distanceUnit)}</TableCell> + <TableCell>{formatDistance(item.startOdometer, distanceUnit)}</TableCell> + <TableCell>{formatDistance(item.endOdometer, distanceUnit)}</TableCell> + <TableCell>{formatSpeed(item.averageSpeed, speedUnit)}</TableCell> + <TableCell>{formatSpeed(item.maxSpeed, speedUnit)}</TableCell> + <TableCell>{formatHours(item.engineHours)}</TableCell> + <TableCell>{formatVolume(item.spentFuel)}</TableCell> + </TableRow> + ))} + </TableBody> + </Table> + </TableContainer> + </ReportLayoutPage> + ); +} + +export default SummaryReportPage; |