From 15480000d352515d1528cc7dfaba4d0dd4898f7b Mon Sep 17 00:00:00 2001 From: adibwp Date: Thu, 13 Jun 2024 14:11:28 +0700 Subject: [PATCH] add click with id params --- handlers/dev/employeeanalytic.handlers.go | 12 ++++ handlers/routes.go | 9 +-- .../employeeanalytic/employeeanalytic.templ | 2 +- .../employeeanalytic_templ.go | 2 +- .../listingemployeeanalytic.templ | 6 +- .../listingemployeeanalytic_templ.go | 66 +++++++++++++------ 6 files changed, 68 insertions(+), 29 deletions(-) diff --git a/handlers/dev/employeeanalytic.handlers.go b/handlers/dev/employeeanalytic.handlers.go index 34a3f1a..691690c 100644 --- a/handlers/dev/employeeanalytic.handlers.go +++ b/handlers/dev/employeeanalytic.handlers.go @@ -178,3 +178,15 @@ func (ea *EmployeeAnalyticHandler) HandleFilter(c echo.Context) error { retval = append(retval, paginationcomponent) return utils.ViewMulti(c, retval) } + +func (ea *EmployeeAnalyticHandler) HandleIntoDetail(c echo.Context) error { + logger, _ := zap.NewProduction() + id := c.Param("id") + + logger.Info("params", zap.Any("id", id)) + + url := "/dev/detail/" + id + c.Response().Header().Set("HX-Redirect", url) + + return nil +} diff --git a/handlers/routes.go b/handlers/routes.go index 454ea45..512a255 100644 --- a/handlers/routes.go +++ b/handlers/routes.go @@ -16,10 +16,10 @@ import ( ) func SetupRoutes(app *echo.Echo, h *dev_handlers.UserHandler) { - group := app.Group("/user") + // group := app.Group("/user") - group.GET("", h.HandlerShowUsers) - group.GET("/details/:id", h.HandlerShowUserById) + // group.GET("", h.HandlerShowUsers) + // group.GET("/details/:id", h.HandlerShowUserById) } @@ -239,10 +239,11 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) { dev.GET("/employeeanalytic", devEmplAnaHandler.HandleShowEmployeeAnalyticScreen) dev.GET("/employeeanalytic/changepage", devEmplAnaHandler.HandlePagination) dev.GET("/employeeanalytic/filter", devEmplAnaHandler.HandleFilter) + dev.GET("/employeeanalytic/click/:id", devEmplAnaHandler.HandleIntoDetail) devDetailMcuService := dev_services.NewDetailMcuServices(appStore) devDetailMcuHandler := dev_handlers.NewDetailMcuHandler(devDetailMcuService) - dev.GET("/detailmcu", devDetailMcuHandler.HandleShowDetailMcuScreen) + dev.GET("/detail/:id", devDetailMcuHandler.HandleShowDetailMcuScreen) // group result devGRServices := dev_services.NewServicesGroupResult(appStore) diff --git a/views/dev/employeeanalytic/employeeanalytic.templ b/views/dev/employeeanalytic/employeeanalytic.templ index 665f428..91d4f42 100644 --- a/views/dev/employeeanalytic/employeeanalytic.templ +++ b/views/dev/employeeanalytic/employeeanalytic.templ @@ -12,7 +12,7 @@ templ EmployeeAnalyticScreen( listingcomponent templ.Component, paginationcomponent templ.Component, ) { -
+
@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "listID", Name: "listID", Type: "hidden", diff --git a/views/dev/employeeanalytic/employeeanalytic_templ.go b/views/dev/employeeanalytic/employeeanalytic_templ.go index 8ceadd9..aea4c28 100644 --- a/views/dev/employeeanalytic/employeeanalytic_templ.go +++ b/views/dev/employeeanalytic/employeeanalytic_templ.go @@ -34,7 +34,7 @@ func EmployeeAnalyticScreen( templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/views/dev/employeeanalytic/listingemployeeanalytic.templ b/views/dev/employeeanalytic/listingemployeeanalytic.templ index a553bbb..e679a94 100644 --- a/views/dev/employeeanalytic/listingemployeeanalytic.templ +++ b/views/dev/employeeanalytic/listingemployeeanalytic.templ @@ -12,13 +12,13 @@ templ ListingData(
for i, d := range data { if i == (len(data) - 1) { -
+
@ItemCard(d)
} else { -
+
@ItemCard(d) -
+
} }
diff --git a/views/dev/employeeanalytic/listingemployeeanalytic_templ.go b/views/dev/employeeanalytic/listingemployeeanalytic_templ.go index 9e6cb96..629a297 100644 --- a/views/dev/employeeanalytic/listingemployeeanalytic_templ.go +++ b/views/dev/employeeanalytic/listingemployeeanalytic_templ.go @@ -61,7 +61,20 @@ func ListingData( if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8\">") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8\" hx-get=\"") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var4 string + templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs("/dev/employeeanalytic/click/" + strconv.Itoa(i)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 15, Col: 147} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + 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 } @@ -78,16 +91,29 @@ func ListingData( if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var4 string - templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID))) + var templ_7745c5c3_Var5 string + templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID))) if templ_7745c5c3_Err != nil { return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 19, Col: 64} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8 mb-8\">") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8 mb-8\" hx-get=\"") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + var templ_7745c5c3_Var6 string + templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs("/dev/employeeanalytic/click/" + strconv.Itoa(i)) + if templ_7745c5c3_Err != nil { + return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 19, Col: 152} + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) + 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 } @@ -120,21 +146,21 @@ func ItemCard(data models.EmployeeAnalytic) templ.Component { defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } ctx = templ.InitializeContext(ctx) - templ_7745c5c3_Var5 := templ.GetChildren(ctx) - if templ_7745c5c3_Var5 == nil { - templ_7745c5c3_Var5 = templ.NopComponent + templ_7745c5c3_Var7 := templ.GetChildren(ctx) + if templ_7745c5c3_Var7 == nil { + templ_7745c5c3_Var7 = templ.NopComponent } ctx = templ.ClearChildren(ctx) _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var6 string - templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuLabel) + var templ_7745c5c3_Var8 string + templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuLabel) if templ_7745c5c3_Err != nil { return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 32, Col: 54} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -142,12 +168,12 @@ func ItemCard(data models.EmployeeAnalytic) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var7 string - templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuNote) + var templ_7745c5c3_Var9 string + templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuNote) if templ_7745c5c3_Err != nil { return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 35, Col: 74} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -155,12 +181,12 @@ func ItemCard(data models.EmployeeAnalytic) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var8 string - templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuStartDate) + var templ_7745c5c3_Var10 string + templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuStartDate) if templ_7745c5c3_Err != nil { return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 38, Col: 79} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -168,12 +194,12 @@ func ItemCard(data models.EmployeeAnalytic) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - var templ_7745c5c3_Var9 string - templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuEndDate) + var templ_7745c5c3_Var11 string + templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuEndDate) if templ_7745c5c3_Err != nil { return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 38, Col: 105} } - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9)) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11)) if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err }