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

src/auth/utils.js

@@ -10,8 +10,8 @@ export const hostname = 'localhost';
 const hostPort = '8090';
 export const hostPath = `http://${hostname}:${hostPort}`;
 //export const apiPath = `http://192.168.0.112:8090/api`;
-// export const apiPath = `${hostPath}/api`;
-export const apiPath = `/api`;
+export const apiPath = `${hostPath}/api`;
+//export const apiPath = `/api`;
 export const paymentPath = `https://pnspsdev.gld.gov.hk/payment`;
 export const iAmSmartPath = `https://<iAM_Smart_domain>`;
 

src/pages/Proof/Search_Public/DataGrid.js

@@ -59,7 +59,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             field: 'actions',
             headerName: '校對編號',
-            width: 150,
+            width: 250,
             cellClassName: 'actions',
             renderCell: (params) => {
                 return <Button onClick={handleEditClick(params)}><u>{params.row.refNo}</u></Button>;
@@ -68,7 +68,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
         {
             id: 'appId',
             field: 'appId',
-            headerName: '申請編號 / 憲報期數',
+            headerName: '申請編號 / 憲報期數 / 我的備註',
             flex: 1,
             renderCell: (params) => {
                 let appNo = params.row.appNo;
@@ -78,14 +78,14 @@ export default function SearchPublicNoticeTable({ recordList }) {
                     + ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2)
                     + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)");
 
-                return <div style={{ margin: 4 }}>{appNo}<br />{isssue}</div>
+                return <div style={{ margin: 4 }}>{appNo}<br />{isssue}<br />{params.row.appRemarks}</div>
             },
         },
         {
             id: 'created',
             field: 'created',
             headerName: '校對日期',
-            flex: 1,
+            width: 250,
             valueGetter: (params) => {
                 return DateUtils.datetimeStr(params?.value);
             }
@@ -94,7 +94,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             id: 'returnBeforeDate',
             field: 'returnBeforeDate',
             headerName: '此日期前回覆',
-            flex: 1,
+            width: 250,
             valueGetter: (params) => {
                 let returnBeforeDate = DateUtils.convertToDate(params?.value);
                 returnBeforeDate = returnBeforeDate.setHours(14, 0, 0, 0);
@@ -105,7 +105,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             id: 'replyDate',
             field: 'replyDate',
             headerName: '回覆日期',
-            flex: 1,
+            width: 250,
             valueGetter: (params) => {
                 return params?.value ? DateUtils.datetimeStr(params?.value) : "";
             }
@@ -123,7 +123,7 @@ export default function SearchPublicNoticeTable({ recordList }) {
             id: 'fee',
             field: 'fee',
             headerName: '費用',
-            flex: 1,
+            width: 250,
             valueGetter: (params) => {
                 return (params?.value) ? "$ " + FormatUtils.currencyFormat(params?.value) : "";
             }

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -94,7 +94,7 @@ export default function SubmittedTab({ rows }) {
             field: 'actions',
             type: 'actions',
             headerName: '',
-            width: 100,
+            width: 120,
             cellClassName: 'actions',
             renderCell: (params) => {
                 return <Button onClick={handleDetailClick(params)}>查看詳細</Button>;

src/utils/ComboData.js

@@ -66,6 +66,6 @@ export const proofPrice = [
 
 export const proofStatus = [
     { key: 0, labelCht: '全部', label: 'All',  type: 'all' }, 
-    { key: 1, labelCht: '已回覆', label:'Replyed',  type: 'T' }, // submitted and reviewed
-    { key: 2, labelCht: '未回覆', label:'Not reply yet', type: 'F' }, 
+    { key: 1, labelCht: '已回覆', label:'Replied',  type: 'T' }, // submitted and reviewed
+    { key: 2, labelCht: '未回覆', label:'Pending Reply', type: 'F' }, 
 ];

src/utils/statusUtils/ProofStatus.js

@@ -1,9 +1,9 @@
 import {getStatusTag} from "utils/statusUtils/Base";
 
-const confirm = {color:"#22a13f", eng:"Confirm", cht:"可以付印"}
-const unable = {color:"#d9372b", eng:"Unable to print", cht:"未能付印"}
-const timeOut = {color:"#8a8784", eng:"Timed out", cht:"回覆逾時"}
-const noReply = {color:"#f5a83d", eng:"No reply yet", cht:"未回覆"}
+const confirm = {color:"#22a13f", eng:"Confirmed", cht:"可以付印"}
+const unable = {color:"#d9372b", eng:"Re-proofing", cht:"未能付印"}
+const timeOut = {color:"#8a8784", eng:"No Reply", cht:"回覆逾時"}
+const noReply = {color:"#f5a83d", eng:"Pending Reply", cht:"未回覆"}
 
 export function getStatus_Cht(params) {
     let status = getStatus(params);