application update

src/pages/PublicNotice/Search_GLD/DataGrid.js

@@ -35,7 +35,18 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
         setRows(recordList);
     }, [recordList]);
 
+    function genIssueNo(params) {
+        const issueNo = params.row.issueYear+ " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3)+ ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2)+ ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)")
+        return issueNo
+    }
 
+    function genGroupNo(params) {
+        let groupNo = params.row.groupNo
+        if (groupNo!=null){
+            groupNo = <><br/><div>{groupNo}</div></>
+        }
+        return groupNo
+    }
 
     const columns = [
         {
@@ -51,11 +62,20 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
             id: 'status',
             field: 'status',
             headerName: 'Status',
-            width: 300,
+            width: 240,
             renderCell: (params) => {
                 return [StatusUtils.getStatusEng(params)]
             },
         },
+        {
+            id: 'withProof',
+            field: 'withProof',
+            headerName: 'With Proof',
+            width: 120,
+            renderCell: (params) => {
+                return [params.row.proofId!=null?"Yes":""]
+            },
+        },
         {
             id: 'created',
             field: 'created',
@@ -97,28 +117,29 @@ export default function SearchPublicNoticeTable({ recordList, reloadFunction })
                 </>);
             }
         },
+        // {
+        //     id: 'groupNo',
+        //     field: 'groupNo',
+        //     headerName: 'Gazette Code',
+        //     flex: 0.5,
+        //     minWidth: 150,
+        //     valueGetter: (params) => {
+        //         return (params?.value) ? (params?.value) : "";
+        //     }
+        // },
         {
-            id: 'groupNo',
-            field: 'groupNo',
-            headerName: 'Gazette Code',
-            flex: 0.5,
-            minWidth: 150,
-            valueGetter: (params) => {
-                return (params?.value) ? (params?.value) : "";
-            }
-        },
-        {
-            id: 'issueId',
-            field: 'issueId',
-            headerName: 'Gazette Issue No.',
+            id: 'issueNoAndCode',
+            field: 'issueNoAndCode',
+            headerName: 'Gazette Issue No. / Gazette Code',
             flex: 1.5,
             minWidth: 350,
-            valueGetter: (params) => {
-                return params.row.issueYear
-                    + " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3)
-                    + ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2)
-                    + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)");
-            }
+            renderCell: (params) =>(
+                <div>
+                    {genIssueNo(params)}
+                    {genGroupNo(params)}
+                </div>
+                
+            )
         },
     ];
 

src/pages/Recon/SearchForm.js

@@ -222,18 +222,18 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
         let sentTxnDateTo = "";
         let sentCollDateFrom = "";
         let sentCollDateTo = "";
-
-        if (sysTxnFromDateValue != "dd / mm / yyyy" && sysTxnToDateValue != "dd / mm / yyyy") {
-            sentSysTxnDateFrom = DateUtils.dateValue(sysTxnFromDateValue)
-            sentSysTxnDateTo = DateUtils.dateValue(sysTxnToDateValue)
+        // Invalid Date
+        if (sysTxnFromDateValue != "dd / mm / yyyy" && sysTxnToDateValue != "dd / mm / yyyy" ) {
+            sentSysTxnDateFrom = DateUtils.dateValue(sysTxnFromDateValue)!="Invalid Date"?DateUtils.dateValue(sysTxnFromDateValue):""
+            sentSysTxnDateTo = DateUtils.dateValue(sysTxnToDateValue)!="Invalid Date"?DateUtils.dateValue(sysTxnToDateValue):""
         }
         if (txnFromDateValue != "dd / mm / yyyy" && txnToDateValue != "dd / mm / yyyy") {
-            sentTxnDateFrom = DateUtils.dateValue(txnFromDateValue)
-            sentTxnDateTo = DateUtils.dateValue(txnToDateValue)
+            sentTxnDateFrom = DateUtils.dateValue(txnFromDateValue)!="Invalid Date"?DateUtils.dateValue(txnFromDateValue):""
+            sentTxnDateTo = DateUtils.dateValue(txnToDateValue)!="Invalid Date"?DateUtils.dateValue(txnToDateValue):""
         }
         if (collFromDateValue != "dd / mm / yyyy" && collToDateValue != "dd / mm / yyyy") {
-            sentCollDateFrom = DateUtils.dateValue(collFromDateValue)
-            sentCollDateTo = DateUtils.dateValue(collToDateValue)
+            sentCollDateFrom = DateUtils.dateValue(collFromDateValue)!="Invalid Date"?DateUtils.dateValue(collFromDateValue):""
+            sentCollDateTo = DateUtils.dateValue(collToDateValue)!="Invalid Date"?DateUtils.dateValue(collToDateValue):""
         }
 
         const temp = {
@@ -246,6 +246,8 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
             CollDateFrom: sentCollDateFrom,
             CollDateTo: sentCollDateTo,
         };
+
+        console.log(temp)
         applySearch(temp);
     };
 
@@ -257,17 +259,17 @@ const SearchPublicNoticeForm = ({ applySearch, generateReport, searchCriteria, o
         let sentCollDateFrom = "";
         let sentCollDateTo = "";
 
-        if (sysTxnFromDateValue != "dd / mm / yyyy" && sysTxnToDateValue != "dd / mm / yyyy") {
-            sentSysTxnDateFrom = DateUtils.dateValue(sysTxnFromDateValue)
-            sentSysTxnDateTo = DateUtils.dateValue(sysTxnToDateValue)
+        if (sysTxnFromDateValue != "dd / mm / yyyy" && sysTxnToDateValue != "dd / mm / yyyy" ) {
+            sentSysTxnDateFrom = DateUtils.dateValue(sysTxnFromDateValue)!="Invalid Date"?DateUtils.dateValue(sysTxnFromDateValue):""
+            sentSysTxnDateTo = DateUtils.dateValue(sysTxnToDateValue)!="Invalid Date"?DateUtils.dateValue(sysTxnToDateValue):""
         }
         if (txnFromDateValue != "dd / mm / yyyy" && txnToDateValue != "dd / mm / yyyy") {
-            sentTxnDateFrom = DateUtils.dateValue(txnFromDateValue)
-            sentTxnDateTo = DateUtils.dateValue(txnToDateValue)
+            sentTxnDateFrom = DateUtils.dateValue(txnFromDateValue)!="Invalid Date"?DateUtils.dateValue(txnFromDateValue):""
+            sentTxnDateTo = DateUtils.dateValue(txnToDateValue)!="Invalid Date"?DateUtils.dateValue(txnToDateValue):""
         }
         if (collFromDateValue != "dd / mm / yyyy" && collToDateValue != "dd / mm / yyyy") {
-            sentCollDateFrom = DateUtils.dateValue(collFromDateValue)
-            sentCollDateTo = DateUtils.dateValue(collToDateValue)
+            sentCollDateFrom = DateUtils.dateValue(collFromDateValue)!="Invalid Date"?DateUtils.dateValue(collFromDateValue):""
+            sentCollDateTo = DateUtils.dateValue(collToDateValue)!="Invalid Date"?DateUtils.dateValue(collToDateValue):""
         }
 
         const temp = {