step 12 : refactor layout add, ketambahan alamat dan agama,

proses add fix

handlers/dev/md.doctor.handlers.go

@@ -234,6 +234,33 @@ func (lh *MdDoctorHandler) HandleShowMdDoctorScreen(c echo.Context) error {
 		},
 	}, dataResultGolonganDarah...)
 
+	// listItem Agama
+	dataResultAgama, err := services.GetTerminologyList(
+		models.TerminologyParamv0{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+		},
+	)
+	fmt.Println(dataResultAgama)
+	fmt.Println(err)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataResultAgama)
+		return err
+	}
+
+	dataResultAgama = append([]models.TerminologyV0{
+		{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+			Code:          "default",
+			Display:       "Agama",
+		},
+	}, dataResultAgama...)
+
 	// listItem Kewarganegaraan
 	dataResultKewarganegaraan, err := lh.MdDoctorServices.GetKewarganegaraan()
 	fmt.Println(dataResultKewarganegaraan)
@@ -399,7 +426,7 @@ func (lh *MdDoctorHandler) HandleShowMdDoctorScreen(c echo.Context) error {
 	// Component Dropdown JK
 	listItemResultJKComponent := dev_mddoctorview.ItemDropdownJenisKelamin(dataResultJenisKelamin, 0)
 
-	// Component Dropdown Golongan Darah
+	// Component Dropdown GD
 	listItemResultGDComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultGolonganDarah,
 		models.TerminologySelectedV0{
 			AttributePath: "Person.blood.type",
@@ -409,6 +436,16 @@ func (lh *MdDoctorHandler) HandleShowMdDoctorScreen(c echo.Context) error {
 		},
 	)
 
+	// Component Dropdown Agama
+	listItemResultAgamaComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultAgama,
+		models.TerminologySelectedV0{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+			Code:          "default",
+			Display:       "Agama",
+		},
+	)
+
 	// Component Radio Button Kewarganegaraan
 	listItemResultKewarganegaraanComponent := dev_mddoctorview.ItemRadioButtonKewarganegaraan(dataResultKewarganegaraan, 1)
 
@@ -618,6 +655,12 @@ func (lh *MdDoctorHandler) HandleShowMdDoctorScreen(c echo.Context) error {
 			Type:        "text",
 			ID:          "doctorimbuhannohp",
 		},
+		models.CustomDropdownv1Prm{
+			Label: "Agama",
+			Name:  "doctoragama",
+			ID:    "doctoragama",
+		},
+		listItemResultAgamaComponent,
 		dialogAddBodyID, dev_mddoctorview.JsHideModalDoctor(""))
 
 	modalActioAddCmp := dev_mddoctorview.ActionFormDoctor(
@@ -982,6 +1025,33 @@ func (lh *MdDoctorHandler) HandleCloseFormAdd(c echo.Context) error {
 		},
 	}, dataResultGolonganDarah...)
 
+	// listItem Agama
+	dataResultAgama, err := services.GetTerminologyList(
+		models.TerminologyParamv0{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+		},
+	)
+	fmt.Println(dataResultAgama)
+	fmt.Println(err)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataResultAgama)
+		return err
+	}
+
+	dataResultAgama = append([]models.TerminologyV0{
+		{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+			Code:          "default",
+			Display:       "Agama",
+		},
+	}, dataResultAgama...)
+
 	// listItem Kewarganegaraan
 	dataResultKewarganegaraan, err := lh.MdDoctorServices.GetKewarganegaraan()
 	fmt.Println(dataResultKewarganegaraan)
@@ -1152,6 +1222,16 @@ func (lh *MdDoctorHandler) HandleCloseFormAdd(c echo.Context) error {
 		},
 	)
 
+	// Component Dropdown Agama
+	listItemResultAgamaComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultAgama,
+		models.TerminologySelectedV0{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+			Code:          "default",
+			Display:       "Agama",
+		},
+	)
+
 	// Component Radio Button Kewarganegaraan
 	listItemResultKewarganegaraanComponent := dev_mddoctorview.ItemRadioButtonKewarganegaraan(dataResultKewarganegaraan, 1)
 
