diff --git a/src/pages/DemandNote/Create/SearchForm.js b/src/pages/DemandNote/Create/SearchForm.js index 2473214..f88bd65 100644 --- a/src/pages/DemandNote/Create/SearchForm.js +++ b/src/pages/DemandNote/Create/SearchForm.js @@ -186,7 +186,17 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
- setIsFailPopUp(false)} > + setIsFailPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Action Fail {failText} @@ -197,7 +207,17 @@ const SearchPublicNoticeForm = ({ applySearch, issueComboData, _paymentCount, _p
- setIsSuccessPopUp(false)} > + setIsSuccessPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Create Result diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js index dc17f6f..43498b2 100644 --- a/src/pages/DemandNote/Search/DataGrid.js +++ b/src/pages/DemandNote/Search/DataGrid.js @@ -353,7 +353,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) />
- setIsErrorPopUp(false)} > + setIsErrorPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Action Fail Number of DN record must less than 100.
Please edit search form.
@@ -364,7 +374,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
- setSelectonWarning(false)} > + setSelectonWarning(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Warning Please Select DN. @@ -375,7 +395,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
- setConfirmPopUp(false)} > + setConfirmPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Confirm Are you sure to mark DN paid? @@ -387,7 +417,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
- setSendPopUp(false)} > + setSendPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Confirm Are you sure to send DN? @@ -399,7 +439,17 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
- setWait(false)} > + setWait(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Calculating, please wait ... diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js index da02d3c..8f3b320 100644 --- a/src/pages/DemandNote/Search_Public/SearchForm.js +++ b/src/pages/DemandNote/Search_Public/SearchForm.js @@ -84,7 +84,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData - + diff --git a/src/pages/Message/Search/SearchForm.js b/src/pages/Message/Search/SearchForm.js index 8416206..e81e6b2 100644 --- a/src/pages/Message/Search/SearchForm.js +++ b/src/pages/Message/Search/SearchForm.js @@ -64,7 +64,7 @@ const SearchForm = ({ applySearch, searchCriteria }) => { - + diff --git a/src/pages/Organization/DetailPage/OrganizationCard.js b/src/pages/Organization/DetailPage/OrganizationCard.js index d7f511d..f81478e 100644 --- a/src/pages/Organization/DetailPage/OrganizationCard.js +++ b/src/pages/Organization/DetailPage/OrganizationCard.js @@ -400,7 +400,17 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => { }
- setCreditorConfirmPopUp(false)} > + setCreditorConfirmPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Confirm Are you sure mark as Creditor? @@ -412,7 +422,17 @@ const OrganizationCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
- setNonCreditorConfirmPopUp(false)} > + setNonCreditorConfirmPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Confirm Are you sure mark as Non-Creditor? diff --git a/src/pages/Organization/DetailPage/OrganizationPubCard.js b/src/pages/Organization/DetailPage/OrganizationPubCard.js index 053a673..e11b837 100644 --- a/src/pages/Organization/DetailPage/OrganizationPubCard.js +++ b/src/pages/Organization/DetailPage/OrganizationPubCard.js @@ -321,7 +321,17 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { }
- setCreditorConfirmPopUp(false)} > + setCreditorConfirmPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Confirm Are you sure mark as Creditor? @@ -333,7 +343,17 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => {
- setNonCreditorConfirmPopUp(false)} > + setNonCreditorConfirmPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Confirm Are you sure mark as Non-Creditor? diff --git a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js index 9812b3c..714938c 100644 --- a/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js +++ b/src/pages/Organization/DetailPage_FromUser/OrganizationCard_loadFromUser.js @@ -256,7 +256,17 @@ const OrganizationCard_loadFromUser = ({ userData, userId }) => {
- setIsFailPopUp(false)} > + setIsFailPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Action Fail {failText} diff --git a/src/pages/Payment/Search_Public/SearchForm.js b/src/pages/Payment/Search_Public/SearchForm.js index 2cbae3e..ea71f11 100644 --- a/src/pages/Payment/Search_Public/SearchForm.js +++ b/src/pages/Payment/Search_Public/SearchForm.js @@ -69,7 +69,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { - + diff --git a/src/pages/Payment/index.js b/src/pages/Payment/index.js index 9324740..d442c05 100644 --- a/src/pages/Payment/index.js +++ b/src/pages/Payment/index.js @@ -433,7 +433,17 @@ const Index = () => { {/*row 2*/}
- setExpiryDateErr(false)} > + setExpiryDateErr(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > 行動失敗 diff --git a/src/pages/Proof/Create_FromApp/ProofForm.js b/src/pages/Proof/Create_FromApp/ProofForm.js index 14dfdfa..359521a 100644 --- a/src/pages/Proof/Create_FromApp/ProofForm.js +++ b/src/pages/Proof/Create_FromApp/ProofForm.js @@ -428,7 +428,17 @@ const FormPanel = ({ formData }) => {
- setIsWarningPopUp(false)} > + setIsWarningPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Warning {warningText} @@ -439,7 +449,17 @@ const FormPanel = ({ formData }) => {
- setWait(false)} > + setWait(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Calculating, please wait ... diff --git a/src/pages/Proof/Reply_GLD/ApplicationDetails.js b/src/pages/Proof/Reply_GLD/ApplicationDetails.js index 1b7de39..7207894 100644 --- a/src/pages/Proof/Reply_GLD/ApplicationDetails.js +++ b/src/pages/Proof/Reply_GLD/ApplicationDetails.js @@ -294,7 +294,10 @@ const ApplicationDetailCard = ({
- setCancelPopUp(false)} > + setCancelPopUp(false)} + > Confirm Are you sure you want to cancel this proof? diff --git a/src/pages/Proof/Reply_Public/ProofForm.js b/src/pages/Proof/Reply_Public/ProofForm.js index f227e5d..15b2735 100644 --- a/src/pages/Proof/Reply_Public/ProofForm.js +++ b/src/pages/Proof/Reply_Public/ProofForm.js @@ -322,7 +322,17 @@ const FormPanel = ({ formData }) => {
- setIsWarningPopUp(false)} > + setIsWarningPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js index 06964fd..e826766 100644 --- a/src/pages/Proof/Search_Public/SearchForm.js +++ b/src/pages/Proof/Search_Public/SearchForm.js @@ -103,7 +103,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData - + diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 247f2fe..88a9e35 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -279,7 +279,17 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
- setIsWarningPopUp(false)} > + setIsWarningPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js index 4ddf106..0deff31 100644 --- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js @@ -537,7 +537,17 @@ const ApplicationDetailCard = (
- setIsWarningPopUp(false)} > + setIsWarningPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Warning {warningText} diff --git a/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js b/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js index 5c0b7a8..6e32f86 100644 --- a/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/GazetteDetailCard.js @@ -262,7 +262,16 @@ const GazetteDetailCard = (
- setIsWarningPopUp(false)} > + setIsWarningPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }}> Warning {warningText} diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index f429f1a..7e295b3 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -633,7 +633,17 @@ const ApplicationDetailCard = (
- setErrorPopUp(false)} > + setErrorPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > 行動失敗 diff --git a/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js b/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js index 4c786b6..6f042b0 100644 --- a/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js +++ b/src/pages/PublicNotice/Details_Public/StatusChangeDialog.js @@ -21,15 +21,16 @@ import * as yup from 'yup'; import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; import {ThemeProvider} from "@emotion/react"; import {FormattedMessage} from "react-intl"; - +import {useIntl} from "react-intl"; const StatusChangeDialog = (props) => { const [status, setStatus] = useState(""); - + const intl = useIntl(); + useEffect(() => { console.log(Object.keys(!props.selectedGazetteGroup).length) if(props.getStatus === "cancel"){ - setStatus("取消") + setStatus(intl.formatMessage({id: 'cancel'})) } }, [props.getStatus]); @@ -60,8 +61,8 @@ const StatusChangeDialog = (props) => { maxWidth={'xs'} > - - {status}公共啟事 + + {status} {intl.formatMessage({id: 'publicNotice'})} @@ -69,7 +70,8 @@ const StatusChangeDialog = (props) => { - 確定{status}公共啟事? + + {intl.formatMessage({id: 'confirmTo'})}{status} {intl.formatMessage({id: 'publicNotice'})}? @@ -82,7 +84,7 @@ const StatusChangeDialog = (props) => { variant="contained" onClick={props.handleClose} autoFocus - color="delete" + color="cancel" > diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js index 46c9d4d..17753b9 100644 --- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js +++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js @@ -365,7 +365,17 @@ export default function SubmittedTab({ rows }) {
- setCheckCareOf(false)} > + setCheckCareOf(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Warning @@ -390,7 +400,17 @@ export default function SubmittedTab({ rows }) {
- setExpiryDateErr(false)} > + setExpiryDateErr(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > 行動失敗 diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js index ed035ef..e410c99 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js @@ -65,7 +65,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { {/*row 1*/} - + {/*row 2*/} diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js index 47bbf86..61bab5d 100644 --- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js +++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization.js @@ -577,7 +577,17 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => }
- setIsWarningPopUp(false)} > + setIsWarningPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Warning {warningText} @@ -588,7 +598,17 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) =>
- setIsConfirmPopUp(false)} > + setIsConfirmPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Confirm {confirmText} diff --git a/src/pages/User/ManagePage_OrgPublic/index.js b/src/pages/User/ManagePage_OrgPublic/index.js index 0d71064..42fcf9e 100644 --- a/src/pages/User/ManagePage_OrgPublic/index.js +++ b/src/pages/User/ManagePage_OrgPublic/index.js @@ -238,7 +238,17 @@ const ManageOrgUserPage = () => { />
- setIsWarningPopUp(false)} > + setIsWarningPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > diff --git a/src/pages/_Test/Mail/index.js b/src/pages/_Test/Mail/index.js index d91727d..e469905 100644 --- a/src/pages/_Test/Mail/index.js +++ b/src/pages/_Test/Mail/index.js @@ -92,7 +92,17 @@ const Mail = () => {
- setIsResponsPopUp(false)} > + setIsResponsPopUp(false)} + PaperProps={{ + sx: { + minWidth: '40vw', + maxWidth: { xs: '90vw', s: '90vw', m: '70vw', lg: '70vw' }, + maxHeight: { xs: '90vh', s: '70vh', m: '70vh', lg: '60vh' } + } + }} + > Respons {responsText} diff --git a/src/translations/en.json b/src/translations/en.json index b578b7d..698559f 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -43,6 +43,7 @@ "mainPage": "Main Page", "myPublicNotice": "My Public Notice", + "publicNotice": "Public Notice", "publicNoticePayment": "Public Notice: Payment", "publicNoticePaymentFail": "Public Notice: Payment Failed", "publicNoticePaymentSuccess": "Public Notice: Payment Success", @@ -265,6 +266,7 @@ "contactPerson": "Contact Person", "requireContactPerson": "Please enter contact person", "search": "Search", + "searchForm": "Search Form", "cancel": "Cancel", "extraMark": "Remarks", "totalAmount": "Total Amount", @@ -371,6 +373,7 @@ "nameChi": "Name (Ch)", "expiryDate": "Expiry date", "create": "Create", + "confirmTo": "Confirm to ", "Dashboard": "Dashboard", "event": "Event" diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index cd49995..97df504 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -42,6 +42,7 @@ "registerFail": "申请失败,请稍后尝试", "mainPage": "主页", + "publicNotice": "公共启事", "myPublicNotice": "我的公共启事", "publicNoticePayment": "公共启事:付款", "publicNoticePaymentFail": "公共启事:付款失败", @@ -265,6 +266,7 @@ "contactPerson": "联络人", "requireContactPerson": "请输入联络人", "search": "搜寻", + "searchForm": "搜寻表格", "cancel": "取消", "extraMark": "备注", "totalAmount": "总额", @@ -371,6 +373,7 @@ "nameChi": "姓名(中文)", "expiryDate": "过期日期", "create": "创建", + "confirmTo": "确定", "Dashboard": "仪表板", "event": "活动" diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 5a8c0d4..3a89070 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -42,6 +42,7 @@ "registerFail": "申請失敗,請稍後嘗試", "mainPage": "主頁", + "publicNotice": "公共啟事", "myPublicNotice": "我的公共啟事", "publicNoticePayment": "公共啟事:付款", "publicNoticePaymentFail": "公共啟事:付款失敗", @@ -265,6 +266,7 @@ "contactPerson": "聯絡人", "requireContactPerson": "請輸入聯絡人", "search": "搜尋", + "searchForm": "搜尋表格", "cancel": "取消", "extraMark": "備註", "totalAmount": "總額", @@ -371,6 +373,7 @@ "nameChi": "姓名(中文)", "expiryDate": "過期日期", "create": "創建", + "confirmTo": "確定", "Dashboard": "儀表板", "event": "活動"