diff --git a/src/components/FiDataGrid.js b/src/components/FiDataGrid.js index 664e352..4640e54 100644 --- a/src/components/FiDataGrid.js +++ b/src/components/FiDataGrid.js @@ -57,9 +57,9 @@ export function FiDataGrid({ rows, columns, sx, autoHeight, if(applySearch!=undefined){ if (Object.keys(getSearchCriteria(window.location.pathname)).length>0){ const localStorageSearchCriteria = getSearchCriteria(window.location.pathname) - console.log(localStorageSearchCriteria) + // console.log(localStorageSearchCriteria) if(localStorageSearchCriteria.start!=undefined){ - console.log(localStorageSearchCriteria) + // console.log(localStorageSearchCriteria) setPage(localStorageSearchCriteria.start/pageSize); } } diff --git a/src/pages/Proof/Reply_GLD/ApplicationDetails.js b/src/pages/Proof/Reply_GLD/ApplicationDetails.js index 85b35ef..f3c1f51 100644 --- a/src/pages/Proof/Reply_GLD/ApplicationDetails.js +++ b/src/pages/Proof/Reply_GLD/ApplicationDetails.js @@ -38,7 +38,6 @@ const ApplicationDetailCard = ({ useEffect(() => { if (formData) { - console.log(formData) setData(formData); } }, [formData]); @@ -134,29 +133,33 @@ const ApplicationDetailCard = ({ alignItems="center" > Public Notice: Proofreading Reply - - { - isGranted(["MAINTAIN_PROOF"]) ? : <> + {data.appMode != "offline"? + <> + + { + isGranted(["MAINTAIN_PROOF"]) ? : <> + } + + :null } - diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js index 42836b9..45ac912 100644 --- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js @@ -55,6 +55,7 @@ const ApplicationDetailCard = ( const [paymentMeans, setPaymentMeans] = useState(ComboData.paymentMeans[0]); const [oldPaymentMeans, setOldPaymentMeans] = useState(""); const [isPaymentMeansPopUp, setIsPaymentMeansPopUp] = useState(false); + const [mode, setMode] = useState(""); const { register, handleSubmit } = useForm() const intl = useIntl(); @@ -88,6 +89,9 @@ const ApplicationDetailCard = ( setVerified(applicationDetailData.userData.verifiedBy ? true : false) setfileDetail(applicationDetailData.fileDetail); setProofId(applicationDetailData.proofId); + if (applicationDetailData.data.mode != null){ + setMode(applicationDetailData.data.mode); + } if (applicationDetailData.data.status == 'submitted'||applicationDetailData.data.status == 'reviewed'||applicationDetailData.data.status == 'confirmed'){ setShowPaymentMeans(true) if (applicationDetailData.data.paymentMethod!=null){ @@ -236,161 +240,118 @@ const ApplicationDetailCard = ( > {verified && currentApplicationDetailData.status !== "notAccepted" ? isGrantedAny("MAINTAIN_APPLICATION") ? - - - - {currentApplicationDetailData.status === "reviewed" && isGranted("MAINTAIN_PROOF") ? - : - null - } - - - - - { - !(orgDetail?.creditor) && currentApplicationDetailData.creditor && currentApplicationDetailData.status === "published" ? - <> +
+ {mode != "offline"? + + + + {currentApplicationDetailData.status === "reviewed" && isGranted("MAINTAIN_PROOF") ? - - : - <> - } - {currentApplicationDetailData.status === "submitted" || currentApplicationDetailData.status == "reviewed" ? - <> - + + Create Proof + : + null + } + + + + { - proofId == null || proofId == 0? - - : - null + !(orgDetail?.creditor) && currentApplicationDetailData.creditor && currentApplicationDetailData.status === "published" ? + <> + + + : + <> } - : - (currentApplicationDetailData.status == "confirmed" && currentApplicationDetailData.creditor == 1) ? - <> - - - - : - (currentApplicationDetailData.status == "confirmed" && currentApplicationDetailData.creditor == 0) ? + {currentApplicationDetailData.status === "submitted" || currentApplicationDetailData.status == "reviewed" ? <> - - : - ( - (currentApplicationDetailData.status == "paid" && currentApplicationDetailData.creditor == 0) ? - <> + { + proofId == null || proofId == 0? - + : + null + } + : + (currentApplicationDetailData.status == "confirmed" && currentApplicationDetailData.creditor == 1) ? + <> + + + + : + (currentApplicationDetailData.status == "confirmed" && currentApplicationDetailData.creditor == 0) ? + <> - : null - ) - - } - - - + + : + ( + (currentApplicationDetailData.status == "paid" && currentApplicationDetailData.creditor == 0) ? + <> + + + + : null + ) + + } + + + + :null + } +
: null : null } diff --git a/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js b/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js index 917a91f..98afd95 100644 --- a/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js @@ -35,6 +35,7 @@ const GazetteDetailCard = ( const [currentStatus, setCurrentStatus] = useState({}); const [sysType, setSysType] = useState(null); const [careOf, setCareOf] = useState(""); + const [mode, setMode] = useState(""); const [isWarningPopUp, setIsWarningPopUp] = useState(false); const [warningText, setWarningText] = useState(""); @@ -55,6 +56,9 @@ const GazetteDetailCard = ( setSysType(applicationDetailData.userData.sysType) setCareOf(applicationDetailData.data.careOf) setGroupTitle(applicationDetailData.data.groupTitle) + if (applicationDetailData.data.mode != null){ + setMode(applicationDetailData.data.mode); + } } }, [applicationDetailData]); @@ -99,6 +103,7 @@ const GazetteDetailCard = ( spacing={2} mb={2} > + {mode != "offline"? + :null + }
diff --git a/src/pages/PublicNotice/Details_GLD/index.js b/src/pages/PublicNotice/Details_GLD/index.js index 72efe92..abe274f 100644 --- a/src/pages/PublicNotice/Details_GLD/index.js +++ b/src/pages/PublicNotice/Details_GLD/index.js @@ -63,6 +63,7 @@ const PublicNoticeDetail_GLD = () => { const [issueNum, setIssueNum] = useState(""); const [groupNo, setGroupNo] = useState(""); // const [groupTitle, setGroupTitle] = useState(""); + const [mode, setMode] = useState(""); //statusWindow const [open, setOpen] = useState(false); @@ -88,7 +89,7 @@ const PublicNoticeDetail_GLD = () => { backgroundPosition: 'right' } - const title = groupNo != null ? (appNo + ", " + gazetteIssue + ", " + issueNum + " , " + groupNo) : (appNo + ", " + gazetteIssue + ", " + issueNum) + const title = groupNo != null ? (appNo + ", " + gazetteIssue + ", " + issueNum + " , " + groupNo +" "+ mode) : (appNo + ", " + gazetteIssue + ", " + issueNum+" "+ mode) useEffect(() => { loadApplicationDetail(); @@ -122,6 +123,9 @@ const PublicNoticeDetail_GLD = () => { setIssueNum(" No. " + gazetteIssueDetail.issueNo); setIssueDate(DateUtils.dateFormat(gazetteIssueDetail.issueDate, "D MMM YYYY (ddd)")); setGroupNo(response.data.data.groupNo); + if (response.data.data.mode != null){ + setMode("("+response.data.data.mode+")"); + } setLoading(false); } }) diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index ae4c712..0e4ee16 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -62,6 +62,7 @@ const ApplicationDetailCard = ( const [issueNum, setIssueNum] = useState(""); const [issueDate, setIssueDate] = useState(""); const [onDownload, setOnDownload] = useState(false); + const [mode, setMode] = useState(""); const { register, // getValues @@ -79,6 +80,9 @@ const ApplicationDetailCard = ( setIssueNum(applicationDetailData.gazetteIssueDetail.volume + "/" + applicationDetailData.gazetteIssueDetail.issueYear + " No. " + applicationDetailData.gazetteIssueDetail.issueNo); setIssueDate(DateUtils.dateFormat(applicationDetailData.gazetteIssueDetail.issueDate, "D MMM YYYY (ddd)")); + if (applicationDetailData.data.mode != null){ + setMode(applicationDetailData.data.mode); + } } }, [applicationDetailData]); @@ -183,62 +187,68 @@ const ApplicationDetailCard = ( border={false} content={false} > - - - - - { - currentApplicationDetailData.status == "confirmed" ? + {mode != "offline"? +
+ + + + + + { + currentApplicationDetailData.status == "confirmed" ? + + : null + } - : null - } - - - - - + + + + +
+ :null + } diff --git a/src/pages/PublicNotice/ListPanel/BaseGrid.js b/src/pages/PublicNotice/ListPanel/BaseGrid.js index 10beb65..9ac798a 100644 --- a/src/pages/PublicNotice/ListPanel/BaseGrid.js +++ b/src/pages/PublicNotice/ListPanel/BaseGrid.js @@ -13,8 +13,9 @@ import { isDummyLoggedIn, } from "utils/Utils"; import {useTheme} from "@emotion/react"; -import {getStatusIntl} from "utils/statusUtils/PublicNoteStatusUtils"; +import {getStatusIntl,getModeEng} from "utils/statusUtils/PublicNoteStatusUtils"; import {FormattedMessage, useIntl} from "react-intl"; + // ==============================|| EVENT TABLE ||============================== // export default function BaseGrid({setCount, url}) { @@ -36,6 +37,16 @@ export default function BaseGrid({setCount, url}) { width: isMdOrLg ? 'auto' : 160, flex: isMdOrLg ? 1 : undefined, }, + { + id: 'mode', + field: 'mode', + headerName: intl.formatMessage({ id: 'applicationMode' }), + width: isMdOrLg ? 'auto' : 100, + flex: isMdOrLg ? 1 : undefined, + renderCell: (params) => { + return [getModeEng(params)] + }, + }, { id: 'created', field: 'created', diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js index 1104edf..9fac99d 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js @@ -42,6 +42,16 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea width: isMdOrLg ? 'auto' : 160, flex: isMdOrLg ? 1 : undefined, }, + { + id: 'mode', + field: 'mode', + headerName: intl.formatMessage({ id: 'applicationMode' }), + width: isMdOrLg ? 'auto' : 100, + flex: isMdOrLg ? 1 : undefined, + renderCell: (params) => { + return [StatusUtils.getModeEng(params)] + }, + }, { id: 'created', field: 'created', diff --git a/src/pages/PublicNotice/Search_GLD/DataGrid.js b/src/pages/PublicNotice/Search_GLD/DataGrid.js index ca85133..03bfcf9 100644 --- a/src/pages/PublicNotice/Search_GLD/DataGrid.js +++ b/src/pages/PublicNotice/Search_GLD/DataGrid.js @@ -64,6 +64,16 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea return clickableLink('/application/' + params.id, params.row.appNo); }, }, + { + id: 'mode', + field: 'mode', + headerName: 'Mode', + sortable: false, + width: 100, + renderCell: (params) => { + return [StatusUtils.getModeEng(params)] + }, + }, { id: 'status', field: 'status', diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js index 1c1bc0f..21725f9 100644 --- a/src/pages/PublicNotice/Search_GLD/SearchForm.js +++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js @@ -89,6 +89,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss issueId: issueSelected?.id, groupNo: data.groupNo, gazettGroup: groupSelected?.code, + mode: data.mode, start:0, limit:10 }; @@ -126,7 +127,8 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss reset({ appNo:"", contact:"", - groupNo:"" + groupNo:"", + mode:"" }); localStorage.setItem('searchCriteria',"") } @@ -418,6 +420,18 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss }} />
+ + +
diff --git a/src/translations/en.json b/src/translations/en.json index 22cd82d..906a42e 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -368,6 +368,7 @@ "withdrawn": "Withdrawn", "searchApplyRecord": "Search application records", "applicationId": "Application No.", + "applicationMode": "Mode", "submitDate": "Submit Date", "submitDateFrom": "Submit Date (From)", "submitDateTo": "Submit Date (To)", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 64126a2..81703f9 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -401,6 +401,7 @@ "withdrawn": "已撤销", "searchApplyRecord": "搜寻申请记录", "applicationId": "申请编号", + "applicationMode": "方式", "submitDate": "提交日期", "submitDateFrom": "提交日期 (从)", "submitDateTo": "提交日期 (到)", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 56864ca..eb89dd3 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -402,6 +402,7 @@ "withdrawn": "已撤銷", "searchApplyRecord": "搜尋申請記錄", "applicationId": "申請編號", + "applicationMode": "方式", "submitDate": "提交日期", "submitDateFrom": "提交日期 (從)", "submitDateTo": "提交日期 (到)", diff --git a/src/utils/statusUtils/PublicNoteStatusUtils.js b/src/utils/statusUtils/PublicNoteStatusUtils.js index 291b322..89a1201 100644 --- a/src/utils/statusUtils/PublicNoteStatusUtils.js +++ b/src/utils/statusUtils/PublicNoteStatusUtils.js @@ -102,3 +102,17 @@ export function getStatusByTextIntl(status, creditor, intl) { return getStatusTag({ text: status }) } } + +export function getModeEng(params) { + return getModeByTextEng(params.row.mode); +} +export function getModeByTextEng(mode) { + switch (mode) { + case "offline": + return "Offline" + case "online": + return "Online" + default: + return "" + } +}