From 1ab60859723bcb6be4b48c703c3a19ee3152558e Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Thu, 18 Jan 2024 15:54:17 +0800 Subject: [PATCH] update payment notice record i18n --- src/assets/style/navbarStyles.css | 2 +- src/layout/MainLayout/Header/index.js | 10 ++++++---- src/pages/DemandNote/Search_Public/DataGrid.js | 8 ++++---- src/pages/DemandNote/Search_Public/SearchForm.js | 11 +++++++---- src/pages/DemandNote/Search_Public/index.js | 5 ++++- src/pages/dashboard/Public/index.js | 2 +- src/translations/en.json | 10 +++++++++- src/translations/zh-CN.json | 8 ++++++++ src/translations/zh-HK.json | 8 ++++++++ 9 files changed, 48 insertions(+), 16 deletions(-) diff --git a/src/assets/style/navbarStyles.css b/src/assets/style/navbarStyles.css index d71cd84..3555ab0 100644 --- a/src/assets/style/navbarStyles.css +++ b/src/assets/style/navbarStyles.css @@ -127,7 +127,7 @@ visibility: hidden; opacity: 0; min-width: 16rem; - position: absolute; + position: relative; /* transition: all 0.5s ease; */ left: 0; display: none; diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index aaa1872..3442f09 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -59,7 +59,7 @@ import { Link } from "react-router-dom"; import LocaleSelector from "./HeaderContent/LocaleSelector"; import { FormattedMessage } from "react-intl"; -const drawerWidth = 240; +const drawerWidth = 300; // const navItems = ['Home', 'About', 'Contact']; // ==============================|| MAIN LAYOUT - HEADER ||============================== // @@ -135,7 +135,7 @@ function Header(props) {
  • - Email Template + Email Template
    • {/*
  • Logout @@ -174,7 +174,9 @@ function Header(props) {
  • - 繳款通知記錄 + + +
    • @@ -268,7 +270,7 @@ function Header(props) { const drawer = ( isUserLoggedIn() ? - + PNSPS diff --git a/src/pages/DemandNote/Search_Public/DataGrid.js b/src/pages/DemandNote/Search_Public/DataGrid.js index 3b4d47a..2028d5d 100644 --- a/src/pages/DemandNote/Search_Public/DataGrid.js +++ b/src/pages/DemandNote/Search_Public/DataGrid.js @@ -31,7 +31,7 @@ export default function SearchDemandNote({ recordList }) { const columns = [ { field: 'dnNo', - headerName: '繳款單號', + headerName: intl.formatMessage({id: 'paymentRecordId'}), width: 200, }, { @@ -42,7 +42,7 @@ export default function SearchDemandNote({ recordList }) { { id: 'issueDate', field: 'issueDate', - headerName: '簽發日期', + headerName: intl.formatMessage({id: 'receiptDate'}), width: 175, valueGetter: (params) => { return DateUtils.dateStr(params?.value); @@ -58,7 +58,7 @@ export default function SearchDemandNote({ recordList }) { }, { field: 'sentDate', - headerName: '發送日期', + headerName: intl.formatMessage({id: 'sendDate'}), flex: 1, valueGetter: (params) => { return params?.value ? DateUtils.datetimeStr(params?.value) + " - " + params.row.sentBy : ""; @@ -66,7 +66,7 @@ export default function SearchDemandNote({ recordList }) { }, { field: 'filename', - headerName: '檔案', + headerName: intl.formatMessage({id: 'files'}), flex: 1, renderCell: (params) => { return ; diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js index d9e87cb..cd5f59b 100644 --- a/src/pages/DemandNote/Search_Public/SearchForm.js +++ b/src/pages/DemandNote/Search_Public/SearchForm.js @@ -133,7 +133,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData fullWidth {...register("dnNo")} id='dnNo' - label="繳款單號" + label={intl.formatMessage({id: 'paymentRecordId'})} defaultValue={searchCriteria.dnNo} InputLabelProps={{ shrink: true @@ -147,7 +147,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData {...register("dateFrom")} id="dateFrom" type="date" - label={"發送日期(從)"} + label={intl.formatMessage({id: 'sendDateFrom'})} defaultValue={searchCriteria.dateFrom} InputProps={{ inputProps: { max: maxDate } }} onChange={(newValue) => { @@ -172,7 +172,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData }} id="dateTo" type="date" - label={"發送日期(到)"} + label={intl.formatMessage({id: 'sendDateTo'})} defaultValue={searchCriteria.dateTo} /> @@ -182,6 +182,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData option.labelCht} inputValue={selectedStatus?.labelCht ? selectedStatus?.labelCht : ""} @@ -233,7 +234,9 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData textTransform: 'capitalize', alignItems: 'end' }}> - 提交 + + + diff --git a/src/pages/DemandNote/Search_Public/index.js b/src/pages/DemandNote/Search_Public/index.js index 35d06c7..8c246f3 100644 --- a/src/pages/DemandNote/Search_Public/index.js +++ b/src/pages/DemandNote/Search_Public/index.js @@ -16,6 +16,7 @@ const LoadingComponent = Loadable(React.lazy(() => import('pages/extra-pages/Loa const SearchForm = Loadable(React.lazy(() => import('./SearchForm'))); const EventTable = Loadable(React.lazy(() => import('./DataGrid'))); import titleBackgroundImg from 'assets/images/dashboard/gazette-bar.png' +import {FormattedMessage} from "react-intl"; const BackgroundHead = { backgroundImage: `url(${titleBackgroundImg})`, @@ -97,7 +98,9 @@ const UserSearchPage_Individual = () => {
    - 繳款通知記錄 + + +
    diff --git a/src/pages/dashboard/Public/index.js b/src/pages/dashboard/Public/index.js index 1eaa554..c2db5de 100644 --- a/src/pages/dashboard/Public/index.js +++ b/src/pages/dashboard/Public/index.js @@ -31,7 +31,7 @@ const DashboardDefault = () => {
    {/* 我的公共啟事 */} - + {isORGLoggedIn() ?userData.fullenName:userData.fullchName}, diff --git a/src/translations/en.json b/src/translations/en.json index 764e308..e5ce08f 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -242,7 +242,7 @@ "cancelled": "Cancelled", "withdrawn": "Withdrawn", "searchApplyRecord": "Search application record", - "applicationId": "Application number", + "applicationId": "Application ID", "submitDate": "Submit date", "submitDateFrom": "Submit date (from)", "submitDateTo": "Submit date (to)", @@ -318,6 +318,14 @@ "transactionTime": "Transaction time", "paymentRefCode": "Payment Reference Number", + "paymentInfoRecord": "Payment Notice Record", + "paymentRecordId": "Payment record number", + "receiptDate": "Issuance date", + "sendDate": "Send date", + "sendDateFrom": "Send date (from)", + "sendDateTo": "Send date (to)", + "files": "File(s)", + "Dashboard": "Dashboard", "event": "Event" } \ No newline at end of file diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index c7ff027..2dfdec0 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -317,6 +317,14 @@ "transactionTime": "交易时间", "paymentRefCode": "付款参考号码", + "paymentInfoRecord": "缴款通知记录", + "paymentRecordId": "缴款单号", + "receiptDate": "签发日期", + "sendDate": "发送日期", + "sendDateFrom": "发送日期(从)", + "sendDateTo": "发送日期(到)", + "files": "档案", + "Dashboard": "仪表板", "event": "活动" } \ No newline at end of file diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index ec87245..42bb7d4 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -317,6 +317,14 @@ "transactionTime": "交易時間", "paymentRefCode": "付款參考號碼", + "paymentInfoRecord": "繳款通知記錄", + "paymentRecordId": "繳款單號", + "receiptDate": "簽發日期", + "sendDate": "發送日期", + "sendDateFrom": "發送日期(從)", + "sendDateTo": "發送日期(到)", + "files": "檔案", + "Dashboard": "儀表板", "event": "活動" } \ No newline at end of file