Siddhesh.More/tanami-admin-panel
1
0
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request 'update modal view' (#18) from Yasin into release/sprint-8

Browse Source 
Reviewed-on: #18
This commit is contained in:
Siddhesh More
2024-11-22 14:24:42 +00:00
parent 7a04ee0abb d4c9a5521f
commit e742f6c18d
13 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Pages/IO_Management/CreateIO/IOCashDetails/RequestApproveModal.jsx
View File

@@ -129,7 +129,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
fontSize="sm"
type="textarea"
size="md"
placeholder={"Enter your checkerComment...."}
placeholder={"Enter your checker comment...."}
rounded={"md"}
resize={"none"}
maxLength={200}

2
src/Pages/IO_Management/CreateIO/IONAVDetails/RequestApproveModal.jsx
View File

@@ -129,7 +129,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
fontSize="sm"
type="textarea"
size="md"
placeholder={"Enter your checkerComment...."}
placeholder={"Enter your checker comment...."}
rounded={"md"}
resize={"none"}
maxLength={200}

2
src/Pages/IO_Management/CreateIO/IOTransaction/ApproveDistrubationModal.jsx
View File

@@ -131,7 +131,7 @@ import {
fontSize="sm"
type="textarea"
size="md"
placeholder={"Enter your checkerComment...."}
placeholder={"Enter your checker comment...."}
rounded={"md"}
resize={"none"}
maxLength={200}

2
src/Pages/IO_Management/CreateIO/IOTransaction/ApproveInvestedModal.jsx
View File

@@ -129,7 +129,7 @@ import {
fontSize="sm"
type="textarea"
size="md"
placeholder={"Enter your checkerComment...."}
placeholder={"Enter your checker comment...."}
rounded={"md"}
resize={"none"}
maxLength={200}

2
src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedCancelTransaction.jsx
View File

@@ -113,7 +113,7 @@ import {
fontSize="sm"
type="textarea"
size="md"
placeholder={"Enter your checkerComment...."}
placeholder={"Enter your checker comment...."}
rounded={"md"}
resize={"none"}
maxLength={200}

2
src/Pages/IO_Management/CreateIO/IOTransaction/ApprovedExit.jsx
View File

@@ -127,7 +127,7 @@ import {
fontSize="sm"
type="textarea"
size="md"
placeholder={"Enter your checkerComment...."}
placeholder={"Enter your checker comment...."}
rounded={"md"}
resize={"none"}
maxLength={200}

2
src/Pages/IO_Management/CreateIO/IOTransaction/RequestApproveModal.jsx
View File

@@ -128,7 +128,7 @@ const RequestApproveModal = ({ isOpen, onClose, firstField ,id}) => {
fontSize="sm"
type="textarea"
size="md"
placeholder={"Enter your checkerComment...."}
placeholder={"Enter your checker comment...."}
rounded={"md"}
resize={"none"}
maxLength={200}

2
src/Pages/IO_Management/CreateIO/IOTransaction/RequestExitApproveModal.jsx
View File

@@ -128,7 +128,7 @@ import {
fontSize="sm"
type="textarea"
size="md"
placeholder={"Enter your checkerComment...."}
placeholder={"Enter your checker comment...."}
rounded={"md"}
resize={"none"}
maxLength={200}

1
src/Pages/IO_Management/CreateIO/IOTransaction/ViewAmountInvested.jsx
View File

@@ -116,6 +116,7 @@ const ViewAmountInvested = ({ isOpen, onClose, id: investorId }) => {
};
// const formatDate = (date) => new Date(date).toLocaleDateString();
const handleAmountChange = (e) => {
// e might be an object or just a value, handle both cases

20
src/Pages/IO_Management/CreateIO/IOTransaction/ViewCancel.jsx
View File

@@ -86,15 +86,17 @@ import RequestRejectModal from "./RequestRejectModal";
resolver: yupResolver(investorExit),
});
// useEffect(() => {
// console.log("hiit useEffectc");
// handleCalculate(id, {
// amount: IODetails?.ioMVNAV,
// });
// reset({
// amount: IODetails?.ioMVNAV,
// });
// }, [IODetails, id]);
useEffect(() => {
console.log("hiit useEffectc");
if (id) {
handleCalculate(id, {
amount: IODetails?.ioMVNAV,
});
}
reset({
amount: IODetails?.ioMVNAV,
});
}, [IODetails, id]);
const handleCalculate = async (id, data) => {
try {

11
src/Pages/IO_Management/CreateIO/IOTransaction/ViewDistributionInvestor.jsx
View File

@@ -72,9 +72,14 @@ const ViewDistributionInvestor = ({ isOpen, onClose,id:exitId }) => {
useEffect(() => {
console.log("hiit useEffectc");
handleCalculate(id, {
amount: IODetails?.ioMVNAV,
});
// handleCalculate(id, {
// amount: IODetails?.ioMVNAV,
// });
if (id) {
handleCalculate(id, {
amount: IODetails?.ioMVNAV,
});
}
reset({
amount: IODetails?.ioMVNAV,
});

21
src/Pages/IO_Management/CreateIO/IOTransaction/ViewExit.jsx
View File

@@ -76,18 +76,21 @@ import RequestRejectModal from "./RequestRejectModal";
resolver: yupResolver(),
});
// useEffect(() => {
// console.log("hiit useEffectc");
// handleCalculate(id, {
// amount: IODetails?.ioMVNAV,
// });
// reset({
// amount: IODetails?.ioMVNAV,
// });
// }, [IODetails, id]);
useEffect(() => {
console.log("hiit useEffectc");
if (id) {
handleCalculate(id, {
amount: IODetails?.ioMVNAV,
});
}
reset({
amount: IODetails?.ioMVNAV,
});
}, [IODetails, id]);
const handleCalculate = async (id, data) => {
try {
const res = await getDistributionInvestment({ id, data });
console.log(res?.data?.data);

10
src/Pages/IO_Management/ViewIO/ViewIOdata.jsx
View File

@@ -40,6 +40,7 @@ import Destribution from "../CreateIO/Destribution";
import IOCashDetails from "../CreateIO/IOCashDetails/IOCashDetails";
import IONAVDetails from "../CreateIO/IONAVDetails/IONAVDetails";
import IOTransaction from "../CreateIO/IOTransaction/IOTransaction";
import { GoDotFill } from "react-icons/go";
const ViewIOdata = () => {
const params = useParams();
@@ -74,6 +75,10 @@ const ViewIOdata = () => {
// { label: "Distribution to Investors", content: <UnderConstruction h={'75vh'} /> },
];
console.log(IODetails?.ioNAVHistory);
return (
<Box
{...OPACITY_ON_LOAD}
@@ -125,8 +130,11 @@ const ViewIOdata = () => {
borderBottom: "2px solid #38a169",
}}
fontWeight={500}
position={"relative"}
>
{label}
{label} {index === 5 &&IODetails?.ioCashStatusHistory?.Pending?.length !== 0||
index === 6 && IODetails?.ioNAVStatusHistory?.Pending?.length !== 0 ||
index === 8 && IODetails?.ioTransactionRecords?.Pending?.length !== 0 ? <Box as="span" right={0} color={"forestGreen"} top={1} position={"absolute"}><GoDotFill /></Box>:""}
</Tab>
))}
</Box>