Merge branch 'development' of gitlab.com:mbugroup/lti-web-client into feat/FE/US-281/TASK-316-317-slicing-ui-and-integrate-api-daily-recording-growing-uniformity-page

src/types/api/closing.d.ts

@@ -6,6 +6,11 @@ import { Kandang } from '@/types/api/master-data/kandang';
 import { Product } from '@type/api/master-data/product';
 import { Customer } from '@type/api/master-data/customer';
 import { BaseMetadata } from '@/types/api/api-general';
+import { Kandang } from '@/types/api/master-data/kandang';
+import { Product } from '@type/api/master-data/product';
+import { Customer } from '@type/api/master-data/customer';
+import { BaseMetadata } from '@/types/api/api-general';
+import { ProjectFlock } from '@/types/api/production/project-flock';
 
 export type BaseSales = {
   id: number;
@@ -29,10 +34,6 @@ export type BaseClosingSales = {
   period: number;
   sales: BaseSales[];
 };
-import { Kandang } from '@/types/api/master-data/kandang';
-import { Product } from '@type/api/master-data/product';
-import { Customer } from '@type/api/master-data/customer';
-import { BaseMetadata } from '@/types/api/api-general';
 
 export type BaseSales = {
   id: number;
@@ -66,9 +67,6 @@ export type BaseClosing = {
   closing_date?: string;
   shed_label: string;
   shed_count: number;
-  sales_paid_amount: number;
-  sales_remaining_amount: number;
-  sales_payment_status: string;
   project_status: 'Pengajuan' | 'Aktif' | 'Selesai';
 };
 
@@ -83,6 +81,7 @@ export type BaseClosingGeneralInformation = BaseClosing & {
   sales_payment_status: string;
   project_status: 'Pengajuan' | 'Aktif' | 'Selesai';
   closing_status: string;
+  project_flock: ProjectFlock;
 };
 
 export type ClosingGeneralInformation = BaseMetadata &

src/types/api/production/recording.d.ts

@@ -4,12 +4,23 @@ import { ProductWarehouse } from '@/types/api/inventory/product-warehouse';
 export type ProductionMetrics = {
   total_depletion_qty: number;
   cum_depletion_rate: number;
-  daily_gain: number;
-  avg_daily_gain: number;
   cum_intake: number;
   fcr_value: number;
+  fcr_std?: number;
   total_chick_qty: number;
-  cum_depletion: number;
+  hand_day?: number;
+  hand_house?: number;
+  feed_intake?: number;
+  egg_mesh?: number;
+  egg_weight?: number;
+  hand_day_std?: number;
+  hand_house_std?: number;
+  feed_intake_std?: number;
+  egg_mesh_std?: number;
+  egg_weight_std?: number;
+  daily_gain?: number;
+  avg_daily_gain?: number;
+  cum_depletion?: number;
 };
 
 export type BaseRecording = {
@@ -20,12 +31,6 @@ export type BaseRecording = {
   project_flock_category?: 'GROWING' | 'LAYING';
 } & ProductionMetrics;
 
-export type RecordingBW = {
-  avg_weight: number;
-  qty: number;
-  total_weight: number;
-};
-
 export type RecordingDepletion = {
   product_warehouse_id: number;
   qty: number;
@@ -63,7 +68,6 @@ export type Recording = BaseMetadata &
   BaseRecording & {
     approval?: BaseApproval;
     created_user: User;
-    body_weights?: RecordingBW[];
     depletions?: RecordingDepletion[];
     stocks?: RecordingStock[];
     eggs?: RecordingEgg[];
@@ -77,10 +81,6 @@ export type NextDayRecording = {
 
 export type CreateGrowingRecordingPayload = {
   project_flock_kandang_id: number;
-  body_weights: {
-    avg_weight: number;
-    qty: number;
-  }[];
   stocks?: {
     product_warehouse_id: number;
     qty: number;

src/types/api/report/production-result.d.ts

@@ -0,0 +1,59 @@
+import { BaseMetadata } from '@/types/api/api-general';
+import { ProjectFlock } from '@/types/api/production/project-flock';
+import { BaseKandang } from '@/types/api/master-data/kandang';
+
+export type BaseProductionResult = {
+  project_flock: Pick<ProjectFlock, 'id' | 'name' | 'category'> & {
+    kandang: Pick<BaseKandang, 'id' | 'name'>;
+  };
+
+  woa: number;
+
+  // BW
+  bw: number;
+  std_bw: number;
+  uniformity: number;
+  std_uniformity: string; // "90% up" - keeping as string based on "up" suffix potential
+
+  // Dep
+  dep_kum: number;
+  dep_std: number;
+
+  // Butiran
+  butiran_utuh: number;
+  butiran_putih: number;
+  butiran_retak: number;
+  butiran_pecah: number;
+  butiran_jumlah: number;
+  total_butir: number;
+
+  // Kg
+  kg_utuh: number;
+  kg_putih: number;
+  kg_retak: number;
+  kg_pecah: number;
+  kg_jumlah: number;
+  total_kg: number;
+
+  // %
+  persen_utuh: number;
+  persen_putih: number;
+  persen_retak: number;
+  persen_pecah: number;
+
+  // Produksi
+  hd: number;
+  hd_std: number;
+  fi: number;
+  fi_std: number;
+  em: number;
+  em_std: number;
+  ew: number;
+  ew_std: number;
+  fcr: number;
+  fcr_std: number;
+  hh: number;
+  hh_std: number;
+};
+
+export type ProductionResult = BaseMetadata & BaseProductionResult;