From 2ea3cf62d8649588094b820652de017d5baae888 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Wed, 16 Dec 2020 15:13:08 +0530
Subject: Driver Implementations

---
 modern/src/App.js                  |  4 +++
 modern/src/MainToolbar.js          |  6 ++++
 modern/src/settings/DriverPage.js  | 65 ++++++++++++++++++++++++++++++++++++++
 modern/src/settings/DriversPage.js | 65 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 140 insertions(+)
 create mode 100644 modern/src/settings/DriverPage.js
 create mode 100644 modern/src/settings/DriversPage.js

diff --git a/modern/src/App.js b/modern/src/App.js
index 83fd9315..94f1ed72 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -22,6 +22,8 @@ import TripReportPage from './reports/TripReportPage';
 import StopReportPage from './reports/StopReportPage';
 import SummaryReportPage from './reports/SummaryReportPage';
 import ChartReportPage from './reports/ChartReportPage';
+import DriversPage from './settings/DriversPage';
+import DriverPage from './settings/DriverPage';
 
 const App = () => {
   const initialized = useSelector(state => !!state.session.server && !!state.session.user);
@@ -52,6 +54,8 @@ const App = () => {
               <Route exact path='/reports/stop' component={StopReportPage} />
               <Route exact path='/reports/summary' component={SummaryReportPage} />
               <Route exact path='/reports/chart' component={ChartReportPage} />
+              <Route exact path='/settings/drivers' component={DriversPage} />
+              <Route exact path='/settings/driver/:id?' component={DriverPage} />
             </Switch>
           )}
         </Route>
