diff --git a/src/pages/DemandNote/Create/DataGrid.js b/src/pages/DemandNote/Create/DataGrid.js index 7e7487f..74b9389 100644 --- a/src/pages/DemandNote/Create/DataGrid.js +++ b/src/pages/DemandNote/Create/DataGrid.js @@ -68,8 +68,9 @@ export default function SearchPublicNoticeTable({ recordList }) { flex: 1, renderCell: (params) => { let company = params.row.enCompanyName != null?params.row.enCompanyName: params.row.chCompanyName; - company = company != null ? " (" + (company) + ")" : ""; + company = company != null ? company : ""; + /* let phone = JSON.parse(params.row.contactTelNo); let faxNo = JSON.parse(params.row.contactFaxNo); @@ -83,10 +84,10 @@ export default function SearchPublicNoticeTable({ recordList }) { contact = contact + ", " contact = contact + "Fax No.:" + faxNo?.countryCode + " " + faxNo?.faxNumber } + */ return (<> - {params?.value + company}
- {contact} + {params?.value}
{company} ); } }, diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js index 965a33f..ef85bcf 100644 --- a/src/pages/DemandNote/Search/DataGrid.js +++ b/src/pages/DemandNote/Search/DataGrid.js @@ -172,9 +172,10 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) headerName: 'Client', width: 300, renderCell: (params) => { - let company = params.row.enCompanyName != null ? params.row.enCompanyName : params.row.chCompanyName; - company = company != null ? " (" + (company) + ")" : ""; + let company = params.row.enCompanyName != null?params.row.enCompanyName: params.row.chCompanyName; + company = company != null ? company : ""; + /* let phone = JSON.parse(params.row.contactTelNo); let faxNo = JSON.parse(params.row.contactFaxNo); @@ -188,10 +189,10 @@ export default function SearchDemandNote({ recordList, reloadFun, applySearch }) contact = contact + ", " contact = contact + "Fax No.:" + faxNo?.countryCode + " " + faxNo?.faxNumber } + */ return (<> - {params?.value + company}
- {contact} + {params?.value}
{company} ); } }, diff --git a/src/pages/Proof/Search_GLD/DataGrid.js b/src/pages/Proof/Search_GLD/DataGrid.js index 71e7984..a1810a9 100644 --- a/src/pages/Proof/Search_GLD/DataGrid.js +++ b/src/pages/Proof/Search_GLD/DataGrid.js @@ -78,12 +78,13 @@ export default function SearchPublicNoticeTable({ recordList }) { { id: 'contactPerson', field: 'contactPerson', - headerName: 'Contact Person', + headerName: 'Client', flex: 1, renderCell: (params) => { let company = params.row.enCompanyName != null?params.row.enCompanyName: params.row.chCompanyName; - company = company != null ? " (" + (company) + ")" : ""; + company = company != null ? company : ""; + /* let phone = JSON.parse(params.row.contactTelNo); let faxNo = JSON.parse(params.row.contactFaxNo); @@ -97,10 +98,10 @@ export default function SearchPublicNoticeTable({ recordList }) { contact = contact + ", " contact = contact + "Fax No.:" + faxNo?.countryCode + " " + faxNo?.faxNumber } + */ return (<> - {params?.value + company}
- {contact} + {params?.value}
{company} ); } }, diff --git a/src/pages/Proof/Search_GLD/SearchForm.js b/src/pages/Proof/Search_GLD/SearchForm.js index d803a2c..f364d23 100644 --- a/src/pages/Proof/Search_GLD/SearchForm.js +++ b/src/pages/Proof/Search_GLD/SearchForm.js @@ -215,7 +215,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss fullWidth {...register("contact")} id="contact" - label="Contact Person" + label="Client" defaultValue={searchCriteria.contact} InputLabelProps={{ shrink: true diff --git a/src/pages/PublicNotice/Search_GLD/DataGrid.js b/src/pages/PublicNotice/Search_GLD/DataGrid.js index 61bbfb7..617e81a 100644 --- a/src/pages/PublicNotice/Search_GLD/DataGrid.js +++ b/src/pages/PublicNotice/Search_GLD/DataGrid.js @@ -59,8 +59,9 @@ export default function SearchPublicNoticeTable({ recordList }) { flex: 2, renderCell: (params) => { let company = params.row.enCompanyName != null?params.row.enCompanyName: params.row.chCompanyName; - company = company != null ? " (" + (company) + ")" : ""; + company = company != null ? company : ""; + /* let phone = JSON.parse(params.row.contactTelNo); let faxNo = JSON.parse(params.row.contactFaxNo); @@ -74,10 +75,10 @@ export default function SearchPublicNoticeTable({ recordList }) { contact = contact + ", " contact = contact + "Fax No.:" + faxNo?.countryCode + " " + faxNo?.faxNumber } + */ return (<> - {params?.value + company}
- {contact} + {params?.value}
{company} ); } }, diff --git a/src/pages/PublicNotice/Search_GLD/SearchForm.js b/src/pages/PublicNotice/Search_GLD/SearchForm.js index ee63347..b0376c6 100644 --- a/src/pages/PublicNotice/Search_GLD/SearchForm.js +++ b/src/pages/PublicNotice/Search_GLD/SearchForm.js @@ -162,7 +162,7 @@ const SearchPublicNoticeForm = ({ applySearch, orgComboData, searchCriteria, iss fullWidth {...register("contact")} id="contact" - label={"Contact Person"} + label={"Client"} defaultValue={searchCriteria.contact} InputLabelProps={{ shrink: true diff --git a/src/utils/statusUtils/PublicNoteStatusUtils.js b/src/utils/statusUtils/PublicNoteStatusUtils.js index 64cdc31..4b67d0a 100644 --- a/src/utils/statusUtils/PublicNoteStatusUtils.js +++ b/src/utils/statusUtils/PublicNoteStatusUtils.js @@ -61,7 +61,7 @@ export function getStatusByTextEng(status, creditor) { case "resubmit": return getStatusTag({ color: "#757373", text: "Re-submit Required" }) case "cancelled": - return getStatusTag({ color: "#f5a83d", text: "Cancelled" }) + return getStatusTag({ color: "#8a8784", text: "Cancelled" }) case "withdrawn": return getStatusTag({ color: "#8a8784", text: "Withdrawn" }) default: