From 28d1fc9ce25922467498df1a0b602afc37ca89af Mon Sep 17 00:00:00 2001 From: Ashutosh Bishnoi Date: Fri, 13 Nov 2020 15:01:01 +0530 Subject: Implementing Daily Summary Report --- modern/src/App.js | 2 + modern/src/MainToolbar.js | 6 +++ modern/src/reports/DailySummaryReportPage.js | 68 ++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+) (limited to 'modern/src') diff --git a/modern/src/App.js b/modern/src/App.js index 8a308c1..c54e648 100644 --- a/modern/src/App.js +++ b/modern/src/App.js @@ -21,6 +21,7 @@ import { LinearProgress } from '@material-ui/core'; import TripReportPage from './reports/TripReportPage'; import StopReportPage from './reports/StopReportPage'; import SummaryReportPage from './reports/SummaryReportPage'; +import DailySummaryReportPage from './reports/DailySummaryReportPage'; const App = () => { const initialized = useSelector(state => !!state.session.server && !!state.session.user); @@ -50,6 +51,7 @@ const App = () => { + )} diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js index 5b94b14..a2a9c9f 100644 --- a/modern/src/MainToolbar.js +++ b/modern/src/MainToolbar.js @@ -141,6 +141,12 @@ const MainToolbar = () => { + history.push('/reports/daily-summary')}> + + + + + diff --git a/modern/src/reports/DailySummaryReportPage.js b/modern/src/reports/DailySummaryReportPage.js index e69de29..c628a9b 100644 --- a/modern/src/reports/DailySummaryReportPage.js +++ b/modern/src/reports/DailySummaryReportPage.js @@ -0,0 +1,68 @@ +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(), + daily: true + }); + const response = await fetch(`/api/reports/summary?${query.toString()}`, { headers: { Accept: 'application/json' } }); + if (response.ok) { + onResult(await response.json()); + } + } + return ; +} + +const DailySummaryReportPage = () => { + + const distanceUnit = useAttributePreference('distanceUnit'); + const speedUnit = useAttributePreference('speedUnit'); + const [items, setItems] = useState([]); + + return ( + + + + + + {t('reportStartDate')} + {t('sharedDistance')} + {t('reportStartOdometer')} + {t('reportEndOdometer')} + {t('reportAverageSpeed')} + {t('reportMaximumSpeed')} + {t('reportEngineHours')} + {t('reportSpentFuel')} + + + + {items.map((item) => ( + + {formatDate(item.startTime, 'YYYY-MM-DD')} + {formatDistance(item.distance, distanceUnit)} + {formatDistance(item.startOdometer, distanceUnit)} + {formatDistance(item.endOdometer, distanceUnit)} + {formatSpeed(item.averageSpeed, speedUnit)} + {formatSpeed(item.maxSpeed, speedUnit)} + {formatHours(item.engineHours)} + {formatVolume(item.spentFuel)} + + ))} + +
+
+
+ ); +} + +export default DailySummaryReportPage; -- cgit v1.2.3