ORG user UI update

src/pages/DemandNote/Search_Public/DataGrid.js

@@ -80,7 +80,7 @@ export default function SearchDemandNote({ recordList }) {
                 <FiDataGrid
                     rows={rows}
                     columns={columns}
-                    customPageSize={100}
+                    customPageSize={10}
                     getRowHeight={() => 'auto'}
                 />
             </Box>

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) {

src/pages/Payment/Details_Public/DataGrid.js

@@ -72,7 +72,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 // console.log(params)
                 return <div style={{ margin: 4, textAlign:"left"}}>
                     <FormattedMessage id="gazetteSampleName"/><br/>
-                    {isORGLoggedIn()?<>Care Of: {params.row.careOf}<br /></>:null}
+                    {isORGLoggedIn()?<><FormattedMessage id="careOf"/>: {params.row.careOf}<br /></>:null}
                     <FormattedMessage id="applicationId"/>: {appNo}<br/>
                     <FormattedMessage id="gazetteDate"/>: {locale === 'en' ? DateUtils.dateStr(params.row.issueDate) : DateUtils.dateStr_Cht(params.row.issueDate)}<br/>
                     <FormattedMessage id="gazetteLength"/>: {params.row.length+ " cm"}</div>

src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js

@@ -304,7 +304,7 @@ const PublicNoticeApplyForm = ({ loadedData, _selections }) => {
                             {isORGLoggedIn()?
                                 <Grid item xs={12} md={12} lg={12} sx={{ mb: 1 }}>
                                     {FieldUtils.getTextField({
-                                        label: "Care Of:",
+                                        label: intl.formatMessage({id: 'careOf'}) + ":",
                                         valueName: "careOf",
                                         form: formik,
                                         // disabled: true

src/pages/PublicNotice/Details_Public/ApplicationDetailCard.js

@@ -615,7 +615,7 @@ const ApplicationDetailCard = (
                                     <Grid container alignItems={"center"}>
                                         <Grid item xs={12} md={3} lg={3}
                                             sx={{ display: 'flex', alignItems: 'center' }}>
-                                            <FormLabel><Typography variant="pnspsFormParagraph">Care Of:</Typography></FormLabel>
+                                            <FormLabel><Typography variant="pnspsFormParagraph"><FormattedMessage id="careOf" />:</Typography></FormLabel>
                                         </Grid>
                                         <Grid item xs={12} md={9} lg={9}>
                                             <Typography variant="pnspsFormParagraph">{currentApplicationDetailData.careOf}</Typography>

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}<br />
-        //             {contact}
-        //         </>);
-        //     }
-        // },
+    
         {
             id: 'remarks',
             field: 'remarks',
@@ -83,7 +57,7 @@ export default function BaseGrid({rows}) {
                 <div>
                     <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
                             + " No. " + params.row.issueNo}<br />
-                    Care Of: {params.row.careOf} <br/>
+                    <FormattedMessage id="careOf" />: {params.row.careOf} <br/>
                     <FormattedMessage variant="pnspsNormalText" id="myRemarks"/>: {params.row.remarks}
     
                 </div>:

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -187,7 +187,7 @@ export default function SubmittedTab({ rows }) {
             renderCell: (params) => (
                 isORGLoggedIn() ?
                     <div>
-                        Care Of: {params.row.careOf}<br />
+                        <FormattedMessage id="careOf" />: {params.row.careOf}<br />
                         <FormattedMessage id="myRemarks" />: {params.row.remarks}
                     </div> :
                     <div>
@@ -304,7 +304,7 @@ export default function SubmittedTab({ rows }) {
                 {isORGLoggedIn() ?
                     <Grid container direction="row" justifyContent="flex-start" alignItems="center" >
                         <Grid item xs={3} md={1}>
-                            <Typography variant="h5">Care Of:</Typography>
+                            <Typography variant="h5"><FormattedMessage id="careOf" />:</Typography>
                         </Grid>
                         <Grid item xs={8} md={2}>
                             <Autocomplete

src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js

@@ -127,8 +127,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                                 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

src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js

@@ -85,7 +85,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
                     <div>
                         <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
                             + " No. " + params.row.issueNo}<br />
-                        Care Of: {params.row.careOf} <br />
+                        <FormattedMessage id="careOf" />: {params.row.careOf} <br />
                         <FormattedMessage id="myRemarks" />: {params.row.remarks}
                     </div> :
                     <div>

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 = [
         {

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 = [
         {

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 = [
         {

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?",

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": "下载",

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": "下載",

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' }, 
 
 ];