bugs fix

Modules/Internal/Http/Controllers/Api/ClaimController.php

@@ -913,7 +913,7 @@ class ClaimController extends Controller
     public function storeHistoryCare(Request $request, $id){
         $request->validate([
             'service_code' => 'required',
-            'admision_date' => 'required',
+            'admission_date' => 'required',
             'discharge_date' => 'required',
             'organization_id' => 'required',
             'practitioner_id' => 'required',
@@ -925,7 +925,7 @@ class ClaimController extends Controller
 
         $data = [
             'service_code' => $request->service_code,
-            'admision_date' => $request->admision_date,
+            'admission_date' => $request->admission_date,
             'discharge_date' => $request->discharge_date,
             'organization_id' => $request->organization_id,
             'practitioner_id' => $request->practitioner_id,

frontend/dashboard/src/pages/Claims/Detail.tsx

@@ -239,11 +239,25 @@ export default function Detail() {
             .get('/doctors?search=&organization_id='+values.organization_id)
             .then((response) => {
                 setDoctor(response.data.data);
-                setOpenHospitalCare(true);
+                
             })
             .catch((error) => {
                 console.error(error);
             });
+
+            // setMainDiagnosis
+            axios
+            .get(`corporates/${corporate_id}/diagnosis`)
+            .then((response) => {
+            setMainDiagnosis(response.data.data)
+            })
+
+            // setOrganization atau hospital atau location
+            axios
+            .get(`corporates/${corporate_id}/hospitals`)
+            .then((response) => {
+                setOrganization(response.data.data)
+            })
        }
 
    }, [claimHistoryId])
@@ -266,6 +280,7 @@ export default function Detail() {
 
     const handleCloseDialogApprove = () => {
         setOpenDialogApproval(false);
+        setEdit(false)
         setClaimHistoryId(null);
         reset();
     }
@@ -373,9 +388,6 @@ export default function Detail() {
 
     const values = watch();
 
-
-    console.log(values, 'debugs')
-
     const {fields, append, remove} = useFieldArray<FormValuesProps>({name: "secondary_diagnosis_id", control})
 
     const onSubmit = async (data: FormValuesProps) => {
@@ -470,6 +482,17 @@ export default function Detail() {
     function handleEditHospitalCare(id: number) {
         setClaimHistoryId(id);
         setEdit(true);
+        setOpenHospitalCare(true);
+        // reset(defaultValues);
+        console.log(defaultValues, 'debugs')
+        console.log(organization, 'debugs')
+    }
+
+    function handleUpdateHospitalCare(id: number) {
+        setOpenHospitalCare(false);
+        setClaimHistoryId(id);
+        setEdit(false);
+        setOpenDialogApproval(true);
     }
 
     //Service
@@ -597,11 +620,13 @@ export default function Detail() {
         axios
         .post('claims/'+id+'/'+decline)
         .then((response) => {
-        enqueueSnackbar('Success '+toTitleCase(decline)+' Claim Request', { variant: 'success' });
-        setOpenDialogSubmit(false);
+            enqueueSnackbar('Success '+toTitleCase(decline)+' Claim Request', { variant: 'success' });
+            setOpenDialogSubmit(false);
+            window.location.reload();
+            
         })
         .catch(({ response }) => {
-        enqueueSnackbar(response.data.message ?? 'Something went wrong!', { variant: 'error' });
+            enqueueSnackbar(response.data.message ?? 'Something went wrong!', { variant: 'error' });
         });
 
         setTimeout(() =>
@@ -810,7 +835,7 @@ export default function Detail() {
                                                 <MenuItem onClick={() => handleEditHospitalCare(claimHistoryCare.id)}>
                                                 <EditTwoTone />Edit
                                                 </MenuItem>
-                                                <MenuItem onClick={() => {setOpenDialogApproval(true); setClaimHistoryId(claimHistoryCare.id)}}>
+                                                <MenuItem onClick={() => handleUpdateHospitalCare(claimHistoryCare.id)}>
                                                 <LoopOutlined />Update Status
                                                 </MenuItem>
                                                 </>

frontend/dashboard/src/pages/Corporates/Formularium/Index.tsx

@@ -24,7 +24,7 @@ export default function CorporateFormularium() {
   }, [configuredCorporateContext]);
 
   return (
-    <Page title="Corportae Formularium">
+    <Page title="Corporate Formularium">
       <HeaderBreadcrumbs
         heading={'Corporate Formularium'}
         links={[

frontend/dashboard/src/pages/Master/FormulariumV2/Detail/Formularium.tsx

@@ -74,7 +74,7 @@ export default function List() {
     };
 
     const handleImportButton = () => {
-      if (importForm?.current) {
+      if (importForm?.current) {;
         handleClose();
         importForm.current ? importForm.current.click() : console.log('No File selected');
       } else {
@@ -88,7 +88,7 @@ export default function List() {
     }
 
     const handleGetTemplate = (type: string) => {
-      axios.get('corporate/import-document-example/' + type)
+      axios.get('corporates/import-document-example/' + type)
         .then((response) => {
           const link = document.createElement('a');
           link.href = response.data.data.file_url;
@@ -127,7 +127,7 @@ export default function List() {
       if (importForm.current?.files?.length) {
         const formData = new FormData();
         formData.append('file', importForm.current?.files[0])
-        axios.post(`master/formularium/${formularium_template_id}/import`, formData )
+        axios.post(`master/formulariums/${formularium_template_id}/import`, formData )
           .then(response => {
             handleCancelImportButton();
             loadDataTableData();
@@ -181,7 +181,7 @@ export default function List() {
                   'aria-labelledby': 'basic-button',
                 }}
               >
-                <MenuItem onClick={() => handleImportButton}>Import</MenuItem>
+                <MenuItem onClick={handleImportButton}>Import</MenuItem>
                 <MenuItem onClick={() => handleGetTemplate('master-formularium')}>Download Template</MenuItem>
                 <MenuItem onClick={() => handleFormulariumList()}>Download Formularium</MenuItem>
               </Menu>