mirror of
https://gitlab.com/mbugroup/lti-web-client.git
synced 2026-05-20 05:22:02 +00:00
Merge branch 'fix/project-flock-form' into 'development'
[FIX/FE] Project Flock Form See merge request mbugroup/lti-web-client!437
This commit is contained in:
@@ -26,7 +26,7 @@ type ProjectFlockFormSchemaType = {
|
||||
label: string;
|
||||
} | null;
|
||||
location_id: number;
|
||||
period: number | string;
|
||||
periode: number | string;
|
||||
kandang_ids: number[];
|
||||
project_budgets: ProjectFlockBudgetsSchemaType[];
|
||||
};
|
||||
@@ -111,7 +111,7 @@ export const ProjectFlockFormSchema: Yup.ObjectSchema<ProjectFlockFormSchemaType
|
||||
.required('Lokasi wajib diisi!'),
|
||||
|
||||
// Period
|
||||
period: Yup.number()
|
||||
periode: Yup.number()
|
||||
.typeError('Periode harus berupa angka!')
|
||||
.min(1, 'Periode minimal 1!')
|
||||
.required('Periode wajib diisi!'),
|
||||
|
||||
@@ -154,7 +154,7 @@ export const ProjectFlockFormConfirmationTable = ({
|
||||
},
|
||||
{
|
||||
label: 'Periode',
|
||||
value: projectFlockForm?.period ?? '-',
|
||||
value: projectFlockForm?.periode ?? '-',
|
||||
},
|
||||
{
|
||||
label: 'Informasi Kandang',
|
||||
@@ -533,7 +533,7 @@ const ProjectFlockForm = ({
|
||||
kandang_ids: initialValues?.kandangs?.map(
|
||||
(k: Kandang) => k.id
|
||||
) as number[],
|
||||
period: initialValues?.period ?? '',
|
||||
periode: initialValues?.period ?? '',
|
||||
project_budgets: initialValues?.project_budgets?.map((budget) => {
|
||||
return {
|
||||
nonstock: {
|
||||
@@ -573,7 +573,7 @@ const ProjectFlockForm = ({
|
||||
category: values.category as string,
|
||||
production_standard_id: values.production_standard_id as number,
|
||||
location_id: values.location_id as number,
|
||||
period: parseInt(values.period as unknown as string),
|
||||
periode: parseInt(values.periode as unknown as string),
|
||||
kandang_ids: values.kandang_ids as number[],
|
||||
project_budgets: values.project_budgets.flatMap((budget) => {
|
||||
return {
|
||||
@@ -1032,7 +1032,7 @@ const ProjectFlockForm = ({
|
||||
name='period'
|
||||
label='Periode'
|
||||
placeholder='Periode Flock'
|
||||
value={formik.values.period}
|
||||
value={formik.values.periode}
|
||||
onChange={(e) =>
|
||||
formik.setFieldValue('period', e.target.value)
|
||||
}
|
||||
@@ -1040,9 +1040,9 @@ const ProjectFlockForm = ({
|
||||
allowNegative={false}
|
||||
decimalScale={0}
|
||||
isError={
|
||||
formik.touched.period && Boolean(formik.errors.period)
|
||||
formik.touched.periode && Boolean(formik.errors.periode)
|
||||
}
|
||||
errorMessage={formik.errors.period as string}
|
||||
errorMessage={formik.errors.periode as string}
|
||||
/>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -445,7 +445,13 @@ const PurchaseOrderDetail = ({
|
||||
setEditPoDate('');
|
||||
editPoDateModal.closeModal();
|
||||
refetchData?.();
|
||||
}, [initialValues?.id, searchParams, editPoDate, editPoDateModal, refetchData]);
|
||||
}, [
|
||||
initialValues?.id,
|
||||
searchParams,
|
||||
editPoDate,
|
||||
editPoDateModal,
|
||||
refetchData,
|
||||
]);
|
||||
|
||||
// ===== APPROVAL/REJECTION HANDLERS =====
|
||||
const managerApprovalHandler = async () => {
|
||||
@@ -873,8 +879,7 @@ const PurchaseOrderDetail = ({
|
||||
</span>
|
||||
<div className='ml-3 flex items-center gap-1'>
|
||||
<span className='text-gray-900'>
|
||||
:{' '}
|
||||
{formatDate(purchaseData.po_date, 'DD MMM YYYY')}
|
||||
: {formatDate(purchaseData.po_date, 'DD MMM YYYY')}
|
||||
</span>
|
||||
<RequirePermission permissions='lti.purchase.update'>
|
||||
<Button
|
||||
@@ -884,10 +889,7 @@ const PurchaseOrderDetail = ({
|
||||
className='p-1 min-h-0 h-auto'
|
||||
onClick={() => {
|
||||
setEditPoDate(
|
||||
formatDate(
|
||||
purchaseData.po_date,
|
||||
'YYYY-MM-DD'
|
||||
)
|
||||
formatDate(purchaseData.po_date, 'YYYY-MM-DD')
|
||||
);
|
||||
editPoDateModal.openModal();
|
||||
}}
|
||||
|
||||
+3
-2
@@ -593,7 +593,9 @@ export function DetailDailyChecklistContent() {
|
||||
let shareData: ShareData;
|
||||
|
||||
if (isMobile) {
|
||||
const htmlBlob = await htmlToImage.toBlob(document.body);
|
||||
const htmlBlob = await htmlToImage.toBlob(document.body, {
|
||||
backgroundColor: '#ffffff',
|
||||
});
|
||||
const imgFile = new File(
|
||||
[htmlBlob!],
|
||||
`daily-checklist-${header?.date}-${header?.kandang_name}-${header?.category}.png`,
|
||||
@@ -606,7 +608,6 @@ export function DetailDailyChecklistContent() {
|
||||
files: [imgFile],
|
||||
title: baseTitle,
|
||||
text: fullMessage,
|
||||
url: window.location.href,
|
||||
};
|
||||
} else {
|
||||
shareData = {
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ export type CreateProjectFlockPayload = {
|
||||
category: string;
|
||||
production_standard_id: number;
|
||||
location_id: number;
|
||||
period: number;
|
||||
periode: number;
|
||||
kandang_ids: number[];
|
||||
project_budgets?: ProjectFlockBudget[];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user