diff --git a/modern/src/MainToolbar.js b/modern/src/MainToolbar.js
index 930e66a0..6e2981f2 100644
--- a/modern/src/MainToolbar.js
+++ b/modern/src/MainToolbar.js
@@ -173,6 +173,12 @@ const MainToolbar = () => {
               </ListItemIcon>
               <ListItemText primary={t('settingsGroups')} />
             </ListItem>
+            <ListItem button onClick={() => history.push('/settings/drivers')}>
+              <ListItemIcon>
+                <PersonIcon />
+              </ListItemIcon>
+              <ListItemText primary={t('sharedDrivers')} />
+            </ListItem>            
           </List>
           {adminEnabled && (
             <>
diff --git a/modern/src/settings/DriverPage.js b/modern/src/settings/DriverPage.js
new file mode 100644
index 00000000..86feab84
--- /dev/null
+++ b/modern/src/settings/DriverPage.js
@@ -0,0 +1,65 @@
+import React, { useState } from 'react';
+import TextField from '@material-ui/core/TextField';
+import t from '../common/localization';
+import EditItemView from '../EditItemView';
+import { Accordion, AccordionSummary, AccordionDetails, makeStyles, Typography } from '@material-ui/core';
+import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
+import EditAttributesView from '../attributes/EditAttributesView';
+
+const useStyles = makeStyles(() => ({
+  details: {
+    flexDirection: 'column',
+  },
+}));
+
+const DriverPage = () => {
+  const classes = useStyles();
+
+  const [item, setItem] = useState();
+
+  return (
+    <EditItemView endpoint="drivers" item={item} setItem={setItem}>
+      {item &&
+        <>
+          <Accordion defaultExpanded>
+            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+              <Typography variant="subtitle1">
+                {t('sharedRequired')}
+              </Typography>
+            </AccordionSummary>
+            <AccordionDetails className={classes.details}>
+              <TextField
+                margin="normal"
+                value={item.name || ''}
+                onChange={event => setItem({...item, name: event.target.value})}
+                label={t('sharedName')}
+                variant="filled" />
+              <TextField
+                margin="normal"
+                value={item.uniqueId || ''}
+                onChange={event => setItem({...item, uniqueId: event.target.value})}
+                label={t('deviceIdentifier')}
+                variant="filled" />                
+            </AccordionDetails>
+          </Accordion>
+          <Accordion>
+            <AccordionSummary expandIcon={<ExpandMoreIcon />}>
+              <Typography variant="subtitle1">
+                {t('sharedAttributes')}
+              </Typography>
+            </AccordionSummary>
+            <AccordionDetails className={classes.details}>
+              <EditAttributesView
+                attributes={item.attributes}
+                setAttributes={attributes => setItem({...item, attributes})}
+                definitions={{}}
+                />
+            </AccordionDetails>
+          </Accordion>
+        </>
+      }
+    </EditItemView>
+  );
+}
+
+export default DriverPage;
diff --git a/modern/src/settings/DriversPage.js b/modern/src/settings/DriversPage.js
new file mode 100644
index 00000000..957e2250
--- /dev/null
+++ b/modern/src/settings/DriversPage.js
@@ -0,0 +1,65 @@
+import React, { useState } from 'react';
+import MainToolbar from '../MainToolbar';
+import { TableContainer, Table, TableRow, TableCell, TableHead, TableBody, makeStyles, IconButton } from '@material-ui/core';
+import MoreVertIcon from '@material-ui/icons/MoreVert';
+import t from '../common/localization';
+import { useEffectAsync } from '../reactHelper';
+import EditCollectionView from '../EditCollectionView';
+
+const useStyles = makeStyles(theme => ({
+  columnAction: {
+    width: theme.spacing(1),
+    padding: theme.spacing(0, 1),
+  },
+}));
+
+const DriversView = ({ updateTimestamp, onMenuClick }) => {
+  const classes = useStyles();
+
+  const [items, setItems] = useState([]);
+
+  useEffectAsync(async () => {
+    const response = await fetch('/api/drivers');
+    if (response.ok) {
+      setItems(await response.json());
+    }
+  }, [updateTimestamp]);
+
+  return (
+    <TableContainer>
+    <Table>
+      <TableHead>
+        <TableRow>
+          <TableCell className={classes.columnAction} />
+          <TableCell>{t('sharedName')}</TableCell>
+          <TableCell>{t('deviceIdentifier')}</TableCell>
+        </TableRow>
+      </TableHead>
+      <TableBody>
+        {items.map((item) => (
+          <TableRow key={item.id}>
+            <TableCell className={classes.columnAction} padding="none">
+              <IconButton onClick={(event) => onMenuClick(event.currentTarget, item.id)}>
+                <MoreVertIcon />
+              </IconButton>
+            </TableCell>
+            <TableCell>{item.name}</TableCell>
+            <TableCell>{item.uniqueId}</TableCell>
+          </TableRow>
+        ))}
+      </TableBody>
+    </Table>
+    </TableContainer>
+  );
+}
+
+const DriversPage = () => {
+  return (
+    <>
+      <MainToolbar />
+      <EditCollectionView content={DriversView} editPath="/settings/driver" endpoint="drivers" />
+    </>
+  );
+}
+
+export default DriversPage;
-- 
cgit v1.2.3


From ff2703294a054f7808bbda36d793cbdd6ac50d47 Mon Sep 17 00:00:00 2001
From: Ashutosh Bishnoi <mail2bishnoi@gmail.com>
Date: Thu, 17 Dec 2020 15:12:10 +0530
Subject: Minor code improvements

---
 modern/src/App.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modern/src/App.js b/modern/src/App.js
index 94f1ed72..6b004ee2 100644
--- a/modern/src/App.js
+++ b/modern/src/App.js
@@ -42,20 +42,20 @@ const App = () => {
               <Route exact path='/position/:id?' component={PositionPage} />
               <Route exact path='/user/:id?' component={UserPage} />
               <Route exact path='/device/:id?' component={DevicePage} />
-              <Route exact path='/reports/route' component={RouteReportPage} />
               <Route exact path='/settings/notifications' component={NotificationsPage} />
               <Route exact path='/settings/notification/:id?' component={NotificationPage} />
               <Route exact path='/settings/groups' component={GroupsPage} />
               <Route exact path='/settings/group/:id?' component={GroupPage} />
+              <Route exact path='/settings/drivers' component={DriversPage} />
+              <Route exact path='/settings/driver/:id?' component={DriverPage} />              
               <Route exact path='/admin/server' component={ServerPage} />
               <Route exact path='/admin/users' component={UsersPage} />
+              <Route exact path='/reports/route' component={RouteReportPage} />              
               <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} />
               <Route exact path='/reports/chart' component={ChartReportPage} />
-              <Route exact path='/settings/drivers' component={DriversPage} />
-              <Route exact path='/settings/driver/:id?' component={DriverPage} />
             </Switch>
           )}
         </Route>
-- 
cgit v1.2.3