From daddebc0a6ed00e572ff77b8acc6246a3f9863a8 Mon Sep 17 00:00:00 2001 From: rstubryan Date: Fri, 19 Dec 2025 16:30:06 +0700 Subject: [PATCH] refactor(FE-357): Refactor HppPerKandang types and add BaseMetadata --- .gitlab-ci.yml | 2 - src/types/api/report/hpp-per-kandang.d.ts | 47 +++++++++++++++++------ 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee8a79a5..935cac46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -165,8 +165,6 @@ deploy:staging: environment: name: staging url: https://stg-lti-erp.mbugroup.id - - # ====== PRODUCTION ====== # build:production: # <<: *build_template diff --git a/src/types/api/report/hpp-per-kandang.d.ts b/src/types/api/report/hpp-per-kandang.d.ts index 2b4522a0..ad3f4e0e 100644 --- a/src/types/api/report/hpp-per-kandang.d.ts +++ b/src/types/api/report/hpp-per-kandang.d.ts @@ -1,17 +1,7 @@ +import { BaseMetadata } from '@types/api/base-metadata'; import { Supplier } from '@/types/api/master-data/supplier'; import { Kandang } from '@/types/api/master-data/kandang'; -export type HppPerKandangSummary = { - total_remaining_chicken_birds: number; - total_remaining_chicken_weight_kg: number; - average_weight_kg: number; - total_remaining_value_rp: number; - total_egg_production_pieces: number; - total_egg_production_kg: number; - average_egg_hpp_rp_per_kg: number; - total_egg_value_rp: number; -}; - export type HppPerKandangRow = { id: number; kandang: Kandang; @@ -33,7 +23,40 @@ export type HppPerKandangRow = { remaining_value_rp: number; }; -export type HppPerKandangReport = { +export type HppPerKandangSummaryTotal = { + total_remaining_chicken_birds: number; + total_remaining_chicken_weight_kg: number; + average_weight_kg: number; + total_remaining_value_rp: number; + total_egg_production_pieces: number; + total_egg_production_kg: number; + average_egg_hpp_rp_per_kg: number; + total_egg_value_rp: number; +}; + +export type HppPerKandangPerWeightRange = { + id: number; + weight_range: { + weight_min: number; + weight_max: number; + }; + label: string; + remaining_chicken_birds: number; + remaining_chicken_weight_kg: number; + avg_weight_kg: number; + feed_suppliers: Supplier[]; + doc_suppliers: Supplier[]; + average_doc_price_rp: number; + hpp_rp: number; + remaining_value_rp: number; +}; + +export type HppPerKandangSummary = { + per_weight_range: HppPerKandangPerWeightRange[]; + total: HppPerKandangSummaryTotal; +}; + +export type HppPerKandangReport = BaseMetadata & { period: string; rows: HppPerKandangRow[]; summary: HppPerKandangSummary;