From e7245fc142f6aa14e70036c0056c498971944cf9 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Tue, 6 Apr 2021 11:43:39 +0530
Subject: summary report data-grid conversion

---
 modern/src/reports/SummaryReportPage.js | 92 ++++++++++++++++++++++-----------
 1 file changed, 61 insertions(+), 31 deletions(-)

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

diff --git a/modern/src/reports/SummaryReportPage.js b/modern/src/reports/SummaryReportPage.js
index 5cfd857d..2af7d3b0 100644
--- a/modern/src/reports/SummaryReportPage.js
+++ b/modern/src/reports/SummaryReportPage.js
@@ -1,5 +1,6 @@
 import React, { useState } from 'react';
-import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, Paper, FormControlLabel, Checkbox } from '@material-ui/core';
+import { DataGrid } from '@material-ui/data-grid';
+import { FormControlLabel, Checkbox } from '@material-ui/core';
 import t from '../common/localization';
 import { formatDistance, formatHours, formatDate, formatSpeed, formatVolume } from '../common/formatter';
 import ReportFilter from './ReportFilter';
@@ -38,40 +39,69 @@ const SummaryReportPage = () => {
 
   const distanceUnit = useAttributePreference('distanceUnit');
   const speedUnit = useAttributePreference('speedUnit');
+  const volumeUnit = useAttributePreference('volumeUnit');
+
   const [items, setItems] = useState([]);
+
+  const columns = [{
+    headerName: t('reportStartDate'),
+    field: 'startTime',
+    type: 'dateTime',
+    flex: 1,
+    valueFormatter: ({ value }) => formatDate(value, 'YYYY-MM-DD'),
+  }, {
+    headerName: t('sharedDistance'),
+    field: 'distance',
+    type: 'number',
+    flex: 1,
+    valueFormatter: ({ value }) => formatDistance(value, distanceUnit),
+  }, {
+    headerName: t('reportStartOdometer'),
+    field: 'startOdometer',
+    type: 'number',
+    flex: 1,
+    valueFormatter: ({ value }) => formatDistance(value, distanceUnit),
+  }, {
+    headerName: t('reportEndOdometer'),
+    field: 'endOdometer',
+    type: 'number',
+    flex: 1,
+    valueFormatter: ({ value }) => formatDistance(value, distanceUnit),
+  }, {
+    headerName: t('reportAverageSpeed'),
+    field: 'averageSpeed',
+    type: 'number',
+    flex: 1,
+    valueFormatter: ({ value }) => formatSpeed(value, speedUnit),
+  }, {
+    headerName: t('reportMaximumSpeed'),
+    field: 'maxSpeed',
+    type: 'number',
+    flex: 1,
+    valueFormatter: ({ value }) => formatSpeed(value, speedUnit),
+  }, {
+    headerName: t('reportEngineHours'),
+    field: 'engineHours',
+    type: 'string',
+    flex: 1,
+    valueFormatter: ({ value }) => formatHours(value),
+  }, {
+    headerName: t('reportSpentFuel'),
+    field: 'spentFuel',
+    type: 'number',
+    flex: 1,
+    hide: true,
+    valueFormatter: ({ value }) => formatVolume(value, volumeUnit),                
+  }]
   
   return (
     <ReportLayoutPage filter={<Filter 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>
+      <DataGrid
+        rows={items} 
+        columns={columns} 
+        hideFooter 
+        autoHeight
+        getRowId={() => Math.random()} />
     </ReportLayoutPage>
   );
 }
-- 
cgit v1.2.3


From 63f25d26f42f41492a3addea856fc81d3fe73896 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Wed, 7 Apr 2021 16:07:03 +0530
Subject: Adding background paper components to reports

---
 modern/src/reports/EventReportPage.js   | 14 ++++++++------
 modern/src/reports/RouteReportPage.js   | 13 ++++++++-----
 modern/src/reports/StopReportPage.js    | 15 +++++++++------
 modern/src/reports/SummaryReportPage.js | 16 +++++++++-------
 modern/src/reports/TripReportPage.js    | 15 +++++++++------
 5 files changed, 43 insertions(+), 30 deletions(-)

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

diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index cbe2ced5..890af348 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { DataGrid } from '@material-ui/data-grid';
-import { FormControl, InputLabel, Select, MenuItem } from '@material-ui/core';
+import { FormControl, InputLabel, Select, MenuItem, Paper } from '@material-ui/core';
 import t from '../common/localization';
 import { formatDate } from '../common/formatter';
 import ReportFilter from './ReportFilter';
@@ -84,11 +84,13 @@ const EventReportPage = () => {
 
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <DataGrid
-        rows={items} 
-        columns={columns} 
-        hideFooter 
-        autoHeight />
+      <Paper>
+        <DataGrid
+          rows={items} 
+          columns={columns} 
+          hideFooter 
+          autoHeight />
+      </Paper>
     </ReportLayoutPage>
   );
 }
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index b8bad00d..02d41a2e 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -5,6 +5,7 @@ import { formatDistance, formatSpeed, formatBoolean, formatDate, formatCoordinat
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
 import { useAttributePreference, usePreference } from '../common/preferences';
+import { Paper } from '@material-ui/core';
 
 const Filter = ({ setItems }) => {
 
@@ -81,11 +82,13 @@ const RouteReportPage = () => {
 
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <DataGrid
-        rows={items} 
-        columns={columns} 
-        hideFooter 
-        autoHeight />
+      <Paper>
+        <DataGrid
+          rows={items} 
+          columns={columns} 
+          hideFooter 
+          autoHeight />
+      </Paper>
     </ReportLayoutPage>
   );
 };
diff --git a/modern/src/reports/StopReportPage.js b/modern/src/reports/StopReportPage.js
index 78731510..d5a25033 100644
--- a/modern/src/reports/StopReportPage.js
+++ b/modern/src/reports/StopReportPage.js
@@ -5,6 +5,7 @@ import { formatDistance, formatHours, formatDate, formatVolume } from '../common
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
 import { useAttributePreference } from '../common/preferences';
+import { Paper } from '@material-ui/core';
 
 const Filter = ({ setItems }) => {
 
@@ -80,12 +81,14 @@ const StopReportPage = () => {
   
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <DataGrid
-        rows={items} 
-        columns={columns} 
-        hideFooter 
-        autoHeight
-        getRowId={() => Math.random()} />
+      <Paper>
+        <DataGrid
+          rows={items} 
+          columns={columns} 
+          hideFooter 
+          autoHeight
+          getRowId={() => Math.random()} />
+      </Paper>
     </ReportLayoutPage>
   );
 };
diff --git a/modern/src/reports/SummaryReportPage.js b/modern/src/reports/SummaryReportPage.js
index 2af7d3b0..ff59a1f6 100644
--- a/modern/src/reports/SummaryReportPage.js
+++ b/modern/src/reports/SummaryReportPage.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { DataGrid } from '@material-ui/data-grid';
-import { FormControlLabel, Checkbox } from '@material-ui/core';
+import { FormControlLabel, Checkbox, Paper } from '@material-ui/core';
 import t from '../common/localization';
 import { formatDistance, formatHours, formatDate, formatSpeed, formatVolume } from '../common/formatter';
 import ReportFilter from './ReportFilter';
@@ -96,12 +96,14 @@ const SummaryReportPage = () => {
   
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <DataGrid
-        rows={items} 
-        columns={columns} 
-        hideFooter 
-        autoHeight
-        getRowId={() => Math.random()} />
+      <Paper>
+        <DataGrid
+          rows={items} 
+          columns={columns} 
+          hideFooter 
+          autoHeight
+          getRowId={() => Math.random()} />
+      </Paper>
     </ReportLayoutPage>
   );
 }
