diff --git a/src/components/pages/production/project-flock/ProjectFlockTable.tsx b/src/components/pages/production/project-flock/ProjectFlockTable.tsx index 6b935812..ab14ef84 100644 --- a/src/components/pages/production/project-flock/ProjectFlockTable.tsx +++ b/src/components/pages/production/project-flock/ProjectFlockTable.tsx @@ -15,7 +15,7 @@ import ConfirmationModalWithNotes from '@/components/modal/ConfirmationModalWith import Table from '@/components/Table'; import { ROWS_OPTIONS } from '@/config/constant'; import { isResponseError, isResponseSuccess } from '@/lib/api-helper'; -import { cn, formatDate } from '@/lib/helper'; +import { cn, formatDate, formatTitleCase } from '@/lib/helper'; import { AreaApi, KandangApi, LocationApi } from '@/services/api/master-data'; import { ProjectFlockApi } from '@/services/api/production/project-flock'; import { useTableFilter } from '@/services/hooks/useTableFilter'; @@ -254,7 +254,8 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => void }) => { header: 'Status', cell: (props) => { const approval = props.row.original.approval; - + const isRejected = approval?.action == 'REJECTED'; + const isApproved = approval?.action == 'APPROVED'; return ( void }) => { badge: 'rounded-lg px-2 w-full flex flex-row justify-start', }} color={ - approval?.step_number == 1 - ? 'neutral' - : approval?.step_number == 2 - ? 'success' - : 'error' + isRejected + ? 'error' + : isApproved + ? approval?.step_number == 1 + ? 'neutral' + : approval?.step_number == 2 + ? 'primary' + : approval?.step_number == 3 + ? 'success' + : 'neutral' + : 'neutral' } > void }) => { approval?.step_number == 1 ? 'neutral' : approval?.step_number == 2 - ? 'success' - : 'error' + ? 'primary' + : approval?.step_number == 3 + ? 'success' + : 'neutral' } /> - {approval?.step_name} + {isRejected + ? 'Ditolak' + : formatTitleCase(approval?.step_name || '')} ); },