From 366260608f9a052715290da90bc2c52479197053 Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Sat, 30 May 2026 09:13:56 +0700 Subject: [PATCH 1/2] fix: remove transition restrict logic --- .../production/recording/form/RecordingForm.tsx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx index 22cbdb1b..7f11709c 100644 --- a/src/components/pages/production/recording/form/RecordingForm.tsx +++ b/src/components/pages/production/recording/form/RecordingForm.tsx @@ -463,13 +463,16 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { }, [selectedKandang]); // ===== TRANSITION RESTRICTION LOGIC ===== - const isTransitionPeriod = useMemo(() => { - return ( - initialValues?.is_transition ?? - projectFlockKandangLookup?.is_transition ?? - false - ); - }, [initialValues, projectFlockKandangLookup]); + // const isTransitionPeriod = useMemo(() => { + // return ( + // initialValues?.is_transition ?? + // projectFlockKandangLookup?.is_transition ?? + // false + // ); + // }, [initialValues, projectFlockKandangLookup]); + + // set to false by request: 30 May 2026, 09:11 + const isTransitionPeriod = false; const recordingRestriction = useMemo(() => { let isLaying: boolean; From 7b4bd7605bf8249332e532c81e35daa44152b78d Mon Sep 17 00:00:00 2001 From: ValdiANS Date: Tue, 2 Jun 2026 09:45:19 +0700 Subject: [PATCH 2/2] fix: remove transition restriction for recording --- .../recording/form/RecordingForm.tsx | 11 +- .../production/recording/recording-utils.ts | 115 ++++++++++-------- 2 files changed, 69 insertions(+), 57 deletions(-) diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx index 7f11709c..38bbe94a 100644 --- a/src/components/pages/production/recording/form/RecordingForm.tsx +++ b/src/components/pages/production/recording/form/RecordingForm.tsx @@ -486,10 +486,13 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => { false; } - const isTransition = - initialValues?.is_transition ?? - projectFlockKandangLookup?.is_transition ?? - false; + // const isTransition = + // initialValues?.is_transition ?? + // projectFlockKandangLookup?.is_transition ?? + // false; + + // set to false by request: 30 May 2026, 09:11 + const isTransition = false; const currentIsLaying = type === 'edit' diff --git a/src/components/pages/production/recording/recording-utils.ts b/src/components/pages/production/recording/recording-utils.ts index fe7d07f8..1544bcb5 100644 --- a/src/components/pages/production/recording/recording-utils.ts +++ b/src/components/pages/production/recording/recording-utils.ts @@ -11,63 +11,72 @@ export const getRecordingRestriction = ( isTransition: boolean, currentIsLaying?: boolean ): RecordingRestriction => { - if (isTransition && !isLaying) { - const isLayingKandangInTransition = currentIsLaying === true; + // if (isTransition && !isLaying) { + // const isLayingKandangInTransition = currentIsLaying === true; - if (isLayingKandangInTransition) { - return { - canEditStock: false, - canEditDepletion: true, - canEditEgg: true, - isLocked: false, - lockReason: undefined, - }; - } else { - return { - canEditStock: true, - canEditDepletion: false, - canEditEgg: false, - isLocked: false, - lockReason: undefined, - }; - } - } + // if (isLayingKandangInTransition) { + // return { + // canEditStock: false, + // canEditDepletion: true, + // canEditEgg: true, + // isLocked: false, + // lockReason: undefined, + // }; + // } else { + // return { + // canEditStock: true, + // canEditDepletion: false, + // canEditEgg: false, + // isLocked: false, + // lockReason: undefined, + // }; + // } + // } - if (!isLaying && !isTransition && currentIsLaying) { - return { - canEditStock: false, - canEditDepletion: false, - canEditEgg: false, - isLocked: true, - lockReason: - 'Recording Growing telah terkunci karena Project Flock sudah masuk fase Laying', - }; - } + // if (!isLaying && !isTransition && currentIsLaying) { + // return { + // canEditStock: false, + // canEditDepletion: false, + // canEditEgg: false, + // isLocked: true, + // lockReason: + // 'Recording Growing telah terkunci karena Project Flock sudah masuk fase Laying', + // }; + // } - if (!isLaying && !isTransition) { - return { - canEditStock: true, - canEditDepletion: true, - canEditEgg: false, - isLocked: false, - lockReason: undefined, - }; - } - if (isLaying && !isTransition) { - return { - canEditStock: true, - canEditDepletion: true, - canEditEgg: true, - isLocked: false, - lockReason: undefined, - }; - } + // if (!isLaying && !isTransition) { + // return { + // canEditStock: true, + // canEditDepletion: true, + // canEditEgg: false, + // isLocked: false, + // lockReason: undefined, + // }; + // } + // if (isLaying && !isTransition) { + // return { + // canEditStock: true, + // canEditDepletion: true, + // canEditEgg: true, + // isLocked: false, + // lockReason: undefined, + // }; + // } + // return { + // canEditStock: false, + // canEditDepletion: false, + // canEditEgg: false, + // isLocked: true, + // lockReason: 'Kondisi transisi tidak valid', + // }; + + // remove recording transition restriction by request: 30 May 2026, 09:11 return { - canEditStock: false, - canEditDepletion: false, - canEditEgg: false, - isLocked: true, - lockReason: 'Kondisi transisi tidak valid', + canEditStock: true, + canEditDepletion: true, + canEditEgg: true, + isLocked: false, + lockReason: undefined, }; };