Merge branch 'development' of https://gitlab.com/mbugroup/lti-web-client into fix/master-data-production-standard

This commit is contained in:
randy-ar
2026-02-03 14:40:12 +07:00
11 changed files with 610 additions and 544 deletions
+21 -10
View File
@@ -122,10 +122,18 @@ const ConfirmationModal = ({
closeOnBackdrop={closeOnBackdrop}
className={{
...className,
modalBox: cn('rounded-xl p-4', className?.modalBox),
modalBox: cn(
'rounded-xl p-4 flex flex-col gap-4 max-h-[90vh]',
className?.modalBox
),
}}
>
<div className='w-full flex flex-col gap-4'>
<div
className={cn(
'flex flex-col gap-4',
children && 'sticky top-0 bg-inherit z-10'
)}
>
{iconPosition === 'center' ? (
<>
<div className='w-fit mx-auto'>
@@ -164,17 +172,24 @@ const ConfirmationModal = ({
</div>
</div>
)}
</div>
{children && <div className='w-full'>{children}</div>}
{children && (
<div className='w-full flex-1 overflow-y-auto'>{children}</div>
)}
{(secondaryButton || primaryButton) && (
<div
className={cn('w-full grid gap-3', {
className={cn(
'w-full grid gap-3',
children && 'sticky bottom-0 bg-inherit z-10',
{
'grid-cols-2': secondaryButton && primaryButton,
'grid-cols-1':
(secondaryButton && !primaryButton) ||
(!secondaryButton && primaryButton),
})}
}
)}
>
{secondaryButton && secondaryButton.text && (
<Button
@@ -218,17 +233,13 @@ const ConfirmationModal = ({
? primaryButton?.isLoading
: isPrimaryButtonLoading
}
className={cn(
'p-2 rounded-xl text-sm',
primaryButton?.className
)}
className={cn('p-2 rounded-xl text-sm', primaryButton?.className)}
>
{primaryButton?.text ?? 'Ya'}
</Button>
)}
</div>
)}
</div>
</Modal>
);
};
@@ -67,7 +67,7 @@ const lineColors: Record<string, string> = {
act_fcr: '#10B981',
std_fcr: '#10B981',
act_fcr_cum: '#F52419',
std_fcr_cum: '#10B981',
std_fcr_cum: '#F52419',
normal: '#10B981',
abnormal: '#F52419',
act_deplesi: '#10B981',
@@ -659,23 +659,29 @@ const DashboardLineChart = ({
seriesData = comparisonChart?.series || [];
}
return seriesData
.filter((series) => visibleSeries.has(series.id))
.map((series, index) => {
return seriesData.map((series, originalIndex) => {
// Skip rendering if series is not visible
if (!visibleSeries.has(series.id)) {
return null;
}
const isStandard = series.id
.toString()
.toLowerCase()
.includes('std');
// Use series.id directly as dataKey to match dataset fields
const dataKey = series.id.toString();
return (
<Line
key={`${series.id}--${index}`}
key={`${series.id}--${originalIndex}`}
type='monotone'
dataKey={dataKey}
name={series.label}
stroke={getLineColor(series.id, index, analysisMode)}
stroke={getLineColor(
series.id,
originalIndex,
analysisMode
)}
opacity={isStandard ? 0.5 : 1}
strokeWidth={2}
strokeDasharray={isStandard ? '5 5' : undefined}
@@ -687,7 +693,7 @@ const DashboardLineChart = ({
fill: '#fff',
stroke: getLineColor(
series.id,
index,
originalIndex,
analysisMode
),
strokeWidth: 2,
@@ -66,7 +66,7 @@ const lineColors: Record<string, string> = {
act_fcr: '#10B981',
std_fcr: '#10B981',
act_fcr_cum: '#F52419',
std_fcr_cum: '#10B981',
std_fcr_cum: '#F52419',
normal: '#10B981',
abnormal: '#F52419',
act_deplesi: '#10B981',
@@ -1,6 +1,7 @@
import PillBadge from '@/components/PillBadge';
import StatusBadge from '@/components/helper/StatusBadge';
import { BaseApproval } from '@/types/api/api-general';
import { Color } from '@/types/theme';
interface ExpenseStatusBadgeProps {
approval?: BaseApproval;
@@ -11,49 +12,45 @@ const ExpenseStatusBadge = ({ approval }: ExpenseStatusBadgeProps) => {
const latestApprovalStepNumber = approval?.step_number;
let expenseStatusPillBadgeColor:
| 'yellow'
| 'green'
| 'gray'
| 'red'
| 'purple'
| 'blue' = 'gray';
let expenseStatusBadgeColor: Color = 'neutral';
switch (latestApprovalStepNumber) {
case 1:
expenseStatusPillBadgeColor = 'gray';
expenseStatusBadgeColor = 'neutral';
break;
case 2:
expenseStatusPillBadgeColor = 'purple';
expenseStatusBadgeColor = 'info';
break;
case 3:
expenseStatusPillBadgeColor = 'blue';
expenseStatusBadgeColor = 'warning';
break;
case 4:
expenseStatusPillBadgeColor = 'yellow';
expenseStatusBadgeColor = 'error';
break;
case 5:
expenseStatusPillBadgeColor = 'green';
expenseStatusBadgeColor = 'success';
break;
case 6:
expenseStatusPillBadgeColor = 'green';
expenseStatusBadgeColor = 'success';
break;
}
if (isLatestApprovalRejected) {
expenseStatusPillBadgeColor = 'red';
expenseStatusBadgeColor = 'error';
}
return (
<PillBadge
content={isLatestApprovalRejected ? 'Ditolak' : approval?.step_name}
color={expenseStatusPillBadgeColor}
className='text-xs'
<StatusBadge
color={expenseStatusBadgeColor}
text={isLatestApprovalRejected ? 'Ditolak' : (approval?.step_name ?? '')}
className={{
badge: 'w-fit',
}}
/>
);
};
@@ -596,12 +596,11 @@ const ExpensesTable = () => {
<RequirePermission permissions='lti.expense.create'>
<Button
href='/expense/add'
variant='outline'
color='primary'
className='w-full sm:w-fit'
className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
>
<Icon icon='ic:round-plus' width={24} height={24} />
Tambah
<Icon icon='heroicons:plus' width={20} height={20} />
Add Expense
</Button>
</RequirePermission>
@@ -1,6 +1,7 @@
import PillBadge from '@/components/PillBadge';
import StatusBadge from '@/components/helper/StatusBadge';
import { BaseApproval } from '@/types/api/api-general';
import { Color } from '@/types/theme';
interface RealizationStatusBadgeProps {
approval?: BaseApproval;
@@ -15,23 +16,21 @@ const RealizationStatusBadge = ({ approval }: RealizationStatusBadgeProps) => {
? 'Sudah Realisasi'
: 'Belum Realisasi';
let realizationStatusPillBadgeColor:
| 'yellow'
| 'green'
| 'gray'
| 'red'
| 'purple'
| 'blue' = isExpenseRealized ? 'green' : 'yellow';
let realizationStatusBadgeColor: Color = isExpenseRealized
? 'success'
: 'warning';
if (isLatestApprovalRejected) {
realizationStatusPillBadgeColor = 'red';
realizationStatusBadgeColor = 'error';
}
return (
<PillBadge
content={isLatestApprovalRejected ? 'Ditolak' : realizationStatus}
color={realizationStatusPillBadgeColor}
className='text-xs'
<StatusBadge
color={realizationStatusBadgeColor}
text={isLatestApprovalRejected ? 'Ditolak' : realizationStatus}
className={{
badge: 'w-fit',
}}
/>
);
};
@@ -151,12 +151,11 @@ const MovementTable = () => {
<RequirePermission permissions='lti.inventory.transfer.create'>
<Button
href='/inventory/movement/add'
variant='outline'
color='primary'
className='w-full sm:w-fit'
className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
>
<Icon icon='ic:round-plus' width={24} height={24} />
Tambah
<Icon icon='heroicons:plus' width={20} height={20} />
Add Movement
</Button>
</RequirePermission>
</div>
@@ -380,12 +380,11 @@ const RecordingTable = () => {
<RequirePermission permissions='lti.production.recording.create'>
<Button
href='/production/recording/add'
variant='outline'
color='primary'
className='w-full sm:w-fit'
className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
>
<Icon icon='ic:round-plus' width={24} height={24} />
Tambah
<Icon icon='heroicons:plus' width={20} height={20} />
Add Recording
</Button>
</RequirePermission>
@@ -48,6 +48,7 @@ import {
UpdateLayingRecordingPayload,
Recording,
NextDayRecording,
RecordingStock,
} from '@/types/api/production/recording';
import { type BaseApiResponse } from '@/types/api/api-general';
import {
@@ -1103,14 +1104,51 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
[formik.values.stocks, type]
);
const getStockPendingInfo = useCallback(
(productWarehouseId: number) => {
if ((type === 'edit' || type === 'detail') && initialValues?.stocks) {
const existingStock = initialValues.stocks.find(
(s) => s.product_warehouse_id === productWarehouseId
) as RecordingStock | undefined;
if (existingStock) {
return {
usageAmount: existingStock.usage_amount ?? 0,
pendingQty: existingStock.pending_qty ?? 0,
};
}
}
return {
usageAmount: 0,
pendingQty: 0,
};
},
[initialValues, type]
);
const getStockUsageAdornment = useCallback(
(stockIdx: number) => {
if ((type as 'add' | 'edit' | 'detail') === 'detail') return null;
const stock = formik.values.stocks?.[stockIdx];
if (!stock || !stock.product_warehouse_id) return null;
const isDetail = (type as 'add' | 'edit' | 'detail') === 'detail';
const availableStock = getAvailableStock(stock.product_warehouse_id);
const requestedUsage = Number(stock.qty) || 0;
const remainingStock = availableStock - requestedUsage;
const { pendingQty } = getStockPendingInfo(stock.product_warehouse_id);
if (isDetail) {
if (pendingQty > 0) {
return (
<span className='text-sm text-gray-600 whitespace-nowrap'>
(tersedia: {formatNumber(requestedUsage)} | pending:{' '}
<span className='text-error'>{formatNumber(pendingQty)}</span> |
pakai: {formatNumber(requestedUsage + pendingQty)})
</span>
);
}
return null;
}
if (requestedUsage > 0) {
return (
<span className='text-sm text-gray-600 whitespace-nowrap'>
@@ -1127,7 +1165,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
</span>
);
},
[formik.values.stocks, getAvailableStock, type]
[formik.values.stocks, getAvailableStock, getStockPendingInfo, type]
);
const getProjectFlockBadgeAdornment = useCallback(() => {
@@ -2550,8 +2588,7 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
: null
}
/>
{(type as 'add' | 'edit' | 'detail') !== 'detail' &&
getStockUsageAdornment(idx)}
{getStockUsageAdornment(idx)}
</div>
</td>
{(type as 'add' | 'edit' | 'detail') !== 'detail' && (
@@ -2604,6 +2641,8 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
</Card>
{/* Depletions Table */}
{((type as 'add' | 'edit' | 'detail') !== 'detail' ||
(formik.values.depletions?.length ?? 0) > 0) && (
<Card
title='Deplesi'
className={{
@@ -2685,11 +2724,13 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
value={
depletionProducts.find(
(product) =>
product.value === depletion.product_warehouse_id
product.value ===
depletion.product_warehouse_id
) || null
}
onChange={(selectedOption) => {
const option = selectedOption as OptionType | null;
const option =
selectedOption as OptionType | null;
formik.setFieldValue(
`depletions.${idx}.product_warehouse_id`,
option?.value || 0
@@ -2802,9 +2843,13 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
</div>
)}
</Card>
)}
{/* Eggs Table - Only for LAYING Category */}
{isLayingCategory && (
{isLayingCategory &&
((type as 'add' | 'edit' | 'detail') !== 'detail' ||
((formik.values as RecordingLayingFormValues).eggs?.length ?? 0) >
0) && (
<Card
title='Telur'
className={{
@@ -2821,10 +2866,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
<CheckboxInput
name='select-all-eggs'
checked={
((formik.values as RecordingLayingFormValues).eggs
?.length ?? 0) === selectedEggs.length &&
((formik.values as RecordingLayingFormValues).eggs
?.length ?? 0) > 0
((formik.values as RecordingLayingFormValues)
.eggs?.length ?? 0) === selectedEggs.length &&
((formik.values as RecordingLayingFormValues)
.eggs?.length ?? 0) > 0
}
onChange={(
e: React.ChangeEvent<HTMLInputElement>
@@ -2874,7 +2919,8 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
{(formik.values as RecordingLayingFormValues).eggs?.map(
(egg, idx) => (
<tr key={`egg-${idx}`}>
{(type as 'add' | 'edit' | 'detail') !== 'detail' && (
{(type as 'add' | 'edit' | 'detail') !==
'detail' && (
<td className='align-middle!'>
<CheckboxInput
name={`egg-${idx}`}
@@ -2950,7 +2996,8 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
thousandSeparator=','
decimalSeparator='.'
isError={
isRepeaterInputError('eggs', 'qty', idx).isError
isRepeaterInputError('eggs', 'qty', idx)
.isError
}
errorMessage={
isRepeaterInputError('eggs', 'qty', idx)
@@ -2990,7 +3037,8 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
inputSuffix='Kilogram'
/>
</td>
{(type as 'add' | 'edit' | 'detail') !== 'detail' && (
{(type as 'add' | 'edit' | 'detail') !==
'detail' && (
<td>
<div className='flex items-center'>
<Button
@@ -1058,7 +1058,7 @@ const UniformityTable = () => {
iconPosition='left'
text='Data Berhasil Ditambahkan'
subtitleText='Data uniformity telah berhasil disimpan.'
closeOnBackdrop={false}
closeOnBackdrop={true}
primaryButton={{
text: 'Ok',
color: 'primary',
@@ -1089,6 +1089,7 @@ const UniformityTable = () => {
ref={singleDeleteModal.ref}
type='error'
iconPosition='left'
closeOnBackdrop={true}
text={`Delete This Data?`}
subtitleText='Are you sure you want to delete this data?'
secondaryButton={{
@@ -1113,6 +1114,7 @@ const UniformityTable = () => {
ref={singleApproveModal.ref}
type='success'
iconPosition='left'
closeOnBackdrop={true}
text='Approve This Submission?'
subtitleText='Are you sure you want to approve this submission?'
secondaryButton={{
@@ -1129,15 +1131,12 @@ const UniformityTable = () => {
}}
>
<div className='flex flex-col gap-4'>
{selectedRowIds.length === 1 ? (
{selectedUniformities.map((uniformity) => (
<UniformityConfirmationPreview
uniformity={selectedUniformities[0]}
key={uniformity.id}
uniformity={uniformity}
/>
) : (
<div className='text-center text-gray-500'>
{selectedRowIds.length} data dipilih
</div>
)}
))}
</div>
</ConfirmationModal>
@@ -1145,8 +1144,13 @@ const UniformityTable = () => {
ref={bulkApproveModal.ref}
type='success'
iconPosition='left'
closeOnBackdrop={true}
text={`Approve This Submission?`}
subtitleText={`Are you sure you want to approve this submission? (${selectedRowIds.length} data)`}
subtitleText={
selectedRowIds.length === 1
? 'Are you sure you want to approve this submission?'
: `Are you sure you want to approve these submissions? (${selectedRowIds.length} data)`
}
secondaryButton={{
text: 'Cancel',
}}
@@ -1161,7 +1165,12 @@ const UniformityTable = () => {
}}
>
<div className='flex flex-col gap-4'>
<UniformityConfirmationPreview uniformity={selectedUniformity} />
{selectedUniformities.map((uniformity) => (
<UniformityConfirmationPreview
key={uniformity.id}
uniformity={uniformity}
/>
))}
</div>
</ConfirmationModal>
@@ -1169,6 +1178,7 @@ const UniformityTable = () => {
ref={singleRejectModal.ref}
type='error'
iconPosition='left'
closeOnBackdrop={true}
text='Reject This Submission?'
subtitleText='Are you sure you want to reject this submission?'
secondaryButton={{
@@ -1185,15 +1195,12 @@ const UniformityTable = () => {
}}
>
<div className='flex flex-col gap-4'>
{selectedRowIds.length === 1 ? (
{selectedUniformities.map((uniformity) => (
<UniformityConfirmationPreview
uniformity={selectedUniformities[0]}
key={uniformity.id}
uniformity={uniformity}
/>
) : (
<div className='text-center text-gray-500'>
{selectedRowIds.length} data dipilih
</div>
)}
))}
</div>
</ConfirmationModal>
@@ -1201,8 +1208,13 @@ const UniformityTable = () => {
ref={bulkRejectModal.ref}
type='error'
iconPosition='left'
closeOnBackdrop={true}
text={`Reject This Submission?`}
subtitleText={`Are you sure you want to reject this submission? (${selectedRowIds.length} data)`}
subtitleText={
selectedRowIds.length === 1
? 'Are you sure you want to reject this submission?'
: `Are you sure you want to reject these submissions? (${selectedRowIds.length} data)`
}
secondaryButton={{
text: 'Cancel',
}}
@@ -1217,15 +1229,12 @@ const UniformityTable = () => {
}}
>
<div className='flex flex-col gap-4'>
{selectedRowIds.length === 1 ? (
{selectedUniformities.map((uniformity) => (
<UniformityConfirmationPreview
uniformity={selectedUniformities[0]}
key={uniformity.id}
uniformity={uniformity}
/>
) : (
<div className='text-center text-gray-500'>
{selectedRowIds.length} data dipilih
</div>
)}
))}
</div>
</ConfirmationModal>
@@ -319,12 +319,11 @@ const PurchaseTable = () => {
<RequirePermission permissions='lti.purchase.create'>
<Button
href='/purchase/add'
variant='outline'
color='primary'
className='w-full sm:w-fit'
className='px-3 py-2.5 w-fit text-sm text-base-100 rounded-lg shadow-sm'
>
<Icon icon='ic:round-plus' width={24} height={24} />
Tambah
<Icon icon='heroicons:plus' width={20} height={20} />
Add Purchase
</Button>
</RequirePermission>
</div>