From 8b0454b16acf7e144102544baee59c8a339ceff0 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Mon, 26 Aug 2024 16:20:54 +0530 Subject: [PATCH 1/2] updated --- src/Constants/Constants.js | 4 +++- .../InvestorDetails/InvestorDetails.jsx | 12 ++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/Constants/Constants.js b/src/Constants/Constants.js index ab8c7a7..510695e 100644 --- a/src/Constants/Constants.js +++ b/src/Constants/Constants.js @@ -2,7 +2,9 @@ import dns from "node:dns" - +export const generateSerialNumber = (index, currentPage, pageSize) => { + return (currentPage - 1) * pageSize + (index + 1); +}; export function getTomorrowDate() { const today = new Date(); diff --git a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx index 0849835..67f5c8d 100644 --- a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx @@ -38,6 +38,7 @@ import { debounce } from "../../Master/Sponser/AddSponser"; import InvestmentDetailsEdit from "./InvestmentDetailsEdit"; import { useGetInvestorsQuery } from "../../../Services/investor.details.service"; import { TABLE_PAGINATION } from "../../../Constants/Paginations"; +import { generateSerialNumber } from "../../../Constants/Constants"; const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter @@ -81,7 +82,7 @@ const InvestorDetails = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - // "Sr N/O", + "Sr No", "Client ID", "First Name", "Last Name", @@ -125,16 +126,19 @@ const InvestorDetails = () => { }); - const extractedArray = filteredData?.map((item) => ({ + const extractedArray = filteredData?.map((item, idx) => ({ id: item?.id, - "Sr N/O": ( + "Sr No": ( - {item.id} + {/* {item.id} */} + {generateSerialNumber(idx,currentPage, pageSize )} + ), "Client ID": ( From 2f7f907a89dced7f8e1ec6e82621682e194572eb Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Mon, 26 Aug 2024 18:58:58 +0530 Subject: [PATCH 2/2] Updated Sr No --- src/Layout/DefaultLayout.jsx | 17 ++++++++--- .../Deposit/DepositRequest/DepositRequest.jsx | 10 +++---- .../DepositViewHistory/DepositHistory.jsx | 9 +++--- .../IO_Management/ViewIO/ViewIOTable.jsx | 17 +++++++++-- .../InvestorDetails/InvestorDetails.jsx | 4 +-- .../Master/InvestmentType/InvestmentType.jsx | 28 ++++++++++--------- src/Pages/Master/Sponser/Sponsers.jsx | 16 ++++++++++- 7 files changed, 70 insertions(+), 31 deletions(-) diff --git a/src/Layout/DefaultLayout.jsx b/src/Layout/DefaultLayout.jsx index 405d59c..3cb55f2 100644 --- a/src/Layout/DefaultLayout.jsx +++ b/src/Layout/DefaultLayout.jsx @@ -51,6 +51,7 @@ import { AlertIcon, Breadcrumb, Divider, + Tooltip, } from "@chakra-ui/react"; import GlobalStateContext from "../Contexts/GlobalStateContext"; import Cookies from "js-cookie"; // Import the Cookies library @@ -382,7 +383,7 @@ const DashboardLayout = ({ isOnline }) => { No Internet ! - {/* { zIndex={999} > - */} + {slideFromRight ? null : ( diff --git a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx index f1507e4..1f95fc3 100644 --- a/src/Pages/Deposit/DepositRequest/DepositRequest.jsx +++ b/src/Pages/Deposit/DepositRequest/DepositRequest.jsx @@ -35,7 +35,7 @@ import NormalTable from "../../../Components/DataTable/NormalTable"; import { useGetDepositRequestQuery } from "../../../Services/deposit.request.service"; import { current } from "@reduxjs/toolkit"; import { TABLE_PAGINATION } from "../../../Constants/Paginations"; -import { removeTrailingZeros } from "../../../Constants/Constants"; +import { generateSerialNumber, removeTrailingZeros } from "../../../Constants/Constants"; export const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter @@ -79,7 +79,7 @@ const DepositRequest = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - // "Sr.no", + "Sr.no", "Client ID", "First Name", "Last Name", @@ -125,18 +125,18 @@ const DepositRequest = () => { - const extractedArray = filteredData?.map((item, index) => ({ + const extractedArray = filteredData?.map((item, idx) => ({ // id: item?.id, "Sr.no": ( - {index + 1} + {generateSerialNumber(idx,currentPage, pageSize )} ), "Client ID": ( diff --git a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx index 9d438b9..6574cda 100644 --- a/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx +++ b/src/Pages/Deposit/DepositViewHistory/DepositHistory.jsx @@ -30,6 +30,7 @@ import { import { ExternalLinkIcon } from "@chakra-ui/icons"; import { TABLE_PAGINATION } from "../../../Constants/Paginations"; +import { generateSerialNumber } from "../../../Constants/Constants"; const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter @@ -72,7 +73,7 @@ const DepositHistory = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ - // "Sr.no", + "Sr.no", "Client ID", "First Name", "Last Name", @@ -124,17 +125,17 @@ const DepositHistory = () => { // onViewOpen(); // }; - const extractedArray = filteredData?.map((item, index) => ({ + const extractedArray = filteredData?.map((item, idx) => ({ "Sr.no": ( - {index + 1} + {generateSerialNumber(idx,currentPage, pageSize )} ), "Client ID": ( diff --git a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx index 2f15878..2e9399b 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOTable.jsx @@ -42,7 +42,7 @@ import { formatCurrency } from "../../../Components/CurrencyInput"; import { IoIosPhonePortrait } from "react-icons/io"; import MobileView from "../../../Components/MobileView"; import { ImMobile } from "react-icons/im"; -import { removeTrailingZeros } from "../../../Constants/Constants"; +import { generateSerialNumber, removeTrailingZeros } from "../../../Constants/Constants"; // import { debounce } from "./AddIOCharges"; const formatDate = (date) => { @@ -83,6 +83,7 @@ const ViewIOTable = () => { // ===============================[ Table Header ] const tableHeadRow = [ + "Sr No.", "IO ID", "IO Name", "Sponsor", @@ -110,7 +111,19 @@ const ViewIOTable = () => { return nameMatches && statusMatches; }); - const extractedArray = filteredData?.map((item, index) => ({ + const extractedArray = filteredData?.map((item, idx) => ({ + "Sr No.": ( + + {/* {item.id} */} + {generateSerialNumber(idx,currentPage, pageSize )} + + ), "IO ID": ( diff --git a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx index 67f5c8d..abe3799 100644 --- a/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/InvestorDetails.jsx @@ -89,7 +89,7 @@ const InvestorDetails = () => { "Country", "Phone Number", "E-mail ID", - "Investor Type", + "Type", "KYC Status", // "Status", "Action", @@ -183,7 +183,7 @@ const InvestorDetails = () => { ), - "Investor Type": ( + "Type": ( diff --git a/src/Pages/Master/InvestmentType/InvestmentType.jsx b/src/Pages/Master/InvestmentType/InvestmentType.jsx index ced6c27..17547c0 100644 --- a/src/Pages/Master/InvestmentType/InvestmentType.jsx +++ b/src/Pages/Master/InvestmentType/InvestmentType.jsx @@ -23,6 +23,7 @@ import { useGetInvestmentTypesQuery, } from "../../../Services/io.service"; import { TABLE_PAGINATION } from "../../../Constants/Paginations"; +import { generateSerialNumber } from "../../../Constants/Constants"; const formatDate = (date) => new Date(date).toLocaleDateString(); // Simple date formatter @@ -84,25 +85,26 @@ const InvestmentType = () => { // ==================================================== [Table Setup] ================================================================ const tableHeadRow = [ - // "Sr.no", + "Sr No", "Investment Type", "Description", "Status", "Action", ]; - const extractedArray = filteredData?.map((item, index) => ({ - // "Sr.no": ( - // - // {index + 1} - // - // ), + const extractedArray = filteredData?.map((item, idx) => ({ + "Sr No": ( + + {/* {item.id} */} + {generateSerialNumber(idx,currentPage, pageSize )} + + ), "Investment Type": ( { const d = new Date(date); @@ -61,13 +62,26 @@ const Sponser = () => { // ====================================================[Table Setup]================================================================ const tableHeadRow = [ + "Sr No", "Sponsor Name", "Email Address", "Status", "Action", ]; - const extractedArray = filteredData?.map((item) => ({ + const extractedArray = filteredData?.map((item, idx) => ({ + "Sr No": ( + + {/* {item.id} */} + {generateSerialNumber(idx,currentPage, pageSize )} + + ), "Sponsor Name": (