Merge branch 'master' of https://git.2fi-solutions.com/derek/FPSMS-frontend

# Conflicts:
#	src/components/DetailScheduleDetail/DetailInfoCard.tsx
#	src/components/DetailScheduleDetail/DetailScheudleDetailView.tsx

src/components/DetailScheduleDetail/DetailInfoCard.tsx

@@ -23,11 +23,14 @@ import { SaveDetailSchedule } from "./DetailScheudleDetailView";
 // temp interface input
 
 type Props = {
-  recordDetails: any;
+  // recordDetails: SaveDetailSchedule;
   isEditing: boolean;
 };
 
-const DetailInfoCard: React.FC<Props> = ({ recordDetails, isEditing }) => {
+const DetailInfoCard: React.FC<Props> = ({ 
+  // recordDetails, 
+  isEditing
+ }) => {
   const {
     t,
     i18n: { language },
@@ -39,12 +42,12 @@ const DetailInfoCard: React.FC<Props> = ({ recordDetails, isEditing }) => {
     formState: { errors, defaultValues, touchedFields },
   } = useFormContext<SaveDetailSchedule>();
 
-  const [details, setDetails] = useState<SaveDetailSchedule | null>(null);
+  const [details, setDetails] = useState<SaveDetailSchedule | undefined>(undefined);
 
   useEffect(() => {
-    console.log("[debug] record details", recordDetails);
-    setDetails(recordDetails);
-  }, [recordDetails]);
+    console.log("[debug] record details", defaultValues)
+    setDetails(defaultValues as SaveDetailSchedule);
+  }, [defaultValues])
 
   useEffect(() => {
     console.log("[debug] isEdit", isEditing);

src/components/DetailScheduleDetail/DetailScheudleDetailView.tsx

@@ -50,7 +50,7 @@ type Props = {
   isEditMode: boolean;
   // type: TypeEnum;
   defaultValues: Partial<SaveDetailSchedule> | undefined;
-  qcChecks: ItemQc[];
+  // qcChecks: ItemQc[]
 };
 
 const DetailScheduleDetailView: React.FC<Props> = ({
@@ -98,14 +98,12 @@ const DetailScheduleDetailView: React.FC<Props> = ({
   }, [isEditMode]);
   // console.log(typeId)
   const formProps = useForm<SaveDetailSchedule>({
-    defaultValues: defaultValues
-      ? defaultValues
-      : {
-          id: 1,
-          productionDate: "2025-05-07",
-          totalJobOrders: 13,
-          totalProductionQty: 21000,
-        },
+    defaultValues: defaultValues ? defaultValues : {
+      id: 1,
+      productionDate: "2025-05-07",
+      totalJobOrders: 13,
+      totalProductionQty: 21000,
+    } as SaveDetailSchedule,
   });
   const errors = formProps.formState.errors;
 
@@ -170,7 +168,7 @@ const DetailScheduleDetailView: React.FC<Props> = ({
           {/*  </Typography>*/}
           {/*</Grid>*/}
           <DetailInfoCard
-            recordDetails={formProps.formState.defaultValues}
+            // recordDetails={formProps.formState.defaultValues}
             isEditing={isEdit}
           />
           <Stack