Browse Source

fix bug

master
Anna Ho 1 year ago
parent
commit
fcb7699d30
2 changed files with 21 additions and 11 deletions
  1. +14
    -4
      src/pages/PublicNotice/Details_GLD/index.js
  2. +7
    -7
      src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js

+ 14
- 4
src/pages/PublicNotice/Details_GLD/index.js View File

@@ -50,6 +50,9 @@ const PublicNoticeDetail_GLD = () => {
const [isLoading, setLoading] = useState(false); const [isLoading, setLoading] = useState(false);
const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent'))); const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent')));
const [getUploadStatus, setUploadStatus] = useState(false); const [getUploadStatus, setUploadStatus] = useState(false);
const [proofCount, setProofCount] = useState(0);
const [paymentCount, setPaymentCount] = useState(0);
const [statusHistoryCount, setStatusHistoryCount] = useState(0);


//pageTitle //pageTitle
const [appNo, setAapNo] = useState(""); const [appNo, setAapNo] = useState("");
@@ -107,6 +110,10 @@ const PublicNoticeDetail_GLD = () => {
.then((response) => { .then((response) => {
if (response.status === 200) { if (response.status === 200) {
setApplicationDetailData(response.data); setApplicationDetailData(response.data);
setProofCount(response.data.proofCount);
setPaymentCount(response.data.paymentCount);
setStatusHistoryCount(response.data.statusHistoryCount);

const gazetteIssueDetail = response.data.gazetteIssueDetail; const gazetteIssueDetail = response.data.gazetteIssueDetail;
setAapNo(response.data.data.appNo); setAapNo(response.data.data.appNo);
setGazetteIssue(gazetteIssueDetail.issueYear + " Vol " + gazetteIssueDetail.volume); setGazetteIssue(gazetteIssueDetail.issueYear + " Vol " + gazetteIssueDetail.volume);
@@ -393,10 +400,13 @@ const PublicNoticeDetail_GLD = () => {
<Grid item xs={12} md={12} lg={12} xl={12}> <Grid item xs={12} md={12} lg={12} xl={12}>
<Box xs={12} sx={{ ml: 2, mt: 3, mr: { sm: 2 }, borderRadius: '10px', width: { xs: '92vw', sm: '96.5vw', md: "auto" }, backgroundColor: '#ffffff' }}> <Box xs={12} sx={{ ml: 2, mt: 3, mr: { sm: 2 }, borderRadius: '10px', width: { xs: '92vw', sm: '96.5vw', md: "auto" }, backgroundColor: '#ffffff' }}>
<TabTableDetail <TabTableDetail
appId={params?.id}
proofCount={applicationDetailData.proofCount}
paymentCount={applicationDetailData.paymentCount}
statusHistoryCount={applicationDetailData.statusHistoryCount}
appId={params.id}
proofCount={proofCount}
paymentCount={paymentCount}
statusHistoryCount={statusHistoryCount}
setProofCount = {setProofCount}
setPaymentCount = {setPaymentCount}
setStatusHistoryCount = {setStatusHistoryCount}
/> />
</Box> </Box>
<br /> <br />


+ 7
- 7
src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js View File

@@ -21,10 +21,10 @@ const StatusHistoryTab = Loadable(lazy(() => import('./StatusHistoryTab')));


// ==============================|| DASHBOARD - DEFAULT ||============================== // // ==============================|| DASHBOARD - DEFAULT ||============================== //


const PublicNotice = ({ appId, proofCount, paymentCount, statusHistoryCount }) => {
const [_proofCount, setProofCount] = React.useState(proofCount);
const [_paymentCount, setPaymentCount] = React.useState(paymentCount);
const [_statusHistoryCount, setStatusHistoryCount] = React.useState(statusHistoryCount);
const PublicNotice = ({ appId, proofCount, paymentCount, statusHistoryCount, setProofCount, setPaymentCount, setStatusHistoryCount }) => {
// const [_proofCount, setProofCount] = React.useState(proofCount);
// const [_paymentCount, setPaymentCount] = React.useState(paymentCount);
// const [_statusHistoryCount, setStatusHistoryCount] = React.useState(statusHistoryCount);


const [onReady, setOnReady] = React.useState(false); const [onReady, setOnReady] = React.useState(false);
const [selectedTab, setSelectedTab] = React.useState("1"); const [selectedTab, setSelectedTab] = React.useState("1");
@@ -48,9 +48,9 @@ const PublicNotice = ({ appId, proofCount, paymentCount, statusHistoryCount }) =
<TabContext value={selectedTab}> <TabContext value={selectedTab}>
<Box sx={{ borderBottom: 1, borderColor: 'divider', overflowX: 'auto' }}> <Box sx={{ borderBottom: 1, borderColor: 'divider', overflowX: 'auto' }}>
<TabList onChange={handleChange} aria-label="lab API tabs example"> <TabList onChange={handleChange} aria-label="lab API tabs example">
<Tab renderActiveOnly={false} label={"Proof (" + _proofCount + ") "} value="1" />
<Tab renderActiveOnly={false} label={"Payment (" + _paymentCount + ") "} value="2" />
<Tab renderActiveOnly={false} label={"Status History (" + _statusHistoryCount + ") "} value="3" />
<Tab renderActiveOnly={false} label={"Proof (" + proofCount + ") "} value="1" />
<Tab renderActiveOnly={false} label={"Payment (" + paymentCount + ") "} value="2" />
<Tab renderActiveOnly={false} label={"Status History (" + statusHistoryCount + ") "} value="3" />
</TabList> </TabList>
</Box> </Box>
<TabPanel value="1" sx={{ p: 0 }}> <TabPanel value="1" sx={{ p: 0 }}>


Loading…
Cancel
Save