diff --git a/handlers/dev/md.doctor.handlers.go b/handlers/dev/md.doctor.handlers.go
index 053671b..1aff76f 100644
--- a/handlers/dev/md.doctor.handlers.go
+++ b/handlers/dev/md.doctor.handlers.go
@@ -30,6 +30,7 @@ type MdDoctorServices interface {
GetJenisKelamin() ([]models.HardCodeDropdownV0, error)
GetKewarganegaraan() ([]models.HardCodeRadioButtonV0, error)
GetListMdSpesialis() ([]models.SpecialistV0, error)
+ GetDateNow() (string, error)
}
func NewMdDoctorHandler(us MdDoctorServices) *MdDoctorHandler {
@@ -221,6 +222,91 @@ func (lh *MdDoctorHandler) HandleShowMdDoctorScreen(c echo.Context) error {
return err
}
+ // listItem Pendidikan
+ dataResultPend, err := services.GetTerminologyList(
+ models.TerminologyParamv0{
+ AttributePath: "Person.education",
+ CodeSystem: "xhis.code.education.level",
+ },
+ )
+ fmt.Println(dataResultPend)
+ fmt.Println(err)
+ if err != nil {
+ defer logger.Sync()
+ logger.Info("ERROR BREADCRUMB DEV",
+ zap.Any("error", err),
+ )
+ fmt.Println(dataResultPend)
+ return err
+ }
+
+ // listItem Identitas
+ dataResultIdentitas, err := services.GetTerminologyList(
+ models.TerminologyParamv0{
+ AttributePath: "Person.identifier.type",
+ CodeSystem: "http://terminology.hl7.org/CodeSystem/v2-0203",
+ },
+ )
+ fmt.Println(dataResultIdentitas)
+ fmt.Println(err)
+ if err != nil {
+ defer logger.Sync()
+ logger.Info("ERROR BREADCRUMB DEV",
+ zap.Any("error", err),
+ )
+ fmt.Println(dataResultIdentitas)
+ return err
+ }
+
+ // listItem dataResultBloodRhesus
+ dataResultBloodRhesus, err := services.GetTerminologyList(
+ models.TerminologyParamv0{
+ AttributePath: "Person.blood.rhesus",
+ CodeSystem: "http://snomed.info/sct",
+ },
+ )
+ fmt.Println(dataResultBloodRhesus)
+ fmt.Println(err)
+ if err != nil {
+ defer logger.Sync()
+ logger.Info("ERROR BREADCRUMB DEV",
+ zap.Any("error", err),
+ )
+ fmt.Println(dataResultBloodRhesus)
+ return err
+ }
+
+ // listItem dataResultEtnis
+ dataResultEtnis, err := services.GetTerminologyList(
+ models.TerminologyParamv0{
+ AttributePath: "Person.etnicity",
+ CodeSystem: "xhis.code.etnicity",
+ },
+ )
+ fmt.Println(dataResultEtnis)
+ fmt.Println(err)
+ if err != nil {
+ defer logger.Sync()
+ logger.Info("ERROR BREADCRUMB DEV",
+ zap.Any("error", err),
+ )
+ fmt.Println(dataResultEtnis)
+ return err
+ }
+
+ // tanggal sekarang
+ dataTglNow, err := lh.MdDoctorServices.GetDateNow()
+ fmt.Println(dataTglNow)
+ fmt.Println(err)
+ if err != nil {
+ defer logger.Sync()
+ logger.Info("ERROR BREADCRUMB DEV",
+ zap.Any("error", err),
+ )
+ fmt.Println(dataTglNow)
+ return err
+ }
+
defer logger.Sync()
logger.Info("LOAD BREADCRUMB DEV",
zap.Any("data", dataBreadCrumb),
@@ -244,6 +330,30 @@ func (lh *MdDoctorHandler) HandleShowMdDoctorScreen(c echo.Context) error {
// Component Dropdown MCU
listItemResultSpesialisComponent := dev_mddoctorview.ItemDropdownSpesialis(dataResultSpecialist, 0, "Pilih Spesialis")
+ // Component Dropdown Pendidikan Terakhir
+ listItemResultPendComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultPend,
+ models.TerminologySelectedV0{},
+ "Pendidikan Terakhir",
+ )
+
+ // Component Dropdown Identitas
+ listItemResultIdentitasComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultIdentitas,
+ models.TerminologySelectedV0{},
+ "Pilih Identitas",
+ )
+
+ // Component Dropdown Rhesus
+ listItemResultBloodRhesusComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultBloodRhesus,
+ models.TerminologySelectedV0{},
+ "Rhesus",
+ )
+
+ // Component Dropdown Etnis
+ listItemResultEtnisComponent := dev_mddoctorview.ItemDropdownTerminology(dataResultEtnis,
+ models.TerminologySelectedV0{},
+ "Etnis",
+ )
+
//modal add form
dialogAddBodyCmp := dev_mddoctorview.BodyFormDoctor(
models.CustomTextFieldv2Prm{
@@ -253,6 +363,14 @@ func (lh *MdDoctorHandler) HandleShowMdDoctorScreen(c echo.Context) error {
Type: "hidden",
ID: "doctorid",
},
+ models.CustomTextFieldv2Prm{
+ Label: "Tgl Sekarang",
+ Name: "doctortglnow",
+ Placeholder: "Tgl Sekarang",
+ Type: "hidden",
+ ID: "doctortglnow",
+ Value: dataTglNow,
+ },
models.CustomDropdownv1Prm{
Label: "Sapaan",
Name: "doctorsapaan",
@@ -304,6 +422,93 @@ func (lh *MdDoctorHandler) HandleShowMdDoctorScreen(c echo.Context) error {
ID: "doctorspesialis",
},
listItemResultSpesialisComponent,
+ models.CustomTextFieldv2Prm{
+ Label: "Imbuhan Akhir 1",
+ Name: "doctorimbuhanakhir1",
+ Placeholder: "Akhir 1",
+ Type: "text",
+ ID: "doctorimbuhanakhir1",
+ },
+ models.CustomTextFieldv2Prm{
+ Label: "Imbuhan Akhir 2",
+ Name: "doctorimbuhanakhir2",
+ Placeholder: "Akhir 2",
+ Type: "text",
+ ID: "doctorimbuhanakhir2",
+ },
+ models.CustomTextFieldv2Prm{
+ Label: "Tahun",
+ Name: "doctorimbuhantahun",
+ Placeholder: "Tahun",
+ Type: "text",
+ ID: "doctorimbuhantahun",
+ },
+ models.CustomTextFieldv2Prm{
+ Label: "Bulan",
+ Name: "doctorimbuhanbulan",
+ Placeholder: "Bulan",
+ Type: "text",
+ ID: "doctorimbuhanbulan",
+ },
+ models.CustomTextFieldv2Prm{
+ Label: "Hari",
+ Name: "doctorimbuhanhari",
+ Placeholder: "Hari",
+ Type: "text",
+ ID: "doctorimbuhanhari",
+ },
+ models.CustomDropdownv1Prm{
+ Label: "Pendidikan Terakhir",
+ Name: "doctorpendidikanterakhir",
+ ID: "doctorpendidikanterakhir",
+ },
+ listItemResultPendComponent,
+ models.CustomDropdownv1Prm{
+ Label: "Identitas",
+ Name: "doctoridentitas",
+ ID: "doctoridentitas",
+ },
+ listItemResultIdentitasComponent,
+ models.CustomTextFieldv2Prm{
+ Label: "Email",
+ Name: "doctorimbuhanemail",
+ Placeholder: "Email",
+ Type: "text",
+ ID: "doctorimbuhanemail",
+ },
+ models.CustomTextFieldv2Prm{
+ Label: "Nama",
+ Name: "doctorimbuhannama",
+ Placeholder: "Nama",
+ Type: "text",
+ ID: "doctorimbuhannama",
+ },
+ models.CustomTextFieldv2Prm{
+ Label: "Tanggal Lahir",
+ Name: "doctorimbuhantanggallahir",
+ Placeholder: "Tanggal Lahir",
+ Type: "date",
+ ID: "doctorimbuhantanggallahir",
+ },
+ models.CustomDropdownv1Prm{
+ Label: "Rhesus",
+ Name: "doctorgolonganbloodrhesus",
+ ID: "doctorgolonganbloodrhesus",
+ },
+ listItemResultBloodRhesusComponent,
+ models.CustomDropdownv1Prm{
+ Label: "Ernis",
+ Name: "doctorgolonganetnis",
+ ID: "doctorgolonganetnis",
+ },
+ listItemResultEtnisComponent,
+ models.CustomTextFieldv2Prm{
+ Label: "Nomor HP",
+ Name: "doctorimbuhannohp",
+ Placeholder: "Nomor HP",
+ Type: "text",
+ ID: "doctorimbuhannohp",
+ },
dialogAddBodyID, dev_mddoctorview.JsHideModalDoctor(""))
modalActioAddCmp := dev_mddoctorview.ActionFormDoctor(
diff --git a/services/dev/md.doctor.services.go b/services/dev/md.doctor.services.go
index cca829f..754e9c7 100644
--- a/services/dev/md.doctor.services.go
+++ b/services/dev/md.doctor.services.go
@@ -690,6 +690,28 @@ func (su *ServicesMdDoctor) GetListMdSpesialis() ([]models.SpecialistV0, error)
return sapaanList, nil
}
+// tanggal sekarang
+func (su *ServicesMdDoctor) GetDateNow() (string, error) {
+ var stringDateNow string
+
+ logger, _ := zap.NewProduction()
+ defer logger.Sync()
+
+ query := `
+ SELECT CURRENT_DATE() as tglSekarang
+ `
+
+ logger.Info("QUERY SEARCH INITIAL",
+ zap.String("query search", query),
+ )
+
+ if err := dbx.Handlex.Get(&stringDateNow, query); err != nil {
+ return "", fmt.Errorf("error querying database: %v", err)
+ }
+
+ return stringDateNow, nil
+}
+
// LISTING, SEARCH, PAGINATION
func (su *ServicesMdDoctor) GetListMdDoctor(search string, currentPage int, rowPerPage int) ([]models.DoctorV1, int, error) {
var doctorList []models.DoctorV1
diff --git a/views/dev/mddoctor/mddoctor.templ b/views/dev/mddoctor/mddoctor.templ
index 3931f0d..148941d 100644
--- a/views/dev/mddoctor/mddoctor.templ
+++ b/views/dev/mddoctor/mddoctor.templ
@@ -157,7 +157,7 @@ templ ItemDropdownTerminology(dataDropdown []models.TerminologyV0, selectedItem
// for item radiobutton kewarganegaraan
templ ItemRadioButtonKewarganegaraan(data []models.HardCodeRadioButtonV0, selectedRadioButton int) {
-
+
for _, v := range data {
if (selectedRadioButton == v.ID) {
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
+ dropdownDoctorPend,
+ listItemPend).Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
+ dropdownDoctorIdentitas,
+ listItemIdentitas).Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
+ InputEmail).Render(ctx, templ_7745c5c3_Buffer)
+ if templ_7745c5c3_Err != nil {
+ return templ_7745c5c3_Err
+ }
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
@@ -407,7 +552,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
var templ_7745c5c3_Var14 string
templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 198, Col: 22}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 365, Col: 22}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
if templ_7745c5c3_Err != nil {
@@ -420,7 +565,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
var templ_7745c5c3_Var15 string
templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 199, Col: 26}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 366, Col: 26}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
if templ_7745c5c3_Err != nil {
@@ -433,7 +578,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
var templ_7745c5c3_Var16 string
templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 200, Col: 24}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 367, Col: 24}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
if templ_7745c5c3_Err != nil {
@@ -474,7 +619,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
var templ_7745c5c3_Var18 string
templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 221, Col: 21}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 388, Col: 21}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
if templ_7745c5c3_Err != nil {
@@ -487,7 +632,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
var templ_7745c5c3_Var19 string
templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 222, Col: 25}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 389, Col: 25}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
if templ_7745c5c3_Err != nil {
@@ -500,7 +645,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
var templ_7745c5c3_Var20 string
templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 223, Col: 23}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 390, Col: 23}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
if templ_7745c5c3_Err != nil {
@@ -555,7 +700,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
var templ_7745c5c3_Var23 string
templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 240, Col: 22}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 407, Col: 22}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
if templ_7745c5c3_Err != nil {
@@ -577,7 +722,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
var templ_7745c5c3_Var25 string
templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(message)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 241, Col: 14}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 408, Col: 14}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
if templ_7745c5c3_Err != nil {
@@ -595,7 +740,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
var templ_7745c5c3_Var26 string
templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(v)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 246, Col: 68}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 413, Col: 68}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
if templ_7745c5c3_Err != nil {
@@ -618,7 +763,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
var templ_7745c5c3_Var27 string
templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(v)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 252, Col: 10}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 419, Col: 10}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
if templ_7745c5c3_Err != nil {
@@ -685,7 +830,7 @@ func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose st
var templ_7745c5c3_Var30 string
templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 266, Col: 22}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 433, Col: 22}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
if templ_7745c5c3_Err != nil {
@@ -698,7 +843,7 @@ func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose st
var templ_7745c5c3_Var31 string
templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 267, Col: 26}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 434, Col: 26}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
if templ_7745c5c3_Err != nil {
@@ -711,7 +856,7 @@ func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose st
var templ_7745c5c3_Var32 string
templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
if templ_7745c5c3_Err != nil {
- return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 268, Col: 24}
+ return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 435, Col: 24}
}
_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
if templ_7745c5c3_Err != nil {