diff --git a/src/layout/MainLayout/Header/index.js b/src/layout/MainLayout/Header/index.js
index 7a33057..f4c2714 100644
--- a/src/layout/MainLayout/Header/index.js
+++ b/src/layout/MainLayout/Header/index.js
@@ -138,7 +138,7 @@ function Header(props) {
Settings
-
- Users Profile
+ My Profile
-
Email Template
@@ -242,6 +242,7 @@ function Header(props) {
console.log(event)}>
+
-
@@ -260,6 +261,7 @@ function Header(props) {
console.log(event)}>
+
-
diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js
index 43498b2..f12a87c 100644
--- a/src/pages/DemandNote/Search/DataGrid.js
+++ b/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 ? "
" + DateUtils.datetimeStr(params.row.sentDate) + " - " + params.row.sentBy : " / To be sent"}
+ >);
}
},
{
@@ -253,14 +248,6 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch })
return ;
},
},
- {
- field: 'appStatus',
- headerName: 'App Status',
- width: 175,
- renderCell: (params) => {
- return [PublicNoteStatusUtils.getStatusByTextEng(params?.value, true)]
- },
- },
{
field: 'status',
headerName: 'Status',
diff --git a/src/pages/Proof/Search_GLD/DataGrid.js b/src/pages/Proof/Search_GLD/DataGrid.js
index 1d95455..983df0a 100644
--- a/src/pages/Proof/Search_GLD/DataGrid.js
+++ b/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 ;
@@ -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;
diff --git a/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js b/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
index 140ab29..8340e37 100644
--- a/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
+++ b/src/pages/PublicNotice/Details_GLD/tabTableDetail/TabTable.js
@@ -76,9 +76,9 @@ const PublicNotice = ({ applicationDetailData, proofList, paymentList }) => {
-
-
-
+
+
+
diff --git a/src/pages/PublicNotice/Details_Public/tabTableDetail/TabTable.js b/src/pages/PublicNotice/Details_Public/tabTableDetail/TabTable.js
index 0785c20..5ad915f 100644
--- a/src/pages/PublicNotice/Details_Public/tabTableDetail/TabTable.js
+++ b/src/pages/PublicNotice/Details_Public/tabTableDetail/TabTable.js
@@ -59,11 +59,11 @@ const PublicNotice = ({ proofList, paymentList }) => {
diff --git a/src/pages/PublicNotice/Search_GLD/DataGrid.js b/src/pages/PublicNotice/Search_GLD/DataGrid.js
index 3f3237a..ae8c290 100644
--- a/src/pages/PublicNotice/Search_GLD/DataGrid.js
+++ b/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)
diff --git a/src/pages/User/GLDUserProfile/index.js b/src/pages/User/GLDUserProfile/index.js
index 75353ef..499ab82 100644
--- a/src/pages/User/GLDUserProfile/index.js
+++ b/src/pages/User/GLDUserProfile/index.js
@@ -87,7 +87,7 @@ const UserMaintainPage = () => {
- User Profile
+ My Profile
diff --git a/src/pages/authentication/RegisterCustom.js b/src/pages/authentication/RegisterCustom.js
index 33d236f..7edb756 100644
--- a/src/pages/authentication/RegisterCustom.js
+++ b/src/pages/authentication/RegisterCustom.js
@@ -80,7 +80,7 @@ const RegisterCustom = () => {
-
+
{" " + intl.formatMessage({id: 'registerTitle2'}) + " "}
diff --git a/src/translations/en.json b/src/translations/en.json
index 2709d54..fa4a603 100644
--- a/src/translations/en.json
+++ b/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)",
diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json
index 4a92306..72be87f 100644
--- a/src/translations/zh-CN.json
+++ b/src/translations/zh-CN.json
@@ -366,7 +366,7 @@
"msgDetails": "消息详情",
"userDetail": "用户详细信息",
- "userProfile": "用户个人资料",
+ "userProfile": "我的个人资料",
"primaryUser": "主要用户",
"resetAndBack": "重置并返回",
"edit": "编辑",
diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json
index 6828519..b4537a5 100644
--- a/src/translations/zh-HK.json
+++ b/src/translations/zh-HK.json
@@ -371,7 +371,7 @@
"msgDetails": "消息詳情",
"userDetail": "使用者詳細資料",
- "userProfile": "使用者個人資料",
+ "userProfile": "我的個人資料",
"primaryUser": "主要使用者",
"resetAndBack": "重置並返回",
"edit": "編輯",
diff --git a/src/utils/DateUtils.js b/src/utils/DateUtils.js
index 03ca962..14821f1 100644
--- a/src/utils/DateUtils.js
+++ b/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) =>{