From d7a78337faee9b7fb041e0cc8889ba2f908aec54 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 22 Feb 2024 10:59:42 +0700 Subject: [PATCH] bugs fix edit hospital --- .../Http/Controllers/Api/OrganizationController.php | 1 + .../dashboard/src/pages/Master/Hospitals/Form.tsx | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/OrganizationController.php b/Modules/Internal/Http/Controllers/Api/OrganizationController.php index 487a8258..cd4b33d7 100644 --- a/Modules/Internal/Http/Controllers/Api/OrganizationController.php +++ b/Modules/Internal/Http/Controllers/Api/OrganizationController.php @@ -124,6 +124,7 @@ class OrganizationController extends Controller 'type' => 'hospital', 'status' => $request->active == 1 ? 'active' : 'inactive', 'description' => $request->description, + 'corporate_id_partner' => $request->corporate_id_partner ]); if ($request->phone != null) { diff --git a/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx b/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx index 09acecf8..4b8ed930 100644 --- a/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx +++ b/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx @@ -222,6 +222,7 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop console.log('formData', formData); const response = await axios.post('/organizations', formData); } else { + formData.append('_method', 'PUT'); const response = await axios.post( '/organizations/' + currentOrganizations?.id ?? '', @@ -257,13 +258,14 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop const [district, setDistrict] = useState([]); const [village, setVillage] = useState([]); + const corporate_selected = currentOrganizations?.corporate_id_partner.split(",").map(Number); + const [corporate_id_partner, setCorporateIdPartner] = useState([]); - const [selectedCorporatID, setSelectedCorporateID] = useState([]); - + const [selectedCorporatID, setSelectedCorporateID] = useState(corporate_selected ?? []); const handleSelectChange = (event, selectedOptions:any) => { const selectedValues = selectedOptions.map(option => option.value); setSelectedCorporateID(selectedValues); - setValue('corporate_id_partner', selectedCorporatID) + setValue('corporate_id_partner', selectedValues) }; useEffect(() => { @@ -329,9 +331,6 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop if (values.corporate_id_partner) { loadCorporateIdPartner(); } - - console.log(corporate_id_partner, 'test'); - }, [values.corporate_id_partner]) @@ -509,7 +508,7 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop option.label} + getOptionLabel={(option) => option.label ?? findValueCorporate.label ?? ''} value={corporate_id_partner.filter(option => selectedCorporatID.includes(option.value))} onChange={handleSelectChange} multiple // Enable multiple selections