diff --git a/modern/src/reports/TripReportPage.js b/modern/src/reports/TripReportPage.js
index 45a7786c..5360e733 100644
--- a/modern/src/reports/TripReportPage.js
+++ b/modern/src/reports/TripReportPage.js
@@ -5,6 +5,7 @@ import { formatDistance, formatSpeed, formatHours, formatDate, formatVolume } fr
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
 import { useAttributePreference } from '../common/preferences';
+import { Paper } from '@material-ui/core';
 
 const Filter = ({ setItems }) => {
 
@@ -111,12 +112,14 @@ const TripReportPage = () => {
 
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <DataGrid
-        rows={items} 
-        columns={columns} 
-        hideFooter 
-        autoHeight
-        getRowId={() => Math.random()} />
+      <Paper>
+        <DataGrid
+          rows={items} 
+          columns={columns} 
+          hideFooter 
+          autoHeight
+          getRowId={() => Math.random()} />
+      </Paper>
     </ReportLayoutPage>
   );
 }
-- 
cgit v1.2.3


From 758647d372df2d633354fb64038d34246531aafb Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Thu, 8 Apr 2021 13:26:23 +0530
Subject: moving paper component to ReportLayout page

---
 modern/src/reports/EventReportPage.js   | 14 ++++++--------
 modern/src/reports/ReportLayoutPage.js  |  4 +++-
 modern/src/reports/RouteReportPage.js   | 13 +++++--------
 modern/src/reports/StopReportPage.js    | 15 ++++++---------
 modern/src/reports/SummaryReportPage.js | 16 +++++++---------
 modern/src/reports/TripReportPage.js    | 15 ++++++---------
 6 files changed, 33 insertions(+), 44 deletions(-)

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

diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index 890af348..cbe2ced5 100644
--- a/modern/src/reports/EventReportPage.js
+++ b/modern/src/reports/EventReportPage.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { DataGrid } from '@material-ui/data-grid';
-import { FormControl, InputLabel, Select, MenuItem, Paper } from '@material-ui/core';
+import { FormControl, InputLabel, Select, MenuItem } from '@material-ui/core';
 import t from '../common/localization';
 import { formatDate } from '../common/formatter';
 import ReportFilter from './ReportFilter';
@@ -84,13 +84,11 @@ const EventReportPage = () => {
 
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <Paper>
-        <DataGrid
-          rows={items} 
-          columns={columns} 
-          hideFooter 
-          autoHeight />
-      </Paper>
+      <DataGrid
+        rows={items} 
+        columns={columns} 
+        hideFooter 
+        autoHeight />
     </ReportLayoutPage>
   );
 }
