From d74481e7f48a1a43f9323aaebb090d07c691b2f5 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Mon, 2 Sep 2024 16:20:51 +0530 Subject: [PATCH 1/6] =?UTF-8?q?[=20Refetch=20update=20]=20=F0=9F=8E=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Components/DataTable/DataTable.jsx | 6 +-- .../IO_Management/CreateIO/Investors.jsx | 45 +++++++++++-------- .../Master/ExchangeRate/ExchangeRate.jsx | 2 +- 3 files changed, 31 insertions(+), 22 deletions(-) diff --git a/src/Components/DataTable/DataTable.jsx b/src/Components/DataTable/DataTable.jsx index 539cded..752a8bb 100644 --- a/src/Components/DataTable/DataTable.jsx +++ b/src/Components/DataTable/DataTable.jsx @@ -65,7 +65,7 @@ const DataTable = ({ {/* {caption} */} {caption} - + {tableHeadRow.map((heading, index) => ( + {tableHeadRow.map((heading, i) => (
@@ -121,7 +121,7 @@ const DataTable = ({ )} ) : ( -
{ fontWeight={"500"} className="d-flex align-items-center web-text-small" > - $ + + $ + {/* {`$${item.Distribution_Amt}`} */} {`$${parseFloat(item.Distribution_Amt || 0).toLocaleString(undefined, { minimumFractionDigits: 2, @@ -264,7 +266,9 @@ const Investors = ({ data }) => { fontWeight={"500"} className="d-flex align-items-center web-text-small" > - $ + + $ + {/* {`$${formatCurrency(item.Total_Return) || 0}`} */} {`${parseFloat(item.Total_Return || 0).toLocaleString(undefined, { minimumFractionDigits: 2, @@ -421,6 +425,7 @@ const Investors = ({ data }) => { const handleRefresh = async () => { setIsRefetchLoading(true); + await refetch(); setIsRefetchLoading(false); }; @@ -445,21 +450,23 @@ const Investors = ({ data }) => { value={searchTerm} onChange={(e) => setSearchTerm(e.target.value)} /> - + + + { > Total Investment Amount ( USD ) - $ + + $ + {parseFloat(IODetails?.totalAmtInvestmentInUSD).toLocaleString()} diff --git a/src/Pages/Master/ExchangeRate/ExchangeRate.jsx b/src/Pages/Master/ExchangeRate/ExchangeRate.jsx index 24aec28..b223e76 100644 --- a/src/Pages/Master/ExchangeRate/ExchangeRate.jsx +++ b/src/Pages/Master/ExchangeRate/ExchangeRate.jsx @@ -84,7 +84,7 @@ const ExchangeRate = () => { fontWeight={"600"} className="d-flex align-items-center fw- web-text-small" > - {index + 1}. + {index + 1} ), "From Currency": ( From c766b29c4b3f4419760db8d9a122d4db1f54a842 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Mon, 2 Sep 2024 17:43:54 +0530 Subject: [PATCH 2/6] =?UTF-8?q?merge=20=F0=9F=93=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/IO_Management/CreateIO/IONAVDetails.jsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx index 249e6ce..a769528 100644 --- a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx +++ b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx @@ -68,8 +68,9 @@ const IONAVDetails = () => { const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); return nameMatches; - }).reverse() - // .sort((b, a) => new Date(a.transactionDate) - new Date(b.transactionDate)); + }) + // .reverse() + .sort((b, a) => new Date(a.transactionDate) - new Date(b.transactionDate)); const extractedArray = filteredData?.map((item, index) => ({ id: item?.id, From d1cc24a43baa69171f8cc68084190eb4083bddbf Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Mon, 2 Sep 2024 18:02:19 +0530 Subject: [PATCH 3/6] =?UTF-8?q?Table=20mod=20=F0=9F=8E=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InvestorDetails/BankDetails.jsx | 15 ++++++++------- .../InvestorDetails/ProfileView.jsx | 2 ++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/Pages/Investor_Management/InvestorDetails/BankDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/BankDetails.jsx index 87daa53..6297064 100644 --- a/src/Pages/Investor_Management/InvestorDetails/BankDetails.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/BankDetails.jsx @@ -67,7 +67,7 @@ const BankDetails = () => { console.log(data?.data?.bank_details); const filteredData = data?.data?.bank_details?.filter((item) => { - const name = item.accountNumber; + const name = item.bankNickName; const searchLower = searchTerm.toLowerCase(); const nameMatches = name.toLowerCase().includes(searchLower); @@ -78,7 +78,7 @@ const BankDetails = () => { const tableHeadRow = [ "Sr No", - "bankNickName", + "Bank Nick Name", "IBAN", "Account No", "Bank Name", @@ -100,7 +100,7 @@ const BankDetails = () => { {generateSerialNumber(idx, currentPage, pageSize)} ), - "bankNickName": ( + "Bank Nick Name": ( { isTruncated={true} className="d-flex align-items-center web-text-small" > - {item.accountName} + {item.accountNumber} ), "Bank Name": ( @@ -157,7 +157,7 @@ const BankDetails = () => { isTruncated={true} className="d-flex align-items-center web-text-small" > - {item.accountNumber} + {item.accountName} ), "Bank Address": ( @@ -202,7 +202,9 @@ const BankDetails = () => { return ( - + + Bank Deatils + { onChange={(e) => setSearchTerm(e.target.value)} /> - {/* ======================== [Data Table] ======================= */} diff --git a/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx b/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx index 3d264a6..697f727 100644 --- a/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/ProfileView.jsx @@ -1,6 +1,7 @@ import { Badge, Box, + Divider, Icon, Tab, TabList, @@ -336,6 +337,7 @@ const ProfileView = () => { + From fdbdc61cace7516ce6809bc6af5cc60db0ce21dd Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Tue, 3 Sep 2024 13:10:31 +0530 Subject: [PATCH 4/6] =?UTF-8?q?Commit=20before=20realese=20=F0=9F=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/IO_Management/CreateIO/IONAVDetails.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx index a769528..e4e6196 100644 --- a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx +++ b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx @@ -69,8 +69,8 @@ const IONAVDetails = () => { const nameMatches = name.toLowerCase().includes(searchLower); return nameMatches; }) - // .reverse() - .sort((b, a) => new Date(a.transactionDate) - new Date(b.transactionDate)); + .reverse() + // .sort((b, a) => new Date(a.transactionDate) - new Date(b.transactionDate)); const extractedArray = filteredData?.map((item, index) => ({ id: item?.id, From 753f3d40c396b2a04b9c4a12d90ee21ad2cbd5e6 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Tue, 3 Sep 2024 13:45:57 +0530 Subject: [PATCH 5/6] =?UTF-8?q?Risky=20Commit=20=E2=98=A0=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HeaderModal/DistributionInvestor.jsx | 35 ++++++++++++------- .../IO_Management/ViewIO/HeaderModal/Exit.jsx | 22 ++++++------ 2 files changed, 32 insertions(+), 25 deletions(-) diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx index 0ac2077..ebf269c 100644 --- a/src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx +++ b/src/Pages/IO_Management/ViewIO/HeaderModal/DistributionInvestor.jsx @@ -110,8 +110,9 @@ const DistributionInvestor = ({ isOpen, onClose }) => { "First name", "Last Name", "Amount", - "Holding %", + "Holding (%)", "Distriution Amt($)", + "Yeild (%)", ]; const extractedArray = calcualtedData?.data?.map((item, index) => ({ @@ -160,17 +161,15 @@ const DistributionInvestor = ({ isOpen, onClose }) => { ), - "Holding %": ( - - - {parseFloat(item?.distribution_per).toFixed(2)}% - - + "Holding (%)": ( + + + {item?.investor_holidings?.toLocaleString(undefined, { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })}% + + ), "Distriution Amt($)": ( @@ -182,6 +181,16 @@ const DistributionInvestor = ({ isOpen, onClose }) => { ), + "Yeild (%)": ( + + + {item?.distribution_per?.toLocaleString(undefined, { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })}% + + + ), })); const Total = () => { @@ -359,7 +368,7 @@ const DistributionInvestor = ({ isOpen, onClose }) => { return ( - + Distribution To Investor Transaction diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx index 728a41b..540d530 100644 --- a/src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx +++ b/src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx @@ -147,7 +147,7 @@ const Exit = ({ isOpen, onClose }) => { "First name", "Last Name", "Amount", - "Holding %", + "Holding (%)", "Exit Amt($)", ]; @@ -197,17 +197,15 @@ const Exit = ({ isOpen, onClose }) => { ), - "Holding %": ( - - - {parseFloat(item?.distribution_per).toFixed(2)}% - - + "Holding (%)": ( + + + {item?.investor_holidings?.toLocaleString(undefined, { + minimumFractionDigits: 2, + maximumFractionDigits: 2, + })}% + + ), "Exit Amt($)": ( From 3a327d63e08019ce6514ea6d928c0ce8fb7242b3 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Tue, 3 Sep 2024 18:03:20 +0530 Subject: [PATCH 6/6] =?UTF-8?q?Exit=20update=20=E2=9A=A1=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Pages/IO_Management/CreateIO/Investors.jsx | 5 +++-- src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Pages/IO_Management/CreateIO/Investors.jsx b/src/Pages/IO_Management/CreateIO/Investors.jsx index 0028ca7..226a4a2 100644 --- a/src/Pages/IO_Management/CreateIO/Investors.jsx +++ b/src/Pages/IO_Management/CreateIO/Investors.jsx @@ -490,10 +490,11 @@ const Investors = ({ data }) => { > Total Investment Amount ( USD ) - + + + $ - {parseFloat(IODetails?.totalAmtInvestmentInUSD).toLocaleString()} diff --git a/src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx b/src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx index 540d530..93de936 100644 --- a/src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx +++ b/src/Pages/IO_Management/ViewIO/HeaderModal/Exit.jsx @@ -392,18 +392,18 @@ const Exit = ({ isOpen, onClose }) => { - Enter Exit Amount + Exit Transaction {/* Amount to Distribute */} - + {/* */} - {/* - - Enter Exit Amount - */} + {/* */} + + Exit Amount : +