Merge remote-tracking branch 'origin/staging' into origin/production
This commit is contained in:
@@ -78,14 +78,25 @@ class HospitalController extends Controller
|
|||||||
{
|
{
|
||||||
$request->validate([
|
$request->validate([
|
||||||
'corporate_id' => 'required',
|
'corporate_id' => 'required',
|
||||||
'code' => 'required',
|
// 'code' => 'required',
|
||||||
'name' => 'required',
|
'name' => 'required',
|
||||||
'organization_id' => 'required',
|
'organization_id' => 'required',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Membuat singkatan dari nama rumah sakit
|
||||||
|
$singkatan = "";
|
||||||
|
$words = explode(' ', $request->name);
|
||||||
|
|
||||||
|
foreach ($words as $word) {
|
||||||
|
$singkatan .= strtoupper(substr($word, 0, 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
// Membuat kode organisasi
|
||||||
|
$kodeOrganisasi = "ORG000" . $singkatan;
|
||||||
|
|
||||||
$newCorporateHospital = CorporateHospital::create([
|
$newCorporateHospital = CorporateHospital::create([
|
||||||
'corporate_id' => $corporate_id,
|
'corporate_id' => $corporate_id,
|
||||||
'code' => $request->code,
|
'code' => $request->code ? $request->code : $kodeOrganisasi,
|
||||||
'name' => $request->name,
|
'name' => $request->name,
|
||||||
'organization_id' => $request->organization_id,
|
'organization_id' => $request->organization_id,
|
||||||
'description' => $request->description ? $request->description : null,
|
'description' => $request->description ? $request->description : null,
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ export default function OrganizationsForm({ isEdit, currentOrganizations }: Prop
|
|||||||
|
|
||||||
const NewCorporateSchema = Yup.object().shape({
|
const NewCorporateSchema = Yup.object().shape({
|
||||||
name: Yup.string().required('Name is required'),
|
name: Yup.string().required('Name is required'),
|
||||||
code: Yup.string().required('Corporate Code is required'),
|
// code: Yup.string().required('Corporate Code is required'),
|
||||||
// file: Yup.boolean().required('Corporate Status is required'),
|
// file: Yup.boolean().required('Corporate Status is required'),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user