@@ -1348,7 +1428,7 @@ func (lh *MdDoctorHandler) HandleCloseFormAdd(c echo.Context) error {
 		},
 		listItemResultBloodRhesusComponent,
 		models.CustomDropdownv1Prm{
-			Label: "Ernis",
+			Label: "Etnis",
 			Name:  "doctorgolonganetnis",
 			ID:    "doctorgolonganetnis",
 		},
@@ -1360,6 +1440,12 @@ func (lh *MdDoctorHandler) HandleCloseFormAdd(c echo.Context) error {
 			Type:        "text",
 			ID:          "doctorimbuhannohp",
 		},
+		models.CustomDropdownv1Prm{
+			Label: "Agama",
+			Name:  "doctoragama",
+			ID:    "doctoragama",
+		},
+		listItemResultAgamaComponent,
 		dialogAddBodyID, dev_mddoctorview.JsHideModalDoctor(""))
 	return utils.View(c, newForm)
 }
@@ -1396,6 +1482,7 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 	doctorGolonganBloodRhesus := c.FormValue("doctorgolonganbloodrhesus")
 	doctorGolonganEtnis := c.FormValue("doctorgolonganetnis")
 	doctorImbuhanNoHP := c.FormValue("doctorimbuhannohp")
+	doctorAgama := c.FormValue("doctoragama")
 
 	separator := "$$"
 
@@ -1438,6 +1525,7 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 		zap.String("doctorGolonganBloodRhesus", doctorGolonganBloodRhesus),
 		zap.String("doctorGolonganEtnis", doctorGolonganEtnis),
 		zap.String("doctorImbuhanNoHP", doctorImbuhanNoHP),
+		zap.String("doctorAgama", doctorAgama),
 		zap.Any("tableid", tableID),
 		zap.Any("search", search),
 		zap.Any("currpage", currPage),
@@ -1566,6 +1654,42 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 		Code:          strArrayGD[0],
 	})
 
+	// agama
+	// listItem Agama
+	strArrayAgama := strings.Split(doctorAgama, separator)
+	dataResultAgama, err := services.GetTerminologyList(
+		models.TerminologyParamv0{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+		},
+	)
+	fmt.Println(dataResultAgama)
+	fmt.Println(err)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataResultAgama)
+		return err
+	}
+
+	dataResultAgama = append([]models.TerminologyV0{
+		{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+			Code:          "default",
+			Display:       "Agama",
+		},
+	}, dataResultAgama...)
+
+	// Component Dropdown Agama
+	listItemResultAgamaComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultAgama, models.TerminologySelectedV0{
+		AttributePath: "Person.religion.code",
+		CodeSystem:    "xcpone.code.religion",
+		Code:          strArrayAgama[0],
+	})
+
 	// listItem Kewarganegaraan
 	dataResultKewarganegaraan, err := lh.MdDoctorServices.GetKewarganegaraan()
 	fmt.Println(dataResultKewarganegaraan)
@@ -1816,6 +1940,13 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 			Code:          strArrayGD[0],
 		})
 
+		// Component Dropdown Agama
+		listItemResultAgamaComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultAgama, models.TerminologySelectedV0{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+			Code:          strArrayAgama[0],
+		})
+
 		// Component Radio Button Kewarganegaraan
 		listItemResultKewarganegaraanComponent := dev_mddoctorview.ItemRadioButtonKewarganegaraan(dataResultKewarganegaraan, idSelectedKewarganegaraan)
 
@@ -2049,6 +2180,13 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 				ID:          "doctorimbuhannohp",
 				Value:       doctorImbuhanNoHP,
 			},
+			// agama
+			models.CustomDropdownv1Prm{
+				Label: "Agama",
+				Name:  "doctoragama",
+				ID:    "doctoragama",
+			},
+			listItemResultAgamaComponent,
 			dialogAddBodyID, dev_mddoctorview.JsHideModalDoctor(""))
 		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Warning", formValidation, "warning"), newForm})
 	}