diff --git a/modern/src/reports/ReportLayoutPage.js b/modern/src/reports/ReportLayoutPage.js
index d6fac051..e5eda05e 100644
--- a/modern/src/reports/ReportLayoutPage.js
+++ b/modern/src/reports/ReportLayoutPage.js
@@ -31,7 +31,9 @@ const ReportLayoutPage = ({ children, filter }) => {
             </Paper>
           </Grid>
           <Grid item xs={12} md={9} lg={10}>
-            {children}
+            <Paper>
+              {children}
+            </Paper>
           </Grid>
         </Grid>
       </div>
diff --git a/modern/src/reports/RouteReportPage.js b/modern/src/reports/RouteReportPage.js
index 02d41a2e..b8bad00d 100644
--- a/modern/src/reports/RouteReportPage.js
+++ b/modern/src/reports/RouteReportPage.js
@@ -5,7 +5,6 @@ import { formatDistance, formatSpeed, formatBoolean, formatDate, formatCoordinat
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
 import { useAttributePreference, usePreference } from '../common/preferences';
-import { Paper } from '@material-ui/core';
 
 const Filter = ({ setItems }) => {
 
@@ -82,13 +81,11 @@ const RouteReportPage = () => {
 
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <Paper>
-        <DataGrid
-          rows={items} 
-          columns={columns} 
-          hideFooter 
-          autoHeight />
-      </Paper>
+      <DataGrid
+        rows={items} 
+        columns={columns} 
+        hideFooter 
+        autoHeight />
     </ReportLayoutPage>
   );
 };
diff --git a/modern/src/reports/StopReportPage.js b/modern/src/reports/StopReportPage.js
index d5a25033..78731510 100644
--- a/modern/src/reports/StopReportPage.js
+++ b/modern/src/reports/StopReportPage.js
@@ -5,7 +5,6 @@ import { formatDistance, formatHours, formatDate, formatVolume } from '../common
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
 import { useAttributePreference } from '../common/preferences';
-import { Paper } from '@material-ui/core';
 
 const Filter = ({ setItems }) => {
 
@@ -81,14 +80,12 @@ const StopReportPage = () => {
   
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <Paper>
-        <DataGrid
-          rows={items} 
-          columns={columns} 
-          hideFooter 
-          autoHeight
-          getRowId={() => Math.random()} />
-      </Paper>
+      <DataGrid
+        rows={items} 
+        columns={columns} 
+        hideFooter 
+        autoHeight
+        getRowId={() => Math.random()} />
     </ReportLayoutPage>
   );
 };
diff --git a/modern/src/reports/SummaryReportPage.js b/modern/src/reports/SummaryReportPage.js
index ff59a1f6..2af7d3b0 100644
--- a/modern/src/reports/SummaryReportPage.js
+++ b/modern/src/reports/SummaryReportPage.js
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { DataGrid } from '@material-ui/data-grid';
-import { FormControlLabel, Checkbox, Paper } from '@material-ui/core';
+import { FormControlLabel, Checkbox } from '@material-ui/core';
 import t from '../common/localization';
 import { formatDistance, formatHours, formatDate, formatSpeed, formatVolume } from '../common/formatter';
 import ReportFilter from './ReportFilter';
@@ -96,14 +96,12 @@ const SummaryReportPage = () => {
   
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <Paper>
-        <DataGrid
-          rows={items} 
-          columns={columns} 
-          hideFooter 
-          autoHeight
-          getRowId={() => Math.random()} />
-      </Paper>
+      <DataGrid
+        rows={items} 
+        columns={columns} 
+        hideFooter 
+        autoHeight
+        getRowId={() => Math.random()} />
     </ReportLayoutPage>
   );
 }
diff --git a/modern/src/reports/TripReportPage.js b/modern/src/reports/TripReportPage.js
index 5360e733..45a7786c 100644
--- a/modern/src/reports/TripReportPage.js
+++ b/modern/src/reports/TripReportPage.js
@@ -5,7 +5,6 @@ import { formatDistance, formatSpeed, formatHours, formatDate, formatVolume } fr
 import ReportFilter from './ReportFilter';
 import ReportLayoutPage from './ReportLayoutPage';
 import { useAttributePreference } from '../common/preferences';
-import { Paper } from '@material-ui/core';
 
 const Filter = ({ setItems }) => {
 
@@ -112,14 +111,12 @@ const TripReportPage = () => {
 
   return (
     <ReportLayoutPage filter={<Filter setItems={setItems} />}>
-      <Paper>
-        <DataGrid
-          rows={items} 
-          columns={columns} 
-          hideFooter 
-          autoHeight
-          getRowId={() => Math.random()} />
-      </Paper>
+      <DataGrid
+        rows={items} 
+        columns={columns} 
+        hideFooter 
+        autoHeight
+        getRowId={() => Math.random()} />
     </ReportLayoutPage>
   );
 }
-- 
cgit v1.2.3