Ver a proveniência

remove user guide add bib

CR013B1
Alex Cheung há 2 semanas
ascendente
cometimento
fd9a595178
3 ficheiros alterados com 29 adições e 7 eliminações
  1. +2
    -2
      src/layout/MainLayout/Header/index.js
  2. +22
    -0
      src/pages/Payment/Search_GLD/DataGrid.js
  3. +5
    -5
      src/routes/LoginRoutes.js

+ 2
- 2
src/layout/MainLayout/Header/index.js Ver ficheiro

@@ -532,13 +532,13 @@ function Header(props) {
</Typography>
</Link>
</li>
<li>
{/* <li>
<Link className="login" to={'/userGuidePub'}>
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>
<FormattedMessage id="userGuide" />
</Typography>
</Link>
</li>
</li> */}
<li>
<Link className="login" to='/login'>
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2 }}>


+ 22
- 0
src/pages/Payment/Search_GLD/DataGrid.js Ver ficheiro

@@ -7,6 +7,10 @@ import * as PaymentStatus from "utils/statusUtils/PaymentStatus"
import { useNavigate } from "react-router-dom";
import { FiDataGrid } from "components/FiDataGrid";
import { clickableLink } from 'utils/CommonFunction';
import {
Checkbox
// MenuItem
} from '@mui/material';
// ==============================|| EVENT TABLE ||============================== //

export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, applySearch}) {
@@ -59,6 +63,16 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a
return clickableLink('/paymentPage/details/' + params.row.id, params.row.transNo);
},
},
{
id: 'payMethod',
field: 'payMethod',
headerName: 'Payment means',
flex: 1,
minWidth: 150,
renderCell: (params) => {
return <div style={{ marginTop: 2, marginBottom: 2 }}>{params.row.payMethod}</div>
}
},
{
id: 'transDateTime',
field: 'transDateTime',
@@ -69,6 +83,14 @@ export default function SearchPaymentTable({ searchCriteria, applyGridOnReady, a
return DateUtils.dateStr(params?.value);
}
},
{
field: 'bib',
headerName: 'BIB',
width: 150,
renderCell: (params) => {
return <Checkbox checked={params.row.bib} onChange={() => {set_paymentMethod("demandNote")}}/>;
}
},
{
field: 'action',
headerName: 'Status',


+ 5
- 5
src/routes/LoginRoutes.js Ver ficheiro

@@ -16,7 +16,7 @@ const PrivacyPolicyPage = Loadable(lazy(() => import('pages/extra-pages/PrivacyP
const ImportantNoticePage = Loadable(lazy(() => import('pages/extra-pages/ImportantNoticePage')));
const AboutUsPage = Loadable(lazy(() => import('pages/extra-pages/AboutUs')));
const UserMenuPage = Loadable(lazy(() => import('pages/extra-pages/UserMenu')));
const UserMenuPubPage = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub')));
// const UserMenuPubPage = Loadable(lazy(() => import('pages/extra-pages/UserMenuPub')));
const DatabaseHealthCheckPage = Loadable(lazy(() => import('pages/extra-pages/DatabaseHealthCheck')));


@@ -88,10 +88,10 @@ const LoginRoutes = {
path: 'userGuide',
element: <UserMenuPage/>
},
{
path: 'userGuidePub',
element: <UserMenuPubPage/>
},
// {
// path: 'userGuidePub',
// element: <UserMenuPubPage/>
// },
{
path: 'databaseHealthCheck',
element: <DatabaseHealthCheckPage/>


Carregando…
Cancelar
Guardar