diff --git a/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go b/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go index 5b2dbbf..74b6cb1 100644 --- a/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go +++ b/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go @@ -13,6 +13,7 @@ import ( type TabDaftarPesertaServices interface { GetListMcuDaftarPeserta(id string, currentpage int, rowperpage int) ([]models.ModelMcuDaftarPeserta, int, error) + GetReportMcu(orderheaderID string) ([]models.TabViewReportMcu, error) } type TabDaftarPesertaHandlers struct { @@ -68,8 +69,12 @@ func (tdp *TabDaftarPesertaHandlers) HandleShowTabDaftarPeserta(c echo.Context) pagination, ) + tabData := []models.TabViewReportMcu{} + tabview := corporate_mcudetail.TabReportView(tabData) + bodymodal := corporate_mcudetail.ModalBody( dialogReportBodyID, + tabview, corporate_mcudetail.JsShowModal(""), ) @@ -146,7 +151,7 @@ func (tdp *TabDaftarPesertaHandlers) HandlePagination(c echo.Context) error { page, "/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/changepage", paginationID, - "#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogReportID, #dialogReportBodyID", + "#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogReportID, #dialogReportBodyID, #currPage"+paginationID, "#contentlayout", "outerHTML", "", "", corporate_mcudetail.BeforeRequestContent(), @@ -171,8 +176,22 @@ func (tdp *TabDaftarPesertaHandlers) HandleOpenReportDialog(c echo.Context) erro dialogReportBodyID := c.QueryParam("dialogReportBodyID") logger.Info("params", zap.Any("idx", idx)) + tabData, err := tdp.TabDaftarPesertaServices.GetReportMcu(idx) + if err != nil { + tab := corporate_mcudetail.TabReportView([]models.TabViewReportMcu{}) + mod := corporate_mcudetail.ModalBody( + dialogReportBodyID, + tab, + corporate_mcudetail.JsShowModal(""), + ) + return utils.View(c, mod) + } + + tabcomponent := corporate_mcudetail.TabReportView(tabData) + modalbody := corporate_mcudetail.ModalBody( dialogReportBodyID, + tabcomponent, corporate_mcudetail.JsShowModal("#"+dialogReportID), ) diff --git a/handlers/corporate/patient.handlers.go b/handlers/corporate/patient.handlers.go index 664e86b..9da660b 100644 --- a/handlers/corporate/patient.handlers.go +++ b/handlers/corporate/patient.handlers.go @@ -11,7 +11,6 @@ import ( corporate_patient "cpone/views/corporate/patient" "strconv" - "github.com/a-h/templ" "github.com/labstack/echo/v4" "go.uber.org/zap" ) @@ -19,6 +18,9 @@ import ( type PatientService interface { GetDashboardPatientBreadcrumb(title string) (models.BreadCrumbV1, error) ListingData(search string, date string, patID string, corpId string, currentpage int, rowperpage int) ([]models.DashboardPatient, int, error) + GetListtingData(email string, currentpage int, rowperpage int) ([]models.DashboardPatient, int, error) + GetPatientData(email string) (string, error) + GetReportMcu(orderheaderID string) ([]models.TabViewReportMcu, error) } func NewPatientHandler(us PatientService) *PatientHandler { @@ -31,16 +33,16 @@ type PatientHandler struct { PatientService PatientService } -func (ph *PatientHandler) HandleShowPatient(c echo.Context) error { +func (ph *PatientHandler) LoadLocalData(c echo.Context) error { logger, _ := zap.NewProduction() - title := "Nanda Arisu" + listID := c.QueryParam("listID") + paginationID := c.QueryParam("paginationID") + dialogID := c.QueryParam("dialogID") + dialogBodyID := c.QueryParam("dialogBodyID") + userEmail := c.QueryParam("userEmail") + logger.Info("params", zap.Any("email", userEmail)) - listID := utils.GenerateRandomID("listid") - paginationID := utils.GenerateRandomID("paginationid") - dialogID := utils.GenerateRandomID("dialogid") - dialogBodyID := utils.GenerateRandomID("dialogbodyid") - - user, err := services.GetUserLogin() + title, err := ph.PatientService.GetPatientData(userEmail) if err != nil { defer logger.Sync() logger.Info("Error get user", zap.Any("error", err)) @@ -54,12 +56,9 @@ func (ph *PatientHandler) HandleShowPatient(c echo.Context) error { return err } defer logger.Sync() - - navbaruser := navbarmenu.NavbarWithLogo(user) - sidbaruser := sidebaruserprofile.Navbaruserprofile(user) breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb) - listingdata, totalPage, err := ph.PatientService.ListingData("", "", "108", "40", 1, 5) + listingdata, totalPage, err := ph.PatientService.GetListtingData(userEmail, 1, 5) if err != nil { defer logger.Sync() logger.Info("error get listing data", zap.Any("error", err), zap.Any("total", totalPage)) @@ -69,7 +68,7 @@ func (ph *PatientHandler) HandleShowPatient(c echo.Context) error { listID, "/corp/dashboard_pat/open", "#"+dialogBodyID, - "#listID, #paginationID, #dialogID, #dialogBodyID", + "#listID, #paginationID, #dialogID, #dialogBodyID, #userEmail", "outerHTML", ) @@ -78,15 +77,19 @@ func (ph *PatientHandler) HandleShowPatient(c echo.Context) error { 1, "/corp/dashboard_pat/changepage", paginationID, - "#listID, #paginationID, #dialogID, #dialogBodyID", - "#"+paginationID, + "#listID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogID, #dialogBodyID, #userEmail", + "#contentlayout", "outerHTML", "", "", corporate_patient.BeforeRequestContent(), corporate_patient.AfterRequestContent(), ) + tabData := []models.TabViewReportMcu{} + tabcomponent := corporate_patient.TabReportView(tabData) + bodyModal := corporate_patient.ModalBody( dialogBodyID, + tabcomponent, corporate_patient.JsShowModal(""), ) @@ -102,27 +105,54 @@ func (ph *PatientHandler) HandleShowPatient(c echo.Context) error { "/corp/dashboard_pat/dialog", "#"+dialogBodyID, "outerHTML", - "#listID, #paginationID, #dialogID, #dialogBodyID"+paginationID, + "#listID, #paginationID, #dialogID, #userEmail, #dialogBodyID"+paginationID, dialogID, title, bodyModal, bodyClose, ) + content := corporate_patient.ContentP(listingcomponent, paginationcomponent) + + view := corporate_patient.ContentPage( + breadcrumb, + content, + modalDialog, + ) + + return utils.View(c, view) +} + +func (ph *PatientHandler) HandleShowPatient(c echo.Context) error { + logger, _ := zap.NewProduction() + // userEmail := c.QueryParam("email") + // logger.Info("params", zap.Any("email", userEmail)) + + listID := utils.GenerateRandomID("listid") + paginationID := utils.GenerateRandomID("paginationid") + dialogID := utils.GenerateRandomID("dialogid") + dialogBodyID := utils.GenerateRandomID("dialogbodyid") + + user, err := services.GetUserLogin() + if err != nil { + defer logger.Sync() + logger.Info("Error get user", zap.Any("error", err)) + return err + } + + navbaruser := navbarmenu.NavbarWithLogo(user) + sidbaruser := sidebaruserprofile.Navbaruserprofile(user) + content := corporate_patient.DashboardPat( listID, paginationID, dialogID, dialogBodyID, - breadcrumb, - listingcomponent, - paginationcomponent, - modalDialog, ) css := corporate_patient.CSSDashboardPat() js := corporate_patient.JSDashboardPat() - view := corporate_patient.ShowDashboardPat(title, content, css, js, navbaruser, sidbaruser) + view := corporate_patient.ShowDashboardPat("Dashboard Pasien", content, css, js, navbaruser, sidbaruser) return utils.View(c, view) } @@ -133,8 +163,10 @@ func (ph *PatientHandler) HandleChangePage(c echo.Context) error { listID := c.QueryParam("listID") paginationID := c.QueryParam("paginationID") dialogBodyID := c.QueryParam("dialogBodyID") + userEmail := c.QueryParam("userEmail") + logger.Info("params", zap.Any("userEmail", userEmail)) - var retval []templ.Component + // var retval []templ.Component page, err := strconv.Atoi(pageparam) if err != nil { defer logger.Sync() @@ -142,7 +174,7 @@ func (ph *PatientHandler) HandleChangePage(c echo.Context) error { return err } - listData, totalPage, err := ph.PatientService.ListingData("", "", "108", "40", page, 5) + listData, totalPage, err := ph.PatientService.GetListtingData(userEmail, page, 5) if err != nil { defer logger.Sync() logger.Info("error get data listing") @@ -152,7 +184,7 @@ func (ph *PatientHandler) HandleChangePage(c echo.Context) error { listID, "/corp/dashboard_pat/open", "#"+dialogBodyID, - "#listID, #paginationID, #dialogID, ", + "#listID, #paginationID, #dialogID, #dialogBodyID, #userEmail", "outerHTML", ) @@ -161,16 +193,19 @@ func (ph *PatientHandler) HandleChangePage(c echo.Context) error { page, "/corp/dashboard_pat/changepage", paginationID, - "#listID, #paginationID, #dialogID, #dialogBodyID, #currPage"+paginationID, - "#"+paginationID, + "#listID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogID, #dialogBodyID, #userEmail, #currPage"+paginationID, + "#contentlayout", "outerHTML", "", "", corporate_patient.BeforeRequestContent(), corporate_patient.AfterRequestContent(), ) - retval = append(retval, listcomponent) - retval = append(retval, paginationcomponent) - return utils.ViewMulti(c, retval) + // retval = append(retval, listcomponent) + // retval = append(retval, paginationcomponent) + // return utils.ViewMulti(c, retval) + + content := corporate_patient.ContentP(listcomponent, paginationcomponent) + return utils.View(c, content) } func (ph *PatientHandler) HandleOpenReport(c echo.Context) error { @@ -181,8 +216,21 @@ func (ph *PatientHandler) HandleOpenReport(c echo.Context) error { dialogBodyID := c.QueryParam("dialogBodyID") logger.Info("params", zap.Any("id", id)) + tabData, err := ph.PatientService.GetReportMcu(id) + if err != nil { + tab := corporate_patient.TabReportView([]models.TabViewReportMcu{}) + mod := corporate_patient.ModalBody( + dialogBodyID, + tab, + corporate_patient.JsShowModal(""), + ) + return utils.View(c, mod) + } + + tabcomponent := corporate_patient.TabReportView(tabData) modalBody := corporate_patient.ModalBody( dialogBodyID, + tabcomponent, corporate_patient.JsShowModal("#"+dialogID), ) diff --git a/handlers/public/login.handlers.go b/handlers/public/login.handlers.go index 57a328d..aef8f8e 100644 --- a/handlers/public/login.handlers.go +++ b/handlers/public/login.handlers.go @@ -33,67 +33,6 @@ func (lh *LoginHandler) HandlerShowLogin(c echo.Context) error { return utils.View(c, si) } -func (lh *LoginHandler) HandlerSignIn(c echo.Context) error { - logger, _ := zap.NewProduction() - - username := c.FormValue("username") - password := c.FormValue("password") - - defer logger.Sync() - logger.Info("Params", zap.Any("username", username), zap.Any("pass", password)) - - resp, err := lh.LoginService.Login(username, password) - if err != nil { - defer logger.Sync() - logger.Info("Error", zap.Error(err)) - - si := public_login.ShowLogin("Login ", public_login.MainLogin(), public_login.CssLogin(), public_login.JsLogin()) - return utils.View(c, si) - } - defer logger.Sync() - - var url string - switch resp.Data.Type { - case "cpone": - url = "/one-ui" - case "pic": - url = "/dashboard_pic" - case "patient": - url = "/home" - default: - url = "/one-ui" - } - - user, err := json.Marshal(resp.Data.User) - if err != nil { - defer logger.Sync() - logger.Info("Error", zap.Error(err)) - - si := public_login.ShowLogin("Login ", public_login.MainLogin(), public_login.CssLogin(), public_login.JsLogin()) - return utils.View(c, si) - } - - userString := string(user) - - storeLocal := ` - - ` - - c.Response().Header().Set("HX-Trigger", "script") - - return c.String(http.StatusOK, storeLocal) -} - func (lh *LoginHandler) HandleSignIn(c echo.Context) error { logger, _ := zap.NewProduction() @@ -141,7 +80,6 @@ func (lh *LoginHandler) HandleSignIn(c echo.Context) error { return utils.View(c, si) } userString := string(user) - store := ` -