From 99fc3f8cae97e4eecd756995560e5900117479f1 Mon Sep 17 00:00:00 2001
From: rstubryan <restubumirr@gmail.com>
Date: Wed, 21 Jan 2026 13:45:12 +0700
Subject: [PATCH] refactor(FE): Standardize unit labels and number formatting

---
 .../recording/form/RecordingForm.tsx          | 73 ++++++++-----------
 1 file changed, 31 insertions(+), 42 deletions(-)

diff --git a/src/components/pages/production/recording/form/RecordingForm.tsx b/src/components/pages/production/recording/form/RecordingForm.tsx
index 10558973..5120bab2 100644
--- a/src/components/pages/production/recording/form/RecordingForm.tsx
+++ b/src/components/pages/production/recording/form/RecordingForm.tsx
@@ -156,39 +156,39 @@ const productionStandardColumns: ColumnDef<StandardDetails>[] = [
   },
   {
     accessorKey: 'egg_production_standard_detail.target_hen_house_production',
-    header: 'Target Hen House (%)',
+    header: 'Target Hen House (btr)',
     cell: (props) =>
-      `${
+      formatNumber(
         (props.row.original.egg_production_standard_detail
           ?.target_hen_house_production as number) || 0
-      }%`,
+      ),
   },
   {
     accessorKey: 'egg_production_standard_detail.target_egg_weight',
-    header: 'Target Egg Weight (gram)',
+    header: 'Target Egg Weight (g)',
     cell: (props) =>
-      formatNumber(
+      `${
         (props.row.original.egg_production_standard_detail
           ?.target_egg_weight as number) || 0
-      ),
+      } g`,
   },
   {
     accessorKey: 'egg_production_standard_detail.target_egg_mass',
-    header: 'Target Egg Mass (gram)',
+    header: 'Target Egg Mass (kg)',
     cell: (props) =>
-      formatNumber(
+      `${
         (props.row.original.egg_production_standard_detail
           ?.target_egg_mass as number) || 0
-      ),
+      } kg`,
   },
   {
     accessorKey: 'egg_production_standard_detail.standard_fcr',
-    header: 'Standard FCR',
+    header: 'Standard FCR (g)',
     cell: (props) =>
-      formatNumber(
+      `${
         (props.row.original.egg_production_standard_detail
           ?.standard_fcr as number) || 0
-      ),
+      } g`,
   },
 ];
 
@@ -2107,38 +2107,33 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                     </thead>
                     <tbody>
                       <tr>
-                        <td className='py-3 font-medium'>FCR</td>
+                        <td className='py-3 font-medium'>FCR (g)</td>
                         <td className='text-center py-3'>
                           <span className='font-semibold'>
                             {initialValues.fcr_value != null
-                              ? formatNumber(initialValues.fcr_value)
+                              ? `${formatNumber(initialValues.fcr_value)} g`
                               : '-'}
                           </span>
                         </td>
                         <td className='text-center py-3 text-gray-600'>
                           {initialValues.project_flock?.fcr?.fcr_std != null
-                            ? formatNumber(
-                                initialValues.project_flock?.fcr?.fcr_std
-                              )
+                            ? `${formatNumber(initialValues.project_flock?.fcr?.fcr_std)} g`
                             : '-'}
                         </td>
                       </tr>
                       <tr>
-                        <td className='py-3 font-medium'>Feed Intake (KG)</td>
+                        <td className='py-3 font-medium'>Feed Intake (g)</td>
                         <td className='text-center py-3'>
                           <span className='font-semibold'>
                             {initialValues.feed_intake != null
-                              ? formatNumber(initialValues.feed_intake)
+                              ? `${formatNumber(initialValues.feed_intake)} g`
                               : '-'}
                           </span>
                         </td>
                         <td className='text-center py-3 text-gray-600'>
                           {initialValues.project_flock?.production_standart
                             ?.feed_intake_std != null
-                            ? formatNumber(
-                                initialValues.project_flock?.production_standart
-                                  ?.feed_intake_std
-                              )
+                            ? `${formatNumber(initialValues.project_flock?.production_standart?.feed_intake_std)} g`
                             : '-'}
                         </td>
                       </tr>
@@ -2218,51 +2213,43 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                         </thead>
                         <tbody>
                           <tr>
-                            <td className='py-3 font-medium'>Egg Mass</td>
+                            <td className='py-3 font-medium'>Egg Mass (kg)</td>
                             <td className='text-center py-3'>
                               <span className='font-semibold'>
                                 {initialValues.egg_mass != null
-                                  ? formatNumber(initialValues.egg_mass)
+                                  ? `${formatNumber(initialValues.egg_mass)} kg`
                                   : '-'}
                               </span>
                             </td>
                             <td className='text-center py-3 text-gray-600'>
                               {initialValues.project_flock?.production_standart
                                 ?.egg_mass_std != null
-                                ? formatNumber(
-                                    initialValues.project_flock
-                                      ?.production_standart?.egg_mass_std
-                                  )
+                                ? `${formatNumber(initialValues.project_flock?.production_standart?.egg_mass_std)} kg`
                                 : '-'}
                             </td>
                           </tr>
                           <tr>
-                            <td className='py-3 font-medium'>
-                              Egg Weight (KG)
-                            </td>
+                            <td className='py-3 font-medium'>Egg Weight (g)</td>
                             <td className='text-center py-3'>
                               <span className='font-semibold'>
                                 {initialValues.egg_weight != null
-                                  ? formatNumber(initialValues.egg_weight)
+                                  ? `${formatNumber(initialValues.egg_weight)} g`
                                   : '-'}
                               </span>
                             </td>
                             <td className='text-center py-3 text-gray-600'>
                               {initialValues.project_flock?.production_standart
                                 ?.egg_weight_std != null
-                                ? formatNumber(
-                                    initialValues.project_flock
-                                      ?.production_standart?.egg_weight_std
-                                  )
+                                ? `${formatNumber(initialValues.project_flock?.production_standart?.egg_weight_std)} g`
                                 : '-'}
                             </td>
                           </tr>
                           <tr>
-                            <td className='py-3 font-medium'>Hen Day</td>
+                            <td className='py-3 font-medium'>Hen Day (%)</td>
                             <td className='text-center py-3'>
                               <span className='font-semibold'>
                                 {initialValues.hen_day != null
-                                  ? formatNumber(initialValues.hen_day)
+                                  ? `${formatNumber(initialValues.hen_day)}%`
                                   : '-'}
                               </span>
                             </td>
@@ -2274,18 +2261,20 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
                             </td>
                           </tr>
                           <tr>
-                            <td className='py-3 font-medium'>Hen House</td>
+                            <td className='py-3 font-medium'>
+                              Hen House (btr)
+                            </td>
                             <td className='text-center py-3'>
                               <span className='font-semibold'>
                                 {initialValues.hen_house != null
-                                  ? formatNumber(initialValues.hen_house)
+                                  ? `${formatNumber(initialValues.hen_house)} btr`
                                   : '-'}
                               </span>
                             </td>
                             <td className='text-center py-3 text-gray-600'>
                               {initialValues.project_flock?.production_standart
                                 ?.hen_house_std != null
-                                ? `${initialValues.project_flock?.production_standart?.hen_house_std}%`
+                                ? `${formatNumber(initialValues.project_flock?.production_standart?.hen_house_std)} btr`
                                 : '-'}
                             </td>
                           </tr>