"auto"}
onRowDoubleClick={handleRowDoubleClick}
+ doLoad={{
+ url: LIST_PROOF,
+ params: _searchCriteria,
+ }}
/>
);
diff --git a/src/pages/Proof/Search_Public/index.js b/src/pages/Proof/Search_Public/index.js
index 6a6989f..da6bbf0 100644
--- a/src/pages/Proof/Search_Public/index.js
+++ b/src/pages/Proof/Search_Public/index.js
@@ -31,7 +31,6 @@ const BackgroundHead = {
const UserSearchPage_Individual = () => {
- const [record,setRecord] = React.useState([]);
const [issueCombo,setIssueCombo] = React.useState([]);
const [searchCriteria, setSearchCriteria] = React.useState({
dateTo: DateUtils.dateValue(new Date()),
@@ -45,21 +44,8 @@ const UserSearchPage_Individual = () => {
React.useEffect(() => {
setOnReady(true);
- }, [record]);
-
- React.useEffect(() => {
- loadGrid();
}, [searchCriteria]);
- function loadGrid(){
- HttpUtils.get({
- url: UrlUtils.LIST_PROOF,
- params: searchCriteria,
- onSuccess: function(responseData){
- setRecord(responseData);
- }
- });
- }
function getIssueCombo(){
HttpUtils.get({
@@ -110,7 +96,7 @@ const UserSearchPage_Individual = () => {
sx={{width: "-webkit-fill-available"}}
>
diff --git a/src/pages/PublicNotice/Details_GLD/index.js b/src/pages/PublicNotice/Details_GLD/index.js
index 1395178..1faaa47 100644
--- a/src/pages/PublicNotice/Details_GLD/index.js
+++ b/src/pages/PublicNotice/Details_GLD/index.js
@@ -47,9 +47,6 @@ const PublicNoticeDetail_GLD = () => {
const params = useParams();
const navigate = useNavigate()
const [applicationDetailData, setApplicationDetailData] = useState({});
- const [proofList, setProofList] = useState([]);
- const [paymentList, setPaymentList] = useState([]);
- // const [refApplicationDetailData, setRefApplicationDetailData] = React.useState({});
const [isLoading, setLoading] = useState(false);
const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingComponent')));
const [getUploadStatus, setUploadStatus] = useState(false);
@@ -116,8 +113,6 @@ const PublicNoticeDetail_GLD = () => {
setIssueNum(" No. " + gazetteIssueDetail.issueNo);
setIssueDate(DateUtils.dateFormat(gazetteIssueDetail.issueDate, "D MMM YYYY (ddd)"));
setGroupNo(response.data.data.groupNo);
- setProofList(response.data.proofList);
- setPaymentList(response.data.paymentList);
setLoading(false);
}
})
@@ -398,9 +393,7 @@ const PublicNoticeDetail_GLD = () => {
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/PaymentTab.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/PaymentTab.js
index fa08b38..24f5759 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/PaymentTab.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/PaymentTab.js
@@ -9,11 +9,11 @@ import * as DateUtils from "utils/DateUtils"
import * as PaymentStatus from "utils/statusUtils/PaymentStatus"
import {useTheme} from "@emotion/react";
import { clickableLink } from 'utils/CommonFunction';
+import {GET_PUBLIC_NOTICE_APPLY_DETAIL_PAYMENT } from "utils/ApiPathConst"
// import * as StatusUtils from "./PublicNoteStatusUtils";
// ==============================|| EVENT TABLE ||============================== //
-export default function SubmittedTab({ rows }) {
-
+export default function SubmittedTab({ appId, setCount }) {
const theme = useTheme();
const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
@@ -63,9 +63,15 @@ export default function SubmittedTab({ rows }) {
<>
({
+ url: GET_PUBLIC_NOTICE_APPLY_DETAIL_PAYMENT+"/"+appId,
+ params: {},
+ callback: function (responseData) {
+ setCount(responseData?.count);
+ }
+ }), [appId])}
/>
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js
index 4ea4b6b..251c873 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/ProofTab.js
@@ -12,19 +12,19 @@ import * as ProofStatus from "utils/statusUtils/ProofStatus";
import {FiDataGrid} from "components/FiDataGrid";
import * as FormatUtils from "utils/FormatUtils"
import * as HttpUtils from "utils/HttpUtils"
-import * as UrlUtils from "utils/ApiPathConst"
+import {GET_PUBLIC_NOTICE_APPLY_DETAIL_PROOF,GEN_GAZETTE_PROOF } from "utils/ApiPathConst"
import {useTheme} from "@emotion/react";
import { clickableLink } from 'utils/CommonFunction';
// ==============================|| EVENT TABLE ||============================== //
-export default function ProofTab({rows}) {
+export default function ProofTab({appId, setCount}) {
const theme = useTheme();
const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
const onDownloadClick = (params) => () => {
HttpUtils.fileDownload({
- url: UrlUtils.GEN_GAZETTE_PROOF+"/"+params.row.id,
+ url: GEN_GAZETTE_PROOF+"/"+params?.row?.id,
});
};
@@ -102,9 +102,15 @@ export default function ProofTab({rows}) {
return (
({
+ url: GET_PUBLIC_NOTICE_APPLY_DETAIL_PROOF+"/"+appId,
+ params: {},
+ callback: function (responseData) {
+ setCount(responseData?.count);
+ }
+ }), [appId])}
/>
);
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/StatusHistoryTab.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/StatusHistoryTab.js
index 1788537..38883cd 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/StatusHistoryTab.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/StatusHistoryTab.js
@@ -10,9 +10,11 @@ import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import {useTheme} from "@emotion/react";
import {useMediaQuery} from "@mui/material";
+import {GET_PUBLIC_NOTICE_APPLY_DETAIL_STATUS_HISTORY } from "utils/ApiPathConst"
+
// ==============================|| EVENT TABLE ||============================== //
-export default function StatusHistoryTab({rows}) {
+export default function StatusHistoryTab({appId, setCount}) {
const theme = useTheme();
const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
@@ -50,9 +52,15 @@ export default function StatusHistoryTab({rows}) {
return (
);
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
index 8340e37..d067a2e 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
@@ -13,90 +13,66 @@ import * as React from "react";
import Loadable from 'components/Loadable';
import { lazy } from 'react';
-const StatusHistoryTab = Loadable(lazy(() => import('./StatusHistoryTab')));
const LoadingComponent = Loadable(lazy(() => import('../../../extra-pages/LoadingComponent')));
-const ProofTab = Loadable(lazy(() => import('./ProofTab')));
-const PaymentTab = Loadable(lazy(() => import('./PaymentTab')));
+// const ProofTab = Loadable(lazy(() => import('./ProofTab')));
+// const PaymentTab = Loadable(lazy(() => import('./PaymentTab')));
+// const StatusHistoryTab = Loadable(lazy(() => import('./StatusHistoryTab')));
+
+import ProofTab from './ProofTab';
+import PaymentTab from './PaymentTab';
+import StatusHistoryTab from './StatusHistoryTab';
// ==============================|| DASHBOARD - DEFAULT ||============================== //
-const PublicNotice = ({ applicationDetailData, proofList, paymentList }) => {
- const [_proofList, setProofList] = React.useState([]);
- const [_paymentList, setPaymentList] = React.useState([]);
+const PublicNotice = ({ appId }) => {
+ const [proofCount, setProofCount] = React.useState(0);
+ const [paymentCount, setPaymentCount] = React.useState(0);
+ const [statusHistoryCount, setStatusHistoryCount] = React.useState(0);
+
const [onReady, setOnReady] = React.useState(false);
const [selectedTab, setSelectedTab] = React.useState("1");
- // const navigate = useNavigate();
- const [statusHistoryList, setStatusHistoryList] = React.useState([]);
-
- const reloadPage = () => {
- window.location.reload(false);
- }
- React.useEffect(() => {
- if (Object.keys(applicationDetailData).length > 0) {
- setStatusHistoryList(applicationDetailData.statusHistoryList);
- }
- }, [applicationDetailData]);
React.useEffect(() => {
- setProofList(proofList);
- }, [proofList]);
-
- React.useEffect(() => {
- setPaymentList(paymentList);
- }, [paymentList]);
-
- React.useEffect(() => {
- //if state data are ready and assign to different field
- if (statusHistoryList.length > 0) {
- setOnReady(true);
- }
- }, [statusHistoryList]);
-
- // useEffect(() => {
- // setLoding(false);
- // }, [submittedList]);
+ setOnReady(true);
+ }, [appId]);
const handleChange = (event, newValue) => {
setSelectedTab(newValue);
}
- // const onBtnClick = () => {
- // navigate('/publicNotice/apply')
- // }
-
return (
!onReady ?
:
-
+
{/*col 2*/}
-
+
-
-
-
+
+
+
-
+
-
+
-
+
diff --git a/src/pages/PublicNotice/Details_Public/index.js b/src/pages/PublicNotice/Details_Public/index.js
index 289e471..c3f655a 100644
--- a/src/pages/PublicNotice/Details_Public/index.js
+++ b/src/pages/PublicNotice/Details_Public/index.js
@@ -191,9 +191,7 @@ const DashboardDefault = () => {
/>
-
-
);
diff --git a/src/pages/User/ManagePage_OrgPublic/index.js b/src/pages/User/ManagePage_OrgPublic/index.js
index 92a82fc..4a6d6c0 100644
--- a/src/pages/User/ManagePage_OrgPublic/index.js
+++ b/src/pages/User/ManagePage_OrgPublic/index.js
@@ -8,7 +8,7 @@ import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png'
import Checkbox from '@mui/material/Checkbox';
import * as React from "react";
import * as HttpUtils from "utils/HttpUtils";
-import * as UrlUtils from "utils/ApiPathConst";
+import {GET_PUBLIC_ORG_USER_LIST, GET_USER_UNLOCK, GET_SET_PRIMARY_USER, GET_SET_UN_PRIMARY_USER} from "utils/ApiPathConst";
import * as DateUtils from "utils/DateUtils";
import { FormattedMessage, useIntl } from "react-intl";
import { useTheme } from "@emotion/react";
@@ -28,7 +28,6 @@ const BackgroundHead = {
const ManageOrgUserPage = () => {
- const [rows, setRows] = React.useState([]);
const intl = useIntl();
const theme = useTheme();
const isMdOrLg = useMediaQuery(theme.breakpoints.up('md'));
@@ -53,28 +52,24 @@ const ManageOrgUserPage = () => {
}
}
+ const [_searchCriteria, set_searchCriteria] = React.useState({});
+ const [reloadTime, setReloadTime] = React.useState(new Date());
+
React.useEffect(() => {
setUserId(JSON.parse(localStorage.getItem("userData")).id);
- loadData();
}, []);
+ React.useEffect(() => {
+ _searchCriteria["reloadTime"] = reloadTime;
+ set_searchCriteria(_searchCriteria);
+ }, [reloadTime]);
- function loadData() {
- HttpUtils.get(
- {
- url: UrlUtils.GET_PUBLIC_ORG_USER_LIST,
- onSuccess: function (responseData) {
- setRows(responseData);
- }
- }
- );
- }
function onActiveClick(params) {
HttpUtils.get({
- url: UrlUtils.GET_USER_UNLOCK + "/" + params.row.id,
+ url: GET_USER_UNLOCK + "/" + params.row.id,
onSuccess: () => {
- loadData();
+ setReloadTime(new Date);
}
});
}
@@ -112,9 +107,9 @@ const ManageOrgUserPage = () => {
setIsWarningPopUp(false)
HttpUtils.get(
{
- url: (!selectUser.row.primaryUser ? UrlUtils.GET_SET_PRIMARY_USER : UrlUtils.GET_SET_UN_PRIMARY_USER) + "/" + selectUser.row.id,
+ url: (!selectUser.row.primaryUser ? GET_SET_PRIMARY_USER : GET_SET_UN_PRIMARY_USER) + "/" + selectUser.row.id,
onSuccess: function () {
- loadData();
+ setReloadTime(new Date);
}
}
);
@@ -241,9 +236,12 @@ const ManageOrgUserPage = () => {
diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js
index a5670a0..1820a05 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -110,6 +110,9 @@ export const POST_ADMIN_USER_REGISTER = apiPath+'/user/registry';
export const DELETE_USER = apiPath+'/user';
export const GET_LOGIN_LOG_LIST = apiPath+'/user/loginLogList';
export const GET_PUBLIC_NOTICE_APPLY_DETAIL = apiPath+'/application/application-detail';
+export const GET_PUBLIC_NOTICE_APPLY_DETAIL_STATUS_HISTORY = apiPath+'/application/application-detail/status-history';
+export const GET_PUBLIC_NOTICE_APPLY_DETAIL_PROOF = apiPath+'/application/application-detail/proof';
+export const GET_PUBLIC_NOTICE_APPLY_DETAIL_PAYMENT = apiPath+'/application/application-detail/payment';
export const SET_PUBLIC_NOTICE_GROUP_DETAIL = apiPath+'/application/application-group-detail';
export const SET_PUBLIC_NOTICE_STATUS_NOT_ACCEPT = apiPath+'/application/application-detail-status-not-accept';
export const SET_PUBLIC_NOTICE_STATUS_CANCELLED = apiPath+'/application/application-detail-status-cancelled';