From 22594ffec3fa338c97728d323c915d8ce1ff7d07 Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Fri, 26 Jan 2024 11:40:38 +0800 Subject: [PATCH 01/10] update display font --- .../Proof/Reply_Public/ApplicationDetails.js | 22 +++++----- .../Details_Public/ApplicationDetailCard.js | 42 +++++++++---------- .../UserInformationCard_Individual_Pub.js | 2 +- src/themes/themeConst.js | 7 ++++ src/themes/typography.js | 9 +++- src/utils/FieldUtils.js | 12 +++--- 6 files changed, 53 insertions(+), 41 deletions(-) diff --git a/src/pages/Proof/Reply_Public/ApplicationDetails.js b/src/pages/Proof/Reply_Public/ApplicationDetails.js index de693e7..fa77bd7 100644 --- a/src/pages/Proof/Reply_Public/ApplicationDetails.js +++ b/src/pages/Proof/Reply_Public/ApplicationDetails.js @@ -79,7 +79,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -93,7 +93,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -112,7 +112,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -132,7 +132,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -149,7 +149,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -164,7 +164,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -181,7 +181,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -205,7 +205,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + ： @@ -248,7 +248,7 @@ const ApplicationDetailCard = ({ formData, }) => { - + : @@ -259,9 +259,9 @@ const ApplicationDetailCard = ({ formData, }) => { { formik.values.groupType === "Private Bill" ? - ( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 ) + ( {data.noOfPages} {intl.formatMessage({id: 'page'})} x $6,552 ) : - ( {data.length} cm x {data.colCount === 2 ? "$364 二格位" : "$182 一格位"} ) + ( {data.length} cm x {data.colCount === 2 ? "$364 二格位" : "$182 一格位"} ) } diff --git a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js index 3c6e05d..f429f1a 100644 --- a/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js @@ -190,7 +190,7 @@ const ApplicationDetailCard = ( - + : @@ -220,7 +220,7 @@ const ApplicationDetailCard = ( - + : @@ -236,11 +236,11 @@ const ApplicationDetailCard = ( - 原因: + 原因: - + {currentApplicationDetailData.reason} @@ -259,7 +259,7 @@ const ApplicationDetailCard = ( - + : @@ -306,7 +306,7 @@ const ApplicationDetailCard = ( - + : @@ -340,7 +340,7 @@ const ApplicationDetailCard = ( - + : @@ -370,7 +370,7 @@ const ApplicationDetailCard = ( - + : @@ -405,7 +405,7 @@ const ApplicationDetailCard = ( - + : @@ -454,13 +454,13 @@ const ApplicationDetailCard = ( - + (HK$): - {FormatUtils.currencyFormat(fee)} + {FormatUtils.currencyFormat(fee)} @@ -473,7 +473,7 @@ const ApplicationDetailCard = ( - + : @@ -524,7 +524,7 @@ const ApplicationDetailCard = ( - + : @@ -535,7 +535,7 @@ const ApplicationDetailCard = ( {fileDetail.filename} @@ -567,10 +567,10 @@ const ApplicationDetailCard = ( - Care Of: + Care Of: - {currentApplicationDetailData.careOf} + {currentApplicationDetailData.careOf} : null @@ -579,12 +579,12 @@ const ApplicationDetailCard = ( - + : - {currentApplicationDetailData.remarks} + {currentApplicationDetailData.remarks} @@ -619,14 +619,14 @@ const ApplicationDetailCard = ( onClick={() => setIsPopUp(false)} aria-label={intl.formatMessage({id: 'close'})} > - + @@ -648,7 +648,7 @@ const ApplicationDetailCard = ( onClick={() => setErrorPopUp(false)} aria-label={intl.formatMessage({id: 'close'})} > - + diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js index 0cad3b4..3568388 100644 --- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js +++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js @@ -217,7 +217,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => { - + : diff --git a/src/themes/themeConst.js b/src/themes/themeConst.js index ce35db6..99c49b9 100644 --- a/src/themes/themeConst.js +++ b/src/themes/themeConst.js @@ -369,6 +369,13 @@ export const PNSPS_THEME = createTheme({ } } }, + MuiFormLabel: { + styleOverrides: { + root:{ + color: "#000000" + } + } + }, MuiTabPanel:{ styleOverrides:{ root:{ diff --git a/src/themes/typography.js b/src/themes/typography.js index 0b8b739..1202060 100644 --- a/src/themes/typography.js +++ b/src/themes/typography.js @@ -23,9 +23,14 @@ const Typography = (fontFamily) => ({ lineHeight: 1.5 }, pnspsFormParagraph: { - fontWeight: 400, + fontWeight: 500, fontSize: '1.1rem', - lineHeight: 0.8 + lineHeight: 1 + }, + pnspsFormParagraphBold: { + fontWeight: 600, + fontSize: '1.1rem', + lineHeight: 1 }, h1: { fontWeight: 600, diff --git a/src/utils/FieldUtils.js b/src/utils/FieldUtils.js index a1463f3..462cf1f 100644 --- a/src/utils/FieldUtils.js +++ b/src/utils/FieldUtils.js @@ -13,7 +13,7 @@ export const notNullFieldLabel = (label) => { export const getDateField = ({ label, valueName, form, disabled }) => { return - {label} + {label} {initField({ @@ -30,7 +30,7 @@ export const getTextField = ({ label, valueName, form, disabled }) => { return - {label} + {label} {initField({ @@ -47,7 +47,7 @@ export const getTextArea = ({ label, valueName, form, disabled, inputProps, ...p return - {label} + {label} {initField({ @@ -74,7 +74,7 @@ export const getPhoneField = ({ label, valueName, form, disabled }) => { return - {label} + {label} @@ -119,7 +119,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => { return - {label} + {label} @@ -154,7 +154,7 @@ export const getAddressField = ({ label, valueName, form, disabled }) => { export const getComboField = ({ label, dataList, valueName, form, disabled, getOptionLabel, onInputChange, onChange, filterOptions, ...props }) => { return - {label} + {label} Date: Fri, 26 Jan 2024 11:58:35 +0800 Subject: [PATCH 02/10] update font --- src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js | 6 +++--- src/themes/themeConst.js | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 61ab176..247f2fe 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -148,7 +148,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => { {/* - 申請公共啟事 + 申請公共啟事 */} @@ -188,7 +188,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => { - + : @@ -214,7 +214,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => { - + ({intl.formatMessage({id: 'fileSizeWarning'})}): diff --git a/src/themes/themeConst.js b/src/themes/themeConst.js index 99c49b9..40247d4 100644 --- a/src/themes/themeConst.js +++ b/src/themes/themeConst.js @@ -77,6 +77,7 @@ export const PNSPS_THEME = createTheme({ }, '&.MuiButton-root':{ fontSize: '1.2rem', + fontWeight: '600', alignItems: 'center', }, } From 960172162a17454f8cc20663f6d4f39ffa8903da Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Fri, 26 Jan 2024 12:50:17 +0800 Subject: [PATCH 03/10] update organization profile --- src/layout/MainLayout/Header/index.js | 2 +- .../DetailPage/OrganizationPubCard.js | 56 +++++++++---------- src/pages/Organization/DetailPage/index.js | 7 ++- src/translations/en.json | 9 +++ src/translations/zh-CN.json | 9 +++ src/translations/zh-HK.json | 9 +++ 6 files changed, 58 insertions(+), 34 deletions(-) diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js index f3994b0..14fcfa6 100644 --- a/src/layout/MainLayout/Header/index.js +++ b/src/layout/MainLayout/Header/index.js @@ -227,7 +227,7 @@ function Header(props) { {/* */} - Organization Profile + diff --git a/src/pages/Organization/DetailPage/OrganizationPubCard.js b/src/pages/Organization/DetailPage/OrganizationPubCard.js index dc0a1ef..053a673 100644 --- a/src/pages/Organization/DetailPage/OrganizationPubCard.js +++ b/src/pages/Organization/DetailPage/OrganizationPubCard.js @@ -19,7 +19,7 @@ const LoadingComponent = Loadable(lazy(() => import('../../extra-pages/LoadingCo import Loadable from 'components/Loadable'; import { lazy } from 'react'; import { notifySaveSuccess } from 'utils/CommonFunction'; -import {useIntl} from "react-intl"; +import {FormattedMessage, useIntl} from "react-intl"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -135,7 +135,9 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { alignItems: 'end' }} > - Create + + + : @@ -145,26 +147,21 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { size="large" variant="contained" onClick={loadDataFun} - sx={{ - textTransform: 'capitalize', - alignItems: 'end' - }} > - Reset & Back + + + @@ -174,15 +171,12 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { <> @@ -197,12 +191,12 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { - Organization Details + {FieldUtils.getTextField({ - label: FieldUtils.notNullFieldLabel("BR No.:"), + label: intl.formatMessage({id: 'brNo'}) + ":", valueName: "brNo", disabled: true, form: formik @@ -210,7 +204,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getTextField({ - label: "Creditor Account" + ":", + label: intl.formatMessage({id: 'creditorAccount'}) + ":", valueName: "creditor", disabled: true, form: formik @@ -231,7 +225,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getTextField({ - label: FieldUtils.notNullFieldLabel("Name (Eng):"), + label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'nameEng'}) + ":"), valueName: "enCompanyName", disabled: true, form: formik @@ -240,7 +234,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getTextField({ - label: "Name (Ch):", + label: intl.formatMessage({id: 'nameChi'}) + ":", valueName: "chCompanyName", disabled: true, form: formik @@ -249,7 +243,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getDateField({ - label: FieldUtils.notNullFieldLabel("Expiry Date:"), + label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'expiryDate'}) + ":"), valueName: "brExpiryDate", disabled: true, form: formik @@ -258,7 +252,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getTextField({ - label: FieldUtils.notNullFieldLabel("Contact Person:"), + label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'contactPerson'}) + ":"), valueName: "contactPerson", disabled: (!editMode && !createMode), form: formik @@ -267,7 +261,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getPhoneField({ - label: FieldUtils.notNullFieldLabel("Contact Tel:"), + label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'userContactNumber'}) + ":"), valueName: { code: "tel_countryCode", num: "phoneNumber" @@ -279,7 +273,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getPhoneField({ - label: "Fax No:", + label: intl.formatMessage({id: 'contactFaxNumber'}) + ":", valueName: { code: "fax_countryCode", num: "faxNumber" @@ -291,7 +285,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getComboField({ - label: FieldUtils.notNullFieldLabel("Country:"), + label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'country'}) + ":"), valueName: "country", disabled: (!editMode && !createMode), dataList: ComboData.country, @@ -302,7 +296,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getComboField({ - label: FieldUtils.notNullFieldLabel("District:"), + label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'district'}) + ":"), valueName: "district", disabled: (!editMode && !createMode), dataList: ComboData.district, @@ -314,7 +308,7 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {FieldUtils.getAddressField({ - label: FieldUtils.notNullFieldLabel("Address:"), + label: FieldUtils.notNullFieldLabel(intl.formatMessage({id: 'formAddress'}) + ":"), valueName: ["addressLine1", "addressLine2", "addressLine3"], disabled: (!editMode && !createMode), form: formik diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js index c53350d..bfea72d 100644 --- a/src/pages/Organization/DetailPage/index.js +++ b/src/pages/Organization/DetailPage/index.js @@ -33,6 +33,7 @@ const BackgroundHead = { backgroundPosition: 'right' } import { + FormattedMessage, // FormattedMessage, useIntl } from "react-intl"; @@ -132,13 +133,15 @@ const OrganizationDetailPage = () => { {isGLDLoggedIn()? Maintain Organization : - Organization Profile + + + } - diff --git a/src/translations/en.json b/src/translations/en.json index 7ecafdb..b578b7d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -363,6 +363,15 @@ "loading": "Loading...", "ok": "Ok", + "organizationProfile": "Organization Profile", + "organizationDetails": "Organization Details", + "brNo": "BR No.", + "creditorAccount": "Creditor account", + "nameEng": "Name (Eng)", + "nameChi": "Name (Ch)", + "expiryDate": "Expiry date", + "create": "Create", + "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 9a18efc..cd49995 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -363,6 +363,15 @@ "loading": "加载中...", "ok": "好的", + "organizationProfile": "机构资料", + "organizationDetails": "机构详情", + "brNo": "商业登记证号码", + "creditorAccount": "债权人帐户", + "nameEng": "姓名(英文)", + "nameChi": "姓名(中文)", + "expiryDate": "过期日期", + "create": "创建", + "Dashboard": "仪表板", "event": "活动" } \ No newline at end of file diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index 2ff637d..5a8c0d4 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -363,6 +363,15 @@ "loading": "加載中...", "ok": "好的", + "organizationProfile": "機構資料", + "organizationDetails": "機構詳情", + "brNo": "商業登記證號碼", + "creditorAccount": "債權人帳戶", + "nameEng": "姓名(英文)", + "nameChi": "姓名(中文)", + "expiryDate": "過期日期", + "create": "創建", + "Dashboard": "儀表板", "event": "活動" } \ No newline at end of file From 85eb75fcf72e6900306092a02f8282f0b26565ec Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Fri, 26 Jan 2024 14:43:55 +0800 Subject: [PATCH 04/10] update dialog window and search heading to search form --- src/pages/DemandNote/Create/SearchForm.js | 24 +++++++- src/pages/DemandNote/Search/DataGrid.js | 60 +++++++++++++++++-- .../DemandNote/Search_Public/SearchForm.js | 2 +- src/pages/Message/Search/SearchForm.js | 2 +- .../DetailPage/OrganizationCard.js | 24 +++++++- .../DetailPage/OrganizationPubCard.js | 24 +++++++- .../OrganizationCard_loadFromUser.js | 12 +++- src/pages/Payment/Search_Public/SearchForm.js | 2 +- src/pages/Payment/index.js | 12 +++- src/pages/Proof/Create_FromApp/ProofForm.js | 24 +++++++- .../Proof/Reply_GLD/ApplicationDetails.js | 5 +- src/pages/Proof/Reply_Public/ProofForm.js | 12 +++- src/pages/Proof/Search_Public/SearchForm.js | 2 +- .../ApplyForm/PublicNoticeApplyForm.js | 12 +++- .../Details_GLD/ApplicationDetailCard.js | 12 +++- .../Details_GLD/GazetteDetailCard.js | 11 +++- .../Details_Public/ApplicationDetailCard.js | 12 +++- .../Details_Public/StatusChangeDialog.js | 16 ++--- .../ListPanel/PendingPaymentTab.js | 24 +++++++- .../ListPanel/SearchPublicNoticeForm.js | 2 +- .../UserInformationCard_Organization.js | 24 +++++++- src/pages/User/ManagePage_OrgPublic/index.js | 12 +++- src/pages/_Test/Mail/index.js | 12 +++- src/translations/en.json | 3 + src/translations/zh-CN.json | 3 + src/translations/zh-HK.json | 3 + 26 files changed, 312 insertions(+), 39 deletions(-) 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": "活動" From 6395250dc97aecc7855e9b07c996461fbd5c9407 Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Fri, 26 Jan 2024 15:19:44 +0800 Subject: [PATCH 05/10] update search form header & reset button color --- src/pages/DemandNote/Search/SearchForm.js | 2 +- .../DemandNote/Search_Public/SearchForm.js | 3 +- src/pages/Message/Search/SearchForm.js | 3 +- .../DetailPage/OrganizationCard.js | 55 +++++--------- .../DetailPage/OrganizationPubCard.js | 33 ++++---- .../SearchPage/OrganizationSearchForm.js | 4 +- src/pages/Payment/Search_GLD/SearchForm.js | 3 +- src/pages/Payment/Search_Public/SearchForm.js | 3 +- src/pages/Proof/Search_GLD/SearchForm.js | 2 +- src/pages/Proof/Search_Public/SearchForm.js | 3 +- .../ListPanel/SearchPublicNoticeForm.js | 1 + .../PublicNotice/Search_GLD/SearchForm.js | 2 +- .../UserInformationCard_Individual.js | 52 +++++-------- .../UserInformationCard_Individual_Pub.js | 1 + .../UserInformationCard_Organization.js | 76 +++++++++---------- .../UserInformationCard_Organization_Pub.js | 1 + src/pages/User/SearchPage/UserSearchForm.js | 2 +- .../UserSearchForm_Individual.js | 2 +- .../UserSearchForm_Organization.js | 2 +- .../UserGroupSearchForm.js | 2 +- src/themes/buttonConst.js | 4 + 21 files changed, 114 insertions(+), 142 deletions(-) diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js index 222e6b8..8717699 100644 --- a/src/pages/DemandNote/Search/SearchForm.js +++ b/src/pages/DemandNote/Search/SearchForm.js @@ -92,7 +92,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue {/*row 1*/} - + Search Form diff --git a/src/pages/DemandNote/Search_Public/SearchForm.js b/src/pages/DemandNote/Search_Public/SearchForm.js index 8f3b320..10ad3ba 100644 --- a/src/pages/DemandNote/Search_Public/SearchForm.js +++ b/src/pages/DemandNote/Search_Public/SearchForm.js @@ -83,7 +83,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData - + @@ -215,6 +215,7 @@ const SearchDemandNoteForm = ({ applySearch, searchCriteria, issueComboData + : <> + + } : <> + + { currentUserData.creditor ? + + : + + } diff --git a/src/pages/Organization/DetailPage/OrganizationPubCard.js b/src/pages/Organization/DetailPage/OrganizationPubCard.js index e11b837..1fe6b5d 100644 --- a/src/pages/Organization/DetailPage/OrganizationPubCard.js +++ b/src/pages/Organization/DetailPage/OrganizationPubCard.js @@ -20,6 +20,8 @@ import Loadable from 'components/Loadable'; import { lazy } from 'react'; import { notifySaveSuccess } from 'utils/CommonFunction'; import {FormattedMessage, useIntl} from "react-intl"; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -126,43 +128,38 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { {createMode ? <> + + : <> + + + + } @@ -170,14 +167,14 @@ const OrganizationPubCard = ({ userData, loadDataFun, id, setEditModeFun }) => { : <> + + } diff --git a/src/pages/Organization/SearchPage/OrganizationSearchForm.js b/src/pages/Organization/SearchPage/OrganizationSearchForm.js index d1d623e..93295a4 100644 --- a/src/pages/Organization/SearchPage/OrganizationSearchForm.js +++ b/src/pages/Organization/SearchPage/OrganizationSearchForm.js @@ -1,6 +1,6 @@ // material-ui import { - Button, + CButton, Grid, TextField, Typography, Autocomplete, @@ -66,7 +66,7 @@ const OrganizationSearchForm = ({ applySearch }) => { {/*row 1*/} - + Search Form diff --git a/src/pages/Payment/Search_GLD/SearchForm.js b/src/pages/Payment/Search_GLD/SearchForm.js index 83dd76d..4f359db 100644 --- a/src/pages/Payment/Search_GLD/SearchForm.js +++ b/src/pages/Payment/Search_GLD/SearchForm.js @@ -49,7 +49,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { {/*row 1*/} - + Search Form @@ -154,6 +154,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { + : <> + + } @@ -321,16 +313,14 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => { })} + + } @@ -454,31 +444,27 @@ const UserInformationCard_Individual = ({ formData, loadDataFun }) => { {locked ? + + : + + } diff --git a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js index 3568388..2a2bb86 100644 --- a/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js +++ b/src/pages/User/DetailsPage_Individual/UserInformationCard_Individual_Pub.js @@ -118,6 +118,7 @@ const UserInformationCard_Individual_Pub = ({ formData, loadDataFun }) => { - + : <> + + } @@ -380,17 +371,14 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => })} + + } @@ -436,33 +424,27 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => {formik.values.locked ? + + : + + } @@ -478,11 +460,13 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => {currentUserData.orgId == null ? + + : null } @@ -593,7 +577,11 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => {warningText} - + + +
@@ -614,8 +602,14 @@ const UserInformationCard_Organization = ({ userData, loadDataFun, orgData }) => {confirmText} - - + + + +
diff --git a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js index 6d0fc88..ed94098 100644 --- a/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js +++ b/src/pages/User/DetailsPage_Organization/UserInformationCard_Organization_Pub.js @@ -114,6 +114,7 @@ const UserInformationCard_Organization_Pub = ({ userData, loadDataFun,}) => { + {fileDetail.filename} + + + From abdcbe403d19682198859912428b31598fdf957f Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Fri, 26 Jan 2024 15:47:44 +0800 Subject: [PATCH 07/10] update remark abnormal bold --- src/pages/PublicNotice/ListPanel/BaseGrid.js | 6 +++--- src/pages/PublicNotice/ListPanel/PendingPaymentTab.js | 6 +++--- src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js | 6 +++--- src/themes/typography.js | 5 +++++ 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/pages/PublicNotice/ListPanel/BaseGrid.js b/src/pages/PublicNotice/ListPanel/BaseGrid.js index d1c8b34..8789cc2 100644 --- a/src/pages/PublicNotice/ListPanel/BaseGrid.js +++ b/src/pages/PublicNotice/ListPanel/BaseGrid.js @@ -80,13 +80,13 @@ export default function BaseGrid({rows}) { renderCell: (params) => ( isORGLoggedIn()?
- Care Of: {params.row.careOf} + Care Of: {params.row.careOf} - : {params.row.remarks} + : {params.row.remarks}
:
- {params.row.remarks} + {params.row.remarks}
) }, diff --git a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js index 17753b9..44b8765 100644 --- a/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js +++ b/src/pages/PublicNotice/ListPanel/PendingPaymentTab.js @@ -166,12 +166,12 @@ export default function SubmittedTab({ rows }) { renderCell: (params) => ( isORGLoggedIn() ?
- Care Of: {params.row.careOf} - + Care Of: {params.row.careOf} + : {params.row.remarks}
:
- {params.row.remarks} + {params.row.remarks}
) }, diff --git a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js index 6076867..c0e001d 100644 --- a/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js +++ b/src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js @@ -83,13 +83,13 @@ export default function SearchPublicNoticeTable({ recordList }) { renderCell: (params) => ( isORGLoggedIn()?
- Care Of: {params.row.careOf} - + Care Of: {params.row.careOf} + : {params.row.remarks}
:
- {params.row.remarks} + {params.row.remarks}
) }, diff --git a/src/themes/typography.js b/src/themes/typography.js index 1202060..46b8c6c 100644 --- a/src/themes/typography.js +++ b/src/themes/typography.js @@ -32,6 +32,11 @@ const Typography = (fontFamily) => ({ fontSize: '1.1rem', lineHeight: 1 }, + pnspsNormalText: { + fontWeight: 600, + fontSize: '1.0rem', + lineHeight: 1.0 + }, h1: { fontWeight: 600, fontSize: '2.5rem', From 26d987b86bafa532996b8995e380addf84b65b72 Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Fri, 26 Jan 2024 16:41:24 +0800 Subject: [PATCH 08/10] update email template layout --- .../Detail_GLD/EmailTemplateDetails.js | 103 ++++++------------ src/pages/EmailTemplate/Search_GLD/index.js | 20 ++-- 2 files changed, 45 insertions(+), 78 deletions(-) diff --git a/src/pages/EmailTemplate/Detail_GLD/EmailTemplateDetails.js b/src/pages/EmailTemplate/Detail_GLD/EmailTemplateDetails.js index ff10def..926259c 100644 --- a/src/pages/EmailTemplate/Detail_GLD/EmailTemplateDetails.js +++ b/src/pages/EmailTemplate/Detail_GLD/EmailTemplateDetails.js @@ -4,8 +4,7 @@ import { Grid, Typography, FormLabel, - OutlinedInput, - Button, + Button, TextField, // TextField, // Autocomplete, } from '@mui/material'; @@ -15,6 +14,8 @@ import * as React from "react"; import Loadable from 'components/Loadable'; const MainCard = Loadable(React.lazy(() => import('components/MainCard'))); import { useForm } from 'react-hook-form'; +import {PNSPS_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // const ApplicationDetailCard = ({ formData, @@ -35,59 +36,30 @@ const ApplicationDetailCard = ({ // initialValues: data, // }); - const DisplayField = ({ name, width, value, rows = 1, disabled = false }) => { - return { + return ; } - const { register, handleSubmit } = useForm() - - - - // const DisplaySelection = ({ name = "test", value = "", onChange }) => { - // return ( - // - // )} - // /> - // } return ( @@ -168,14 +141,14 @@ const ApplicationDetailCard = ({ - + - Subject (Cht): - + - + - Subject (Chs): - + @@ -236,18 +209,18 @@ const ApplicationDetailCard = ({ - + - Subject (Eng): - + @@ -273,33 +246,25 @@ const ApplicationDetailCard = ({ {/*bottom button*/} + + diff --git a/src/pages/EmailTemplate/Search_GLD/index.js b/src/pages/EmailTemplate/Search_GLD/index.js index 2556ba1..f45730b 100644 --- a/src/pages/EmailTemplate/Search_GLD/index.js +++ b/src/pages/EmailTemplate/Search_GLD/index.js @@ -25,6 +25,8 @@ const BackgroundHead = { backgroundPosition: 'right' } import { useNavigate } from "react-router"; +import {PNSPS_LONG_BUTTON_THEME} from "../../../themes/buttonConst"; +import {ThemeProvider} from "@emotion/react"; // ==============================|| DASHBOARD - DEFAULT ||============================== // @@ -56,7 +58,7 @@ const Index = () => { : ( - +
@@ -78,18 +80,18 @@ const Index = () => { - + + + From f799d38b2cf7a667b71aa1e30bafc50d1c225a3a Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Fri, 26 Jan 2024 16:50:26 +0800 Subject: [PATCH 09/10] update payment detail bottom text size --- src/pages/Payment/MultiPaymentWindow.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Payment/MultiPaymentWindow.js b/src/pages/Payment/MultiPaymentWindow.js index a962987..a4d3422 100644 --- a/src/pages/Payment/MultiPaymentWindow.js +++ b/src/pages/Payment/MultiPaymentWindow.js @@ -237,12 +237,12 @@ const MultiPaymentWindow = (props) => { - + (HK$):  - + {" HK$ " + FormatUtils.currencyFormat(props.totalAmount)} From 6699648178011cdaf0e266c8e9e5a399e63f359a Mon Sep 17 00:00:00 2001 From: "jason.lam" Date: Fri, 26 Jan 2024 17:30:25 +0800 Subject: [PATCH 10/10] update title display for small layout --- src/pages/DemandNote/Search_Public/index.js | 2 +- src/pages/Message/Search/index.js | 2 +- src/pages/Organization/DetailPage/index.js | 6 ++++-- src/pages/Payment/Search_Public/index.js | 2 +- src/pages/Proof/Payment/Pay.js | 4 ++-- src/pages/Proof/Payment/Pay_Creditor.js | 6 +++--- src/pages/Proof/Reply_GLD/index.js | 4 +++- src/pages/Proof/Reply_Public/index.js | 4 ++-- src/pages/Proof/Search_Public/index.js | 6 +++--- src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js | 2 +- src/pages/PublicNotice/Details_Public/index.js | 2 +- src/pages/PublicNotice/ListPanel/index.js | 4 ++-- src/pages/User/DetailsPage_Individual/index.js | 6 ++++-- src/pages/User/DetailsPage_Organization/index.js | 6 ++++-- src/pages/User/GLDUserProfile/index.js | 4 +++- src/pages/User/ManagePage_OrgPublic/index.js | 2 +- src/pages/dashboard/GLD/index.js | 4 +++- 17 files changed, 39 insertions(+), 27 deletions(-) diff --git a/src/pages/DemandNote/Search_Public/index.js b/src/pages/DemandNote/Search_Public/index.js index a3bb149..2602a46 100644 --- a/src/pages/DemandNote/Search_Public/index.js +++ b/src/pages/DemandNote/Search_Public/index.js @@ -98,7 +98,7 @@ const UserSearchPage_Individual = () => {
- + diff --git a/src/pages/Message/Search/index.js b/src/pages/Message/Search/index.js index 9706d5d..b96ae87 100644 --- a/src/pages/Message/Search/index.js +++ b/src/pages/Message/Search/index.js @@ -69,7 +69,7 @@ const Index = () => {
- + diff --git a/src/pages/Organization/DetailPage/index.js b/src/pages/Organization/DetailPage/index.js index bfea72d..0442947 100644 --- a/src/pages/Organization/DetailPage/index.js +++ b/src/pages/Organization/DetailPage/index.js @@ -131,9 +131,11 @@ const OrganizationDetailPage = () => {
{isGLDLoggedIn()? - Maintain Organization + + Maintain Organization + : - + } diff --git a/src/pages/Payment/Search_Public/index.js b/src/pages/Payment/Search_Public/index.js index 0930897..1b2e72d 100644 --- a/src/pages/Payment/Search_Public/index.js +++ b/src/pages/Payment/Search_Public/index.js @@ -69,7 +69,7 @@ const Index = () => {
- + diff --git a/src/pages/Proof/Payment/Pay.js b/src/pages/Proof/Payment/Pay.js index 17e7893..9fad007 100644 --- a/src/pages/Proof/Payment/Pay.js +++ b/src/pages/Proof/Payment/Pay.js @@ -85,9 +85,9 @@ const Index = () => { ( -
+
- + diff --git a/src/pages/Proof/Payment/Pay_Creditor.js b/src/pages/Proof/Payment/Pay_Creditor.js index 9d1631f..bea153b 100644 --- a/src/pages/Proof/Payment/Pay_Creditor.js +++ b/src/pages/Proof/Payment/Pay_Creditor.js @@ -65,9 +65,9 @@ const Index = () => { ( -
- - +
+ + diff --git a/src/pages/Proof/Reply_GLD/index.js b/src/pages/Proof/Reply_GLD/index.js index 3aac47b..741f413 100644 --- a/src/pages/Proof/Reply_GLD/index.js +++ b/src/pages/Proof/Reply_GLD/index.js @@ -119,7 +119,9 @@ const Index = () => {
- Proof Record + + Proof Record +
diff --git a/src/pages/Proof/Reply_Public/index.js b/src/pages/Proof/Reply_Public/index.js index 80cc52c..bed3ac6 100644 --- a/src/pages/Proof/Reply_Public/index.js +++ b/src/pages/Proof/Reply_Public/index.js @@ -84,11 +84,11 @@ const Index = () => { : ( - +
- + diff --git a/src/pages/Proof/Search_Public/index.js b/src/pages/Proof/Search_Public/index.js index 4aed5a9..b0de3f1 100644 --- a/src/pages/Proof/Search_Public/index.js +++ b/src/pages/Proof/Search_Public/index.js @@ -82,9 +82,9 @@ const UserSearchPage_Individual = () => { : -
- - +
+ + diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index 88a9e35..d9d9da9 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -132,7 +132,7 @@ const PublicNoticeApplyForm = ({ loadedData, selections }) => {
- + diff --git a/src/pages/PublicNotice/Details_Public/index.js b/src/pages/PublicNotice/Details_Public/index.js index 3139c29..7744770 100644 --- a/src/pages/PublicNotice/Details_Public/index.js +++ b/src/pages/PublicNotice/Details_Public/index.js @@ -154,7 +154,7 @@ const DashboardDefault = () => {
- + diff --git a/src/pages/PublicNotice/ListPanel/index.js b/src/pages/PublicNotice/ListPanel/index.js index 06a8a77..2d36982 100644 --- a/src/pages/PublicNotice/ListPanel/index.js +++ b/src/pages/PublicNotice/ListPanel/index.js @@ -108,7 +108,7 @@ const PublicNotice = () => {
- + @@ -129,7 +129,7 @@ const PublicNotice = () => { { JSON.parse(localStorage.getItem('userData')).creditor ? ( - + diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js index c780d1e..08ed36f 100644 --- a/src/pages/User/DetailsPage_Individual/index.js +++ b/src/pages/User/DetailsPage_Individual/index.js @@ -125,9 +125,11 @@ const UserMaintainPage_Individual = () => {
{isGLDLoggedIn()? - Maintain Individual User + + Maintain Individual User + : - + } diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js index 91bc1a7..0831cb9 100644 --- a/src/pages/User/DetailsPage_Organization/index.js +++ b/src/pages/User/DetailsPage_Organization/index.js @@ -186,9 +186,11 @@ const UserMaintainPage_Organization = () => {
{isGLDLoggedIn()? - Maintain Organisation User + + Maintain Organisation User + : - + } diff --git a/src/pages/User/GLDUserProfile/index.js b/src/pages/User/GLDUserProfile/index.js index e253354..f77df99 100644 --- a/src/pages/User/GLDUserProfile/index.js +++ b/src/pages/User/GLDUserProfile/index.js @@ -82,7 +82,9 @@ const UserMaintainPage = () => {
- User Profile + + User Profile +
diff --git a/src/pages/User/ManagePage_OrgPublic/index.js b/src/pages/User/ManagePage_OrgPublic/index.js index 42fcf9e..cf7fa21 100644 --- a/src/pages/User/ManagePage_OrgPublic/index.js +++ b/src/pages/User/ManagePage_OrgPublic/index.js @@ -222,7 +222,7 @@ const ManageOrgUserPage = () => {
- + diff --git a/src/pages/dashboard/GLD/index.js b/src/pages/dashboard/GLD/index.js index f720e4c..4d6443f 100644 --- a/src/pages/dashboard/GLD/index.js +++ b/src/pages/dashboard/GLD/index.js @@ -25,7 +25,9 @@ const DashboardDefault = () => {
- Morning, {userData.fullenName} + + Morning, {userData.fullenName} +