Merge branch 'andy/table'
This commit is contained in:
@@ -1,17 +1,22 @@
|
||||
package dev_handlers
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
"cpone/component/pagination"
|
||||
tablecomponent "cpone/component/table"
|
||||
"cpone/models"
|
||||
"cpone/utils"
|
||||
mastermenuusergroup "cpone/views/dev/mastermenuusergroup"
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
services "cpone/services/dev"
|
||||
|
||||
"github.com/a-h/templ"
|
||||
"github.com/labstack/echo/v4"
|
||||
"go.uber.org/zap"
|
||||
)
|
||||
|
||||
type MasterMenuUserGroupService interface {
|
||||
@@ -47,16 +52,24 @@ func (lh *MasterMenuUserGroupHandler) HandlerShowMasterMenuUserGroup(c echo.Cont
|
||||
return err
|
||||
}
|
||||
dataUserGroup, err := lh.MasterMenuUserGroupService.GetUserGroup()
|
||||
fmt.Println(dataUserGroup)
|
||||
fmt.Println(err)
|
||||
|
||||
if err != nil {
|
||||
fmt.Println(dataUserGroup)
|
||||
return err
|
||||
}
|
||||
|
||||
contentID := utils.GenerateRandomID("tablebody")
|
||||
|
||||
logger, _ := zap.NewProduction()
|
||||
defer logger.Sync()
|
||||
logger.Info("LOAD USER GROUP DEV",
|
||||
zap.String("id", contentID),
|
||||
zap.Any("data", dataUserGroup),
|
||||
)
|
||||
|
||||
si := mastermenuusergroup.ShowMasterMenuUserGroup(
|
||||
"Master Menu",
|
||||
mastermenuusergroup.ContentMasterMenuUserGroup(dataUserGroup),
|
||||
mastermenuusergroup.ContentMasterMenuUserGroup(dataUserGroup, contentID),
|
||||
mastermenuusergroup.CssMasterMenuUserGroup(),
|
||||
mastermenuusergroup.JsMasterMenuUserGroup(),
|
||||
dataMenu,
|
||||
@@ -82,6 +95,7 @@ func (lh *MasterMenuUserGroupHandler) ChangeFormEdit(c echo.Context) error {
|
||||
func (lh *MasterMenuUserGroupHandler) HandleChangePage(c echo.Context) error {
|
||||
page := c.QueryParam("page")
|
||||
currPage := c.QueryParam("currentPage")
|
||||
contentID := c.QueryParam("contentID")
|
||||
dataUserGroup, err := lh.MasterMenuUserGroupService.GetUserGroup()
|
||||
|
||||
if err != nil {
|
||||
@@ -98,7 +112,18 @@ func (lh *MasterMenuUserGroupHandler) HandleChangePage(c echo.Context) error {
|
||||
fmt.Println("currpage err")
|
||||
return err
|
||||
}
|
||||
vw := tablecomponent.Table([]string{"KODE", "USERGROUP", "AKSI"}, []string{"40%", "40%", "20%"}, mastermenuusergroup.TableRow(dataUserGroup), pagination.Pagination(pageInt, currPageInt))
|
||||
logger, _ := zap.NewProduction()
|
||||
defer logger.Sync()
|
||||
logger.Info("CHANGE PAGE USER GROUP DEV",
|
||||
zap.String("id", contentID),
|
||||
zap.Any("data", dataUserGroup),
|
||||
)
|
||||
time.Sleep(3 * time.Second)
|
||||
// time.Sleep(5 * time.Second)
|
||||
vw := tablecomponent.Table([]string{"KODE", "USERGROUP", "AKSI"},
|
||||
[]string{"40%", "40%", "20%"},
|
||||
mastermenuusergroup.TableRow(dataUserGroup),
|
||||
pagination.Pagination(pageInt, currPageInt, "dev/usergroup/pagination", contentID))
|
||||
|
||||
return lh.View(c, vw)
|
||||
}
|
||||
|
||||
@@ -183,4 +183,13 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
|
||||
dvlpserv := dev_services.NewServicesLandingPage(appStore)
|
||||
devlphan := dev_handlers.NewLandingPageHandler(dvlpserv)
|
||||
dev.GET("/landingpage", devlphan.ShowLandingPage)
|
||||
|
||||
//DEV USERGROUP
|
||||
devUGServices := dev_services.NewServicesMasterMenuUserGroup(appStore)
|
||||
devUGhandlers := dev_handlers.NewMasterMenuUserGroupHandler(devUGServices)
|
||||
dev.GET("/usergroup", devUGhandlers.HandlerShowMasterMenuUserGroup)
|
||||
dev.GET("/usergroup/pagination", devUGhandlers.HandleChangePage)
|
||||
|
||||
// clientgroup.GET("/usergroup/edit", mastermenuusergroupHandler.ChangeFormEdit)
|
||||
// clientgroup.GET("/usergroup/pagination", mastermenuusergroupHandler.HandleChangePage)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user