diff --git a/src/components/pages/report/sale/tab/HppPerKandangTab.tsx b/src/components/pages/report/sale/tab/HppPerKandangTab.tsx index ab52a0da..7bd774f3 100644 --- a/src/components/pages/report/sale/tab/HppPerKandangTab.tsx +++ b/src/components/pages/report/sale/tab/HppPerKandangTab.tsx @@ -562,8 +562,8 @@ const HppPerKandangTab = () => { header: 'Kandang', accessorKey: 'kandang.name', cell: (props) => { - const kandang = props.row.original.kandang; - return kandang?.name || '-'; + const row = props.row.original; + return row.name_with_periode || row.kandang?.name || '-'; }, footer: () =>
ALL
, }, diff --git a/src/types/api/production/project-flock-kandang.d.ts b/src/types/api/production/project-flock-kandang.d.ts index 8c8d6273..111ca98b 100644 --- a/src/types/api/production/project-flock-kandang.d.ts +++ b/src/types/api/production/project-flock-kandang.d.ts @@ -10,6 +10,7 @@ export type BaseProjectFlockKandang = { kandang_id: number; kandang: Kandang; project_flock: ProjectFlock; + name_with_period?: string; approval: BaseApproval; chickins?: Chickin[]; available_qtys?: AvailableQty[]; diff --git a/src/types/api/report/hpp-per-kandang.d.ts b/src/types/api/report/hpp-per-kandang.d.ts index 208a2cdb..0d47fc3f 100644 --- a/src/types/api/report/hpp-per-kandang.d.ts +++ b/src/types/api/report/hpp-per-kandang.d.ts @@ -5,6 +5,7 @@ import { Kandang } from '@/types/api/master-data/kandang'; export type HppPerKandangRow = { id: number; kandang: Kandang; + name_with_periode?: string; weight_range: { weight_min: number; weight_max: number;