From 18fea3fc86dca4808f0f4fefc8bda7dc2be9d292 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 12 Mar 2024 10:59:32 +0800 Subject: [PATCH] ORG user UI update --- .../DemandNote/Search_Public/DataGrid.js | 2 +- .../DemandNote/Search_Public/SearchForm.js | 6 ++-- src/pages/Payment/Details_Public/DataGrid.js | 2 +- .../ApplyForm/PublicNoticeApplyForm.js | 2 +- .../Details_Public/ApplicationDetailCard.js | 2 +- src/pages/PublicNotice/ListPanel/BaseGrid.js | 30 ++----------------- .../ListPanel/PendingPaymentTab.js | 4 +-- .../ListPanel/SearchPublicNoticeForm.js | 4 +-- .../ListPanel/SearchPublicNoticeTable.js | 2 +- src/pages/User/DetailPage/LoginGrid.js | 6 ---- .../User/DetailsPage_Individual/LoginGrid.js | 6 ---- .../DetailsPage_Organization/LoginGrid.js | 6 ---- src/translations/en.json | 15 ++++++---- src/translations/zh-CN.json | 9 ++++-- src/translations/zh-HK.json | 9 ++++-- src/utils/ComboData.js | 6 ++-- 16 files changed, 38 insertions(+), 73 deletions(-) diff --git a/src/pages/DemandNote/Search_Public/DataGrid.js b/src/pages/DemandNote/Search_Public/DataGrid.js index fe1c2a3..a3b9315 100644 --- a/src/pages/DemandNote/Search_Public/DataGrid.js +++ b/src/pages/DemandNote/Search_Public/DataGrid.js @@ -80,7 +80,7 @@ export default function SearchDemandNote({ recordList }) { 'auto'} /> diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js index 680f59e..531ba14 100644 --- a/src/pages/DemandNote/Search_Public/SearchForm.js +++ b/src/pages/DemandNote/Search_Public/SearchForm.js @@ -25,7 +25,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData const { locale } = intl; const [type, setType] = React.useState([]); - const [issueSelected, setIssueSelected] = React.useState({}); + const [issueSelected, setIssueSelected] = React.useState({ key: 0, i18nLabel: 'all', labelCht: '全部', label: 'All', type: 'all' }); const [issueCombo, setIssueCombo] = React.useState([]); const [selectedStatus, setSelectedStatus] = React.useState({}); @@ -204,8 +204,8 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData id="status" size="small" options={ComboData.denmandNoteStatus_Public} - getOptionLabel={(option) => option.labelCht} - inputValue={selectedStatus?.labelCht ? selectedStatus?.labelCht : ""} + getOptionLabel={(option) => option?.i18nLabel? intl.formatMessage({ id: option.i18nLabel }) : ""} + inputValue={selectedStatus?.i18nLabel? intl.formatMessage({ id: selectedStatus.i18nLabel }) : ""} value={selectedStatus} onChange={(event, newValue) => { if (newValue !== null) { diff --git a/src/pages/Payment/Details_Public/DataGrid.js b/src/pages/Payment/Details_Public/DataGrid.js index 157a8ab..245604d 100644 --- a/src/pages/Payment/Details_Public/DataGrid.js +++ b/src/pages/Payment/Details_Public/DataGrid.js @@ -72,7 +72,7 @@ export default function SearchPublicNoticeTable({ recordList }) { // console.log(params) return

- {isORGLoggedIn()?<>Care Of: {params.row.careOf}
:null} + {isORGLoggedIn()?<>: {params.row.careOf}
:null} : {appNo}
: {locale === 'en' ? DateUtils.dateStr(params.row.issueDate) : DateUtils.dateStr_Cht(params.row.issueDate)}
: {params.row.length+ " cm"}
diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 7dfbbb4..c961093 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -304,7 +304,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => { {isORGLoggedIn()? {FieldUtils.getTextField({ - label: "Care Of:", + label: intl.formatMessage({id: 'careOf'}) + ":", valueName: "careOf", form: formik, // disabled: true diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index 2019da2..dde1124 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -615,7 +615,7 @@ const ApplicationDetailCard = ( - Care Of: + : {currentApplicationDetailData.careOf} diff --git a/src/pages/PublicNotice/ListPanel/BaseGrid.js b/src/pages/PublicNotice/ListPanel/BaseGrid.js index 3c2bfe1..dc2ae5a 100644 --- a/src/pages/PublicNotice/ListPanel/BaseGrid.js +++ b/src/pages/PublicNotice/ListPanel/BaseGrid.js @@ -26,7 +26,6 @@ export default function BaseGrid({rows}) { navigate('/publicNotice/'+ params.id); }; - // const remarkHeadername = rows.orgId===null?"我的備註":"Care Of / 我的備註" const columns = [ { @@ -46,32 +45,7 @@ export default function BaseGrid({rows}) { return DateUtils.datetimeStr(params?.value); } }, - // { - // id: 'contactPerson', - // field: 'contactPerson', - // headerName: '聯絡人', - // flex: 2, - // renderCell: (params) => { - // let phone = JSON.parse(params.row.contactTelNo); - // let faxNo = JSON.parse(params.row.contactFaxNo); - - // let contact = ""; - // if (phone) { - // contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber - // } - - // if (faxNo && faxNo?.faxNumber) { - // if (contact != "") - // contact = contact + ", " - // contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber - // } - - // return (<> - // {params?.value}
- // {contact} - // ); - // } - // }, + { id: 'remarks', field: 'remarks', @@ -83,7 +57,7 @@ export default function BaseGrid({rows}) {
: {params.row.issueVolume + "/" + params.row.issueYear + " No. " + params.row.issueNo}
- Care Of: {params.row.careOf}
+ : {params.row.careOf}
: {params.row.remarks}
: diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js index ad38114..7b092dd 100644 --- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js +++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js @@ -187,7 +187,7 @@ export default function SubmittedTab({ rows }) { renderCell: (params) => ( isORGLoggedIn() ?
- Care Of: {params.row.careOf}
+ : {params.row.careOf}
: {params.row.remarks}
:
@@ -304,7 +304,7 @@ export default function SubmittedTab({ rows }) { {isORGLoggedIn() ? - Care Of: + : { fullWidth {...register("careOf")} id="careOf" - label="Care Of" - aria-label={"Care Of"} + label={intl.formatMessage({id: 'careOf'})} + aria-label={intl.formatMessage({id: 'careOf'})} defaultValue={searchCriteria.careOf} InputLabelProps={{ shrink: true diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js index e2a3d7b..ec86011 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js @@ -85,7 +85,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
: {params.row.issueVolume + "/" + params.row.issueYear + " No. " + params.row.issueNo}
- Care Of: {params.row.careOf}
+ : {params.row.careOf}
: {params.row.remarks}
:
diff --git a/src/pages/User/DetailPage/LoginGrid.js b/src/pages/User/DetailPage/LoginGrid.js index 9e367e8..b9617fc 100644 --- a/src/pages/User/DetailPage/LoginGrid.js +++ b/src/pages/User/DetailPage/LoginGrid.js @@ -22,13 +22,7 @@ export default function LoginGrid({rows}) { // const navigate = useNavigate() const theme = useTheme(); const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); - // const intl = useIntl(); - // const handleDetailClick = (params) => () => { - // navigate('/publicNotice/'+ params.id); - // }; - - // const remarkHeadername = rows.orgId===null?"我的備註":"Care Of / 我的備註" const columns = [ { diff --git a/src/pages/User/DetailsPage_Individual/LoginGrid.js b/src/pages/User/DetailsPage_Individual/LoginGrid.js index 9e367e8..b9617fc 100644 --- a/src/pages/User/DetailsPage_Individual/LoginGrid.js +++ b/src/pages/User/DetailsPage_Individual/LoginGrid.js @@ -22,13 +22,7 @@ export default function LoginGrid({rows}) { // const navigate = useNavigate() const theme = useTheme(); const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); - // const intl = useIntl(); - // const handleDetailClick = (params) => () => { - // navigate('/publicNotice/'+ params.id); - // }; - - // const remarkHeadername = rows.orgId===null?"我的備註":"Care Of / 我的備註" const columns = [ { diff --git a/src/pages/User/DetailsPage_Organization/LoginGrid.js b/src/pages/User/DetailsPage_Organization/LoginGrid.js index 9e367e8..b9617fc 100644 --- a/src/pages/User/DetailsPage_Organization/LoginGrid.js +++ b/src/pages/User/DetailsPage_Organization/LoginGrid.js @@ -22,13 +22,7 @@ export default function LoginGrid({rows}) { // const navigate = useNavigate() const theme = useTheme(); const isMdOrLg = useMediaQuery(theme.breakpoints.up('md')); - // const intl = useIntl(); - // const handleDetailClick = (params) => () => { - // navigate('/publicNotice/'+ params.id); - // }; - - // const remarkHeadername = rows.orgId===null?"我的備註":"Care Of / 我的備註" const columns = [ { diff --git a/src/translations/en.json b/src/translations/en.json index dceb667..d8627e7 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -311,9 +311,9 @@ "cancelledStatus": "Cancelled", "inProgress": "In Progress", "replied": "Replied", - "pendingReply": "PendingReply", + "pendingReply": "Pending Reply", "processing": "Processing", - "pendingPayment": "Pending payment", + "pendingPayment": "Pending Payment", "pendingPublish": "To be Published", "completed": "Completed", "notAccepted": "Not accepted", @@ -330,6 +330,8 @@ "viewDetail": "View details", "price": "Amount ($)", "pay": "Pay", + "toBePaid": "To be Paid", + "paid": "Paid", "payDate": "Payment Date", "payDateFrom": "Payment Date (From)", "payDateTo": "Payment Date (To)", @@ -369,6 +371,7 @@ "gazetteCount2" :"Gazette Issue No./ Remarks", "gazetteCount2_1" :"Care Of/ Remarks", "gazetteCount3" :"Gazette Issue No./ Care Of/ Remarks", + "careOf":"Care Of", "publishDate": "Publish Date", "draftFile": "Manuscript file", "download": "Download", @@ -408,10 +411,10 @@ "transactionNo": "Transaction number", "transactionDate": "Transaction Date", "transactionTime": "Transaction Time", - "paymentRefCode": "Payment reference number", + "paymentRefCode": "Payment Reference Number", "paymentInfoRecord": "Payment Notice Record", - "paymentRecordId": "Payment record number", + "paymentRecordId": "Payment Record Number", "receiptDate": "Issuance Date", "sendDate": "Send Date", "sendDateFrom": "Send Date (From)", @@ -419,10 +422,10 @@ "files": "File(s)", "loginName": "Login Name", "lastLoginDate": "Last Login Date", - "lastSubmissionDate": "Last submission date", + "lastSubmissionDate": "Last Submission Date", "locked": "Locked", "unlock": "Unlock", - "pendingFor": "Pending approval", + "pendingFor": "Pending Approval", "active": "Active", "primary": "Primary", "MSG.setPrimay": "Are you sure to mark user “{username}” as primary user?", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index e6cf22d..822acae 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -324,6 +324,8 @@ "viewDetail": "查看详细", "price": "金额 ($)", "pay": "付款", + "toBePaid": "待支付", + "paid": "已付款", "payDate": "付款日期", "payDateFrom": "付款日期 (从)", "payDateTo": "付款日期 (到)", @@ -360,9 +362,10 @@ "applyPerson": "申请人", "applyStatus": "申请状态", "gazetteCount": "宪报期数", - "gazetteCount2" :"宪报期数 / 我的备注", - "gazetteCount2_1" :"Care Of / 我的备注", - "gazetteCount3" :"宪报期数 / Care Of/ 我的备注", + "gazetteCount2" :"宪报期数/ 我的备注", + "gazetteCount2_1" :"托管/ 我的备注", + "gazetteCount3" :"宪报期数/ 托管/ 我的备注", + "careOf":"托管", "publishDate": "发布日期", "draftFile": "稿件档案", "download": "下载", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 21b26fc..667b52d 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -327,6 +327,8 @@ "viewDetail": "查看詳細", "price": "金額 ($)", "pay": "付款", + "toBePaid": "待支付", + "paid": "已付費", "payDate": "付款日期", "payDateFrom": "付款日期 (從)", "payDateTo": "付款日期 (到)", @@ -363,9 +365,10 @@ "applyPerson": "申請人", "applyStatus": "申請狀態", "gazetteCount": "憲報期數", - "gazetteCount2" :"憲報期數 / 我的備註", - "gazetteCount2_1" :"Care Of / 我的備註", - "gazetteCount3" :"憲報期數 / Care Of/ 我的備註", + "gazetteCount2" :"憲報期數/ 我的備註", + "gazetteCount2_1" :"托管/ 我的備註", + "gazetteCount3" :"憲報期數/ 托管/ 我的備註", + "careOf":"托管", "publishDate": "發佈日期", "draftFile": "稿件檔案", "download": "下載", diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js index cb0feb8..74f2bf8 100644 --- a/src/utils/ComboData.js +++ b/src/utils/ComboData.js @@ -114,9 +114,9 @@ export const denmandNoteStatus = [ ]; export const denmandNoteStatus_Public = [ - { key: 0, labelCht: '全部', label: 'All', type: 'all' }, - { key: 2, labelCht: '待支付', label:'To be Paid', type: 'to be paid' }, - { key: 3, labelCht: '已付費', label:'Paid', type: 'paid' }, + { key: 0, i18nLabel: 'all', labelCht: '全部', label: 'All', type: 'all' }, + { key: 2, i18nLabel: 'toBePaid', labelCht: '待支付', label:'To be Paid', type: 'to be paid' }, + { key: 3, i18nLabel: 'paid', labelCht: '已付費', label:'Paid', type: 'paid' }, ];