mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-24 23:35:45 +00:00
fix(FE-88): fix project flock data types
This commit is contained in:
@@ -58,7 +58,7 @@ const ProjectFlockForm = ({
|
|||||||
const [optionsLocation, setOptionsLocation] = useState<OptionType[]>([]);
|
const [optionsLocation, setOptionsLocation] = useState<OptionType[]>([]);
|
||||||
|
|
||||||
const [openSelectKandangs, setOpenSelectKandangs] = useState(
|
const [openSelectKandangs, setOpenSelectKandangs] = useState(
|
||||||
initialValues?.kandangs?.length > 0
|
initialValues?.kandangs && initialValues?.kandangs?.length > 0
|
||||||
);
|
);
|
||||||
const [optionsKandang, setOptionsKandang] = useState<Kandang[]>(
|
const [optionsKandang, setOptionsKandang] = useState<Kandang[]>(
|
||||||
initialValues?.kandangs ?? []
|
initialValues?.kandangs ?? []
|
||||||
@@ -329,11 +329,11 @@ const ProjectFlockForm = ({
|
|||||||
: null,
|
: null,
|
||||||
flock_id: initialValues?.flock?.id ?? 0,
|
flock_id: initialValues?.flock?.id ?? 0,
|
||||||
area_id: initialValues?.area?.id ?? 0,
|
area_id: initialValues?.area?.id ?? 0,
|
||||||
category: initialValues?.category,
|
category: initialValues?.category as (NonNullable<"GROWING" | "LAYING" | undefined>),
|
||||||
fcr_id: initialValues?.fcr?.id ?? 0,
|
fcr_id: initialValues?.fcr?.id ?? 0,
|
||||||
location_id: initialValues?.location?.id ?? 0,
|
location_id: initialValues?.location?.id ?? 0,
|
||||||
period: initialValues?.period ?? '',
|
period: initialValues?.period ?? 0,
|
||||||
kandang_ids: initialValues?.kandangs?.map((k: Kandang) => k.id),
|
kandang_ids: initialValues?.kandangs?.map((k: Kandang) => k.id) as (number | undefined)[],
|
||||||
};
|
};
|
||||||
}, [initialValues]);
|
}, [initialValues]);
|
||||||
|
|
||||||
@@ -376,13 +376,15 @@ const ProjectFlockForm = ({
|
|||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (formType == 'detail') {
|
if (formType == 'detail') {
|
||||||
formik.setFieldValue('area', {
|
formik.setFieldValue('area', {
|
||||||
value: initialValues.area.id,
|
value: initialValues?.area.id,
|
||||||
label: initialValues.area.name,
|
label: initialValues?.area.name,
|
||||||
});
|
});
|
||||||
formik.setFieldValue('area_id', initialValues.area_id);
|
formik.setFieldValue('area_id', initialValues?.area_id);
|
||||||
setSelectedArea(initialValues.area?.id);
|
if(initialValues?.area_id){
|
||||||
|
setSelectedArea(initialValues?.area_id.toString() as string);
|
||||||
|
}
|
||||||
|
|
||||||
formik.setFieldValue('period', initialValues.period);
|
formik.setFieldValue('period', initialValues?.period);
|
||||||
}
|
}
|
||||||
}, [initialValues, setSelectedArea, formType]);
|
}, [initialValues, setSelectedArea, formType]);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|||||||
+2
@@ -4,8 +4,10 @@ import { Flock } from "@/types/api/master-data/flock";
|
|||||||
import { Kandang } from "@/types/api/master-data/kandang";
|
import { Kandang } from "@/types/api/master-data/kandang";
|
||||||
import { Location } from "@/types/api/master-data/location";
|
import { Location } from "@/types/api/master-data/location";
|
||||||
import { ProductCategory } from "@/types/api/master-data/product-category";
|
import { ProductCategory } from "@/types/api/master-data/product-category";
|
||||||
|
import { BaseMetadata } from "@/types/api/api-general";
|
||||||
|
|
||||||
export type BaseProjectFlock = {
|
export type BaseProjectFlock = {
|
||||||
|
id: number;
|
||||||
name: string;
|
name: string;
|
||||||
status: string;
|
status: string;
|
||||||
flock: Flock;
|
flock: Flock;
|
||||||
|
|||||||
Reference in New Issue
Block a user