From d7a78337faee9b7fb041e0cc8889ba2f908aec54 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 22 Feb 2024 10:59:42 +0700 Subject: [PATCH 1/4] 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 From 1e493442073bff58c479c9967335a66e3ca58920 Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 22 Feb 2024 11:06:31 +0700 Subject: [PATCH 2/4] update bugs fix --- frontend/dashboard/src/pages/Master/Hospitals/Form.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx b/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx index 4b8ed930..365ad054 100644 --- a/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx +++ b/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx @@ -258,8 +258,8 @@ 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_selected = currentOrganizations?.corporate_id_partner ? currentOrganizations.corporate_id_partner.split(",").map(Number) : null; + const [corporate_id_partner, setCorporateIdPartner] = useState([]); const [selectedCorporatID, setSelectedCorporateID] = useState(corporate_selected ?? []); const handleSelectChange = (event, selectedOptions:any) => { From dcf1eead2d9938a61f93cfee135bf96e87527c4c Mon Sep 17 00:00:00 2001 From: Tb Fajri Date: Thu, 22 Feb 2024 11:23:46 +0700 Subject: [PATCH 3/4] update bugs --- .../src/pages/Master/Hospitals/Form.tsx | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx b/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx index 365ad054..62d07198 100644 --- a/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx +++ b/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx @@ -258,10 +258,26 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop const [district, setDistrict] = useState([]); const [village, setVillage] = useState([]); - const corporate_selected = currentOrganizations?.corporate_id_partner ? currentOrganizations.corporate_id_partner.split(",").map(Number) : null; + let corporate_selected = []; + if (defaultValues?.corporate_id_partner) { + if (defaultValues.corporate_id_partner.includes(',')) { + corporate_selected = defaultValues.corporate_id_partner.split(",").map(Number); + } else { + corporate_selected = [Number(defaultValues.corporate_id_partner)]; + } + } + const [corporate_id_partner, setCorporateIdPartner] = useState([]); - const [selectedCorporatID, setSelectedCorporateID] = useState(corporate_selected ?? []); + const [selectedCorporatID, setSelectedCorporateID] = useState([]); + + + useEffect(()=> { + setSelectedCorporateID(corporate_selected) + }, [defaultValues]) + + console.log(corporate_selected, 'test') + const handleSelectChange = (event, selectedOptions:any) => { const selectedValues = selectedOptions.map(option => option.value); setSelectedCorporateID(selectedValues); From 693c7db324fd50a33fe3dfa21f172c489e1f6e1f Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Thu, 22 Feb 2024 13:36:25 +0700 Subject: [PATCH 4/4] Update xport xc tot bill 0 dan log req --- Modules/Client/Http/Controllers/Api/ClaimController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modules/Client/Http/Controllers/Api/ClaimController.php b/Modules/Client/Http/Controllers/Api/ClaimController.php index fefb1a9c..b90a5931 100644 --- a/Modules/Client/Http/Controllers/Api/ClaimController.php +++ b/Modules/Client/Http/Controllers/Api/ClaimController.php @@ -312,7 +312,7 @@ class ClaimController extends Controller ->leftJoin('members', 'members.id', '=', 'request_logs.member_id') ->leftJoin('corporate_employees','corporate_employees.member_id','=','members.id') ->where('corporate_employees.corporate_id', '=', $corporate_id) - ->where('request_logs.status_final_log', '=', 'approved') + // ->where('request_logs.status_final_log', '=', 'approved') ->where('request_logs.deleted_at', '=', null) ->when($start != 'all' && $end != 'all', function ($query) use ($start, $end) { $query->where('request_logs.submission_date', '>=', $start) @@ -528,7 +528,7 @@ class ClaimController extends Controller $penjamin, !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '', !empty($dataMember->no_polis) ? $dataMember->no_polis : '', - '', + '0', '', '', '',