refactor(FE-441): Display '-' for empty/zero numeric fields

This commit is contained in:
rstubryan
2025-12-31 09:02:15 +07:00
parent 6c3285f624
commit 2bf764a05c
@@ -1570,7 +1570,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
<td className='py-3 font-medium'>FCR</td> <td className='py-3 font-medium'>FCR</td>
<td className='text-center py-3'> <td className='text-center py-3'>
<span className='font-semibold'> <span className='font-semibold'>
{formatNumber(initialValues.fcr_value || 0)} {initialValues.fcr_value &&
initialValues.fcr_value > 0
? formatNumber(initialValues.fcr_value)
: '-'}
</span> </span>
</td> </td>
<td className='text-center py-3 text-gray-600'>-</td> <td className='text-center py-3 text-gray-600'>-</td>
@@ -1579,18 +1582,27 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
<td className='py-3 font-medium'>Feed Intake (KG)</td> <td className='py-3 font-medium'>Feed Intake (KG)</td>
<td className='text-center py-3'> <td className='text-center py-3'>
<span className='font-semibold'> <span className='font-semibold'>
{formatNumber(initialValues.feed_intake || 0)} {initialValues.feed_intake &&
initialValues.feed_intake > 0
? formatNumber(initialValues.feed_intake)
: '-'}
</span> </span>
</td> </td>
<td className='text-center py-3 text-gray-600'> <td className='text-center py-3 text-gray-600'>
{formatNumber(initialValues.feed_intake_std || 0)} {initialValues.feed_intake_std &&
initialValues.feed_intake_std > 0
? formatNumber(initialValues.feed_intake_std)
: '-'}
</td> </td>
</tr> </tr>
<tr> <tr>
<td className='py-3 font-medium'>Cum. Intake (KG)</td> <td className='py-3 font-medium'>Cum. Intake (KG)</td>
<td className='text-center py-3'> <td className='text-center py-3'>
<span className='font-semibold'> <span className='font-semibold'>
{formatNumber(initialValues.cum_intake || 0)} {initialValues.cum_intake &&
initialValues.cum_intake > 0
? formatNumber(initialValues.cum_intake)
: '-'}
</span> </span>
</td> </td>
<td className='text-center py-3 text-gray-600'>-</td> <td className='text-center py-3 text-gray-600'>-</td>
@@ -1643,33 +1655,45 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
<tr> <tr>
<td className='text-center py-3 border-r border-gray-100'> <td className='text-center py-3 border-r border-gray-100'>
<span className='font-semibold'> <span className='font-semibold'>
{formatNumber(initialValues.hand_day || 0)} {initialValues.hand_day &&
initialValues.hand_day > 0
? formatNumber(initialValues.hand_day)
: '-'}
</span> </span>
</td> </td>
<td className='text-center py-3 border-r border-gray-200 text-gray-600'> <td className='text-center py-3 border-r border-gray-200 text-gray-600'>
{initialValues.hand_day_std !== undefined {initialValues.hand_day_std !== undefined &&
initialValues.hand_day_std > 0
? `${initialValues.hand_day_std}%` ? `${initialValues.hand_day_std}%`
: '-'} : '-'}
</td> </td>
<td className='text-center py-3 border-r border-gray-100'> <td className='text-center py-3 border-r border-gray-100'>
<span className='font-semibold'> <span className='font-semibold'>
{formatNumber( {initialValues.total_depletion_qty &&
initialValues.total_depletion_qty || 0 initialValues.total_depletion_qty > 0
)} ? formatNumber(initialValues.total_depletion_qty)
: '-'}
</span> </span>
</td> </td>
<td className='text-center py-3 text-gray-600'> <td className='text-center py-3 text-gray-600'>
{initialValues.cum_depletion_rate?.toFixed(2) || '-'} {initialValues.cum_depletion_rate &&
initialValues.cum_depletion_rate > 0
? initialValues.cum_depletion_rate.toFixed(2)
: '-'}
</td> </td>
</tr> </tr>
<tr className='border-b border-gray-200'> <tr className='border-b border-gray-200'>
<td className='text-center py-3 border-r border-gray-100'> <td className='text-center py-3 border-r border-gray-100'>
<span className='font-semibold'> <span className='font-semibold'>
{formatNumber(initialValues.hand_house || 0)} {initialValues.hand_house &&
initialValues.hand_house > 0
? formatNumber(initialValues.hand_house)
: '-'}
</span> </span>
</td> </td>
<td className='text-center py-3 border-r border-gray-200 text-gray-600'> <td className='text-center py-3 border-r border-gray-200 text-gray-600'>
{initialValues.hand_house_std !== undefined {initialValues.hand_house_std !== undefined &&
initialValues.hand_house_std > 0
? `${initialValues.hand_house_std}%` ? `${initialValues.hand_house_std}%`
: '-'} : '-'}
</td> </td>
@@ -1691,7 +1715,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
colSpan={2} colSpan={2}
className='text-center py-3 font-semibold' className='text-center py-3 font-semibold'
> >
{formatNumber(initialValues.total_chick_qty || 0)} {initialValues.total_chick_qty &&
initialValues.total_chick_qty > 0
? formatNumber(initialValues.total_chick_qty)
: '-'}
</td> </td>
</tr> </tr>
</tbody> </tbody>
@@ -1727,11 +1754,17 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
<td className='py-3 font-medium'>Egg Mesh</td> <td className='py-3 font-medium'>Egg Mesh</td>
<td className='text-center py-3'> <td className='text-center py-3'>
<span className='font-semibold'> <span className='font-semibold'>
{formatNumber(initialValues.egg_mesh || 0)} {initialValues.egg_mesh &&
initialValues.egg_mesh > 0
? formatNumber(initialValues.egg_mesh)
: '-'}
</span> </span>
</td> </td>
<td className='text-center py-3 text-gray-600'> <td className='text-center py-3 text-gray-600'>
{formatNumber(initialValues.egg_mesh_std || 0)} {initialValues.egg_mesh_std &&
initialValues.egg_mesh_std > 0
? formatNumber(initialValues.egg_mesh_std)
: '-'}
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -1740,11 +1773,17 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
</td> </td>
<td className='text-center py-3'> <td className='text-center py-3'>
<span className='font-semibold'> <span className='font-semibold'>
{formatNumber(initialValues.egg_weight || 0)} {initialValues.egg_weight &&
initialValues.egg_weight > 0
? formatNumber(initialValues.egg_weight)
: '-'}
</span> </span>
</td> </td>
<td className='text-center py-3 text-gray-600'> <td className='text-center py-3 text-gray-600'>
{formatNumber(initialValues.egg_weight_std || 0)} {initialValues.egg_weight_std &&
initialValues.egg_weight_std > 0
? formatNumber(initialValues.egg_weight_std)
: '-'}
</td> </td>
</tr> </tr>
</tbody> </tbody>