@@ -454,8 +496,8 @@ const ExpenseRequestContent = ({
| : |
{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)
)}
diff --git a/src/components/pages/expense/ExpenseStatusBadge.tsx b/src/components/pages/expense/ExpenseStatusBadge.tsx
index a70b6454..a7fcb3e9 100644
--- a/src/components/pages/expense/ExpenseStatusBadge.tsx
+++ b/src/components/pages/expense/ExpenseStatusBadge.tsx
@@ -39,6 +39,10 @@ const ExpenseStatusBadge = ({ approval }: ExpenseStatusBadgeProps) => {
case 5:
expenseStatusPillBadgeColor = 'green';
break;
+
+ case 6:
+ expenseStatusPillBadgeColor = 'green';
+ break;
}
if (isLatestApprovalRejected) {
diff --git a/src/components/pages/expense/ExpensesTable.tsx b/src/components/pages/expense/ExpensesTable.tsx
index 1f3e9df5..fdfd9cc3 100644
--- a/src/components/pages/expense/ExpensesTable.tsx
+++ b/src/components/pages/expense/ExpensesTable.tsx
@@ -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 (
@@ -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 | 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 | 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 && (
<>
-
+
+
+
+
+
@@ -622,7 +665,8 @@ const ExpensesTable = () => {
@@ -631,7 +675,8 @@ const ExpensesTable = () => {
color='error'
onClick={bulkRejectClickHandler}
disabled={
- !isAllSelectedRowLatestApprovalOnManager &&
+ !isAllSelectedRowLatestApprovalOnHeadArea &&
+ !isAllSelectedRowLatestApprovalOnUnitVicePresident &&
!isAllSelectedRowLatestApprovalOnFinance
}
className='w-full sm:w-fit'
diff --git a/src/components/pages/expense/RealizationStatusBadge.tsx b/src/components/pages/expense/RealizationStatusBadge.tsx
index e042c022..720c1d03 100644
--- a/src/components/pages/expense/RealizationStatusBadge.tsx
+++ b/src/components/pages/expense/RealizationStatusBadge.tsx
@@ -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'
diff --git a/src/components/pages/expense/form/ExpenseRealizationForm.tsx b/src/components/pages/expense/form/ExpenseRealizationForm.tsx
index 6526b1c1..ed5aea3e 100644
--- a/src/components/pages/expense/form/ExpenseRealizationForm.tsx
+++ b/src/components/pages/expense/form/ExpenseRealizationForm.tsx
@@ -17,6 +17,7 @@ import DropFileInput from '@/components/input/DropFileInput';
import ExpenseKandangsTable from '@/components/pages/expense/form/ExpenseKandangsTable';
import ExpenseRealizationKandangDetailExpense from '@/components/pages/expense/form/ExpenseRealizationKandangDetailExpense';
import RequirePermission from '@/components/helper/RequirePermission';
+import AlertErrorList from '@/components/helper/form/FormErrors';
import {
CreateExpenseRealizationPayload,
@@ -35,6 +36,7 @@ import { LocationApi, SupplierApi } from '@/services/api/master-data';
import { Supplier } from '@/types/api/master-data/supplier';
import { ACCEPTED_FILE_TYPE } from '@/config/constant';
import { cn } from '@/lib/helper';
+import { useFormikErrorList } from '@/services/hooks/useFormikErrorList';
interface ExpenseRealizationFormProps {
type?: 'add' | 'edit' | 'detail';
@@ -132,6 +134,7 @@ const ExpenseRealizationForm = ({
});
const { setValues: formikSetValues } = formik;
+ const { formErrorList, close, handleFormSubmit } = useFormikErrorList(formik);
const {
setInputValue: setLocationInputValue,
@@ -223,6 +226,13 @@ const ExpenseRealizationForm = ({
const realizationDocumentsChangeHandler = (val: File[]) => {
formik.setFieldTouched('documents', true);
+
+ const invalidFiles = val.filter((file) => file.size > 5 * 1024 * 1024);
+ if (invalidFiles.length > 0) {
+ toast.error('Ukuran dokumen maksimal 5 MB!');
+ return;
+ }
+
formik.setFieldValue('documents', val);
};
@@ -256,7 +266,7 @@ const ExpenseRealizationForm = ({
|