From 9a4e9db7989777072bc364d985dbae025955b44f Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Wed, 9 Oct 2024 10:31:33 +0700 Subject: [PATCH] Update --- .../Controllers/Api/OrganizationController.php | 6 +++++- .../Internal/Transformers/OrganizationResource.php | 6 ++++-- frontend/dashboard/src/@types/organization.tsx | 2 ++ .../dashboard/src/pages/Master/Hospitals/Form.tsx | 14 +++++++++++++- .../dashboard/src/pages/Master/Hospitals/List.tsx | 14 +++++++++++++- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Modules/Internal/Http/Controllers/Api/OrganizationController.php b/Modules/Internal/Http/Controllers/Api/OrganizationController.php index cd4b33d7..7c2cbbd1 100755 --- a/Modules/Internal/Http/Controllers/Api/OrganizationController.php +++ b/Modules/Internal/Http/Controllers/Api/OrganizationController.php @@ -48,6 +48,8 @@ class OrganizationController extends Controller public function store(Request $request) { $organization = [ + 'phone' => $request->no_hp, + 'email' => $request->email, 'code' => $request->code, 'name' => $request->name, 'type' => 'hospital', @@ -119,6 +121,8 @@ class OrganizationController extends Controller $update_organization = Organization::find($id); $update_organization->update([ + 'phone' => $request->no_hp, + 'email' => $request->email, 'code' => $request->code, 'name' => $request->name, 'type' => 'hospital', @@ -152,7 +156,7 @@ class OrganizationController extends Controller 'lat' => $request->lat, 'lng' => $request->lng, ]); - + $update_organization->main_address_id = $newAddres->id; $update_organization->save(); diff --git a/Modules/Internal/Transformers/OrganizationResource.php b/Modules/Internal/Transformers/OrganizationResource.php index 72448ee3..6dbdb426 100755 --- a/Modules/Internal/Transformers/OrganizationResource.php +++ b/Modules/Internal/Transformers/OrganizationResource.php @@ -27,12 +27,14 @@ class OrganizationResource extends JsonResource } $corporatePartner = implode(', ', $corporateName); } - - } + + } $organization = [ 'id' => $this->id, 'name' => $this->name, 'type' => $this->type, + 'no_hp' => $this->phone, + 'email' => $this->email, 'code' => $this->code, 'description' => $this->description, 'kodeRs' => $this->meta->KodeRS ?? null, diff --git a/frontend/dashboard/src/@types/organization.tsx b/frontend/dashboard/src/@types/organization.tsx index 1af7adcd..39b31e3c 100755 --- a/frontend/dashboard/src/@types/organization.tsx +++ b/frontend/dashboard/src/@types/organization.tsx @@ -1,6 +1,8 @@ export type Organizations = { id: number; code: string; + no_hp: number; + email: string; name: string; address: string; type: string; diff --git a/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx b/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx index 81084fa0..145afc23 100755 --- a/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx +++ b/frontend/dashboard/src/pages/Master/Hospitals/Form.tsx @@ -116,6 +116,8 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop name: currentOrganizations?.name || '', code: currentOrganizations?.code || '', phone: currentOrganizations?.phone || '', + no_hp: currentOrganizations?.no_hp || '', + email: currentOrganizations?.email || '', lat: currentOrganizations?.lat || '', lng: currentOrganizations?.lng || '', address: currentOrganizations?.address || '', @@ -185,6 +187,8 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop formData.append('name', data.name); formData.append('code', data.code); formData.append('phone', data.phone); + formData.append('no_hp', data.no_hp); + formData.append('email', data.email); formData.append('lat', data.lat); formData.append('lng', data.lng); formData.append('address', data.address); @@ -361,7 +365,7 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop const findValueCorporate = selectedCorporatID.find( (item: any) => item.value === currentOrganizations?.corporate_id_partner ); - + return ( @@ -391,6 +395,14 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop Nomor IGD + + No. HP + + + + Email + + Alamat diff --git a/frontend/dashboard/src/pages/Master/Hospitals/List.tsx b/frontend/dashboard/src/pages/Master/Hospitals/List.tsx index 1ceffab9..96b49d12 100755 --- a/frontend/dashboard/src/pages/Master/Hospitals/List.tsx +++ b/frontend/dashboard/src/pages/Master/Hospitals/List.tsx @@ -301,9 +301,21 @@ export default function List() { : {row.code ? row.code : '-'} + + No. HP + + + : {row.no_hp ? row.no_hp : '-'} + + + Email + + + : {row.email ? row.email : '-'} + - Rekanan + Rekanan : {row.corporate_name ? row.corporate_name : '-'}