From f7b06bfd193d3c81c6bb0c234501f00f105706bc Mon Sep 17 00:00:00 2001
From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com>
Date: Mon, 26 Aug 2024 16:05:03 +0530
Subject: [PATCH] pagination
---
src/Pages/IO_Management/CreateIO/IOCashDetails.jsx | 4 ++--
src/Pages/IO_Management/CreateIO/IONAVDetails.jsx | 6 ++++--
src/Pages/IO_Management/ViewIO/ViewIOTable.jsx | 2 +-
src/Pages/IO_Management/ViewIO/ViewIOdata.jsx | 2 +-
src/Services/deposit.request.service.js | 2 +-
src/Services/investor.details.service.js | 2 +-
6 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx b/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx
index db3f9e2..783ca2b 100644
--- a/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IOCashDetails.jsx
@@ -72,7 +72,7 @@ const IOCashDetails = () => {
);
toast({
render: () => ,
- });
+ });
}, 300);
// Table filter
@@ -94,7 +94,7 @@ const IOCashDetails = () => {
fontWeight={"500"}
className="d-flex align-items-center web-text-small"
>
- {item?.transactionDate}
+ {formatDate(item?.transactionDate)}
),
"Transaction type": (
diff --git a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx
index 8c3c42f..3a002f0 100644
--- a/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx
+++ b/src/Pages/IO_Management/CreateIO/IONAVDetails.jsx
@@ -8,6 +8,7 @@ import CustomAlertDialog from '../../../Components/CustomAlertDialog';
import { formatDatee } from '../../../Components/FormField';
import { AddIcon } from '@chakra-ui/icons';
import AddIONav from './AddIONav';
+import { formatDate } from '../../Master/Sponser/Sponsers';
const IONAVDetails = () => {
const { navDetails, setNavDetails, IODetails } =
@@ -67,7 +68,8 @@ const IONAVDetails = () => {
fontWeight={"500"}
className="d-flex align-items-center web-text-small"
>
- {formatDatee(item.transactionDate)}
+ {/* {formatDatee(item.transactionDate)} */}
+ {formatDate(item?.transactionDate)}
),
"NAV": (
@@ -76,7 +78,7 @@ const IONAVDetails = () => {
as={"span"}
color={"teal.900"}
fontWeight={"500"}
- className="d-flex align-items-center web-text-small"
+ className="d-flex align-items-center web-text-small"
>
{/* {`${item.transactionAmount}`} */}
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx
index 3b7201b..2f15878 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx
@@ -72,7 +72,7 @@ const ViewIOTable = () => {
const [pageSize, setPageSize] = useState(TABLE_PAGINATION?.size);
const [currentPage, setCurrentPage] = useState(TABLE_PAGINATION?.page);
- // ===============================[ RTK Api calls ]
+ // ===============================[ RTK Api calls ] =============================================
const { data, isLoading, error } = useGetIOsQuery({
page: currentPage,
size: pageSize,
diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
index 81060a4..53aeaf5 100644
--- a/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
+++ b/src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
@@ -46,7 +46,7 @@ const ViewIOdata = () => {
const navigate = useNavigate();
const [isEditing, setIsEditing] = useState(false);
const { IODetails, setIODetails } = useContext(GlobalStateContext);
- console.log(IODetails?.isInvestedAmount);
+ console.log(IODetails?.isInvestedAmount);
const tabs = [
{ label: "IO Details", content: },
diff --git a/src/Services/deposit.request.service.js b/src/Services/deposit.request.service.js
index 2d5ce13..66c95c4 100644
--- a/src/Services/deposit.request.service.js
+++ b/src/Services/deposit.request.service.js
@@ -39,7 +39,7 @@ export const depositRequest = createApi({
}),
getDepositHistory: builder.query({
- query: () => `/deposit/admin/history`,
+ query: ({page, size}) => `/deposit/admin/history?page=${page}&size=${size}`,
providesTags: ["getDepositHistory"],
}),
}),
diff --git a/src/Services/investor.details.service.js b/src/Services/investor.details.service.js
index a214abe..6ea2af1 100644
--- a/src/Services/investor.details.service.js
+++ b/src/Services/investor.details.service.js
@@ -21,7 +21,7 @@ export const investorDetails = createApi({
// =====[get investment details ]
getInvestorsDetailsById: builder.query({
- query: (id) => `/investorDetails/admin/${id}`,
+ query: (id) => `/investorDetails/admin/byId/${id}`,
providesTags: ["getInvestors"],
}),