From 00e0126e42f48a94ace2bb0394f9f9ea80eda5fa Mon Sep 17 00:00:00 2001 From: rstubryan Date: Thu, 18 Dec 2025 20:35:47 +0700 Subject: [PATCH] refactor(FE-357): Use string weights and parse floats for filters --- .../report/sale/tab/HppPerKandangTab.tsx | 20 ++++++------------- src/services/api/report/marketing-sale.ts | 4 ++-- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/components/pages/report/sale/tab/HppPerKandangTab.tsx b/src/components/pages/report/sale/tab/HppPerKandangTab.tsx index c9456a8c..7c9847c8 100644 --- a/src/components/pages/report/sale/tab/HppPerKandangTab.tsx +++ b/src/components/pages/report/sale/tab/HppPerKandangTab.tsx @@ -117,7 +117,7 @@ const HppPerKandangTab = () => { >( (e) => { const val = e.target.value; - updateFilter('weight_min', val ? String(parseInt(val, 10)) : ''); + updateFilter('weight_min', val ? String(parseFloat(val) || 0) : ''); setIsSubmitted(false); }, [updateFilter] @@ -128,7 +128,7 @@ const HppPerKandangTab = () => { >( (e) => { const val = e.target.value; - updateFilter('weight_max', val ? String(parseInt(val, 10)) : ''); + updateFilter('weight_max', val ? String(parseFloat(val) || 0) : ''); setIsSubmitted(false); }, [updateFilter] @@ -189,12 +189,8 @@ const HppPerKandangTab = () => { tableFilterState.kandang_id.length > 0 ? tableFilterState.kandang_id.join(',') : undefined, - weight_min: tableFilterState.weight_min - ? Number(tableFilterState.weight_min) - : undefined, - weight_max: tableFilterState.weight_max - ? Number(tableFilterState.weight_max) - : undefined, + weight_min: tableFilterState.weight_min || undefined, + weight_max: tableFilterState.weight_max || undefined, period: tableFilterState.period || undefined, sort_by: tableFilterState.sort_by || undefined, show_unrecorded: tableFilterState.show_unrecorded, @@ -250,12 +246,8 @@ const HppPerKandangTab = () => { tableFilterState.kandang_id.length > 0 ? tableFilterState.kandang_id.join(',') : undefined, - weight_min: tableFilterState.weight_min - ? Number(tableFilterState.weight_min) - : undefined, - weight_max: tableFilterState.weight_max - ? Number(tableFilterState.weight_max) - : undefined, + weight_min: tableFilterState.weight_min || undefined, + weight_max: tableFilterState.weight_max || undefined, period: tableFilterState.period || undefined, sort_by: tableFilterState.sort_by || undefined, show_unrecorded: tableFilterState.show_unrecorded, diff --git a/src/services/api/report/marketing-sale.ts b/src/services/api/report/marketing-sale.ts index 4422957e..bb9c1f49 100644 --- a/src/services/api/report/marketing-sale.ts +++ b/src/services/api/report/marketing-sale.ts @@ -15,8 +15,8 @@ export class MarketingSaleReportService extends BaseApiService< area_id?: string, location_id?: string, kandang_id?: string, - weight_min?: number, - weight_max?: number, + weight_min?: string, + weight_max?: string, period?: string, sort_by?: string, show_unrecorded?: boolean,