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

fix(FE): resolve merge conflict with branch development

Browse Source
This commit is contained in:
randy-ar
2025-12-17 14:26:03 +07:00
parent bb80e9e9c6 224f7ddeea
commit 918e85e0cc
10 changed files with 156 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/production/recording/detail/edit/page.tsx
+1 -1
View File
@@ -14,7 +14,7 @@ const RecordingEdit = () => {
const { data: recording, isLoading: isLoadingRecording } = useSWR(
recordingId,
(id: number) => RecordingApi.getSingle(id) // Gunakan RecordingApi
(id: string) => RecordingApi.getSingle(parseInt(id))
);
if (!recordingId) {
src/app/production/recording/detail/page.tsx
+1 -1
View File
@@ -14,7 +14,7 @@ const RecordingDetail = () => {
const { data: recording, isLoading: isLoadingRecording } = useSWR(
recordingId,
(id: number) => RecordingApi.getSingle(id)
(id: string) => RecordingApi.getSingle(parseInt(id))
);
if (!recordingId) {
src/components/pages/production/recording/RecordingTable.tsx
+9 -4
View File
@@ -50,12 +50,17 @@ const RowOptionsMenu = ({
);
};
const isRecordingRejected = (recording: Recording) => {
return recording.approval?.action === 'REJECTED';
};
const isApproved = isRecordingApproved(props.row.original);
const isRejected = isRecordingRejected(props.row.original);
return (
<RowOptionsMenuWrapper type={type}>
<Button
href={`recording/detail/?recordingId=${props.row.original.id}`}
href={`/production/recording/detail/?recordingId=${props.row.original.id}`}
variant='ghost'
color='primary'
className='justify-start text-sm'
@@ -64,7 +69,7 @@ const RowOptionsMenu = ({
Detail
</Button>
<Button
href={`recording/detail/edit/?recordingId=${props.row.original.id}`}
href={`/production/recording/detail/edit/?recordingId=${props.row.original.id}`}
variant='ghost'
color='warning'
className='justify-start text-sm'
@@ -72,7 +77,7 @@ const RowOptionsMenu = ({
<Icon icon='mdi:pencil-outline' width={16} height={16} />
Edit
</Button>
{!isApproved && (
{!isApproved && !isRejected && (
<Button
onClick={approveClickHandler}
variant='ghost'
@@ -83,7 +88,7 @@ const RowOptionsMenu = ({
Approve
</Button>
)}
{!isApproved && (
{!isApproved && !isRejected && (
<Button
onClick={rejectClickHandler}
variant='ghost'
src/components/pages/production/recording/form/RecordingForm.tsx
+47 -31
View File
@@ -112,6 +112,10 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
);
}, []);
const isRecordingRejected = useCallback((recording?: Recording) => {
return recording?.approval?.action === 'REJECTED';
}, []);
// ===== PAYLOAD CREATION HELPERS =====
const createGrowingPayload = useCallback(
(values: RecordingGrowingFormValues) => {
@@ -1483,37 +1487,48 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
Kembali
</Button>
{type === 'detail' && !isRecordingApproved(initialValues) && (
<div className='flex flex-row gap-2'>
<Button
variant='outline'
color='success'
onClick={() => {
setApprovalNotes('');
approveModal.openModal();
}}
isLoading={isApproveLoading}
className='w-full sm:w-fit'
>
<Icon icon='material-symbols:check' width={24} height={24} />
Approve
</Button>
{type === 'detail' &&
initialValues?.approval &&
!isRecordingApproved(initialValues) &&
!isRecordingRejected(initialValues) && (
<div className='flex flex-row gap-2'>
<Button
variant='outline'
color='success'
onClick={() => {
setApprovalNotes('');
approveModal.openModal();
}}
isLoading={isApproveLoading}
className='w-full sm:w-fit'
>
<Icon
icon='material-symbols:check'
width={24}
height={24}
/>
Approve
</Button>
<Button
variant='outline'
color='error'
onClick={() => {
setApprovalNotes('');
rejectModal.openModal();
}}
isLoading={isRejectLoading}
className='w-full sm:w-fit'
>
<Icon icon='material-symbols:close' width={24} height={24} />
Reject
</Button>
</div>
)}
<Button
variant='outline'
color='error'
onClick={() => {
setApprovalNotes('');
rejectModal.openModal();
}}
isLoading={isRejectLoading}
className='w-full sm:w-fit'
>
<Icon
icon='material-symbols:close'
width={24}
height={24}
/>
Reject
</Button>
</div>
)}
</div>
<h1 className='text-2xl font-bold text-center'>
@@ -2803,7 +2818,8 @@ const RecordingForm = ({ type = 'add', initialValues }: RecordingFormProps) => {
{/* Approve Confirmation Modal */}
{(type as 'add' | 'edit' | 'detail') === 'detail' &&
!isRecordingApproved(initialValues) && (
!isRecordingApproved(initialValues) &&
!isRecordingRejected(initialValues) && (
<ConfirmationModalWithNotes
ref={approveModal.ref}
type='success'
src/components/pages/purchase/form/order/PurchaseOrderStaffApprovalForm.tsx
+6 -2
View File
@@ -314,7 +314,9 @@ const PurchaseOrderStaffApprovalForm = ({
const isNewItemForm =
!formItem.purchase_item_id || formItem.purchase_item_id === 0;
let cleanPayload: UpdateStaffApprovalRequestPayload['items'][0];
let cleanPayload: NonNullable<
UpdateStaffApprovalRequestPayload['items']
>[0];
if (isNewItemForm) {
cleanPayload = {
@@ -362,7 +364,9 @@ const PurchaseOrderStaffApprovalForm = ({
const isNewItemForm =
!formItem.purchase_item_id || formItem.purchase_item_id === 0;
let cleanPayload: UpdateStaffApprovalRequestPayload['items'][0];
let cleanPayload: NonNullable<
UpdateStaffApprovalRequestPayload['items']
>[0];
if (isNewItemForm) {
cleanPayload = {
src/components/pages/purchase/form/request/PurchaseRequestForm.schema.ts
+6
View File
@@ -7,6 +7,7 @@ type PurchaseRequestFormSchemaType = {
label: string;
} | null;
supplier_id: number;
credit_term: number;
area?: {
value: number;
label: string;
@@ -81,6 +82,10 @@ export const PurchaseRequestFormSchema: Yup.ObjectSchema<PurchaseRequestFormSche
.required('Supplier wajib dipilih!')
.min(1, 'Supplier wajib dipilih!')
.typeError('Supplier wajib dipilih!'),
credit_term: Yup.number()
.required('Jangka waktu kredit wajib diisi!')
.min(0, 'Jangka waktu kredit tidak boleh kurang dari 0!')
.typeError('Jangka waktu kredit wajib diisi!'),
area: Yup.object({
value: Yup.number().min(1).required(),
label: Yup.string().required(),
@@ -119,6 +124,7 @@ export const getPurchaseRequestFormInitialValues = (
}
: null,
supplier_id: initialValues?.supplier?.id ?? 0,
credit_term: initialValues?.credit_term ?? 0,
area: initialValues?.area
? {
value: initialValues.area.id,
src/components/pages/purchase/form/request/PurchaseRequestForm.tsx
+77 -2
View File
@@ -185,6 +185,10 @@ const PurchaseRequestForm = ({
typeof values.supplier_id === 'string'
? parseInt(values.supplier_id) || 0
: values.supplier_id || 0,
credit_term:
typeof values.credit_term === 'string'
? parseInt(values.credit_term) || 0
: values.credit_term || 0,
notes: values.notes || '',
items: (values.items || []).map((item) => ({
warehouse_id: Number(item.warehouse_id) || 0,
@@ -338,6 +342,27 @@ const PurchaseRequestForm = ({
};
// ===== UTILITY FUNCTIONS =====
const updateCreditTermBasedOnSupplier = useCallback(
(supplierId: number) => {
if (supplierId > 0 && isResponseSuccess(supplierRawData)) {
const supplierData = supplierRawData.data.find(
(s: Supplier) => s.id === supplierId
);
if (supplierData?.due_date) {
formik.setFieldTouched('credit_term', false);
formik.setFieldValue('credit_term', supplierData.due_date.toString());
} else {
formik.setFieldTouched('credit_term', false);
formik.setFieldValue('credit_term', '');
}
} else {
formik.setFieldTouched('credit_term', false);
formik.setFieldValue('credit_term', '');
}
},
[supplierRawData]
);
const resetPurchaseItems = useCallback(() => {
if (formik.values.items) {
formik.values.items.forEach((_, idx) => {
@@ -352,6 +377,16 @@ const PurchaseRequestForm = ({
}, []);
// ===== SIDE EFFECTS =====
useEffect(() => {
if (formik.values.supplier_id && Number(formik.values.supplier_id) > 0) {
updateCreditTermBasedOnSupplier(Number(formik.values.supplier_id));
resetPurchaseItems();
} else {
formik.setFieldTouched('credit_term', false);
formik.setFieldValue('credit_term', '');
resetPurchaseItems();
}
}, [formik.values.supplier_id]);
// ===== FORM HANDLERS =====
const handleSupplierChange = useCallback(
@@ -367,6 +402,23 @@ const PurchaseRequestForm = ({
[]
);
const handleCreditTermChange = useCallback(
(e: React.ChangeEvent<HTMLInputElement>) => {
const value = e.target.value;
formik.setFieldTouched('credit_term', true);
formik.setFieldValue('credit_term', value);
},
[]
);
const handleCreditTermBlur = useCallback(
(e: React.FocusEvent<HTMLInputElement>) => {
formik.handleBlur(e);
},
[formik]
);
const handleAreaChange = useCallback(
(val: OptionType | OptionType[] | null) => {
const area = val as OptionType | null;
@@ -447,7 +499,7 @@ const PurchaseRequestForm = ({
body: 'flex flex-col gap-6',
}}
>
<div className={'grid grid-cols-1 md:grid-cols-3 gap-6'}>
<div className={'grid grid-cols-1 md:grid-cols-2 gap-6'}>
<SelectInput
required
label='Vendor'
@@ -466,6 +518,29 @@ const PurchaseRequestForm = ({
isClearable
/>
<NumberInput
required={!!formik.values.supplier_id}
label='Jatuh tempo (hari)'
name='credit_term'
value={formik.values.credit_term || ''}
onChange={handleCreditTermChange}
onBlur={handleCreditTermBlur}
isError={
formik.touched.credit_term &&
Boolean(formik.errors.credit_term)
}
errorMessage={formik.errors.credit_term as string}
readOnly={type === 'detail' || !formik.values.supplier_id}
disabled={type === 'detail' || !formik.values.supplier_id}
allowNegative={false}
decimalScale={0}
placeholder={
!formik.values.supplier_id
? 'Pilih Vendor terlebih dahulu'
: 'Masukkan jumlah hari jatuh tempo'
}
/>
<SelectInput
label='Area'
placeholder='Pilih Area...'
@@ -490,7 +565,7 @@ const PurchaseRequestForm = ({
isClearable={type !== 'detail'}
/>
<div className={'md:col-span-3'}>
<div className={'col-span-2'}>
<TextInput
label='Notes'
name='notes'
src/components/pages/purchase/order/PurchaseOrderDetail.tsx
-2
View File
@@ -1052,7 +1052,6 @@ const PurchaseOrderDetail = ({
const payload: CreateStaffApprovalRequestPayload = {
action: 'REJECTED',
notes: notes || null,
items: [],
};
await createStaffApprovalHandler(payload);
@@ -1080,7 +1079,6 @@ const PurchaseOrderDetail = ({
const payload: CreateAcceptApprovalRequestPayload = {
action: 'REJECTED',
notes: notes || null,
items: [],
};
await createAcceptApprovalHandler(payload);
src/components/pages/purchase/order/PurchaseOrderInvoice.tsx
+3
View File
@@ -309,6 +309,9 @@ const PurchaseOrderInvoice = ({ data }: PurchaseOrderInvoiceProps) => {
{purchaseData?.supplier?.alias || ''})
</Text>
<Text>{purchaseData?.supplier?.category || '-'}</Text>
<Text>
Credit Term: {purchaseData?.credit_term || 0} hari
</Text>
<Text>
Due Date:{' '}
{purchaseData?.due_date
src/types/api/purchase/purchase.d.ts
Vendored
+6 -4
View File
@@ -51,6 +51,7 @@ export type BasePurchase = {
po_document_path?: string | null;
po_date: string;
supplier: Supplier;
credit_term?: number;
due_date: string;
notes?: string | null;
deleted_at?: string | null;
@@ -66,8 +67,9 @@ export type Purchase = BaseMetadata & BasePurchase;
export type CreatePurchaseRequestPayload = {
supplier_id: number;
credit_term: number;
notes?: string | null;
items: {
items?: {
warehouse_id: number;
product_id: number;
qty: number;
@@ -77,7 +79,7 @@ export type CreatePurchaseRequestPayload = {
export type CreateStaffApprovalRequestPayload = {
action: 'APPROVED' | 'REJECTED';
notes?: string | null;
items: {
items?: {
purchase_item_id: number;
qty: number;
price: number;
@@ -88,7 +90,7 @@ export type CreateStaffApprovalRequestPayload = {
export type UpdateStaffApprovalRequestPayload = {
action: 'APPROVED' | 'REJECTED';
notes?: string | null;
items: Array<{
items?: Array<{
purchase_item_id?: number;
product_id?: number;
warehouse_id?: number;
@@ -106,7 +108,7 @@ export type CreateManagerApprovalRequestPayload = {
export type CreateAcceptApprovalRequestPayload = {
action: 'APPROVED' | 'REJECTED';
notes?: string | null;
items: {
items?: {
purchase_item_id: number;
received_date: string;
travel_number: string;