From cd1cf86fc93eb2fcf462e08eb9a39c2bf693ac95 Mon Sep 17 00:00:00 2001 From: "Siddhesh.More" Date: Thu, 17 Oct 2024 20:28:21 +0530 Subject: [PATCH] update --- src/Components/FormInputView.jsx | 39 +++++++++++++++---- src/Pages/Admin/Notification.jsx | 5 +++ .../IO_Management/ViewIO/ViewIOdetails.jsx | 2 +- 3 files changed, 38 insertions(+), 8 deletions(-) diff --git a/src/Components/FormInputView.jsx b/src/Components/FormInputView.jsx index dd95abe..37dd9f7 100644 --- a/src/Components/FormInputView.jsx +++ b/src/Components/FormInputView.jsx @@ -15,6 +15,7 @@ import { Th, Thead, Tr, + Checkbox, // Import Checkbox from Chakra UI } from "@chakra-ui/react"; import React from "react"; @@ -34,8 +35,13 @@ const FormInputView = ({ {section} - {/* */} - + {fields.map( ({ value, label, id, width, btn, arabic, type, align }, key) => type === "table" ? ( @@ -62,8 +68,7 @@ const FormInputView = ({ w={6} h={6} src={ - import.meta.env.VITE_IMAGE_URL+ - item?.logo + import.meta.env.VITE_IMAGE_URL + item?.logo } /> {item.country === "United Arab Emirates" @@ -94,7 +99,6 @@ const FormInputView = ({ isRequired={true} bg={"#F5F8F6"} focusBorderColor="forestGreen.300" - // border="1px solid #000" size={"sm"} fontSize={"sm"} rounded={"sm"} @@ -102,7 +106,6 @@ const FormInputView = ({ value={item.value} textAlign={"right"} placeholder={"00.00"} - // color={"#000"} color={"#1A202C"} fontWeight={500} border={"1px solid #e2e8f0"} @@ -120,7 +123,30 @@ const FormInputView = ({ + ) : type === "checkBox" ? ( + // + + + + {label} + + + Is this shaiah compliant + + ) : ( + // {label} @@ -141,7 +167,6 @@ const FormInputView = ({ ) )} - {/* */} {index < Object.entries(groupedFields, groupedFieldsTwo).length - 1 && ( diff --git a/src/Pages/Admin/Notification.jsx b/src/Pages/Admin/Notification.jsx index f2811df..b8beb97 100644 --- a/src/Pages/Admin/Notification.jsx +++ b/src/Pages/Admin/Notification.jsx @@ -74,6 +74,7 @@ const Notification = () => { const { control, reset, + watch, handleSubmit, formState: { errors }, } = useForm({ @@ -141,6 +142,8 @@ const Notification = () => { name: "title", type: "text", width:"100%", + maxLength:100, + helperText:`Maximum length should be 100 characters. You have entered ${watch()?.title?.length || 0} characters.`, isRequired: true, section: "Send Custom Push Notification", // value: contact?.phoneNumber || "", @@ -152,6 +155,8 @@ const Notification = () => { width:"100%", type: "textarea", isRequired: true, + maxLength:200, + helperText:`Maximum length should be 200 characters. You have entered ${watch()?.message?.length || 0} characters.`, section: "Send Custom Push Notification", // value: contact?.phoneNumber || "", }, diff --git a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx index b291a3b..a7ab321 100644 --- a/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx +++ b/src/Pages/IO_Management/ViewIO/ViewIOdetails.jsx @@ -211,7 +211,7 @@ const ViewIOdetails = () => { // isRequired: true, section: " ", width: "32.3%", - value: IObyID?.data?.isShariah ? "✅ Is This Sharia Compliant" : "❎ Is This Sharia Compliant", + value: IObyID?.data?.isShariah, },