Skip to content

#181414724 (feature): Approvals Table #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

#181414724 (feature): Approvals Table #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .husky/pre-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

# yarn lint
yarn lint
yarn test
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"redux": "^4.2.0",
"redux-persist": "^6.0.0",
"sass": "^1.51.0",
"save-dev": "^0.0.1-security",
"simplebar-react": "^2.4.1",
"styled-components": "^5.3.5",
"yup": "^0.32.11"
Expand Down
91 changes: 47 additions & 44 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,64 @@
import React from 'react';
import { Route, Routes } from 'react-router-dom';
import Home from './pages/index';
import Registration from './pages/registration';
import Unverified from './pages/unverified';
import Welcome from './components/Welcome';
import PrivateRoute from './app/privateRoute';
import BounceRoute from './app/bounce';
import SuperAdminRoute from './app/superAdmin';
import Login from './pages/login';
import SocialAuth from './components/login/socialAuth';
import { ToastContainer } from 'react-toastify';
import './styles/app.scss';
import ForgetPassword from './pages/forgetPassword';
import ResetPassword from './pages/resetPassword';
import DashboardLayout from './layouts';
import DashboardApp from './pages/DashboardApp';
import Users from './pages/Users';
import 'react-toastify/dist/ReactToastify.css';
import Accommodations from './pages/Accommodations';
import Accomodation from './pages/accommodation';
import BounceRoute from './app/bounce';
import Chat from './pages/Chat';
import DashboardApp from './pages/DashboardApp';
import DashboardLayout from './layouts';
import ForgetPassword from './pages/forgetPassword';
import Home from './pages/index';
import Login from './pages/login';
import PrivateRoute from './app/privateRoute';
import Product from './components/accommodation/productPage';
import Profile from './pages/Profile';
import Registration from './pages/registration';
import ResetPassword from './pages/resetPassword';
import SocialAuth from './components/login/socialAuth';
import SuperAdminRoute from './app/superAdmin';
import TripRequest from './pages/TripRequest';
import Unverified from './pages/unverified';
import Users from './pages/Users';
import VerificationPage from './pages/VerificationPage';
import Product from './components/accommodation/productPage';
// import Role from './pages/role';
import Welcome from './components/Welcome';

function App() {
return (
<Routes>
<Route path="/" element={<Home />} />
<Route path="unverified" element={<Unverified />} />
<Route path="welcome" element={<Welcome />} />
<Route element={<BounceRoute />}>
<Route path="login" element={<Login />} />
<Route path="social-auth" element={<SocialAuth />} />
<Route path="registration" element={<Registration />} />
</Route>
<Route element={<PrivateRoute />}>
<Route path="dashboard" element={<DashboardLayout />}>
<Route path="app" element={<DashboardApp />} />
<Route path="accomodation/:id" element={<Accomodation />} />
<Route element={<SuperAdminRoute />}>
<Route path="users" element={<Users />} />
<>
<Routes>
<Route path="/" element={<Home />} />
<Route path="unverified" element={<Unverified />} />
<Route path="welcome" element={<Welcome />} />
<Route element={<BounceRoute />}>
<Route path="login" element={<Login />} />
<Route path="social-auth" element={<SocialAuth />} />
<Route path="registration" element={<Registration />} />
</Route>
<Route element={<PrivateRoute />}>
<Route path="dashboard" element={<DashboardLayout />}>
<Route path="app" element={<DashboardApp />} />
<Route path="accomodation/:id" element={<Accomodation />} />
<Route element={<SuperAdminRoute />}>
<Route path="users" element={<Users />} />
</Route>
<Route path="accommodations" element={<Accommodations />} />
<Route path="chat" element={<Chat />} />
<Route path="profile" element={<Profile />} />
<Route path="trip-request" element={<TripRequest />} />
</Route>
<Route path="accommodations" element={<Accommodations />} />
<Route path="chat" element={<Chat />} />
<Route path="profile" element={<Profile />} />
<Route path="trip-request" element={<TripRequest />} />
</Route>
</Route>
<Route path="reset-password" element={<ResetPassword />} />
<Route path="forgot-password" element={<ForgetPassword />} />
<Route path="registration" element={<Registration />} />
<Route path="welcome" element={<Welcome />} />
<Route path="api/users/verify/" element={<VerificationPage />} />
<Route path="products/:id" element={<Product />} />
{/* <Route path="role" element={<Role />} /> */}
</Routes>
<Route path="reset-password" element={<ResetPassword />} />
<Route path="forgot-password" element={<ForgetPassword />} />
<Route path="registration" element={<Registration />} />
<Route path="welcome" element={<Welcome />} />
<Route path="api/users/verify/" element={<VerificationPage />} />
<Route path="products/:id" element={<Product />} />
</Routes>
<ToastContainer />
</>
);
}

Expand Down
198 changes: 149 additions & 49 deletions src/components/request/Table.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,45 @@
import React, { useEffect, useState } from 'react';
import { DataGrid } from '@mui/x-data-grid';
import { Button, Grid, ClickAwayListener } from '@mui/material';
import { PublishedWithChanges } from '@mui/icons-material';
import { useDispatch } from 'react-redux';
import jwtDecode from 'jwt-decode';
import { getTripRequests } from '../../redux/features/trip/tripSlice';
import api from '../../utility/api';
import Approval from '../tripApproval/tripApproval';
import '../../styles/Table.scss';

