fix(FE): fixing sapronak calculation get kandangId state

This commit is contained in:
randy-ar
2026-01-12 15:38:07 +07:00
parent 36b167dafb
commit 0f9849c0ac
4 changed files with 8 additions and 10 deletions
@@ -22,7 +22,6 @@ import HppExpeditionReportTable from './hpp-ekspedisi/HppExpeditionReportTable';
import ClosingKandangList from '@/components/pages/closing/ClosingKandangList'; import ClosingKandangList from '@/components/pages/closing/ClosingKandangList';
import { ProjectFlock } from '@/types/api/production/project-flock'; import { ProjectFlock } from '@/types/api/production/project-flock';
import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang'; import { ProjectFlockKandang } from '@/types/api/production/project-flock-kandang';
interface ClosingDetailProps { interface ClosingDetailProps {
id: number; id: number;
initialValue?: ClosingGeneralInformation; initialValue?: ClosingGeneralInformation;
@@ -56,7 +55,6 @@ const ClosingDetail: React.FC<ClosingDetailProps> = ({
<ClosingSapronakCalculationTabContent <ClosingSapronakCalculationTabContent
closingGeneralInformation={initialValue} closingGeneralInformation={initialValue}
projectFlockId={id} projectFlockId={id}
projectKandangId={kandangData?.id}
/> />
), ),
}, },
@@ -5,13 +5,11 @@ import { ClosingGeneralInformation } from '@/types/api/closing';
interface ClosingSapronakCalculationTabContentProps { interface ClosingSapronakCalculationTabContentProps {
projectFlockId?: number; projectFlockId?: number;
projectKandangId?: number;
closingGeneralInformation?: ClosingGeneralInformation; closingGeneralInformation?: ClosingGeneralInformation;
} }
const ClosingSapronakCalculationTabContent = ({ const ClosingSapronakCalculationTabContent = ({
projectFlockId, projectFlockId,
projectKandangId,
closingGeneralInformation, closingGeneralInformation,
}: ClosingSapronakCalculationTabContentProps) => { }: ClosingSapronakCalculationTabContentProps) => {
return ( return (
@@ -21,7 +19,6 @@ const ClosingSapronakCalculationTabContent = ({
<ClosingSapronakCalculationTable <ClosingSapronakCalculationTable
closingGeneralInformation={closingGeneralInformation} closingGeneralInformation={closingGeneralInformation}
projectFlockId={projectFlockId} projectFlockId={projectFlockId}
projectKandangId={projectKandangId}
/> />
</> </>
)} )}
@@ -14,21 +14,23 @@ import useSWR from 'swr';
import { ClosingApi } from '@/services/api/closing'; import { ClosingApi } from '@/services/api/closing';
import { isResponseSuccess } from '@/lib/api-helper'; import { isResponseSuccess } from '@/lib/api-helper';
import { ClosingGeneralInformation } from '@/types/api/closing'; import { ClosingGeneralInformation } from '@/types/api/closing';
import { useSearchParams } from 'next/navigation';
interface ClosingSapronakCalculationTableProps { interface ClosingSapronakCalculationTableProps {
projectFlockId: number; projectFlockId: number;
projectKandangId?: number;
closingGeneralInformation?: ClosingGeneralInformation; closingGeneralInformation?: ClosingGeneralInformation;
} }
const ClosingSapronakCalculationTable = ({ const ClosingSapronakCalculationTable = ({
projectFlockId, projectFlockId,
closingGeneralInformation, closingGeneralInformation,
projectKandangId,
}: ClosingSapronakCalculationTableProps) => { }: ClosingSapronakCalculationTableProps) => {
const searchParams = useSearchParams();
const kandangId = searchParams.get('kandangId');
const { data: sapronakCalculation, isLoading } = useSWR( const { data: sapronakCalculation, isLoading } = useSWR(
`/closing/sapronak-calculation/${projectFlockId}${projectKandangId ? `/${projectKandangId}` : ''}`, `/closing/sapronak-calculation/${projectFlockId}${kandangId ? `/${kandangId}` : ''}`,
() => ClosingApi.getPerhitunganSapronak(projectFlockId, projectKandangId), () => ClosingApi.getPerhitunganSapronak(projectFlockId, Number(kandangId)),
{ {
keepPreviousData: true, keepPreviousData: true,
} }
@@ -180,7 +182,7 @@ const ClosingSapronakCalculationTable = ({
{/* Table DOC jika kategori Project Flock Growing */} {/* Table DOC jika kategori Project Flock Growing */}
<Card <Card
title={ title={
closingGeneralInformation?.project_category === 'GROWING' closingGeneralInformation?.project_type == 'GROWING'
? 'DOC' ? 'DOC'
: 'Pullet' : 'Pullet'
} }
+1
View File
@@ -63,6 +63,7 @@ export type BaseClosing = {
location_id: number; location_id: number;
location_name: string; location_name: string;
project_category: 'GROWING' | 'LAYING'; project_category: 'GROWING' | 'LAYING';
project_type?: 'GROWING' | 'LAYING'; // berubah dari BE?
period: number; period: number;
closing_date?: string; closing_date?: string;
shed_label: string; shed_label: string;