diff --git a/frontend/dashboard/src/pages/Corporates/Formularium/New/CategoryDetail.tsx b/frontend/dashboard/src/pages/Corporates/Formularium/New/CategoryDetail.tsx index c1194c1f..b3f620e3 100644 --- a/frontend/dashboard/src/pages/Corporates/Formularium/New/CategoryDetail.tsx +++ b/frontend/dashboard/src/pages/Corporates/Formularium/New/CategoryDetail.tsx @@ -19,12 +19,18 @@ import { useForm } from 'react-hook-form'; import * as Yup from 'yup'; import { CorporateFormulariumList } from "./Types"; -export default function CategoryDetail(props: DetailCorpFormularium) { +type ParamsDetail = { + props: DetailCorpFormularium, + formularium: CorporateFormulariumList, +} + +export default function CategoryDetail({props, formularium} : ParamsDetail) { + type FormValuesProps = { value: string; active: boolean; }; - + const { corporate_id } = useParams(); const [open, setOpen] = React.useState(false); const [isDialogOpen, setDialogOpen] = useState(false) let titles = { @@ -59,7 +65,7 @@ export default function CategoryDetail(props: DetailCorpFormularium) { const onSubmit = async (row : any) => { try { - handleUpdate(dataValue?.active, dataValue?.id) + handleUpdate(dataValue?.active, dataValue?.id, row.reason) } catch (error: any) { console.log('data gagal'); } @@ -70,14 +76,19 @@ export default function CategoryDetail(props: DetailCorpFormularium) { } }; - const handleUpdate = (active: string, id: number) => { - console.log(active) + const handleUpdate = (active: string, id: number, reason: string) => { + if (active == "Active") { + active = "0" + } else { + active = "1" + } + console.log(corporate_id, id , active) axios - .put(`/corporates/${id}/formulariums-update-status/${id}`, { - active: active, - reason: reason + .put(`/corporates/${corporate_id}/formulariums-update-status/${id}`, { + active: active, }) .then((res) => { + console.log(res.data.message) window.location.reload(); }); } @@ -85,7 +96,7 @@ export default function CategoryDetail(props: DetailCorpFormularium) { const getContent = () => ( <> - Are you sure to {dataValue?.active === "1" ? 'Inactive' : 'Active'} this Formularium ? + Are you sure to {dataValue?.active === "Active" ? 'inactive' : 'active'} this Formularium ? @@ -127,7 +138,7 @@ export default function CategoryDetail(props: DetailCorpFormularium) { > Cancel - {dataValue?.active == "1" ? + {dataValue?.active == "Active" ? {props.code} {props.name} - + {formularium.active == "Active" ? ( + + ): ( + + )} handleActivate(true, { - id: 0, - formulaurium_category_id: 0, - category: '-', - description: '-', - active: '1' + id: formularium.id, + formulaurium_category_id: formularium.formulaurium_category_id, + category: formularium.category, + description: formularium.description, + active: formularium.active }) }> @@ -194,13 +207,15 @@ export default function CategoryDetail(props: DetailCorpFormularium) { - - - - - - - + + + + + + + + + {/* TODO: dialog update status */} = (props) => { No Data ) : ( dataRow?.map(item => ( - + )) )} diff --git a/frontend/dashboard/src/pages/Corporates/Formularium/New/List.tsx b/frontend/dashboard/src/pages/Corporates/Formularium/New/List.tsx index 016fb4c1..0e880864 100644 --- a/frontend/dashboard/src/pages/Corporates/Formularium/New/List.tsx +++ b/frontend/dashboard/src/pages/Corporates/Formularium/New/List.tsx @@ -45,8 +45,6 @@ export default function List() { setDataTableLoading(false); setDataTableData(resp.data); setDataRow(resp.data.data); - console.log(dataTableData); - console.log(dataRow); } const applyFilter = async (searchFilter: any) => { @@ -63,6 +61,8 @@ export default function List() { useEffect(() => { loadDataTableData(); + console.log(dataTableData); + console.log(dataRow); }, []); @@ -140,7 +140,7 @@ export default function List() { - + Formularium Name Description