revice tab ordering service

2024-07-16 13:18:58 +07:00
parent 938e6d60f1
commit a729d6ab67
11 changed files with 441 additions and 476 deletions
--- a/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go
+++ b/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go
@@ -7,18 +7,19 @@ import (
 	"cpone/utils"
 	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
 	"strconv"
+	"strings"

 	"github.com/a-h/templ"
+	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"
 	"go.uber.org/zap"
 )

 type TabDaftarPesertaServices interface {
-	GetListMcuDaftarPeserta(id string, currentpage int, rowperpage int) ([]models.ModelMcuDaftarPeserta, int, error)
-	GetReportMcu(orderheaderID string) ([]models.TabViewReportMcu, error)
-	GetListReportPeserta(orderheaderID string, host string) ([]models.TabViewReportMcu, error)
+	GetListDaftarPesertaMCU(id string, currentpage int, rowperpage int) ([]models.ModelMcuDaftarPeserta, int, error)
 	GenerataPasswordMCU(mgmMCUID string, host string) (models.GeneratePasswordResponse, error)
 	GetAkunPeserta(patientID string) (models.AuthPatient, error)
+	GetListReportPesertaV3(orderheaderID string, staffname string) ([]models.TabViewReportMcu, error)
 }

 type TabDaftarPesertaHandlers struct {
@@ -49,7 +50,7 @@ func (tdp *TabDaftarPesertaHandlers) HandleShowTabDaftarPeserta(c echo.Context)
 	id := c.Param("id")
 	logger.Info("Params", zap.Any("id", id))

-	dataTable, totalPage, err := tdp.TabDaftarPesertaServices.GetListMcuDaftarPeserta(id, 1, 10)
+	dataTable, totalPage, err := tdp.TabDaftarPesertaServices.GetListDaftarPesertaMCU(id, 1, 10)
 	if err != nil {
 		return err
 	}
@@ -239,7 +240,7 @@ func (tdp *TabDaftarPesertaHandlers) HandlePagination(c echo.Context) error {
 		return err
 	}

-	tableData, totalPage, err := tdp.TabDaftarPesertaServices.GetListMcuDaftarPeserta(id, page, 10)
+	tableData, totalPage, err := tdp.TabDaftarPesertaServices.GetListDaftarPesertaMCU(id, page, 10)
 	if err != nil {
 		return err
 	}
@@ -274,15 +275,19 @@ func (tdp *TabDaftarPesertaHandlers) HandlePagination(c echo.Context) error {

 func (tdp *TabDaftarPesertaHandlers) HandleOpenReportDialog(c echo.Context) error {
 	logger, _ := zap.NewProduction()
-	host := c.Request().Host
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	staffname := claims["M_StaffName"].(string)

 	idx := c.QueryParam("idx")
 	dialogReportID := c.QueryParam("dialogReportID")
 	dialogReportBodyID := c.QueryParam("dialogReportBodyID")
 	logger.Info("params", zap.Any("idx", idx))

-	newtabdata, err := tdp.TabDaftarPesertaServices.GetListReportPeserta(idx, host)
+	tabdatav3, err := tdp.TabDaftarPesertaServices.GetListReportPesertaV3(idx, staffname)
 	if err != nil {
+		logger.Info("error", zap.Any("err", err))
 		tab := corporate_mcudetail.TabReportView([]models.TabViewReportMcu{})
 		mod := corporate_mcudetail.ModalRptBody(
 			dialogReportBodyID,
@@ -292,9 +297,9 @@ func (tdp *TabDaftarPesertaHandlers) HandleOpenReportDialog(c echo.Context) erro
 		return utils.View(c, mod)
 	}

-	logger.Info("resp new data", zap.Any("data", newtabdata))
+	logger.Info("resp new data", zap.Any("data", tabdatav3))

-	tabcomponent := corporate_mcudetail.TabReportView(newtabdata)
+	tabcomponent := corporate_mcudetail.TabReportView(tabdatav3)

 	modalbody := corporate_mcudetail.ModalRptBody(
 		dialogReportBodyID,
@@ -327,18 +332,9 @@ func (tdp *TabDaftarPesertaHandlers) HandleDialogGenPass(c echo.Context) error {
 	host := c.Request().Host
 	id := c.Param("id")

-	// tableID := c.FormValue("tableID")
-	// paginationID := c.FormValue("paginationID")
-	// pageparam := c.FormValue("currpage" + paginationID)
-
 	dialogGenPassID := c.FormValue("dialogGenPassID")
 	dialogGenPassBodyID := c.FormValue("dialogGenPassBodyID")

-	// dialogReportBodyID := c.FormValue("dialogReportBodyID")
-	// dialogAkunBodyID := c.FormValue("dialogAkunBodyID")
-
-	// logger.Info("param", zap.Any("id", id), zap.Any("page", pageparam))
-
 	// generate pasword
 	resp, err := tdp.TabDaftarPesertaServices.GenerataPasswordMCU(id, host)
 	if err != nil {
@@ -505,9 +501,81 @@ func (tdp *TabDaftarPesertaHandlers) HandleAkun(c echo.Context) error {
 	dialogAkunBodyID := c.FormValue("dialogAkunBodyID")
 	logger.Info("params", zap.Any("patid", patientID))

-	// akunEmail := c.FormValue("akunpesertaemail")
-	// akunPass := c.FormValue("akunpesertapass")
-	// akunPasscel := c.FormValue("akunpesertapasscek")
+	akunID := c.FormValue("akunpesertaid")
+	akunEmail := c.FormValue("akunpesertaemail")
+	akunPass := c.FormValue("akunpesertapass")
+	akunPasscek := c.FormValue("akunpesertapasscek")
+
+	formValidation := ""
+	emailValidation := ""
+	passValidation := ""
+	pass2Validation := ""
+
+	if strings.TrimSpace(akunEmail) == "" {
+		formValidation = "Email tidak boleh kosong"
+		emailValidation = "Email tidak boleh kosong"
+	}
+	if strings.TrimSpace(akunPass) == "" {
+		formValidation = "Password tidak boleh kosong"
+		passValidation = "Password tidak boleh kosong"
+	}
+	if strings.TrimSpace(akunPasscek) == "" {
+		formValidation = "Password tidak boleh kosong"
+		pass2Validation = "Password tidak boleh kosong"
+	}
+	if strings.TrimSpace(akunEmail) == "" && strings.TrimSpace(akunPass) == "" && strings.TrimSpace(akunPasscek) == "" {
+		formValidation = "Email dan Password tidak boleh kosong"
+		emailValidation = "Email tidak boleh kosong"
+		passValidation = "Password tidak boleh kosong"
+		pass2Validation = "Password tidak boleh kosong"
+	}
+	if strings.TrimSpace(akunPass) != strings.TrimSpace(akunPasscek) {
+		formValidation = "Password tidak sama"
+		passValidation = "Password tidak sama"
+		pass2Validation = "Password tidak sama"
+	}
+
+	if formValidation != "" || emailValidation != "" || passValidation != "" || pass2Validation != "" {
+		dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
+			dialogAkunBodyID,
+			models.CustomTextFieldv2Prm{
+				Label:       "ID Akun Peserta",
+				Name:        "akunpesertaid",
+				Placeholder: "ID Akun Peserta",
+				Type:        "hidden",
+				ID:          "akunpesertaidid",
+				Value:       akunID,
+			},
+			models.CustomTextFieldv2Prm{
+				Label:    "Email Akun",
+				Name:     "akunpesertaemail",
+				Type:     "text",
+				ID:       "akunpesertaemailid",
+				Value:    akunEmail,
+				ErrorMsg: emailValidation,
+			},
+			models.CustomTextFieldv2Prm{
+				Label:    "Password Akun",
+				Name:     "akunpesertapass",
+				Type:     "password",
+				ID:       "akunpesertapassid",
+				Value:    akunPass,
+				ErrorMsg: passValidation,
+			},
+			models.CustomTextFieldv2Prm{
+				Label:    "Ketik ulang password",
+				Name:     "akunpesertapasscek",
+				Type:     "password",
+				ID:       "akunpesertapasscekid",
+				Value:    akunPasscek,
+				ErrorMsg: pass2Validation,
+			},
+			corporate_mcudetail.JsShowModal(""),
+		)
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", formValidation, "warning")
+		retVal := []templ.Component{toastwarning, dialogAkunBody}
+		return utils.ViewMulti(c, retVal)
+	}

 	dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
 		dialogAkunBodyID,
--- a/handlers/corporate/patient.handlers.go
+++ b/handlers/corporate/patient.handlers.go
@@ -17,11 +17,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)
-	GetListReportPeserta(orderheaderID string, host string) ([]models.TabViewReportMcu, error)
+	GetListReportPesertaV3(orderheaderID string, staffname string) ([]models.TabViewReportMcu, error)
 }

 func NewPatientHandler(us PatientService) *PatientHandler {
@@ -215,25 +213,17 @@ func (ph *PatientHandler) HandleChangePage(c echo.Context) error {

 func (ph *PatientHandler) HandleOpenReport(c echo.Context) error {
 	logger, _ := zap.NewProduction()
-	host := c.Request().Host

 	id := c.QueryParam("id")
 	dialogID := c.QueryParam("dialogID")
 	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)
-	// }
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	staffname := claims["M_StaffName"].(string)

-	newtabdata, err := ph.PatientService.GetListReportPeserta(id, host)
+	newtabdata, err := ph.PatientService.GetListReportPesertaV3(id, staffname)
 	if err != nil {
 		tab := corporate_patient.TabReportView([]models.TabViewReportMcu{})
 		mod := corporate_patient.ModalBody(
--- a/handlers/public/login.handlers.go
+++ b/handlers/public/login.handlers.go
@@ -14,7 +14,6 @@ import (
 )

 type LoginService interface {
-	Login(username string, password string) (models.ResponseApi, error)
 	MultiSignIn(username string, password string, host string) (models.Response, error)
 }

@@ -48,20 +47,15 @@ func (lh *LoginHandler) HandleSignIn(c echo.Context) error {
 		defer logger.Sync()
 		logger.Info("Error", zap.Any("error multi signin", err))

-		si := public_login.ShowLogin("Login ", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
+		si := public_login.ShowLogin("Login", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
 		return utils.View(c, si)
-
-		// loginform := public_login.FormSignin(false)
-		// return utils.View(c, loginform)
 	}
 	if resp.Status == "ERR" {
 		defer logger.Sync()
 		logger.Info("Error", zap.Any("ERR", resp.Status))

-		si := public_login.ShowLogin("Login ", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
+		si := public_login.ShowLogin("Login", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
 		return utils.View(c, si)
-		// loginform := public_login.FormSignin(false)
-		// return utils.View(c, loginform)
 	}

 	defer logger.Sync()
@@ -86,9 +80,6 @@ func (lh *LoginHandler) HandleSignIn(c echo.Context) error {

 		si := public_login.ShowLogin("Login ", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
 		return utils.View(c, si)
-
-		// loginform := public_login.FormSignin(false)
-		// return utils.View(c, loginform)
 	}

 	cookie := new(http.Cookie)