From bb333436448beddd19069df917c028b0ad8136b0 Mon Sep 17 00:00:00 2001
From: anna <anna.ho@2fi-solutions.com.hk>
Date: Thu, 21 Dec 2023 18:25:32 +0800
Subject: [PATCH] DemandNote

---
 src/pages/DemandNote/Search/DataGrid.js   | 12 ++++++++++--
 src/pages/DemandNote/Search/SearchForm.js |  9 ++++++++-
 src/pages/DemandNote/Search/index.js      |  2 +-
 src/utils/ApiPathConst.js                 |  1 +
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/pages/DemandNote/Search/DataGrid.js b/src/pages/DemandNote/Search/DataGrid.js
index 6c31900..a890362 100644
--- a/src/pages/DemandNote/Search/DataGrid.js
+++ b/src/pages/DemandNote/Search/DataGrid.js
@@ -60,10 +60,9 @@ export default function SeaarchDemandNote({ recordList }) {
 
     const columns = [
         {
-            field: 'actions',
+            field: 'appNo',
             headerName: 'App No.',
             width: 150,
-            cellClassName: 'actions',
             renderCell: (params) => {
                 return <Button onClick={handleEditClick(params)}><u>{params.row.appNo}</u></Button>;
             },
@@ -140,6 +139,15 @@ export default function SeaarchDemandNote({ recordList }) {
                 return <Button onClick={onDownloadClick(params)}><u>{params.row.filename}</u></Button>;
             },
         },
+        {
+            id: 'status',
+            field: 'status',
+            headerName: '',
+            width: 150,
+            renderCell: (params) => {
+                return <Button onClick={onDownloadClick(params)}><u>View Details</u></Button>;
+            },
+        },
     ];
 
 
diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js
index 1ce63fe..d983aaa 100644
--- a/src/pages/DemandNote/Search/SearchForm.js
+++ b/src/pages/DemandNote/Search/SearchForm.js
@@ -51,6 +51,13 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
         applySearch(temp);
     };
 
+    const findReadyToSend=()=>{
+        const temp = {
+            status: 'pending',
+        };
+        applySearch(temp);
+    }
+
     React.useEffect(() => {
         if (orgComboData && orgComboData.length > 0) {
             setOrgCombo(orgComboData);
@@ -262,7 +269,7 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue
                             <Button
                                 size="large"
                                 variant="contained"
-                                onClick={resetForm}
+                                onClick={findReadyToSend}
                                 sx={{
                                     textTransform: 'capitalize',
                                     alignItems: 'end'
diff --git a/src/pages/DemandNote/Search/index.js b/src/pages/DemandNote/Search/index.js
index 391b3a7..80b0f2c 100644
--- a/src/pages/DemandNote/Search/index.js
+++ b/src/pages/DemandNote/Search/index.js
@@ -55,7 +55,7 @@ const UserSearchPage_Individual = () => {
 
     function getUserList() {
         HttpUtils.get({
-            url: UrlUtils.GET_PUBLIC_NOTICE_LIST,
+            url: UrlUtils.DEMAND_NOTE_LIST,
             params: searchCriteria,
             onSuccess: function (responseData) {
                 setRecord(responseData);
diff --git a/src/utils/ApiPathConst.js b/src/utils/ApiPathConst.js
index 031e8b9..8f0c6d9 100644
--- a/src/utils/ApiPathConst.js
+++ b/src/utils/ApiPathConst.js
@@ -96,6 +96,7 @@ export const PAYMENT_APP_LIST = apiPath+'/payment/applist';//POST
 
 export const DEMAND_NOTE_PREVIEW = apiPath+'/demandNote/preview';//GET
 export const DEMAND_NOTE_CREATE = apiPath+'/demandNote/create';//POST
+export const DEMAND_NOTE_LIST = apiPath+'/demandNote/list';//GET