feat(FE-136): update RecordingForm schema to remove tanggal and add flock object

This commit is contained in:
rstubryan
2025-10-14 23:01:01 +07:00
parent 6dcb97bcac
commit 89318407ea
2 changed files with 40 additions and 48 deletions
@@ -1,9 +1,13 @@
import * as Yup from 'yup'; import * as Yup from 'yup';
import { RECORDING_FLAG_OPTIONS } from '@/config/constant'; import { RECORDING_FLAG_OPTIONS } from '@/config/constant';
import { Recording } from '@/types/api/flock/recording';
export const RecordingFormSchema = Yup.object({ export const RecordingFormSchema = Yup.object({
flock: Yup.object({
value: Yup.number().min(1).required(),
label: Yup.string().required(),
}).nullable(),
flock_id: Yup.number().required('Flock wajib diisi!'), flock_id: Yup.number().required('Flock wajib diisi!'),
tanggal: Yup.string().required('Tanggal wajib diisi!'),
data_pakan: Yup.array() data_pakan: Yup.array()
.of( .of(
Yup.object({ Yup.object({
@@ -71,48 +75,37 @@ export const UpdateRecordingFormSchema = RecordingFormSchema;
export type RecordingFormValues = Yup.InferType<typeof RecordingFormSchema>; export type RecordingFormValues = Yup.InferType<typeof RecordingFormSchema>;
export const getRecordingFormInitialValues = ( export const getRecordingFormInitialValues = (
initialValues?: Partial<RecordingFormValues> initialValues?: Recording
): RecordingFormValues => ({ ): RecordingFormValues => ({
flock_id: initialValues?.flock_id ?? 0, flock: initialValues?.flock
tanggal: initialValues?.tanggal ?? '', ? {
data_pakan: value: initialValues.flock.id,
Array.isArray(initialValues?.data_pakan) && label: initialValues.flock.name,
initialValues.data_pakan.length > 0 }
? initialValues.data_pakan : null,
: [ flock_id: initialValues?.flock?.id ?? 0,
data_pakan: initialValues?.data_pakan ?? [
{ {
nama_pakan: '', nama_pakan: '',
qty_pakan: 0, qty_pakan: 0,
stock_pakan: 0, stock_pakan: 0,
}, },
], ],
bobot_badan: bobot_badan: initialValues?.bobot_badan ?? [
Array.isArray(initialValues?.bobot_badan) &&
initialValues.bobot_badan.length > 0
? initialValues.bobot_badan
: [
{ {
berat_ayam: 0, berat_ayam: 0,
jumlah_ayam: 0, jumlah_ayam: 0,
rata_rata_berat_ayam: 0, rata_rata_berat_ayam: 0,
}, },
], ],
vaksinasi: vaksinasi: initialValues?.vaksinasi ?? [
Array.isArray(initialValues?.vaksinasi) &&
initialValues.vaksinasi.length > 0
? initialValues.vaksinasi
: [
{ {
nama_vaksin: '', nama_vaksin: '',
total_stock: 0, total_stock: 0,
jumlah_stock: 0, jumlah_stock: 0,
}, },
], ],
mortalitas: mortalitas: initialValues?.mortalitas ?? [
Array.isArray(initialValues?.mortalitas) &&
initialValues.mortalitas.length > 0
? initialValues.mortalitas
: [
{ {
kondisi: '', kondisi: '',
jumlah: 0, jumlah: 0,
-1
View File
@@ -29,7 +29,6 @@ export type Recording = BaseMetadata & BaseRecording;
export type CreateRecordingPayload = { export type CreateRecordingPayload = {
flock_id: number; flock_id: number;
tanggal: string;
data_pakan: { data_pakan: {
nama_pakan: string; nama_pakan: string;
qty_pakan: number; qty_pakan: number;