Merge branch 'master' of https://git.2fi-solutions.com/alex/PNSPS-frontend-MaterialUI

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}<br />
-                    {contact}
+                    {params?.value}<br />{company}
                 </>);
             }
         },

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}<br />
-                    {contact}
+                    {params?.value}<br />{company}
                 </>);
             }
         },

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}<br />
-                    {contact}
+                    {params?.value}<br />{company}
                 </>);
             }
         },

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

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}<br />
-                    {contact}
+                    {params?.value}<br />{company}
                 </>);
             }
         },

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

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: