fix(FE): adjust chickin and closing after submit

This commit is contained in:
randy-ar
2025-12-06 11:38:28 +07:00
parent 341cb42452
commit ffbf886718
3 changed files with 11 additions and 8 deletions
@@ -26,7 +26,6 @@ const ChickinFormKandang = ({
initialValues: ProjectFlockKandang; initialValues: ProjectFlockKandang;
afterSubmit?: () => void; afterSubmit?: () => void;
}) => { }) => {
const [activeTabId, setActiveTabId] = useState<string>('formChickIn');
const [openChickin, setOpenChickin] = useState<boolean>(false); const [openChickin, setOpenChickin] = useState<boolean>(false);
const { const {
@@ -41,7 +40,7 @@ const ChickinFormKandang = ({
}); });
const afterSubmitFormChickin = () => { const afterSubmitFormChickin = () => {
setActiveTabId('logsChickIn'); setOpenChickin(true);
afterSubmit && afterSubmit(); afterSubmit && afterSubmit();
refreshApprovals(); refreshApprovals();
}; };
@@ -28,7 +28,7 @@ const ProjectFlockClosingForm = ({
projectFlockKandang: ProjectFlockKandang; projectFlockKandang: ProjectFlockKandang;
}) => { }) => {
const closeModal = useModal(); const closeModal = useModal();
const isCanClose = projectFlock.approval.step_number <= 2; const isCanClose = projectFlock.approval?.step_number <= 1;
const [isClosingLoading, setIsClosingLoading] = useState(false); const [isClosingLoading, setIsClosingLoading] = useState(false);
const { data: closingData, isLoading } = useSWR( const { data: closingData, isLoading } = useSWR(
@@ -116,7 +116,7 @@ const ProjectFlockClosingForm = ({
> >
<Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Area
</div> </div>
<div className='col-span-2'>{projectFlock.area.name}</div> <div className='col-span-2'>{projectFlock.area?.name}</div>
{/* Lokasi */} {/* Lokasi */}
<div <div
@@ -126,7 +126,7 @@ const ProjectFlockClosingForm = ({
> >
<Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Lokasi
</div> </div>
<div className='col-span-2'>{projectFlock.location.name}</div> <div className='col-span-2'>{projectFlock.location?.name}</div>
{/* Kandang */} {/* Kandang */}
<div <div
@@ -136,7 +136,7 @@ const ProjectFlockClosingForm = ({
> >
<Icon width={14} height={14} icon='mdi:circle-slice-8' /> Kandang <Icon width={14} height={14} icon='mdi:circle-slice-8' /> Kandang
</div> </div>
<div className='col-span-2'>{projectFlockKandang.kandang.name}</div> <div className='col-span-2'>{projectFlockKandang.kandang?.name}</div>
{/* Jumlah DOC */} {/* Jumlah DOC */}
<div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'> <div className='col-span-1 flex flex-row items-center text-gray-400 font-semibold gap-2'>
@@ -279,7 +279,11 @@ const ProjectFlockClosingForm = ({
<ConfirmationModal <ConfirmationModal
ref={closeModal.ref} ref={closeModal.ref}
type='error' type='error'
text={`Apakah kamu yakin ingin mengakhiri project ini ? *Pastikan persediaan produk di gudang terkait sudah kosong, dan BOP sudah selesai`} text={
projectFlock.approval?.step_number <= 1
? 'Apakah kamu yakin ingin mengakhiri project ini ? *Pastikan persediaan produk di gudang terkait sudah kosong, dan BOP sudah selesai'
: 'Apakah kamu yakin ingin membuka kembali project ini ? *Project ini akan kembali ke status aktif'
}
secondaryButton={{ secondaryButton={{
text: 'Tidak', text: 'Tidak',
}} }}
@@ -903,7 +903,7 @@ const ProjectFlockForm = ({
<div className='divider'></div> <div className='divider'></div>
<div className='flex flex-col gap-4 px-4 pb-4'> <div className='flex flex-col gap-4 px-4 pb-4'>
<h2 className='text-2xl font-semibold'> <h2 className='text-2xl font-semibold'>
Estimasi Aggaran Per Flock Estimasi Anggaran Per Flock
</h2> </h2>
<div className='flex flex-col gap-4'> <div className='flex flex-col gap-4'>
{formik.values.project_budgets && {formik.values.project_budgets &&