gitea-admin/lti-web-client
1
0
Fork 0
mirror of https://gitlab.com/mbugroup/lti-web-client.git synced 2026-05-20 13:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'hot-fix/project-flock-status' into 'development'

Browse Source 
[FIX/FE] Fix Approval Status Badge

See merge request mbugroup/lti-web-client!200
This commit is contained in:
Rivaldi A N S
2026-01-17 04:15:40 +00:00
parent b85bace073 835ba077d8
commit 67d695303e
3 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/pages/production/chickin/form/ChickinForm.tsx
+2 -2
View File
@@ -75,12 +75,12 @@ const ChickinFormKandang = ({
<div className='flex flex-row gap-2'>
<Badge
variant='soft'
color='success'
color='primary'
className={{
badge: 'rounded-lg px-2',
}}
>
<Icon icon='mdi:circle' width={12} height={12} color='success' />{' '}
<Icon icon='mdi:circle' width={12} height={12} color='primary' />{' '}
Aktif
</Badge>
<div className='divider divider-horizontal p-0 m-0'></div>
src/components/pages/production/project-flock/ProjectFlockTable.tsx
+21 -10
View File
@@ -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 (
<Badge
variant='soft'
@@ -262,11 +263,17 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => 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'
}
>
<Icon
@@ -277,11 +284,15 @@ const ProjectFlockTable = ({ refresh }: { refresh?: () => 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 || '')}
</Badge>
);
},
src/components/pages/production/project-flock/detail/ProjectFlockDetail.tsx
+8 -8
View File
@@ -156,9 +156,9 @@ const ProjectFlockDetail = ({
projectFlock.approval?.step_number == 1
? 'neutral'
: projectFlock.approval?.step_number == 2
? 'success'
: projectFlock.approval?.step_number >= 3
? 'error'
? 'primary'
: projectFlock.approval?.step_number == 3
? 'success'
: undefined
}
className={{
@@ -173,9 +173,9 @@ const ProjectFlockDetail = ({
projectFlock.approval?.step_number == 1
? 'neutral'
: projectFlock.approval?.step_number == 2
? 'success'
: projectFlock.approval?.step_number >= 3
? 'error'
? 'primary'
: projectFlock.approval?.step_number == 3
? 'success'
: undefined
}
/>{' '}
@@ -273,7 +273,7 @@ const ProjectFlockDetail = ({
<div className='flex flex-row gap-2'>
<Badge
variant='soft'
color={'success'}
color={'primary'}
className={{
badge: 'rounded-lg px-2',
}}
@@ -282,7 +282,7 @@ const ProjectFlockDetail = ({
icon='mdi:circle'
width={12}
height={12}
color={'success'}
color={'primary'}
/>{' '}
Kandang Aktif ({projectFlock.kandangs?.length})
</Badge>