From 602dfa2ffb12cc2e6ac21dbcc875d173d1aeb446 Mon Sep 17 00:00:00 2001 From: Srinath Date: Wed, 25 Mar 2026 09:23:39 +0530 Subject: [PATCH] Search issue fixing --- .../Reports/Revenue/RevenueItemWiseReport.jsx | 353 ++---------------- 1 file changed, 22 insertions(+), 331 deletions(-) diff --git a/src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx b/src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx index a45b993..52b5c42 100644 --- a/src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx +++ b/src/Pages/Reports/Revenue/RevenueItemWiseReport.jsx @@ -35,23 +35,17 @@ const RevenueItemWiseReport = () => { const formattedToday = today.toISOString()?.split('T')[0]; const dispatch = useDispatch(); const formRef = useRef(); - // const [filteredInfo, setFilteredInfo] = useState({}); const [sortedInfo, setSortedInfo] = useState({}); - // const [sortedInfo2, setSortedInfo2] = useState({}); const [searchedText, setSearchedText] = useState(''); - // const [searchedText2, setSearchedText2] = useState(""); const [OrderFromDate, setOrderFromDate] = useState(formattedToday); const [OrderToDate, setOrderToDate] = useState(formattedToday); const [RevenueData, setRevenueData] = useState(); - // const [CateWiseData, setCateWiseData] = useState(); const [userDropDown, setuserDropDown] = useState([]); - // const [chartData, setchartdata] = useState([]); const [apiCall, setapiCall] = useState(false); const [chart, setchart] = useState(false); const [selectedUserData, setSelectedUserData] = useState(null); const [receiptTextItemWise, setreceiptTextItemWise] = useState(); - // const [receiptTextCatWise, setreceiptTextCatWise] = useState() const SettingDataSelector = useSelector(PreferenceData); const UomPrint = SettingDataSelector?.[0]?.SettingDtlDetails?.filter( @@ -174,32 +168,11 @@ const RevenueItemWiseReport = () => { fetchInitialData(); }, []); - // useEffect(() => { - // setchart(false) - // }, [apiCall]); useEffect(() => { if (UserRole != 'Employee') { userDropData(); } }, []); - // useEffect(() => { - // if (apiCall) { - // setSelectedUserData(0); - // fetchCatData(); - // } - // else { - - // setSelectedUserData(0); - // fetchInitialData(); - - // } - // }, [apiCall]); - // useEffect(() => { - // if (UserId==0){ - // onFinish(); - // } - // }, []); - function safeRound(amountStr) { if (amountStr == null) return allowDecimal ? '0.00' : '0'; @@ -211,28 +184,6 @@ const RevenueItemWiseReport = () => { return allowDecimal ? num.toFixed(2) : Math.round(num).toString(); } - // const fetchCatData = async () => { - // let data1 = { - // CompId: CompId, - // BranchId: BranchId, - // AppId: AppId, - // OrderFromDate: OrderFromDate?.split("T")?.[0], - // OrderToDate: OrderToDate?.split("T")?.[0], - // UserId: 0, - // type: 'PE' - - // }; - - // let response = await dispatch(getEstimateCatItemWiseReport(data1)).unwrap(); - // if (response?.data?.statusCode == 1) { - // setCateWiseData(response?.data?.data) - - // } - // else { - - // setCateWiseData(); - // } - // } const userDropData = async () => { const gettinguserDropDown = await dispatch( UserDataBasedOnBranchId(BranchId) @@ -268,27 +219,14 @@ const RevenueItemWiseReport = () => { setFilteredInfo(filters); setSortedInfo(sorter); }; - // const handleChange2 = (pagination, filters, sorter) => { - // setSortedInfo2(sorter); - // }; - - // const onComplete = useCallback(() => { - // setMessageData(null); - // setMessageType(null); - // }, []) const onSearch = (value) => { - setSearchedText(value); + setSearchedText(typeof value === "string" ? value : ""); }; + const onSearchChange = (e) => { - setSearchedText(e?.target?.value); + setSearchedText(e?.target?.value || ""); }; - // const onSearch2 = (value) => { - // setSearchedText2(value); - // }; - // const onSearchChange2 = (e) => { - // setSearchedText2(e?.target?.value); - // }; const Print = async () => { if (isMobile) { if (MobileA4Print) { @@ -426,45 +364,7 @@ const RevenueItemWiseReport = () => { }, }, ]; - // const columns2 = [ - // { - // title: "SI NO", - // dataIndex: "SINO", - // key: "SINO", - // align: "center", - // render: (text, object, index) => {index + 1}, - // }, - // { - // title: "Category", - // dataIndex: "ProdCatName", - // key: "Category", - // filteredValue: [searchedText2], - // onFilter: (value, record) => { - // return String(record.ProdCatName) - // ?.toLowerCase() - // ?.includes(value?.toLowerCase()); - // }, - // sorter: (a, b) => a?.ProdCatName?.localeCompare(b?.ProdCatName), - // sortOrder: sortedInfo2.columnKey === "ItemName" ? sortedInfo2.order : null, - // ellipsis: true, - // }, - // { - // title: "Qty", - // dataIndex: "SalesQty", - // key: "Qty", - // align: "right", - // }, - // { - // title: "Amount", - // dataIndex: "TotalAmt", - // key: "Amount", - // align: "right", - // render : (text)=> ( - // {safeRound(text)} - // ) - // } - // ]; const DateWisTableData = RevenueData?.map((item, index) => ({ SINO: index + 1, ItemName: @@ -511,40 +411,16 @@ const RevenueItemWiseReport = () => { UserId: UserId, type: 'E', }; - // let data1 = { - // CompId: CompId, - // BranchId: BranchId, - // AppId: AppId, - // OrderFromDate: OrderFromDate?.split("T")?.[0], - // OrderToDate: OrderToDate?.split("T")?.[0], - // UserId: UserId, - // type: 'E' - // }; if (!apiCall) { let Response = await dispatch(getRevenueItemWiseReport(data)).unwrap(); setRevenueData(Response?.data?.data); } - // else { - // let response = await dispatch(getEstimateCatItemWiseReport(data1)).unwrap(); - // if (response?.data?.statusCode === 1) { - // setCateWiseData(response?.data?.data) - // } else { - // // setMessageType("warning"); - // // setMessageData("No Data Found"); - // setCateWiseData(); - // } - // } + } catch (error) { console.error('An error occurred:', error); } }; - // let filterRate1 = CateWiseData?.map((item) => item.TotalAmt); - // const TotalAmount2 = filterRate1?.reduce( - // (accumulator, currentValue) => accumulator + currentValue, - // 0 - // ); - let filterPurchaseRate = RevenueData?.map((item) => item.ProductPurchaseRate); const PurchaseRate = filterPurchaseRate?.reduce( @@ -562,10 +438,6 @@ const RevenueItemWiseReport = () => { const TotalSalesAmt = salesRate - PurchaseRate; - // const onChange = (checked) => { - // setapiCall(checked); - // }; - const reprintDate = (date) => { const salesDate = new Date(date); const formattedDate = salesDate.toLocaleDateString('en-GB', { @@ -582,58 +454,6 @@ const RevenueItemWiseReport = () => { } }, [itemData]); - // useEffect(() => { - // if (CateWiseData?.length > 0) { - // mobileCatWisePrintFun(CateWiseData) - // } - - // }, [CateWiseData]) - - // const mobileCatWisePrintFun = async (printdata) => { - - // let Tabledata = printdata?.map((data, index) => { - - // const snoSpacing = Math.max(0, 3 - String(index + 1).length); - // // Calculate dynamic spacing for Rate - // const QtySpacing = Math.max(0, 5 - String(data?.SalesQty).length); - // const rateSpacing = Math.max(0, 7 - String(data?.TotalAmt).length); - - // // Calculate dynamic spacing for TotalAmt - - // // Generate formatted string with dynamic spacings - // const formattedString = - // " ".repeat(snoSpacing) + - // parseInt(index + 1) + - // " " + - // (data?.ProdCatName + " ".repeat(20)).substring(0, 20) + - - // " " + - // " ".repeat(QtySpacing) + String(data?.SalesQty) + - // " " + - // " ".repeat(rateSpacing) + String(data?.TotalAmt) + - // " " + "\n"; - - // return formattedString; - // }); - - // var receiptTextdata = - - // "[C]" + "Category Wise Sales" + "\n" + - // "[L]From Date :" + reprintDate(OrderFromDate) + - // "[L]" + " " + "To Date :" + reprintDate(OrderToDate) + - // "\n" + - // "[C]------------------------------------------------\n" + - - // "[L]" + "" + "S.No" + " " + " Category " + " " + "Quantity " + " " + "Amount " + "" + "" + - // "[L]\n" + - // "[C]------------------------------------------------\n" + - // Tabledata.join("") + - // "[C]------------------------------------------------\n" + - // "[R]" + "TotalAmount:" + parseFloat(TotalAmount).toFixed(2) + "\n" + - // "[L]------------------------------------------------\n" - - // setreceiptTextCatWise(receiptTextdata) - // } const mobileItemWisePrintFun = async (printdata) => { let Tabledata = printdata?.map((data, index) => { @@ -701,7 +521,7 @@ const RevenueItemWiseReport = () => { return allowDecimal ? parseFloat(value || 0).toFixed(2) : Math.round(value || 0); }; const getPreference = async () => { - const data = { AppId: AppId, CompId: CompId, BranchId: BranchId,UserId: UserId }; + const data = { AppId: AppId, CompId: CompId, BranchId: BranchId, UserId: UserId }; const { data: res } = await dispatch(getPreferenceData(data)).unwrap() const decimalSetting = res?.data?.[0]?.SettingDtlDetails?.find((setting) => setting?.SettingIdName?.toLowerCase() === "decimal" && setting?.SettingValue === 'Y'); if (decimalSetting) { @@ -721,12 +541,6 @@ const RevenueItemWiseReport = () => { TotalSalesAmt={TotalSalesAmt} RevenueData={RevenueData} /> - {/* */}
@@ -735,57 +549,6 @@ const RevenueItemWiseReport = () => {

Gross Margin

- {/*
-
-

- From Date -

-
- - - -
- -
-
-

To Date

-
- - - - -
*/} @@ -863,59 +626,20 @@ const RevenueItemWiseReport = () => { />
- {/*
- - {!apiCall ? 0 - ? "ItemWiseReport-printerIcon" - : "ItemWiseReport-printerIcon-disabled" - } - /> : - 0 - ? "ItemWiseReport-printerIcon" - : "ItemWiseReport-printerIcon-disabled" - } - />} - -
*/} +
- {!apiCall ? ( - - ) : !chart ? ( - - ) : ( - '' - )} +
- {/* {apiCall &&
-

PieChart

   

TableData

-
} */}
- {/* */} - @@ -929,16 +653,17 @@ const RevenueItemWiseReport = () => { {itemData && - itemData - .filter( - (row) => - !searchedText || + (itemData || []) + .filter((row) => { + const search = (searchedText || "").toLowerCase(); + + return ( + !search || (row.ItemName && - row.ItemName?.toLowerCase()?.includes( - searchedText?.toLowerCase() - )) - ) - .sort((a, b) => { + row.ItemName.toLowerCase().includes(search)) + ); + }) + ?.sort((a, b) => { if (sortedInfo.columnKey === 'ItemName') { return sortedInfo.order === 'ascend' ? a.ItemName?.localeCompare(b.ItemName) @@ -946,7 +671,7 @@ const RevenueItemWiseReport = () => { } return 0; }) - .map((row, idx) => ( + ?.map((row, idx) => ( @@ -994,30 +719,10 @@ const RevenueItemWiseReport = () => {
{idx + 1} {row.ItemName}
- {/*
- {!apiCall ? : !chart ? ( - - ) : () - } -
*/}
- {/* {apiCall && chart ? null : ( -

Net Amount: {!apiCall ? TotalAmount : (!chart ? TotalAmount2 : "")}

- )} */} - {!apiCall ? (
@@ -1030,15 +735,6 @@ const RevenueItemWiseReport = () => { - {/* {RevenueData?.[0]?.OverallDisc > 0 && - - - } - - {RevenueData?.[0]?.TaxAmt > 0 && - - - } */}

Sales Rate {safeRound(salesRate)}
Discount Amount{RevenueData?.[0]?.OverallDisc}
Total Tax{RevenueData?.[0]?.TaxAmt}
@@ -1093,11 +789,6 @@ const RevenueItemWiseReport = () => { ) )} - {/*
- {apiCall && chart ? null : ( -

Net Amount: {!apiCall ? TotalAmount : (!chart ? TotalAmount2 : "")}

- )} -
*/}