From eb14139bcfcbd652682688deb0441b9d8a20c7cb Mon Sep 17 00:00:00 2001 From: YasinShaikh123 <123150391+YasinShaikh123@users.noreply.github.com> Date: Wed, 30 Oct 2024 12:30:20 +0530 Subject: [PATCH] update 30/10 --- .../IO_Management/CreateIO/AddCashDetails.jsx | 6 ++-- src/Pages/IO_Management/CreateIO/AddIONav.jsx | 4 +-- src/Pages/IO_Management/IOArtifactsAdd.jsx | 16 +++++++--- .../IO_Management/InvestmentDocuments.jsx | 2 +- .../InvestorDetails/Kyc.jsx | 4 +-- .../InvestorDetails/Transaction.jsx | 32 +++++++++---------- .../InvestmentType/AddInvestmentType.jsx | 18 +++++------ 7 files changed, 45 insertions(+), 37 deletions(-) diff --git a/src/Pages/IO_Management/CreateIO/AddCashDetails.jsx b/src/Pages/IO_Management/CreateIO/AddCashDetails.jsx index 02861a7..695de3d 100644 --- a/src/Pages/IO_Management/CreateIO/AddCashDetails.jsx +++ b/src/Pages/IO_Management/CreateIO/AddCashDetails.jsx @@ -30,9 +30,9 @@ import GlobalStateContext from "../../../Contexts/GlobalStateContext"; import CurrencyInput from "../../../Components/CurrencyInput"; const cashDetails = yup.object().shape({ - transactionDate: yup.string().required("Artifact name is required"), - ioTransType_xid: yup.number().required("Artifact name is required"), - transactionAmount: yup.number().required("Artifact name is required"), + transactionDate: yup.string().required("Date is required"), + ioTransType_xid: yup.number().required("Cash transaction is required"), + transactionAmount: yup.number().required("Transaction Amount is required"), comments: yup.string().notRequired(), }); diff --git a/src/Pages/IO_Management/CreateIO/AddIONav.jsx b/src/Pages/IO_Management/CreateIO/AddIONav.jsx index d236ab1..f326d85 100644 --- a/src/Pages/IO_Management/CreateIO/AddIONav.jsx +++ b/src/Pages/IO_Management/CreateIO/AddIONav.jsx @@ -34,8 +34,8 @@ import { import { formatDatee } from "../../../Components/FormField"; const ioNav = yup.object().shape({ - transactionDate: yup.string().required("Artifact name is required"), - transactionAmount: yup.number().required("Artifact name is required"), + transactionDate: yup.string().required("Date is required"), + transactionAmount: yup.number().required("New NAV is required"), comments: yup.string().notRequired(), }); diff --git a/src/Pages/IO_Management/IOArtifactsAdd.jsx b/src/Pages/IO_Management/IOArtifactsAdd.jsx index 15d312f..f80f838 100644 --- a/src/Pages/IO_Management/IOArtifactsAdd.jsx +++ b/src/Pages/IO_Management/IOArtifactsAdd.jsx @@ -34,7 +34,8 @@ import { formatTimestampInGulfTimezone } from "../../Constants/Constants"; import { IoMdRemoveCircleOutline } from "react-icons/io"; const investmentImageSchema = yup.object().shape({ - artifactName: yup.string().required("Artifact image name is required"), + artifactName: yup.string().required("Artifact image name is required") + .max(25, "File name must be at most 25 characters"), artifactPathName: yup.mixed().required("Artifact image is required"), }); @@ -171,7 +172,11 @@ const IOArtifactsAdd = ({ }; const handleSave = () => { + if (!alert) { + setAlert(true) + }else{ handleSubmit(onSubmit)(); + } }; const handleClose = () => { @@ -214,9 +219,9 @@ const IOArtifactsAdd = ({ IO Artifacts Image - + - + Artifact Name )} /> @@ -241,6 +247,7 @@ const IOArtifactsAdd = ({ errors.artifactPathName?.message && errors.artifactPathName } + isRequired={true} > Artifact Image (600 X 300) setAlert(true)} + // onClick={() => setAlert(true)} + onClick={handleSave} // type="submit" > Save diff --git a/src/Pages/IO_Management/InvestmentDocuments.jsx b/src/Pages/IO_Management/InvestmentDocuments.jsx index 4872a1f..687a8b7 100644 --- a/src/Pages/IO_Management/InvestmentDocuments.jsx +++ b/src/Pages/IO_Management/InvestmentDocuments.jsx @@ -199,7 +199,7 @@ const InvestmentDocuments = ({ - Add Details + Add Investment Documents diff --git a/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx b/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx index 481aaca..844f470 100644 --- a/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/Kyc.jsx @@ -74,7 +74,7 @@ const Kyc = () => { /> - + Block @@ -102,7 +102,7 @@ const Kyc = () => { /> - + Country diff --git a/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx b/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx index d319ad6..2185790 100644 --- a/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx +++ b/src/Pages/Investor_Management/InvestorDetails/Transaction.jsx @@ -95,7 +95,7 @@ const Transaction = () => { // "Currency", // "TO USD", // "From USD", - "USD amount", + // "USD amount", "IO Name", "Payment Method", ]; @@ -163,21 +163,21 @@ const Transaction = () => { {item.invCurToUSD_Rate} ), - "USD amount": ( - - {item?.invCurToUSD_Rate === "0.0000" && ( - - - $ - - {parseFloat(item?.USDAmount || 0).toLocaleString(undefined, { - minimumFractionDigits: 2, - maximumFractionDigits: 2, - })} - - )} - - ), + // "USD amount": ( + // + // {item?.invCurToUSD_Rate === "0.0000" && ( + // + // + // $ + // + // {parseFloat(item?.USDAmount || 0).toLocaleString(undefined, { + // minimumFractionDigits: 2, + // maximumFractionDigits: 2, + // })} + // + // )} + // + // ), "IO Name": ( diff --git a/src/Pages/Master/InvestmentType/AddInvestmentType.jsx b/src/Pages/Master/InvestmentType/AddInvestmentType.jsx index 4fc7b20..d37fc31 100644 --- a/src/Pages/Master/InvestmentType/AddInvestmentType.jsx +++ b/src/Pages/Master/InvestmentType/AddInvestmentType.jsx @@ -175,7 +175,7 @@ const AddInvestmentType = () => { name: "investmentTypeName", type: "text", isRequired: true, - section: "Add Details", + section: "", maxLength: 50, helperText: `Maximum length should be 50 characters. You have entered ${ watch()?.investmentTypeName?.length || 0 @@ -187,7 +187,7 @@ const AddInvestmentType = () => { placeHolder: " ", type: "text", isRequired: true, - section: "Add Details", + section: "", arabic: true, maxLength: 255, helperText: `Maximum length should be 255 characters. You have entered ${ @@ -200,7 +200,7 @@ const AddInvestmentType = () => { name: "note", type: "textarea", // isRequired: true, - section: "Add Details", + section: "", maxLength: 255, helperText: `Maximum length should be 255 characters. You have entered ${ watch()?.note?.length || 0 @@ -213,7 +213,7 @@ const AddInvestmentType = () => { type: "textarea", // isRequired: true, arabic: true, - section: "Add Details", + section: "", maxLength: 255, helperText: `Maximum length should be 255 characters. You have entered ${ watch()?.noteArabic?.length || 0 @@ -230,7 +230,7 @@ const AddInvestmentType = () => { name: "investmentTypeName", type: "text", isRequired: true, - section: "Add Details", + section: "", maxLength: 50, helperText: `Maximum length should be 50 characters. You have entered ${ watch()?.investmentTypeName?.length || 0 @@ -242,7 +242,7 @@ const AddInvestmentType = () => { placeHolder: " ", type: "text", isRequired: true, - section: "Add Details", + section: "", arabic: true, maxLength: 255, helperText: `Maximum length should be 255 characters. You have entered ${ @@ -255,7 +255,7 @@ const AddInvestmentType = () => { name: "note", type: "textarea", // isRequired: true, - section: "Add Details", + section: "", maxLength: 255, helperText: `Maximum length should be 255 characters. You have entered ${ watch()?.note?.length || 0 @@ -268,7 +268,7 @@ const AddInvestmentType = () => { type: "textarea", // isRequired: true, arabic: true, - section: "Add Details", + section: "", maxLength: 255, helperText: `Maximum length should be 255 characters. You have entered ${ watch()?.noteArabic?.length || 0 @@ -338,7 +338,7 @@ const AddInvestmentType = () => { isOpen={alert} onClose={() => setAlert(false)} alertHandler={handleConfirm} - message={"Are you sure you want to add this?"} + message={id ? "Are you sure you want to update this document?" : " Are you sure you want to add this document?"} isLoading={isLoadingBtn} />