From d7bfb9ac6fabf09f4675ea58bc58e12dbd04eee9 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Thu, 12 Nov 2020 16:03:33 +0530
Subject: Implementing Trip Report with attribute formating

---
 modern/src/reports/SummaryReportPage.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 modern/src/reports/SummaryReportPage.js

(limited to 'modern/src/reports/SummaryReportPage.js')

diff --git a/modern/src/reports/SummaryReportPage.js b/modern/src/reports/SummaryReportPage.js
new file mode 100644
index 0000000..e69de29
-- 
cgit v1.2.3


From 42cf49c219f0455537eccaf76cf8febf2dae6730 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Fri, 13 Nov 2020 14:39:34 +0530
Subject: Implementing Summary Report

---
 modern/src/App.js                       |  2 +
 modern/src/reports/SummaryReportPage.js | 67 +++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

(limited to 'modern/src/reports/SummaryReportPage.js')

diff --git a/modern/src/App.js b/modern/src/App.js
index bbcab3e..8a308c1 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 e69de29..e482d0f 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;
-- 
cgit v1.2.3


From 37ff59bbdc540bf2293a96ecbedcf210f6b4548a Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Sat, 14 Nov 2020 09:02:34 +0530
Subject: Adding DailySummary param to summary report and minor code
 improvements

---
 modern/src/App.js                       |  2 --
 modern/src/MainToolbar.js               |  6 ------
 modern/src/common/formatter.js          |  2 --
 modern/src/reports/SummaryReportPage.js | 13 +++++++++++--
 4 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'modern/src/reports/SummaryReportPage.js')

diff --git a/modern/src/App.js b/modern/src/App.js
index c54e648..8a308c1 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -21,7 +21,6 @@ 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);
@@ -51,7 +50,6 @@ const App = () => {
               <Route exact path='/reports/trip' component={TripReportPage} />
               <Route exact path='/reports/stop' component={StopReportPage} />
               <Route exact path='/reports/summary' component={SummaryReportPage} />
-              <Route exact path='/reports/daily-summary' component={DailySummaryReportPage} />
             </Switch>
           )}
         </Route>
diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index a2a9c9f..a899950 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -140,12 +140,6 @@ const MainToolbar = () => {
                 <FormatListBulletedIcon />
               </ListItemIcon>
               <ListItemText primary={t('reportSummary')} />
-            </ListItem>
-            <ListItem button onClick={() => history.push('/reports/daily-summary')}>
-              <ListItemIcon>
-                <FormatListBulletedIcon />
-              </ListItemIcon>
-              <ListItemText primary={t('reportDaily')} />
             </ListItem>            
             <ListItem button disabled>
               <ListItemIcon>
diff --git a/modern/src/common/formatter.js b/modern/src/common/formatter.js
index 7221618..e41e591 100644
--- a/modern/src/common/formatter.js
+++ b/modern/src/common/formatter.js
@@ -9,8 +9,6 @@ export const formatPosition = (value, key) => {
     case 'fixTime':
     case 'deviceTime':
     case 'serverTime':
-    case 'startTime':
-    case 'endTime':
       return moment(value).format('LLL');
     case 'latitude':
     case 'longitude':
diff --git a/modern/src/reports/SummaryReportPage.js b/modern/src/reports/SummaryReportPage.js
index e482d0f..c90ddb4 100644
--- a/modern/src/reports/SummaryReportPage.js
+++ b/modern/src/reports/SummaryReportPage.js
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper } from '@material-ui/core';
+import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper, FormControlLabel, Checkbox } from '@material-ui/core';
 import t from '../common/localization';
 import { formatDistance, formatHours, formatDate, formatSpeed, formatVolume } from '../common/formatter';
 import ReportFilter from './ReportFilter';
@@ -8,18 +8,27 @@ import { useAttributePreference } from '../common/preferences';
 
 const ReportFilterForm = ({ onResult }) => {
 
+  const [daily, setDaily] = useState(false);
+
   const handleSubmit = async (deviceId, from, to) => {
     const query = new URLSearchParams({
       deviceId,
       from: from.toISOString(),
       to: to.toISOString(),
+      daily
     });
     const response = await fetch(`/api/reports/summary?${query.toString()}`, { headers: { Accept: 'application/json' } });
     if (response.ok) {
       onResult(await response.json());
     }
   }
-  return <ReportFilter handleSubmit={handleSubmit} />;
+  return (
+    <ReportFilter handleSubmit={handleSubmit}>
+      <FormControlLabel
+        control={<Checkbox checked={daily} onChange={event => setDaily(event.target.checked)} />}
+        label={t('reportDaily')} />
+    </ReportFilter>
+  );
 }
 
 const SummaryReportPage = () => {
-- 
cgit v1.2.3