alex
/
PNSPS-frontend-MaterialUI
1
0
複製 0
程式碼 問題 0 合併請求 0 版本發佈 0 Wiki 活動
瀏覽代碼

label update

master
Jason Chuang 1 年之前
父節點
561a40f92a
當前提交
26793a20df
共有 12 個檔案被更改，包括 40 行新增 和 51 行删除
分割檢視
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -1
      src/layout/MainLayout/Header/index.js
  2. +9
    -22
      src/pages/DemandNote/Search/DataGrid.js
  3. +2
    -2
      src/pages/Proof/Search_GLD/DataGrid.js
  4. +3
    -3
      src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
  5. +2
    -2
      src/pages/PublicNotice/Details_Public/tabTableDetail/TabTable.js
  6. +2
    -2
      src/pages/PublicNotice/Search_GLD/DataGrid.js
  7. +1
    -1
      src/pages/User/GLDUserProfile/index.js
  8. +1
    -1
      src/pages/authentication/RegisterCustom.js
  9. +14
    -14
      src/translations/en.json
  10. +1
    -1
      src/translations/zh-CN.json
  11. +1
    -1
      src/translations/zh-HK.json
  12. +1
    -1
      src/utils/DateUtils.js

+ 3
- 1
src/layout/MainLayout/Header/index.js 查看文件

