fix table field for dummy user

src/pages/DemandNote/Export/DataGrid.js

@@ -77,9 +77,9 @@ export default function SearchPublicNoticeTable({ searchCriteria,}) {
                 // let user = params.row.enCompanyName != null ? params.row.enCompanyName : params.row.chCompanyName;
                 let user = params.row.contactPerson;
                 // user = user != null ? user : "";
-                if (params.row.sysType != null && params.row.sysType == "dummy"){
-                    user = "Dummy - PD"
-                }
+                // if (params.row.sysType != null && params.row.sysType == "dummy"){
+                //     user = "Dummy - PD"
+                // }
                 return <div>
                    {user}
                 </div>;

src/pages/Proof/Search_Public/DataGrid.js

@@ -11,6 +11,7 @@ import { useNavigate } from "react-router-dom";
 import { FiDataGrid } from "components/FiDataGrid";
 import {
     isORGLoggedIn,
+    isDummyLoggedIn,
 } from "utils/Utils";
 import { useTheme } from "@emotion/react";
 import { useIntl } from "react-intl";
@@ -122,7 +123,7 @@ export default function SearchPublicNoticeTable({ searchCriteria, applyGridOnRea
                 let isssue = getIssueLabel(params);
 
                 // return <div style={{ margin: 4 }}>{appNo}<br />{isssue}<br />{params.row.appRemarks}</div>
-                return <div style={{ margin: 4 }}>{isssue}<br />{isORGLoggedIn() ? <>{params.row.appCareOf}<br /></> : null}{params.row.appRemarks}</div>
+                return <div style={{ margin: 4 }}>{isssue}<br />{isORGLoggedIn() ? isDummyLoggedIn()?<><>GLD: {params.row.applicant}<br /></><>{params.row.appCareOf}<br /></></>:<>{params.row.appCareOf}<br /></> : null}{params.row.appRemarks}</div>
             },
         },
         {

src/pages/PublicNotice/ListPanel/BaseGrid.js

@@ -10,6 +10,7 @@ import * as DateUtils from "utils/DateUtils"
 import {useNavigate} from "react-router-dom";
 import {
     isORGLoggedIn,
+    isDummyLoggedIn,
   } from "utils/Utils";
 import {useTheme} from "@emotion/react";
 import {getStatusIntl} from "utils/statusUtils/PublicNoteStatusUtils";
@@ -54,13 +55,21 @@ export default function BaseGrid({setCount, url}) {
             flex: isMdOrLg ? 3 : undefined,
             renderCell: (params) => (
                 isORGLoggedIn()? 
-                <div>
-                    <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
-                            + " No. " + params.row.issueNo}<br />
-                    <FormattedMessage id="careOf" />: {params.row.careOf} <br/>
-                    <FormattedMessage variant="pnspsNormalText" id="myRemarks"/>: {params.row.remarks}
-    
-                </div>:
+                    isDummyLoggedIn()?
+                        <div>
+                            <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
+                                + " No. " + params.row.issueNo}<br />
+                            GLD: {params.row.custName} <br />
+                            <FormattedMessage id="careOf" />: {params.row.careOf} <br />
+                            <FormattedMessage id="myRemarks" />: {params.row.remarks}
+                        </div>:
+                        <div>
+                            <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
+                                + " No. " + params.row.issueNo}<br />
+                            <FormattedMessage id="careOf" />: {params.row.careOf} <br />
+                            <FormattedMessage id="myRemarks" />: {params.row.remarks}
+                        </div> 
+                :
                 <div>
                     <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
                             + " No. " + params.row.issueNo}<br />

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -23,6 +23,7 @@ import * as StatusUtils from "utils/statusUtils/PublicNoteStatusUtils";
 import { useNavigate } from "react-router-dom";
 import {
     isORGLoggedIn,
+    isDummyLoggedIn,
 } from "utils/Utils";
 // import { dateStr } from "utils/DateUtils";
 import { ThemeProvider, useTheme } from "@emotion/react";
@@ -193,12 +194,21 @@ export default function SubmittedTab({ setCount, url }) {
             flex: isMdOrLg ? 3 : undefined,
             renderCell: (params) => (
                 isORGLoggedIn() ?
-                    <div>
-                        <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
-                            + " No. " + params.row.issueNo}<br />
-                        <FormattedMessage id="careOf" />: {params.row.careOf}<br />
-                        <FormattedMessage id="myRemarks" />: {params.row.remarks}
-                    </div> :
+                        isDummyLoggedIn()?
+                        <div>
+                            <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
+                                + " No. " + params.row.issueNo}<br />
+                            GLD: {params.row.custName} <br />
+                            <FormattedMessage id="careOf" />: {params.row.careOf} <br />
+                            <FormattedMessage id="myRemarks" />: {params.row.remarks}
+                        </div>:
+                        <div>
+                            <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
+                                + " No. " + params.row.issueNo}<br />
+                            <FormattedMessage id="careOf" />: {params.row.careOf} <br />
+                            <FormattedMessage id="myRemarks" />: {params.row.remarks}
+                        </div> 
+                    :
                     <div>
                         <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
                             + " No. " + params.row.issueNo}<br />

src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js

@@ -10,6 +10,7 @@ import { useNavigate } from "react-router-dom";
 import { FiDataGrid } from "components/FiDataGrid";
 import {
     isORGLoggedIn,
+    isDummyLoggedIn,
 } from "utils/Utils";
 import {GET_PUBLIC_NOTICE_LIST} from "utils/ApiPathConst";
 import { useTheme } from "@emotion/react";
@@ -85,12 +86,21 @@ export default function SearchPublicNoticeTable({ searchCriteria }) {
             flex: isMdOrLg ? 3 : undefined,
             renderCell: (params) => (
                 isORGLoggedIn() ?
-                    <div>
-                        <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
-                            + " No. " + params.row.issueNo}<br />
-                        <FormattedMessage id="careOf" />: {params.row.careOf} <br />
-                        <FormattedMessage id="myRemarks" />: {params.row.remarks}
-                    </div> :
+                    isDummyLoggedIn()?
+                        <div>
+                            <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
+                                + " No. " + params.row.issueNo}<br />
+                            GLD: {params.row.custName} <br />
+                            <FormattedMessage id="careOf" />: {params.row.careOf} <br />
+                            <FormattedMessage id="myRemarks" />: {params.row.remarks}
+                        </div>:
+                        <div>
+                            <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
+                                + " No. " + params.row.issueNo}<br />
+                            <FormattedMessage id="careOf" />: {params.row.careOf} <br />
+                            <FormattedMessage id="myRemarks" />: {params.row.remarks}
+                        </div> 
+                    :
                     <div>
                         <FormattedMessage id="gazetteCount" />: {params.row.issueVolume + "/" + params.row.issueYear
                             + " No. " + params.row.issueNo}<br />