function Table() {
const [data, setData] = useState([]);
const [managerData, setManagerData] = useState([]);
const [selectedData, setSelectedData] = useState('');
const [changeStatus, setChangeStatus] = useState(false);
const [changeView, setChangeView] = useState(false);
const dispatch = useDispatch();

const token = jwtDecode(localStorage.getItem('token'), { header: 'jwt' });
const { roleId } = token.user;

useEffect(() => {
const renderState = async () => {
api.get('/api/trip/request/list').then((res) => {
setData(res.data.trips);
api.get('/api/trip/request/list/manager').then((res) => {
setManagerData(res.data.response);
dispatch(getTripRequests(res.data.response));
});
};
renderState();
}, []);

const columns = [
const handleStatus = () => {
localStorage.setItem('tripId', data.id);
setChangeStatus(true);
};

const handleClickAway = () => {
setChangeStatus(false);
};

const requesterColumns = [
{ field: 'id', headerName: 'ID', width: 90, color: 'blue' },
{
field: 'Accommodation',
Expand Down Expand Up @@ -45,58 +69,134 @@ function Table() {
headerName: 'Status',
width: 120,
border: '1 solid black',
className: 'approved',
valueFormatter: (params) => params.value.status,
},
];
const managerColumns = [
{ field: 'id', headerName: 'ID', width: 90, color: 'blue' },
{
field: 'Accommodation',
headerName: 'Accommodation',
width: 180,
cellClassName: 'accomodation-column',
valueFormatter: (params) => params.value.name,
},
{
field: 'Destination',
headerName: 'Destination',
width: 150,
valueFormatter: (params) => params.value.city,
},
{ field: 'departureDate', headerName: 'Departure Date', width: 110 },
{ field: 'returnDate', headerName: 'Return Date', width: 110 },
{ field: 'travel_reason', headerName: 'Travel Reason', width: 110 },
{ field: 'tripType', headerName: 'Trip Type', width: 110 },
{
field: 'manager',
headerName: 'Manager',
width: 180,
valueFormatter: (params) => params.value.email,
},
{
field: 'status',
headerName: 'Status',
width: 120,
border: '1 solid black',
className: 'approved',
cellClassName: 'status-column',
valueFormatter: (params) => params.value.status,
},
{
field: 'action',
headerName: 'Actions',
width: 100,
hide: changeView,
className: 'actions',
renderCell: () => (
<div>
<Button className="cellAction" onClick={handleStatus}>
<PublishedWithChanges />
</Button>
</div>
),
},
];

return (
<>
<div
className="container"
data-testid="request-table"
style={{
height: 475,
width: '98%',
backgroundColor: 'white',
margin: ' 4rem 0 0 2rem',
display: 'flex',
flexDirection: 'column',
}}
>
<DataGrid
{changeStatus ? (
<ClickAwayListener onClickAway={handleClickAway}>
<Grid>
<Approval data={selectedData} />
</Grid>
</ClickAwayListener>
) : null}
{changeStatus ? null : (
<Grid
className="container"
data-testid="request-table"
rows={data}
columns={columns}
pageSize={7}
rowsPerPageOptions={[5]}
checkboxSelection
sx={{
height: '100%',
width: '100%',
'& .MuiDataGrid-columnHeaderTitle': {
color: '#f5f5f5',
},
'& .MuiDataGrid-columnHeadersInner': {
backgroundColor: '#1565c0',
fontWeight: 'bold',
textAlign: 'center',
},
'& .MuiDataGrid-columnHeaderTitleContainerContent': {
paddingLeft: '10px',
},
'& .MuiToolbar-root': {
color: '#1565c0',
},
'& .MuiDataGrid-selectedRowCount': {
color: '#1565c0',
},
'& .css-d3ri6l-MuiStack-root': {
display: 'grid',
flexDirection: 'column !important',
alignItems: 'start',
},
style={{
height: '700px',
width: '98%',
backgroundColor: 'white',
margin: ' 4rem 0 0 2rem',
display: 'flex',
flexDirection: 'column',
}}
/>
</div>
>
<DataGrid
data-testid="request-table"
rows={roleId === 1 ? data : managerData}
columns={roleId === 1 ? requesterColumns : managerColumns}
pageSize={10}
rowsPerPageOptions={[10]}
checkboxSelection
onSelectionModelChange={(id) => {
const selectedRowData = managerData.filter((row) => row.id == id);
setSelectedData(selectedRowData[0]);
}}
style={{
zIndex: 0,
}}
sx={{
height: '70%',
width: '100%',
'& .MuiDataGrid-columnHeaderTitle': {
color: '#f5f5f5',
},
'& .MuiDataGrid-columnHeadersInner': {
backgroundColor: '#1565c0',
fontWeight: 'bold',
textAlign: 'center',
},
'& .MuiDataGrid-columnHeaderTitleContainerContent': {
paddingLeft: '10px',
},
'& .MuiToolbar-root': {
color: '#1565c0',
},
'& .MuiDataGrid-selectedRowCount': {
color: '#1565c0',
},
'& .css-d3ri6l-MuiStack-root': {
display: 'grid',
flexDirection: 'column !important',
alignItems: 'start',
},
'& .cellAction': {
justifyContent: 'center',
color: '#4cd964',
cursor: 'pointer',
},
'& .approved': {
color: '#4cd964',
padding: '2px',
border: '1px solid #4cd964',
},
}}
/>
</Grid>
)}
</>
);
}
Expand Down
Loading