mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-20 05:22:02 +00:00
Merge branch 'development' of https://gitlab.com/mbugroup/lti-web-client into dev/randy
This commit is contained in:
@@ -37,7 +37,7 @@ const ExpenseRealization = () => {
|
||||
const isExpenseCanBeRealized =
|
||||
isResponseSuccess(expense) &&
|
||||
expense.data.latest_approval.action !== 'REJECTED' &&
|
||||
expense.data.latest_approval.step_number === 3;
|
||||
expense.data.latest_approval.step_number === 4;
|
||||
|
||||
if (isResponseSuccess(expense) && !isExpenseCanBeRealized) {
|
||||
if (typeof window !== 'undefined') {
|
||||
|
||||
@@ -28,7 +28,7 @@ const ExpenseDetail: React.FC<ExpenseDetailProps> = ({ initialValues }) => {
|
||||
|
||||
if (
|
||||
initialValues?.latest_approval &&
|
||||
initialValues?.latest_approval.step_number >= 4 &&
|
||||
initialValues?.latest_approval.step_number >= 5 &&
|
||||
initialValues.latest_approval.action !== 'REJECTED'
|
||||
) {
|
||||
validTabs.push({
|
||||
|
||||
@@ -59,34 +59,40 @@ const ExpenseRequestContent = ({
|
||||
|
||||
const isLatestApprovalRejectedOrDone =
|
||||
isLatestApprovalRejected ||
|
||||
initialValues?.latest_approval.step_number === 5;
|
||||
initialValues?.latest_approval.step_number === 6;
|
||||
|
||||
const isCurrentApprovalOnManager =
|
||||
const isCurrentApprovalOnHeadArea =
|
||||
!isLatestApprovalRejected &&
|
||||
initialValues?.latest_approval.step_number === 1;
|
||||
|
||||
const isCurrentApprovalOnFinance =
|
||||
const isCurrentApprovalOnUnitVicePresident =
|
||||
!isLatestApprovalRejected &&
|
||||
initialValues?.latest_approval.step_number === 2;
|
||||
|
||||
const isCurrentApprovalOnFinance =
|
||||
!isLatestApprovalRejected &&
|
||||
initialValues?.latest_approval.step_number === 3;
|
||||
|
||||
const isCurrentApprovalOnRealization =
|
||||
!isLatestApprovalRejected &&
|
||||
initialValues?.latest_approval.step_number === 4;
|
||||
initialValues?.latest_approval.step_number === 5;
|
||||
|
||||
const showEditButton =
|
||||
initialValues?.latest_approval.step_number !== 5 &&
|
||||
initialValues?.latest_approval.step_number !== 6 &&
|
||||
(initialValues?.latest_approval.step_number === 1 ||
|
||||
initialValues?.latest_approval.step_number === 2 ||
|
||||
initialValues?.latest_approval.step_number === 3);
|
||||
initialValues?.latest_approval.step_number === 3 ||
|
||||
initialValues?.latest_approval.step_number === 4);
|
||||
|
||||
const showRejectButton =
|
||||
!isLatestApprovalRejected &&
|
||||
(initialValues?.latest_approval.step_number === 1 ||
|
||||
initialValues?.latest_approval.step_number === 2);
|
||||
initialValues?.latest_approval.step_number === 2 ||
|
||||
initialValues?.latest_approval.step_number === 3);
|
||||
|
||||
const isExpenseCanBeRealized =
|
||||
!isLatestApprovalRejected &&
|
||||
initialValues?.latest_approval.step_number === 3;
|
||||
initialValues?.latest_approval.step_number === 4;
|
||||
|
||||
// Modal hooks
|
||||
const deleteModal = useModal();
|
||||
@@ -174,8 +180,15 @@ const ExpenseRequestContent = ({
|
||||
|
||||
let approveResponse: BaseApiResponse<Expense> | undefined = undefined;
|
||||
|
||||
if (isCurrentApprovalOnManager) {
|
||||
approveResponse = await ExpenseApi.approveManager(
|
||||
if (isCurrentApprovalOnHeadArea) {
|
||||
approveResponse = await ExpenseApi.approveHeadArea(
|
||||
initialValues.id,
|
||||
notes
|
||||
);
|
||||
}
|
||||
|
||||
if (isCurrentApprovalOnUnitVicePresident) {
|
||||
approveResponse = await ExpenseApi.approveUnitVicePresident(
|
||||
initialValues.id,
|
||||
notes
|
||||
);
|
||||
@@ -207,8 +220,15 @@ const ExpenseRequestContent = ({
|
||||
|
||||
let rejectResponse: BaseApiResponse<Expense> | undefined = undefined;
|
||||
|
||||
if (isCurrentApprovalOnManager) {
|
||||
rejectResponse = await ExpenseApi.rejectManager(initialValues.id, notes);
|
||||
if (isCurrentApprovalOnHeadArea) {
|
||||
rejectResponse = await ExpenseApi.rejectHeadArea(initialValues.id, notes);
|
||||
}
|
||||
|
||||
if (isCurrentApprovalOnUnitVicePresident) {
|
||||
rejectResponse = await ExpenseApi.rejectUnitVicePresident(
|
||||
initialValues.id,
|
||||
notes
|
||||
);
|
||||
}
|
||||
|
||||
if (isCurrentApprovalOnFinance) {
|
||||
@@ -255,8 +275,8 @@ const ExpenseRequestContent = ({
|
||||
{/* TODO: apply RBAC */}
|
||||
|
||||
<div className='w-full max-w-5xl mx-auto flex flex-col sm:flex-row justify-end gap-2'>
|
||||
{isCurrentApprovalOnManager && (
|
||||
<RequirePermission permissions='lti.expense.approve.manager'>
|
||||
{isCurrentApprovalOnHeadArea && (
|
||||
<RequirePermission permissions='lti.expense.approve.head_area'>
|
||||
<Button
|
||||
variant='outline'
|
||||
color='info'
|
||||
@@ -264,7 +284,21 @@ const ExpenseRequestContent = ({
|
||||
className='w-full sm:w-fit'
|
||||
>
|
||||
<Icon icon='lucide-lab:farm' width={24} height={24} />
|
||||
Approve Manager
|
||||
Approve Head Area
|
||||
</Button>
|
||||
</RequirePermission>
|
||||
)}
|
||||
|
||||
{isCurrentApprovalOnUnitVicePresident && (
|
||||
<RequirePermission permissions='lti.expense.approve.unit_vice_president'>
|
||||
<Button
|
||||
variant='outline'
|
||||
color='success'
|
||||
onClick={approveClickHandler}
|
||||
className='w-full sm:w-fit'
|
||||
>
|
||||
<Icon icon='tdesign:money' width={24} height={24} />
|
||||
Approve Unit Vice President
|
||||
</Button>
|
||||
</RequirePermission>
|
||||
)}
|
||||
@@ -304,7 +338,8 @@ const ExpenseRequestContent = ({
|
||||
{showRejectButton && (
|
||||
<RequirePermission
|
||||
permissions={[
|
||||
'lti.expense.approve.manager',
|
||||
'lti.expense.approve.head_area',
|
||||
'lti.expense.approve.unit_vice_president',
|
||||
'lti.expense.approve.finance',
|
||||
]}
|
||||
>
|
||||
@@ -454,8 +489,8 @@ const ExpenseRequestContent = ({
|
||||
<th>:</th>
|
||||
<td>
|
||||
{formatCurrency(
|
||||
initialValues?.latest_approval.step_number === 4 ||
|
||||
initialValues?.latest_approval.step_number === 5
|
||||
initialValues?.latest_approval.step_number === 5 ||
|
||||
initialValues?.latest_approval.step_number === 6
|
||||
? (initialValues?.total_realisasi ?? 0)
|
||||
: (initialValues?.total_pengajuan ?? 0)
|
||||
)}
|
||||
|
||||
@@ -55,15 +55,16 @@ const RowOptionsMenu = ({
|
||||
deleteClickHandler: () => void;
|
||||
}) => {
|
||||
const showEditButton =
|
||||
props.row.original.latest_approval.step_number !== 5 &&
|
||||
props.row.original.latest_approval.step_number !== 6 &&
|
||||
(props.row.original.latest_approval.step_number === 1 ||
|
||||
props.row.original.latest_approval.step_number === 2 ||
|
||||
props.row.original.latest_approval.step_number === 3);
|
||||
props.row.original.latest_approval.step_number === 3 ||
|
||||
props.row.original.latest_approval.step_number === 4);
|
||||
|
||||
// TODO: apply RBAC
|
||||
const showRealizationButton =
|
||||
props.row.original.latest_approval.action !== 'REJECTED' &&
|
||||
props.row.original.latest_approval.step_number === 3;
|
||||
props.row.original.latest_approval.step_number === 4;
|
||||
|
||||
return (
|
||||
<RowOptionsMenuWrapper type={type}>
|
||||
@@ -193,7 +194,7 @@ const ExpensesTable = () => {
|
||||
parseInt(item)
|
||||
);
|
||||
|
||||
const isAllSelectedRowLatestApprovalOnManager = useMemo(() => {
|
||||
const isAllSelectedRowLatestApprovalOnHeadArea = useMemo(() => {
|
||||
return selectedRowIds.every((rowId) => {
|
||||
if (!isResponseSuccess(expenses)) return false;
|
||||
|
||||
@@ -202,11 +203,28 @@ const ExpensesTable = () => {
|
||||
const isLatestApprovalRejected =
|
||||
expenseItem?.latest_approval.action === 'REJECTED';
|
||||
|
||||
const isCurrentApprovalOnManager =
|
||||
const isCurrentApprovalOnHeadArea =
|
||||
!isLatestApprovalRejected &&
|
||||
expenseItem?.latest_approval.step_number === 1;
|
||||
|
||||
return isCurrentApprovalOnManager;
|
||||
return isCurrentApprovalOnHeadArea;
|
||||
});
|
||||
}, [expenses, selectedRowIds]);
|
||||
|
||||
const isAllSelectedRowLatestApprovalOnUnitVicePresident = useMemo(() => {
|
||||
return selectedRowIds.every((rowId) => {
|
||||
if (!isResponseSuccess(expenses)) return false;
|
||||
|
||||
const expenseItem = expenses.data.find((item) => item.id === rowId);
|
||||
|
||||
const isLatestApprovalRejected =
|
||||
expenseItem?.latest_approval.action === 'REJECTED';
|
||||
|
||||
const isCurrentApprovalOnUnitVicePresident =
|
||||
!isLatestApprovalRejected &&
|
||||
expenseItem?.latest_approval.step_number === 2;
|
||||
|
||||
return isCurrentApprovalOnUnitVicePresident;
|
||||
});
|
||||
}, [expenses, selectedRowIds]);
|
||||
|
||||
@@ -221,7 +239,7 @@ const ExpensesTable = () => {
|
||||
|
||||
const isCurrentApprovalOnFinance =
|
||||
!isLatestApprovalRejected &&
|
||||
expenseItem?.latest_approval.step_number === 2;
|
||||
expenseItem?.latest_approval.step_number === 3;
|
||||
|
||||
return isCurrentApprovalOnFinance;
|
||||
});
|
||||
@@ -238,7 +256,7 @@ const ExpensesTable = () => {
|
||||
|
||||
const isCurrentApprovalOnRealization =
|
||||
!isLatestApprovalRejected &&
|
||||
expenseItem?.latest_approval.step_number === 4;
|
||||
expenseItem?.latest_approval.step_number === 5;
|
||||
|
||||
return isCurrentApprovalOnRealization;
|
||||
});
|
||||
@@ -397,7 +415,7 @@ const ExpensesTable = () => {
|
||||
) => {
|
||||
return (
|
||||
row.original.latest_approval.action !== 'REJECTED' &&
|
||||
row.original.latest_approval.step_number !== 5
|
||||
row.original.latest_approval.step_number !== 6
|
||||
);
|
||||
};
|
||||
|
||||
@@ -441,8 +459,13 @@ const ExpensesTable = () => {
|
||||
|
||||
let bulkApproveResponse: BaseApiResponse<Expense> | undefined = undefined;
|
||||
|
||||
if (isAllSelectedRowLatestApprovalOnManager) {
|
||||
bulkApproveResponse = await ExpenseApi.bulkApproveManager(
|
||||
if (isAllSelectedRowLatestApprovalOnHeadArea) {
|
||||
bulkApproveResponse = await ExpenseApi.bulkApproveHeadArea(
|
||||
selectedRowIds,
|
||||
notes
|
||||
);
|
||||
} else if (isAllSelectedRowLatestApprovalOnUnitVicePresident) {
|
||||
bulkApproveResponse = await ExpenseApi.bulkApproveUnitVicePresident(
|
||||
selectedRowIds,
|
||||
notes
|
||||
);
|
||||
@@ -478,8 +501,13 @@ const ExpensesTable = () => {
|
||||
|
||||
let bulkRejectResponse: BaseApiResponse<Expense> | undefined = undefined;
|
||||
|
||||
if (isAllSelectedRowLatestApprovalOnManager) {
|
||||
bulkRejectResponse = await ExpenseApi.bulkRejectManager(
|
||||
if (isAllSelectedRowLatestApprovalOnHeadArea) {
|
||||
bulkRejectResponse = await ExpenseApi.bulkRejectHeadArea(
|
||||
selectedRowIds,
|
||||
notes
|
||||
);
|
||||
} else if (isAllSelectedRowLatestApprovalOnUnitVicePresident) {
|
||||
bulkRejectResponse = await ExpenseApi.bulkRejectUnitVicePresident(
|
||||
selectedRowIds,
|
||||
notes
|
||||
);
|
||||
@@ -594,16 +622,31 @@ const ExpensesTable = () => {
|
||||
|
||||
{selectedRowIds.length > 0 && (
|
||||
<>
|
||||
<RequirePermission permissions='lti.expense.approve.manager'>
|
||||
<RequirePermission permissions='lti.expense.approve.head_area'>
|
||||
<Button
|
||||
variant='outline'
|
||||
color='info'
|
||||
onClick={bulkApproveClickHandler}
|
||||
disabled={!isAllSelectedRowLatestApprovalOnManager}
|
||||
disabled={!isAllSelectedRowLatestApprovalOnHeadArea}
|
||||
className='w-full sm:w-fit'
|
||||
>
|
||||
<Icon icon='lucide-lab:farm' width={24} height={24} />
|
||||
Approve Manager
|
||||
Approve Head Area
|
||||
</Button>
|
||||
</RequirePermission>
|
||||
|
||||
<RequirePermission permissions='lti.expense.approve.unit_vice_president'>
|
||||
<Button
|
||||
variant='outline'
|
||||
color='success'
|
||||
onClick={bulkApproveClickHandler}
|
||||
disabled={
|
||||
!isAllSelectedRowLatestApprovalOnUnitVicePresident
|
||||
}
|
||||
className='w-full sm:w-fit'
|
||||
>
|
||||
<Icon icon='tdesign:money' width={24} height={24} />
|
||||
Approve Unit Vice President
|
||||
</Button>
|
||||
</RequirePermission>
|
||||
|
||||
@@ -622,7 +665,8 @@ const ExpensesTable = () => {
|
||||
|
||||
<RequirePermission
|
||||
permissions={[
|
||||
'lti.expense.approve.manager',
|
||||
'lti.expense.approve.head_area',
|
||||
'lti.expense.approve.unit_vice_president',
|
||||
'lti.expense.approve.finance',
|
||||
]}
|
||||
>
|
||||
@@ -631,7 +675,8 @@ const ExpensesTable = () => {
|
||||
color='error'
|
||||
onClick={bulkRejectClickHandler}
|
||||
disabled={
|
||||
!isAllSelectedRowLatestApprovalOnManager &&
|
||||
!isAllSelectedRowLatestApprovalOnHeadArea &&
|
||||
!isAllSelectedRowLatestApprovalOnUnitVicePresident &&
|
||||
!isAllSelectedRowLatestApprovalOnFinance
|
||||
}
|
||||
className='w-full sm:w-fit'
|
||||
|
||||
@@ -9,7 +9,7 @@ interface RealizationStatusBadgeProps {
|
||||
const RealizationStatusBadge = ({ approval }: RealizationStatusBadgeProps) => {
|
||||
const isLatestApprovalRejected = approval?.action === 'REJECTED';
|
||||
|
||||
const isExpenseRealized = approval?.step_number && approval.step_number >= 4;
|
||||
const isExpenseRealized = approval?.step_number && approval.step_number >= 5;
|
||||
|
||||
const realizationStatus = isExpenseRealized
|
||||
? 'Sudah Realisasi'
|
||||
|
||||
@@ -75,7 +75,16 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
|
||||
|
||||
deleted_documents: Yup.array().of(Yup.number().required()).optional(),
|
||||
|
||||
documents: Yup.array().of(Yup.mixed<File>().required()).optional(),
|
||||
documents: Yup.array()
|
||||
.of(
|
||||
Yup.mixed<File>()
|
||||
.required()
|
||||
.test('fileSize', 'Ukuran dokumen maksimal 5 MB', (value) => {
|
||||
if (!value || !(value instanceof File)) return true;
|
||||
return value.size <= 5 * 1024 * 1024;
|
||||
})
|
||||
)
|
||||
.optional(),
|
||||
|
||||
expense_nonstocks: Yup.array()
|
||||
.of(
|
||||
@@ -104,7 +113,16 @@ export const ExpenseRequestFormSchema: Yup.ObjectSchema<ExpenseFormSchemaType> =
|
||||
export const UpdateExpenseRequestFormSchema = ExpenseRequestFormSchema;
|
||||
|
||||
export const UploadRequestDocumentsFormSchema = Yup.object({
|
||||
documents: Yup.array().of(Yup.mixed<File>().required()).required(),
|
||||
documents: Yup.array()
|
||||
.of(
|
||||
Yup.mixed<File>()
|
||||
.required()
|
||||
.test('fileSize', 'Ukuran dokumen maksimal 5 MB', (value) => {
|
||||
if (!value || !(value instanceof File)) return true;
|
||||
return value.size <= 5 * 1024 * 1024;
|
||||
})
|
||||
)
|
||||
.required(),
|
||||
});
|
||||
|
||||
export type ExpenseRequestFormValues = Yup.InferType<
|
||||
|
||||
@@ -37,6 +37,8 @@ import { cn, sleep } from '@/lib/helper';
|
||||
import { LocationApi, SupplierApi } from '@/services/api/master-data';
|
||||
import { ACCEPTED_FILE_TYPE } from '@/config/constant';
|
||||
import { Supplier } from '@/types/api/master-data/supplier';
|
||||
import { getUniqueFormikErrors } from '@/lib/formik-helper';
|
||||
import AlertErrorList from '@/components/helper/form/FormErrors';
|
||||
|
||||
interface ExpenseFormProps {
|
||||
type?: 'add' | 'edit' | 'detail';
|
||||
@@ -55,6 +57,7 @@ const ExpenseRequestForm = ({
|
||||
const rejectModal = useModal();
|
||||
|
||||
const [expenseFormErrorMessage, setExpenseFormErrorMessage] = useState('');
|
||||
const [formErrorList, setFormErrorList] = useState<string[]>([]);
|
||||
|
||||
const createExpenseHandler = useCallback(
|
||||
async (payload: CreateExpensePayload) => {
|
||||
@@ -322,6 +325,22 @@ const ExpenseRequestForm = ({
|
||||
router.push('/expense');
|
||||
};
|
||||
|
||||
const handleValidateForm = async () => {
|
||||
const errors = await formik.validateForm();
|
||||
|
||||
if (Object.keys(errors).length > 0) {
|
||||
const errorMessages = getUniqueFormikErrors(errors);
|
||||
setFormErrorList(errorMessages);
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
||||
const handleFormSubmit = (e: React.FormEvent<HTMLFormElement>) => {
|
||||
e.preventDefault();
|
||||
handleValidateForm();
|
||||
formik.handleSubmit(e);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
formikSetValues(getExpenseFormInitialValues(initialValues));
|
||||
}, [formikSetValues, getExpenseFormInitialValues, initialValues]);
|
||||
@@ -347,10 +366,27 @@ const ExpenseRequestForm = ({
|
||||
</header>
|
||||
|
||||
<form
|
||||
onSubmit={formik.handleSubmit}
|
||||
onSubmit={handleFormSubmit}
|
||||
onReset={formik.handleReset}
|
||||
className='w-full mt-8 flex flex-col gap-6'
|
||||
>
|
||||
{expenseFormErrorMessage && (
|
||||
<div role='alert' className='alert alert-error'>
|
||||
<Icon
|
||||
icon='material-symbols:error-outline'
|
||||
width={24}
|
||||
height={24}
|
||||
/>
|
||||
<span>{expenseFormErrorMessage}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{formErrorList.length > 0 && (
|
||||
<AlertErrorList
|
||||
formErrorList={formErrorList}
|
||||
onClose={() => setFormErrorList([])}
|
||||
/>
|
||||
)}
|
||||
<div className='grid grid-cols-12 gap-4'>
|
||||
<SelectInput
|
||||
label='Kategori'
|
||||
@@ -535,17 +571,6 @@ const ExpenseRequestForm = ({
|
||||
</div>
|
||||
)}
|
||||
|
||||
{expenseFormErrorMessage && (
|
||||
<div role='alert' className='alert alert-error w-full'>
|
||||
<Icon
|
||||
icon='material-symbols:error-outline'
|
||||
width={24}
|
||||
height={24}
|
||||
/>
|
||||
<span>{expenseFormErrorMessage}</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{type !== 'detail' && (
|
||||
<div
|
||||
className={cn('flex flex-row justify-end gap-2', {
|
||||
|
||||
@@ -198,7 +198,7 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
|
||||
expense?.latest_approval?.action === 'REJECTED';
|
||||
const isExpenseRealized =
|
||||
expense?.latest_approval?.step_number &&
|
||||
expense?.latest_approval.step_number >= 4;
|
||||
expense?.latest_approval.step_number >= 5;
|
||||
|
||||
const realizationStatus = isExpenseRealized
|
||||
? 'Sudah Realisasi'
|
||||
@@ -242,8 +242,8 @@ const ExpensePDF = ({ expense }: ExpensePDFProps) => {
|
||||
{
|
||||
label: 'Nominal Biaya',
|
||||
value: formatCurrency(
|
||||
expense?.latest_approval.step_number === 4 ||
|
||||
expense?.latest_approval.step_number === 5
|
||||
expense?.latest_approval.step_number === 5 ||
|
||||
expense?.latest_approval.step_number === 6
|
||||
? (expense?.total_realisasi ?? 0)
|
||||
: (expense?.total_pengajuan ?? 0)
|
||||
),
|
||||
|
||||
@@ -1737,16 +1737,16 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
||||
<td className='py-3 font-medium'>Egg Mass</td>
|
||||
<td className='text-center py-3'>
|
||||
<span className='font-semibold'>
|
||||
{initialValues.egg_mesh &&
|
||||
initialValues.egg_mesh > 0
|
||||
? formatNumber(initialValues.egg_mesh)
|
||||
{initialValues.egg_mass &&
|
||||
initialValues.egg_mass > 0
|
||||
? formatNumber(initialValues.egg_mass)
|
||||
: '-'}
|
||||
</span>
|
||||
</td>
|
||||
<td className='text-center py-3 text-gray-600'>
|
||||
{initialValues.egg_mesh_std &&
|
||||
initialValues.egg_mesh_std > 0
|
||||
? formatNumber(initialValues.egg_mesh_std)
|
||||
{initialValues.egg_mass_std &&
|
||||
initialValues.egg_mass_std > 0
|
||||
? formatNumber(initialValues.egg_mass_std)
|
||||
: '-'}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -1773,16 +1773,16 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
||||
<td className='py-3 font-medium'>Hen Day</td>
|
||||
<td className='text-center py-3'>
|
||||
<span className='font-semibold'>
|
||||
{initialValues.hand_day &&
|
||||
initialValues.hand_day > 0
|
||||
? formatNumber(initialValues.hand_day)
|
||||
{initialValues.hen_day &&
|
||||
initialValues.hen_day > 0
|
||||
? formatNumber(initialValues.hen_day)
|
||||
: '-'}
|
||||
</span>
|
||||
</td>
|
||||
<td className='text-center py-3 text-gray-600'>
|
||||
{initialValues.hand_day_std !== undefined &&
|
||||
initialValues.hand_day_std > 0
|
||||
? `${initialValues.hand_day_std}%`
|
||||
{initialValues.hen_day_std !== undefined &&
|
||||
initialValues.hen_day_std > 0
|
||||
? `${initialValues.hen_day_std}%`
|
||||
: '-'}
|
||||
</td>
|
||||
</tr>
|
||||
@@ -1790,16 +1790,16 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
|
||||
<td className='py-3 font-medium'>Hen House</td>
|
||||
<td className='text-center py-3'>
|
||||
<span className='font-semibold'>
|
||||
{initialValues.hand_house &&
|
||||
initialValues.hand_house > 0
|
||||
? formatNumber(initialValues.hand_house)
|
||||
{initialValues.hen_house &&
|
||||
initialValues.hen_house > 0
|
||||
? formatNumber(initialValues.hen_house)
|
||||
: '-'}
|
||||
</span>
|
||||
</td>
|
||||
<td className='text-center py-3 text-gray-600'>
|
||||
{initialValues.hand_house_std !== undefined &&
|
||||
initialValues.hand_house_std > 0
|
||||
? `${initialValues.hand_house_std}%`
|
||||
{initialValues.hen_house_std !== undefined &&
|
||||
initialValues.hen_house_std > 0
|
||||
? `${initialValues.hen_house_std}%`
|
||||
: '-'}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@@ -74,7 +74,23 @@ export const RECORDING_APPROVAL_LINE: ApprovalLine = [
|
||||
},
|
||||
{
|
||||
step_number: 2,
|
||||
step_name: 'Disetujui',
|
||||
step_name: 'Approval Head Area',
|
||||
},
|
||||
{
|
||||
step_number: 3,
|
||||
step_name: 'Approval Business Unit Vice President',
|
||||
},
|
||||
{
|
||||
step_number: 4,
|
||||
step_name: 'Approval Finance',
|
||||
},
|
||||
{
|
||||
step_number: 5,
|
||||
step_name: 'Realisasi',
|
||||
},
|
||||
{
|
||||
step_number: 6,
|
||||
step_name: 'Selesai',
|
||||
},
|
||||
] as const;
|
||||
|
||||
@@ -130,18 +146,22 @@ export const EXPENSE_REQUEST_APPROVAL_LINE: ApprovalLine = [
|
||||
},
|
||||
{
|
||||
step_number: 2,
|
||||
step_name: 'Approval Manager',
|
||||
step_name: 'Approval Head Area',
|
||||
},
|
||||
{
|
||||
step_number: 3,
|
||||
step_name: 'Approval Finance',
|
||||
step_name: 'Approval Business Unit Vice President',
|
||||
},
|
||||
{
|
||||
step_number: 4,
|
||||
step_name: 'Realisasi',
|
||||
step_name: 'Approval Finance',
|
||||
},
|
||||
{
|
||||
step_number: 5,
|
||||
step_name: 'Realisasi',
|
||||
},
|
||||
{
|
||||
step_number: 6,
|
||||
step_name: 'Selesai',
|
||||
},
|
||||
] as const;
|
||||
|
||||
+116
-8
@@ -169,13 +169,13 @@ export class ExpenseApiService extends BaseApiService<
|
||||
}
|
||||
}
|
||||
|
||||
async approveManager(
|
||||
async approveHeadArea(
|
||||
id: number,
|
||||
notes?: string
|
||||
): Promise<BaseApiResponse<Expense> | undefined> {
|
||||
try {
|
||||
const approveRes = await httpClient<BaseApiResponse<Expense>>(
|
||||
`${this.basePath}/approvals/manager`,
|
||||
`${this.basePath}/approvals/head-area`,
|
||||
{
|
||||
method: 'POST',
|
||||
body: {
|
||||
@@ -196,13 +196,67 @@ export class ExpenseApiService extends BaseApiService<
|
||||
}
|
||||
}
|
||||
|
||||
async bulkApproveManager(
|
||||
async bulkApproveHeadArea(
|
||||
ids: number[],
|
||||
notes?: string
|
||||
): Promise<BaseApiResponse<Expense> | undefined> {
|
||||
try {
|
||||
const bulkApproveRes = await httpClient<BaseApiResponse<Expense>>(
|
||||
`${this.basePath}/approvals/manager`,
|
||||
`${this.basePath}/approvals/head-area`,
|
||||
{
|
||||
method: 'POST',
|
||||
body: {
|
||||
action: 'APPROVED',
|
||||
approvable_ids: ids,
|
||||
notes: notes,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
return bulkApproveRes;
|
||||
} catch (error) {
|
||||
if (axios.isAxiosError<BaseApiResponse<Expense>>(error)) {
|
||||
return error.response?.data;
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
async approveUnitVicePresident(
|
||||
id: number,
|
||||
notes?: string
|
||||
): Promise<BaseApiResponse<Expense> | undefined> {
|
||||
try {
|
||||
const approveRes = await httpClient<BaseApiResponse<Expense>>(
|
||||
`${this.basePath}/approvals/unit-vice-president`,
|
||||
{
|
||||
method: 'POST',
|
||||
body: {
|
||||
action: 'APPROVED',
|
||||
approvable_ids: [id],
|
||||
notes: notes,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
return approveRes;
|
||||
} catch (error) {
|
||||
if (axios.isAxiosError<BaseApiResponse<Expense>>(error)) {
|
||||
return error.response?.data;
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
async bulkApproveUnitVicePresident(
|
||||
ids: number[],
|
||||
notes?: string
|
||||
): Promise<BaseApiResponse<Expense> | undefined> {
|
||||
try {
|
||||
const bulkApproveRes = await httpClient<BaseApiResponse<Expense>>(
|
||||
`${this.basePath}/approvals/unit-vice-president`,
|
||||
{
|
||||
method: 'POST',
|
||||
body: {
|
||||
@@ -277,13 +331,13 @@ export class ExpenseApiService extends BaseApiService<
|
||||
}
|
||||
}
|
||||
|
||||
async rejectManager(
|
||||
async rejectHeadArea(
|
||||
id: number,
|
||||
notes?: string
|
||||
): Promise<BaseApiResponse<Expense> | undefined> {
|
||||
try {
|
||||
const rejectRes = await httpClient<BaseApiResponse<Expense>>(
|
||||
`${this.basePath}/approvals/manager`,
|
||||
`${this.basePath}/approvals/head-area`,
|
||||
{
|
||||
method: 'POST',
|
||||
body: {
|
||||
@@ -304,13 +358,67 @@ export class ExpenseApiService extends BaseApiService<
|
||||
}
|
||||
}
|
||||
|
||||
async bulkRejectManager(
|
||||
async bulkRejectHeadArea(
|
||||
ids: number[],
|
||||
notes?: string
|
||||
): Promise<BaseApiResponse<Expense> | undefined> {
|
||||
try {
|
||||
const bulkRejectRes = await httpClient<BaseApiResponse<Expense>>(
|
||||
`${this.basePath}/approvals/manager`,
|
||||
`${this.basePath}/approvals/head-area`,
|
||||
{
|
||||
method: 'POST',
|
||||
body: {
|
||||
action: 'REJECTED',
|
||||
approvable_ids: ids,
|
||||
notes: notes,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
return bulkRejectRes;
|
||||
} catch (error) {
|
||||
if (axios.isAxiosError<BaseApiResponse<Expense>>(error)) {
|
||||
return error.response?.data;
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
async rejectUnitVicePresident(
|
||||
id: number,
|
||||
notes?: string
|
||||
): Promise<BaseApiResponse<Expense> | undefined> {
|
||||
try {
|
||||
const rejectRes = await httpClient<BaseApiResponse<Expense>>(
|
||||
`${this.basePath}/approvals/unit-vice-president`,
|
||||
{
|
||||
method: 'POST',
|
||||
body: {
|
||||
action: 'REJECTED',
|
||||
approvable_ids: [id],
|
||||
notes: notes,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
return rejectRes;
|
||||
} catch (error) {
|
||||
if (axios.isAxiosError<BaseApiResponse<Expense>>(error)) {
|
||||
return error.response?.data;
|
||||
}
|
||||
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
async bulkRejectUnitVicePresident(
|
||||
ids: number[],
|
||||
notes?: string
|
||||
): Promise<BaseApiResponse<Expense> | undefined> {
|
||||
try {
|
||||
const bulkRejectRes = await httpClient<BaseApiResponse<Expense>>(
|
||||
`${this.basePath}/approvals/unit-vice-president`,
|
||||
{
|
||||
method: 'POST',
|
||||
body: {
|
||||
|
||||
+7
-7
@@ -8,15 +8,15 @@ export type ProductionMetrics = {
|
||||
fcr_value: number;
|
||||
fcr_std?: number;
|
||||
total_chick_qty: number;
|
||||
hand_day?: number;
|
||||
hand_house?: number;
|
||||
hen_day?: number;
|
||||
hen_house?: number;
|
||||
feed_intake?: number;
|
||||
egg_mesh?: number;
|
||||
egg_weight?: number;
|
||||
hand_day_std?: number;
|
||||
hand_house_std?: number;
|
||||
feed_intake_std?: number;
|
||||
egg_mesh_std?: number;
|
||||
egg_mass?: number;
|
||||
egg_weight?: number;
|
||||
hen_day_std?: number;
|
||||
hen_house_std?: number;
|
||||
egg_mass_std?: number;
|
||||
egg_weight_std?: number;
|
||||
daily_gain?: number;
|
||||
avg_daily_gain?: number;
|
||||
|
||||
Reference in New Issue
Block a user