Merge branch 'development' into feat/FE/US-81/production-result-report

src/types/api/dashboard/dashboard-production.d.ts

@@ -0,0 +1,52 @@
+export interface DashboardProduction {
+  statistics_data: DashboardProductionStatisticsData[];
+  production_charts: DashboardProductionProductionCharts[];
+  standard_productions: DashboardProductionStandardProductions[];
+  egg_weights: DashboardProductionEggWeights[];
+  fcr_data: DashboardProductionFcrData[];
+}
+
+export interface DashboardProductionFcrData {
+  flock: DashboardProductionFcrDataFlock;
+  fcr: number;
+}
+
+export interface DashboardProductionEggWeights {
+  flock: DashboardProductionFcrDataFlock;
+  weight: number;
+}
+
+export interface DashboardProductionStandardProductions {
+  week: number;
+  standards: DashboardProductionStandardProductionsStandards[];
+  flocks: DashboardProductionProductionChartsFlocks[];
+}
+
+export interface DashboardProductionProductionCharts {
+  date: string;
+  flocks: DashboardProductionProductionChartsFlocks[];
+}
+
+export interface DashboardProductionStatisticsData {
+  title: string;
+  value: number;
+  change: number;
+  period: string;
+  changeType: string;
+}
+
+export interface DashboardProductionFcrDataFlock {
+  id: number;
+  name: string;
+}
+
+export interface DashboardProductionStandardProductionsStandards {
+  name: string;
+  value: number;
+}
+
+export interface DashboardProductionProductionChartsFlocks {
+  id: number;
+  name: string;
+  data: number;
+}

src/types/api/expense.d.ts

@@ -57,11 +57,12 @@ export type Expense = BaseMetadata & BaseExpense;
 
 export type CreateExpensePayload = {
   category: 'BOP' | 'NON-BOP';
+  location_id: number;
   transaction_date: string;
   supplier_id: number;
   documents: File[];
   expense_nonstocks: {
-    kandang_id: number;
+    kandang_id?: number;
     cost_items: {
       nonstock_id: number;
       quantity: number;
@@ -72,12 +73,13 @@ export type CreateExpensePayload = {
 };
 
 export type UpdateExpensePayload = {
+  location_id: number;
   category: 'BOP' | 'NON-BOP';
   transaction_date: string;
   supplier_id: number;
   documents: File[];
   expense_nonstocks: {
-    kandang_id: number;
+    kandang_id?: number;
     cost_items: {
       nonstock_id: number;
       quantity: number;

src/types/api/master-data/production-standard.d.ts

@@ -21,6 +21,7 @@ export interface ProductionStandardDetails {
   target_hen_house_production: number;
   target_egg_weight: number;
   target_egg_mass: number;
+  standard_fcr: number;
 }
 
 export interface StandardGrowthDetails {
@@ -46,6 +47,7 @@ export interface CreateProductionStandardPayload {
       target_hen_house_production: number;
       target_egg_weight: number;
       target_egg_mass: number;
+      standard_fcr: number;
     };
   }[];
 }
@@ -66,6 +68,7 @@ export interface UpdateProductionStandardPayload {
       target_hen_house_production: number;
       target_egg_weight: number;
       target_egg_mass: number;
+      standard_fcr: number;
     };
   }[];
 }

src/types/api/production/project-flock.d.ts

@@ -16,6 +16,8 @@ export type BaseProjectFlock = {
   category: string;
   fcr: Fcr;
   fcr_id: number;
+  production_standard: ProductionStandard;
+  production_standard_id: number;
   location: Location;
   location_id: number;
   period: number;
@@ -48,6 +50,7 @@ export type CreateProjectFlockPayload = {
   area_id: number;
   category: string;
   fcr_id: number;
+  production_standard_id: number;
   location_id: number;
   kandang_ids: number[];
   project_budgets?: ProjectFlockBudget[];