From bbbd767cf2ae63d8318dde05002db6f9c7d5c965 Mon Sep 17 00:00:00 2001
From: rstubryan <restubumirr@gmail.com>
Date: Fri, 20 Feb 2026 09:21:42 +0700
Subject: [PATCH] refactor(FE): Fix week calculation logic in UniformityForm

---
 .../uniformity/form/UniformityForm.tsx        | 79 +++++++++----------
 1 file changed, 39 insertions(+), 40 deletions(-)

diff --git a/src/components/pages/production/uniformity/form/UniformityForm.tsx b/src/components/pages/production/uniformity/form/UniformityForm.tsx
index 33b649c4..724f7b81 100644
--- a/src/components/pages/production/uniformity/form/UniformityForm.tsx
+++ b/src/components/pages/production/uniformity/form/UniformityForm.tsx
@@ -203,16 +203,19 @@ const UniformityForm = ({
 
   // ===== RECORDINGS DATA (FOR WEEK CALCULATION) =====
   const recordingsUrl = useMemo(() => {
+    if (!projectFlockKandangLookup?.project_flock_kandang_id) return null;
     const params = new URLSearchParams({
       page: '1',
       limit: '100',
+      project_flock_kandang_id:
+        projectFlockKandangLookup.project_flock_kandang_id.toString(),
     });
     return `${RecordingApi.basePath}?${params.toString()}`;
-  }, []);
+  }, [projectFlockKandangLookup?.project_flock_kandang_id]);
 
   const { data: recordingsData } = useSWR(
     recordingsUrl,
-    RecordingApi.getAllFetcher
+    recordingsUrl ? RecordingApi.getAllFetcher : null
   );
 
   // ===== FORM CONFIGURATION =====
@@ -400,50 +403,46 @@ const UniformityForm = ({
   useEffect(() => {
     if (
       projectFlockKandangLookup?.chick_in_date &&
-      projectFlockKandangLookup?.project_flock_kandang_id &&
-      isResponseSuccess(recordingsData) &&
-      recordingsData.data
+      projectFlockKandangLookup?.project_flock_kandang_id
     ) {
-      const matchingRecordings = recordingsData.data.filter(
-        (recording: Recording) =>
-          recording.project_flock?.project_flock_kandang_id ===
-          projectFlockKandangLookup.project_flock_kandang_id
-      );
+      const chickInDate = new Date(projectFlockKandangLookup.chick_in_date);
+      chickInDate.setHours(0, 0, 0, 0);
 
-      matchingRecordings.sort(
-        (a: Recording, b: Recording) =>
-          new Date(a.record_datetime).getTime() -
-          new Date(b.record_datetime).getTime()
-      );
+      let initialWeek = 18;
 
-      const earliestRecording = matchingRecordings[0];
+      if (
+        isResponseSuccess(recordingsData) &&
+        recordingsData.data &&
+        recordingsData.data.length > 0
+      ) {
+        const sortedRecordings = [...recordingsData.data].sort(
+          (a: Recording, b: Recording) =>
+            new Date(a.record_datetime).getTime() -
+            new Date(b.record_datetime).getTime()
+        );
 
-      if (earliestRecording) {
-        const chickInDate = new Date(projectFlockKandangLookup.chick_in_date);
-        chickInDate.setHours(0, 0, 0, 0);
-
-        const earliestRecordDate = new Date(earliestRecording.record_datetime);
-        earliestRecordDate.setHours(0, 0, 0, 0);
-
-        const initialWeek =
-          earliestRecording.project_flock?.production_standart?.week || 18;
-
-        if (formik.values.date) {
-          const selectedDate = new Date(formik.values.date);
-          selectedDate.setHours(0, 0, 0, 0);
-
-          const daysDiff = Math.floor(
-            (selectedDate.getTime() - chickInDate.getTime()) /
-              (1000 * 60 * 60 * 24)
-          );
-
-          const weeksDiff = Math.floor(daysDiff / 7);
-
-          formik.setFieldValue('week', initialWeek + weeksDiff);
-        } else {
-          formik.setFieldValue('week', initialWeek);
+        const earliestRecording = sortedRecordings[0];
+        if (earliestRecording?.project_flock?.production_standart?.week) {
+          initialWeek =
+            earliestRecording.project_flock.production_standart.week;
         }
       }
+
+      if (formik.values.date) {
+        const selectedDate = new Date(formik.values.date);
+        selectedDate.setHours(0, 0, 0, 0);
+
+        const daysDiff = Math.floor(
+          (selectedDate.getTime() - chickInDate.getTime()) /
+            (1000 * 60 * 60 * 24)
+        );
+
+        const weeksDiff = Math.floor(daysDiff / 7);
+
+        formik.setFieldValue('week', initialWeek + weeksDiff);
+      } else {
+        formik.setFieldValue('week', initialWeek);
+      }
     }
   }, [
     projectFlockKandangLookup?.chick_in_date,