refactor(FE-114): simplify project flock types and update flock reference in recording

This commit is contained in:
rstubryan
2025-10-22 09:41:00 +07:00
parent 2e595b5e86
commit a904c35b7f
3 changed files with 15 additions and 106 deletions
+11 -17
View File
@@ -1,35 +1,29 @@
import { Area } from "@/types/api/master-data/area";
import { Fcr } from "@/types/api/master-data/fcr";
import { Flock } from "@/types/api/master-data/flock";
import { Kandang } from "@/types/api/master-data/kandang";
import { Location } from "@/types/api/master-data/location";
import { BaseMetadata } from "@/types/api/api-general";
import { Area } from '@/types/api/master-data/area';
import { Fcr } from '@/types/api/master-data/fcr';
import { Flock } from '@/types/api/master-data/flock';
import { Kandang } from '@/types/api/master-data/kandang';
import { Location } from '@/types/api/master-data/location';
import { BaseMetadata } from '@/types/api/api-general';
export type BaseProjectFlock = {
id: number;
name: string;
status: string;
flock: Flock;
flock_id: number;
area: Area;
area_id: number;
category: string;
fcr: Fcr;
fcr_id: number;
location: Location;
location_id: number;
period: number;
kandang_ids: number[];
kandangs: Kandang[];
}
};
export type PeriodFlock = {
flock: Flock;
next_period: number;
}
};
export type ProjectFlock = BaseMetadata & BaseProjectFlock
export type ProjectFlock = BaseMetadata & BaseProjectFlock;
export type CreateProjectFlockPayload = {
flock_id: number;
@@ -39,6 +33,6 @@ export type CreateProjectFlockPayload = {
location_id: number;
period: number;
kandang_ids: number[];
}
};
export type UpdateProjectFlockPayload = CreateProjectFlockPayload;
export type UpdateProjectFlockPayload = CreateProjectFlockPayload;
+2 -2
View File
@@ -1,11 +1,11 @@
import { BaseMetadata } from '@/types/api/api-general';
import { ProjectFlock } from '@/types/api/production/project-flock';
import { Location } from '@/types/api/master-data/location';
import { Kandang } from '@/types/api/master-data/kandang';
import { Flock } from '@/types/api/master-data/flock';
export type BaseRecording = {
id: number;
flock: ProjectFlock;
flock: Flock;
recording_date: string;
location: Location;
coop: Kandang;