@@ -2071,6 +2209,13 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 			Code:          strArrayGD[0],
 		})
 
+		// Component Dropdown Agama
+		listItemResultAgamaComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultAgama, models.TerminologySelectedV0{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+			Code:          strArrayAgama[0],
+		})
+
 		// Component Radio Button Kewarganegaraan
 		listItemResultKewarganegaraanComponent := dev_mddoctorview.ItemRadioButtonKewarganegaraan(dataResultKewarganegaraan, idSelectedKewarganegaraan)
 
@@ -2305,6 +2450,13 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 				ID:          "doctorimbuhannohp",
 				Value:       doctorImbuhanNoHP,
 			},
+			// agama
+			models.CustomDropdownv1Prm{
+				Label: "Agama",
+				Name:  "doctoragama",
+				ID:    "doctoragama",
+			},
+			listItemResultAgamaComponent,
 			dialogAddBodyID, dev_mddoctorview.JsHideModalDoctor(""))
 		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Error", "Error Get Doctor Code", "danger"), newForm})
 
@@ -2321,8 +2473,8 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 		M_DoctorSuffix2:           doctorImbuhanAkhir2,
 		M_DoctorGender:            doctorJKAdd,
 		M_DoctorDOB:               doctorImbuhanTanggalLahir,
-		M_DoctorReligionCode:      "",
-		M_DoctorReligionSystem:    "",
+		M_DoctorReligionCode:      strArrayAgama[0],
+		M_DoctorReligionSystem:    strArrayAgama[1],
 		M_DoctorBloodTypeCode:     strArrayGD[0],
 		M_DoctorBloodTypeSystem:   strArrayGD[1],
 		M_DoctorBloodRhCode:       strArrayRhesus[0],
@@ -2377,6 +2529,7 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 			zap.String("doctorGolonganBloodRhesus", doctorGolonganBloodRhesus),
 			zap.String("doctorGolonganEtnis", doctorGolonganEtnis),
 			zap.String("doctorImbuhanNoHP", doctorImbuhanNoHP),
+			zap.String("doctorAgama", doctorAgama),
 		)
 
 		// Component Dropdown JK
@@ -2392,6 +2545,13 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 			Code:          strArrayGD[0],
 		})
 
+		// Component Dropdown Agama
+		listItemResultAgamaComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultAgama, models.TerminologySelectedV0{
+			AttributePath: "Person.religion.code",
+			CodeSystem:    "xcpone.code.religion",
+			Code:          strArrayAgama[0],
+		})
+
 		// Component Radio Button Kewarganegaraan
 		listItemResultKewarganegaraanComponent := dev_mddoctorview.ItemRadioButtonKewarganegaraan(dataResultKewarganegaraan, idSelectedKewarganegaraan)
 
@@ -2624,6 +2784,13 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 				ID:          "doctorimbuhannohp",
 				Value:       doctorImbuhanNoHP,
 			},
+			// agama
+			models.CustomDropdownv1Prm{
+				Label: "Agama",
+				Name:  "doctoragama",
+				ID:    "doctoragama",
+			},
+			listItemResultAgamaComponent,
 			dialogAddBodyID, dev_mddoctorview.JsHideModalDoctor(""))
 		return utils.ViewMulti(c, []templ.Component{
 			customtoastv2.CustomToastV2Show("Error", err.Error(), "danger"),
@@ -2867,6 +3034,12 @@ func (lh *MdDoctorHandler) HandleAddMdDoctor(c echo.Context) error {
 			Type:        "text",
 			ID:          "doctorimbuhannohp",
 		},
+		models.CustomDropdownv1Prm{
+			Label: "Agama",
+			Name:  "doctoragama",
+			ID:    "doctoragama",
+		},
+		listItemResultAgamaComponent,
 		dialogAddBodyID, dev_mddoctorview.JsHideModalDoctor("#"+dialogAddID))
 	toastSuccess := customtoastv2.CustomToastV2Show("Success", "Success add master doctor "+doctorImbuhanNama, "success")