@@ -138,7 +138,7 @@ function Header(props) {
<Link className="setting" ><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }}>Settings</Typography><KeyboardArrowDownIcon sx={{ fontSize: '1.0rem' }} /></Link>
<ul className='dropdown'>
<li>
<Link className="userProfileGld" to='/user/profile'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>Users Profile</Typography></Link>
<Link className="userProfileGld" to='/user/profile'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>My Profile</Typography></Link>
</li>
<li>
<Link className="emailTemplate" to='/emailTemplate'><Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 2, mt: 1, mb: 1 }}>Email Template</Typography></Link>
@@ -242,6 +242,7 @@ function Header(props) {
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }} onClick={(event) => console.log(event)}>
<FormattedMessage id="setting" />
</Typography>
<KeyboardArrowDownIcon sx={{ fontSize: '1.0rem' }} />
</Link>
<ul className='dropdown' style={{ width: "max-content" }}>
<li>
@@ -260,6 +261,7 @@ function Header(props) {
<Typography style={{ opacity: 0.9 }} variant={"pnspsHeaderTitle"} sx={{ ml: 1 }} onClick={(event) => console.log(event)}>
<FormattedMessage id="setting" />
</Typography>
<KeyboardArrowDownIcon sx={{ fontSize: '1.0rem' }} />
</Link>
<ul className='dropdown' style={{ width: "max-content" }}>
<li>


+ 9
- 22
src/pages/DemandNote/Search/DataGrid.js 查看文件

@@ -11,7 +11,6 @@ import DownloadIcon from '@mui/icons-material/Download';
import * as DateUtils from "utils/DateUtils";
import * as FormatUtils from "utils/FormatUtils";
import * as StatusUtils from "utils/statusUtils/DnStatus";
import * as PublicNoteStatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
import { useNavigate } from "react-router-dom";
import { FiDataGrid } from "components/FiDataGrid";
import { notifyDownloadSuccess } from 'utils/CommonFunction';
@@ -200,7 +199,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
},
{
field: 'cm',
headerName: 'Length(cm)',
headerName: 'Length',
width: 100,
renderCell: (params) => {
return (<>
@@ -213,6 +212,7 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
field: 'amount',
headerName: 'Amount($)',
width: 100,
align: 'right',
valueGetter: (params) => {
return FormatUtils.currencyFormat(params?.value);
}
@@ -228,18 +228,13 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
{
id: 'issueDate',
field: 'issueDate',
headerName: 'DN Issue/Due Date',
width: 175,
valueGetter: (params) => {
return DateUtils.dateStr(params?.value);
}
},
{
field: 'sentDate',
headerName: 'DN Sent Date',
width: 175,
valueGetter: (params) => {
return params?.value ? DateUtils.datetimeStr(params?.value) + " - " + params.row.sentBy : "";
headerName: 'Due Date / Sent Date',
width: 250,
renderCell: (params) => {
return (<>
{DateUtils.dateStr(params?.value)}
{params.row.sentDate ? "<br />" + DateUtils.datetimeStr(params.row.sentDate) + " - " + params.row.sentBy : " / To be sent"}
</>);
}
},
{
@@ -253,14 +248,6 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
return <Button onClick={onDownloadClick(params)}><u>{params.row.filename}</u></Button>;
},
},
{
field: 'appStatus',
headerName: 'App Status',
width: 175,
renderCell: (params) => {
return [PublicNoteStatusUtils.getStatusByTextEng(params?.value, true)]
},
},
{
field: 'status',
headerName: 'Status',


+ 2
- 2
src/pages/Proof/Search_GLD/DataGrid.js 查看文件

@@ -26,7 +26,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
{
field: 'actions',
headerName: 'Proof No.',
width: 150,
width: 170,
cellClassName: 'actions',
renderCell: (params) => {
return <Button onClick={handleEditClick(params)}><u>{params.row.refNo}</u></Button>;
@@ -36,7 +36,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
id: 'appId',
field: 'appId',
headerName: 'Application No./ Gazette Code/ Gazette Issue',
flex: 1.5,
width: 400,
renderCell: (params) => {
let appNo = params.row.appNo;
let code = params.row.groupNo;


+ 3
- 3
src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js 查看文件

@@ -76,9 +76,9 @@ const PublicNotice = ({ applicationDetailData, proofList, paymentList }) => {
<TabContext value={selectedTab}>
<Box sx={{ borderBottom: 1, borderColor: 'divider', overflowX: 'auto' }}>
<TabList onChange={handleChange} aria-label="lab API tabs example">
<Tab label={"Proof(" + _proofList?.length + ") "} value="1" />
<Tab label={"Payment(" + _paymentList.length + ") "} value="2" />
<Tab label={"Status History(" + statusHistoryList.length + ") "} value="3" />
<Tab label={"Proof (" + _proofList?.length + ") "} value="1" />
<Tab label={"Payment (" + _paymentList.length + ") "} value="2" />
<Tab label={"Status History (" + statusHistoryList.length + ") "} value="3" />
</TabList>
</Box>
<TabPanel value="1" sx={{p:0}}>


+ 2
- 2
src/pages/PublicNotice/Details_Public/tabTableDetail/TabTable.js 查看文件

@@ -59,11 +59,11 @@ const PublicNotice = ({ proofList, paymentList }) => {
<Tab
aria-label={intl.formatMessage({id: 'proofRecord'})}
label={
intl.formatMessage({id: 'proofRecord'}) + "(" + _proofList.length + ") "} value="1"
intl.formatMessage({id: 'proofRecord'}) + " (" + _proofList.length + ") "} value="1"
/>
<Tab
aria-label={intl.formatMessage({id: 'paymentHistory'})}
label={ intl.formatMessage({id: 'paymentHistory'}) +"(" + _paymentList.length + ") "} value="2"
label={ intl.formatMessage({id: 'paymentHistory'}) +" (" + _paymentList.length + ") "} value="2"
/>
</TabList>
</Box>


+ 2
- 2
src/pages/PublicNotice/Search_GLD/DataGrid.js 查看文件

@@ -85,7 +85,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
id: 'groupNo',
field: 'groupNo',
headerName: 'Gazette Group',
flex: 1,
flex: 0.5,
valueGetter: (params) => {
return (params?.value) ? (params?.value) : "";
}
@@ -94,7 +94,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
id: 'issueId',
field: 'issueId',
headerName: 'Issue No',
flex: 1,
flex: 1.5,
valueGetter: (params) => {
return params.row.issueYear
+ " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3)


+ 1
- 1
src/pages/User/GLDUserProfile/index.js 查看文件

@@ -87,7 +87,7 @@ const UserMaintainPage = () => {
<div style={BackgroundHead}>
<Stack direction="row" height='70px' justifyContent="flex-start" alignItems="center">
<Typography ml={15} color='#FFF' variant="h4" sx={{display: { xs: 'none', sm: 'none', md: 'block', pt:2 }}}>
User Profile
My Profile
</Typography>
</Stack>
</div>


+ 1
- 1
src/pages/authentication/RegisterCustom.js 查看文件

@@ -80,7 +80,7 @@ const RegisterCustom = () => {
<Box alignItems="center">
<Grid container>
<Grid item xs={12} md={12}>
<Typography mt={4} variant="h2">
<Typography mt={4} variant="h3">
<FormattedMessage id="registerTitle1"/>
<strong style={{ color: '#FF5733' }}>
{" " + intl.formatMessage({id: 'registerTitle2'}) + " "}


+ 14
- 14
src/translations/en.json 查看文件

@@ -53,7 +53,7 @@
"publicNoticePaymentProofDoneAndPaid": "Public Notice: Proofreading Completed and Payment",
"publicNoticePaymentProofComment": "Public Notice: Proofreading Reply",
"publicNoticePaymentProofInfo": "Public Notice: Proofreading Information",
"proofRecord": "Proof Record",
"proofRecord": "Proof Records",
"onlinePaymentHistory": "Online Payment History",
"setting": "Settings",
"companyOrUserRecord": "Company/Institutional User Records",
@@ -96,20 +96,20 @@
"user": "User",
"personalUser": "Personal user",
"becomeNewPersonalUser": "Become New Personal User",
"registerNewPersonalUser": "Apply for personal user",
"businessUser": "Organization/Company User",
"registerNewBusinessUser": "Applying Organization/Company user",
"becomeNewBusinessUser": "Become New Organization/Company user",
"registerNewPersonalUser": "Apply as personal user",
"businessUser": "Organisation/Company User",
"registerNewBusinessUser": "Apply as organisation/company user",
"becomeNewBusinessUser": "Become New Organisation/Company user",
"userName": "Username",
"userChineseName": "Chinese Name",
"userEnglishName": "English Name",
"userContactName": "Name",
"userRequireChineseName": "Please enter your Chinese name",
"userRequireEnglishName": "Please enter your English name",
"userRequireName": "Please enter your name",
"userRequireName": "Name is required.",
"userContactEmail": "Email",
"confirmEmail": "Confirm Email",
"requireEmail": "Please enter your email",
"requireEmail": "Email address is required.",
"validEmailFormat": "Please enter a valid email",
"validSameEmail": "Please enter same email address",
"emailUsed": "This email has been registered, please use another email",
@@ -117,7 +117,7 @@
"userContactNumber": "Contact Number",
"contactFaxNumber": "Contact Fax",
"requiredValidNumber": "Please enter a valid contact number",
"requireContactNumber": "Please enter your contact number",
"requireContactNumber": "Contact number is required.",
"require3Number": "Please enter an 3-digit number",
"require8Number": "Please enter an 8-digit number",
"requireAtLeast8Number": "Please enter at least 8 digits",
@@ -135,9 +135,9 @@
"personalInformation": "Personal Information",
"yourPersonalInformation": "Your Personal Information",
"yourLoginInformation": "Your Login Information",
"yourBusinessInformation": "Your Organization/Company Information",
"businessEngName": "English name of Organization/Company",
"businessChName": "Chinese name of Organization/Company",
"yourBusinessInformation": "Your Organisation/Company Information",
"businessEngName": "English name of Organisation/Company",
"businessChName": "Chinese name of Organisation/Company",
"preview": "Preview",
"finishSubmission": "Finish Submission",
"reset": "Reset",
@@ -370,7 +370,7 @@
"msgDetails": "Message Details",

"userDetail": "User Details",
"userProfile": "User Profile",
"userProfile": "My Profile",
"primaryUser": "Primary User",
"resetAndBack": "Reset & Back",
"edit": "Edit",
@@ -389,8 +389,8 @@
"loading": "Loading...",
"ok": "Ok",

"organizationProfile": "Organization Profile",
"organizationDetails": "Organization Details",
"organizationProfile": "Organisation Profile",
"organizationDetails": "Organisation Details",
"brNo": "BR No.",
"creditorAccount": "Creditor account",
"nameEng": "Name (Eng)",


+ 1
- 1
src/translations/zh-CN.json 查看文件

@@ -366,7 +366,7 @@
"msgDetails": "消息详情",

"userDetail": "用户详细信息",
"userProfile": "用户个人资料",
"userProfile": "我的个人资料",
"primaryUser": "主要用户",
"resetAndBack": "重置并返回",
"edit": "编辑",


+ 1
- 1
src/translations/zh-HK.json 查看文件

@@ -371,7 +371,7 @@
"msgDetails": "消息詳情",

"userDetail": "使用者詳細資料",
"userProfile": "使用者個人資料",
"userProfile": "我的個人資料",
"primaryUser": "主要使用者",
"resetAndBack": "重置並返回",
"edit": "編輯",


+ 1
- 1
src/utils/DateUtils.js 查看文件

@@ -2,7 +2,7 @@ import dayjs from 'dayjs';

export const datetimeStr = (date) =>{
return dateFormat(date,"DD-MM-YYYY HH:mm:ss")
return dateFormat(date,"YYYY-MM-DD HH:mm:ss")
};

export const dateStr = (date) =>{


Write Preview
Loading…
取消
儲存