aboutsummaryrefslogtreecommitdiff
path: root/modern
diff options
context:
space:
mode:
authorAshutosh Bishnoi <mail2bishnoi@gmail.com>2021-04-08 13:26:23 +0530
committerAshutosh Bishnoi <mail2bishnoi@gmail.com>2021-04-08 13:26:23 +0530
commit758647d372df2d633354fb64038d34246531aafb (patch)
tree441d03024fef78a46182efab3b872e9e819702bb /modern
parent63f25d26f42f41492a3addea856fc81d3fe73896 (diff)
downloadetbsa-traccar-web-758647d372df2d633354fb64038d34246531aafb.tar.gz
etbsa-traccar-web-758647d372df2d633354fb64038d34246531aafb.tar.bz2
etbsa-traccar-web-758647d372df2d633354fb64038d34246531aafb.zip
moving paper component to ReportLayout page
Diffstat (limited to 'modern')
-rw-r--r--modern/src/reports/EventReportPage.js14
-rw-r--r--modern/src/reports/ReportLayoutPage.js4
-rw-r--r--modern/src/reports/RouteReportPage.js13
-rw-r--r--modern/src/reports/StopReportPage.js15
-rw-r--r--modern/src/reports/SummaryReportPage.js16
-rw-r--r--modern/src/reports/TripReportPage.js15
6 files changed, 33 insertions, 44 deletions
diff --git a/modern/src/reports/EventReportPage.js b/modern/src/reports/EventReportPage.js
index 890af34..cbe2ced 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 d6fac05..e5eda05 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 02d41a2..b8bad00 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 d5a2503..7873151 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 ff59a1f..2af7d3b 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 5360e73..45a7786 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>
);
}