From d13384ab64557a239d8ea0234350fd9a0a84ecf3 Mon Sep 17 00:00:00 2001
From: sindhu <albertussindhu15@gmail.com>
Date: Sat, 25 May 2024 13:29:52 +0700
Subject: [PATCH] step 2 : add data group result with form validation

---
 .../customcheckbox/customcheckboxv1.templ     |   8 +-
 .../customcheckbox/customcheckboxv1_templ.go  | 107 +++--
 handlers/dev/groupresult.handlers.go          | 425 +++++++++++++++++-
 handlers/routes.go                            |   4 +
 models/customcheckbox.models.go               |   2 +-
 services/dev/groupresult.services.go          |  89 ++++
 views/dev/groupresult/groupresult.templ       |  11 +-
 views/dev/groupresult/groupresult_templ.go    | 227 ++++++----
 .../dev/groupresult/modaladdgroupresult.templ | 111 +++++
 .../groupresult/modaladdgroupresult_templ.go  | 329 ++++++++++++++
 10 files changed, 1178 insertions(+), 135 deletions(-)
 create mode 100644 views/dev/groupresult/modaladdgroupresult.templ
 create mode 100644 views/dev/groupresult/modaladdgroupresult_templ.go

diff --git a/component/customcheckbox/customcheckboxv1.templ b/component/customcheckbox/customcheckboxv1.templ
index 012aed8..cac9ce4 100644
--- a/component/customcheckbox/customcheckboxv1.templ
+++ b/component/customcheckbox/customcheckboxv1.templ
@@ -1,12 +1,18 @@
 package customcheckbox
 
+import "cpone/models"
+
 templ MainCustomCheckboxInput(inp models.CustomCheckboxv1Prm) {
 	<div class="form-control bg-field border-0 h-auto">
 		<div class="form-group">
 			<label>{ inp.Label }</label>
 			<div class="checkbox-list">
 				<label class="checkbox">
-					<input type="checkbox" name={ inp.Name } id={ inp.ID }/>
+					if (inp.Value == "on") {
+						<input type="checkbox" name={ inp.Name } id={ inp.ID } checked/>
+					} else {
+						<input type="checkbox" name={ inp.Name } id={ inp.ID }/>
+					}
 					<span></span>
 					{ inp.Text }
 				</label>
diff --git a/component/customcheckbox/customcheckboxv1_templ.go b/component/customcheckbox/customcheckboxv1_templ.go
index 90c936b..7c154a4 100644
--- a/component/customcheckbox/customcheckboxv1_templ.go
+++ b/component/customcheckbox/customcheckboxv1_templ.go
@@ -10,6 +10,8 @@ import "context"
 import "io"
 import "bytes"
 
+import "cpone/models"
+
 func MainCustomCheckboxInput(inp models.CustomCheckboxv1Prm) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
@@ -30,48 +32,89 @@ func MainCustomCheckboxInput(inp models.CustomCheckboxv1Prm) templ.Component {
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Label)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 6, Col: 21}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 8, Col: 21}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</label><div class=\"checkbox-list\"><label class=\"checkbox\"><input type=\"checkbox\" name=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</label><div class=\"checkbox-list\"><label class=\"checkbox\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 9, Col: 43}
+		if inp.Value == "on" {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input type=\"checkbox\" name=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var3 string
+			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 12, Col: 44}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" id=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var4 string
+			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 12, Col: 58}
+			}
+			_, 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("\" checked> ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input type=\"checkbox\" name=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var5 string
+			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 14, Col: 44}
+			}
+			_, 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("\" id=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 14, Col: 58}
+			}
+			_, 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
+			}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<span></span> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" id=\"")
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Text)
 		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 17, Col: 15}
 		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 9, Col: 57}
-		}
-		_, 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("\"> <span></span> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Text)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 11, Col: 15}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -79,12 +122,12 @@ func MainCustomCheckboxInput(inp models.CustomCheckboxv1Prm) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 16, Col: 17}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 22, Col: 17}
 		}
-		_, 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
 		}
diff --git a/handlers/dev/groupresult.handlers.go b/handlers/dev/groupresult.handlers.go
index 3710869..1b2a376 100644
--- a/handlers/dev/groupresult.handlers.go
+++ b/handlers/dev/groupresult.handlers.go
@@ -6,12 +6,14 @@ import (
 	navbarmenu "cpone/component/navbar"
 	"cpone/component/pagination"
 	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	customtoastv2 "cpone/component/toastbootstrap"
 	"cpone/models"
 	globalservices "cpone/services"
 	"cpone/utils"
 	groupresult "cpone/views/dev/groupresult"
 	"fmt"
 	"strconv"
+	"strings"
 
 	"github.com/a-h/templ"
 	"github.com/labstack/echo/v4"
@@ -28,7 +30,8 @@ type GroupResultService interface {
 	// EditUserGroup(id string, code string, name string) (models.UserGroupV1, error)
 	// DeleteUserGroup(id string) (models.UserGroupV1, error)
 	GetListGroupResult(search string, currentPage int, rowPerPage int) ([]models.GroupResult, int, error)
-	// GetUserGroupByIDV1(id string) (models.UserGroupV1, error)
+	GetGroupResultResumeMcu() ([]models.GroupResultResumeMcu, error)
+	AddGroupResult(groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, groupresultresumemcu string) (models.GroupResult, error)
 }
 
 func NewGroupResultHandler(us GroupResultService) *GroupResultHandler {
@@ -98,6 +101,62 @@ func (lh *GroupResultHandler) HandlerShowGroupResultPaginationV1(c echo.Context)
 	return utils.ViewMulti(c, retval)
 }
 
+// HANDLE CLOSE BUTTON
+func (lh *GroupResultHandler) HandleCloseForm(c echo.Context) error {
+	// #dialogAddBodyID, #dialogAddID
+
+	logger, _ := zap.NewProduction()
+	defer logger.Sync()
+
+	// listItem
+	dataResultMcu, err := lh.GroupResultService.GetGroupResultResumeMcu()
+	fmt.Println(dataResultMcu)
+	fmt.Println(err)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataResultMcu)
+		return err
+	}
+	// Component Dropdown MCU
+	listItemResultMcuComponent := groupresult.ItemDropdown(dataResultMcu, 0)
+
+	dialogAddBodyID := c.FormValue("dialogAddBodyID")
+	form := groupresult.DialogNewBodyV1(
+		models.CustomTextFieldv2Prm{
+			Label:       "Group Result name",
+			Name:        "groupresultid",
+			Placeholder: "Group Result name",
+			Type:        "hidden",
+			ID:          "groupresultid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Group Result Name",
+			Name:        "groupresultname",
+			Placeholder: "Group Result Name",
+			Type:        "text", ID: "groupresultname"},
+		models.CustomCheckboxv1Prm{
+			Label: "Group Result Flag Per Test (Dicentang Maka Ya)",
+			Name:  "groupresultflagpertest",
+			ID:    "groupresultflagpertest",
+		},
+		models.CustomCheckboxv1Prm{
+			Label: "Group Result Flag Non Lab (Dicentang Maka Ya)",
+			Name:  "groupresultflagnonlab",
+			ID:    "groupresultflagnonlab",
+		},
+		models.CustomDropdownv1Prm{
+			Label: "Group Result Resume MCU",
+			Name:  "groupresultresumemcu",
+			ID:    "groupresultresumemcu",
+		},
+		listItemResultMcuComponent,
+		dialogAddBodyID, groupresult.HandleJSModalAddGR(""))
+	return utils.View(c, form)
+}
+
 // LISTING FUNCTION INITIAL
 func (lh *GroupResultHandler) HandlerShowGroupResultV1(c echo.Context) error {
 
@@ -178,8 +237,72 @@ func (lh *GroupResultHandler) HandlerShowGroupResultV1(c echo.Context) error {
 	// sidebar
 	sidebaruserprofileComponent := sidebaruserprofile.Navbaruserprofile(dataUser)
 
+	// listItem
+	dataResultMcu, err := lh.GroupResultService.GetGroupResultResumeMcu()
+	fmt.Println(dataResultMcu)
+	fmt.Println(err)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataResultMcu)
+		return err
+	}
+
+	defer logger.Sync()
+	logger.Info("LOAD BREADCRUMB DEV",
+		zap.Any("data", dataBreadCrumb),
+	)
+
+	// Component Dropdown MCU
+	listItemResultMcuComponent := groupresult.ItemDropdown(dataResultMcu, 0)
+
 	//Component modal add usergroup
-	modaladdcomponent := groupresult.EmptyDiv1()
+	// modaladdcomponent := groupresult.EmptyDiv1()
+	modaladdcomponent := groupresult.GroupResultForm(models.GroupResultFormComponent{
+		IDComponent: "formgroupresult",
+		Link:        "/dev/groupresult/add",
+		HxTarget:    "#" + dialogAddBodyID,
+		HxSwap:      "outerHTML",
+		HxInclude:   "#tableID, #paginationID, #searchID, #dialogAddBodyID, #dialogAddID, #dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #dialogEditID, #" + searchID + ", #currpage" + paginationID,
+		ModalID:     dialogAddID,
+		ModalTitle:  "New-Group Result",
+		DialogBody: groupresult.DialogNewBodyV1(
+			models.CustomTextFieldv2Prm{
+				Label:       "Group Result name",
+				Name:        "groupresultid",
+				Placeholder: "Group Result name",
+				Type:        "hidden",
+				ID:          "groupresultid",
+			},
+			models.CustomTextFieldv2Prm{
+				Label:       "Group Result Name",
+				Name:        "groupresultname",
+				Placeholder: "Group Result Name",
+				Type:        "text", ID: "groupresultname"},
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Per Test (Dicentang Maka Ya)",
+				Name:  "groupresultflagpertest",
+				ID:    "groupresultflagpertest",
+				Value: "N",
+			},
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Non Lab (Dicentang Maka Ya)",
+				Name:  "groupresultflagnonlab",
+				ID:    "groupresultflagnonlab",
+				Value: "N",
+			},
+			models.CustomDropdownv1Prm{
+				Label: "Group Result Resume MCU",
+				Name:  "groupresultresumemcu",
+				ID:    "groupresultresumemcu",
+			},
+			listItemResultMcuComponent,
+			dialogAddBodyID, groupresult.HandleJSModalAddGR("")),
+		DialogAction: groupresult.DialogNewActionV1("/dev/groupresulthandlecloseform", "#"+dialogAddBodyID, "outerHTML", "#"+dialogAddID),
+		ButtonCLose:  groupresult.BtnCloseNewV1("/dev/groupresulthandlecloseform", "#"+dialogAddBodyID, "outerHTML", "#"+dialogAddID),
+	})
 
 	//Component modal edit usergroup
 	modalEditcomponent := groupresult.EmptyDiv1()
@@ -255,6 +378,304 @@ func (lh *GroupResultHandler) HandlerShowGroupResultV1(c echo.Context) error {
 	return utils.View(c, si)
 }
 
+// PROSES ADD DATA
+func (lh *GroupResultHandler) AddUserGroup(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	defer logger.Sync()
+
+	//prm form addusergroup
+
+	// DARI FORM ADD NYA
+	groupresultname := c.FormValue("groupresultname")
+	groupresultflagpertest := c.FormValue("groupresultflagpertest")
+	groupresultflagnonlab := c.FormValue("groupresultflagnonlab")
+	groupresultresumemcu := c.FormValue("groupresultresumemcu")
+
+	// setting flag test dan flagnonlab
+	var flagPerTest string = "N"
+	var flagNonLab string = "N"
+	// var mcuResumeSelectedValue int = 0
+
+	// OTHER
+	tableID := c.FormValue("tableID")
+	paginationID := c.FormValue("paginationID")
+
+	// groupresultid := c.FormValue("groupresultid")
+	searchID := c.FormValue("searchID")
+	search := c.FormValue("search")
+	currPagePrm := c.FormValue("currpage" + paginationID)
+	// #dialogAddBodyID, #dialogAddID
+	dialogAddBodyID := c.FormValue("dialogAddBodyID")
+	dialogAddID := c.FormValue("dialogAddID")
+	dialogEditBodyID := c.FormValue("dialogEditBodyID")
+	// dialogEditID := c.FormValue("dialogEditID")
+	dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID")
+	// dialogDeleteID := c.FormValue("dialogDeleteID")
+
+	currPage, err := strconv.Atoi(currPagePrm)
+
+	if err != nil {
+		return err
+	}
+	logger.Info("ADD USER GROUP PARAM",
+		zap.Any("groupresultname", groupresultname),
+		zap.Any("groupresultflagpertest", groupresultflagpertest),
+		zap.Any("groupresultflagnonlab", groupresultflagnonlab),
+		zap.Any("groupresultresumemcu", groupresultresumemcu),
+		zap.Any("tableid", tableID),
+		zap.Any("search", search),
+		zap.Any("currpage", currPage),
+	)
+
+	// listItem
+	dataResultMcu, err := lh.GroupResultService.GetGroupResultResumeMcu()
+	fmt.Println(dataResultMcu)
+	fmt.Println(err)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataResultMcu)
+		return err
+	}
+	// Component Dropdown MCU
+	listItemResultMcuComponent := groupresult.ItemDropdown(dataResultMcu, 0)
+
+	// check dropdown result mcu
+	var idSelectedGroupResultResumeMcu int
+	idSelectedGroupResultResumeMcu, err = strconv.Atoi(groupresultresumemcu)
+	if err != nil {
+		// Tangani kesalahan konversi
+		fmt.Println("Error converting string to int:", err)
+		// return
+		test := groupresult.DialogNewBodyV1(
+			models.CustomTextFieldv2Prm{
+				Label:       "Group Result name",
+				Name:        "groupresultid",
+				Placeholder: "Group Result name",
+				Type:        "hidden",
+				ID:          "groupresultid",
+			},
+			models.CustomTextFieldv2Prm{
+				Label:       "Group Result Name",
+				Name:        "groupresultname",
+				Placeholder: "Group Result Name",
+				Type:        "text", ID: "groupresultname"},
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Per Test (Dicentang Maka Ya)",
+				Name:  "groupresultflagpertest",
+				ID:    "groupresultflagpertest",
+			},
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Non Lab (Dicentang Maka Ya)",
+				Name:  "groupresultflagnonlab",
+				ID:    "groupresultflagnonlab",
+			},
+			models.CustomDropdownv1Prm{
+				Label: "Group Result Resume MCU",
+				Name:  "groupresultresumemcu",
+				ID:    "groupresultresumemcu",
+			},
+			listItemResultMcuComponent,
+			dialogAddBodyID, groupresult.HandleJSModalAddGR(""),
+		)
+		coba := utils.ViewMulti(c, []templ.Component{
+			customtoastv2.CustomToastV2Show("Error", "Error converting string to int", "error"),
+			test})
+		return coba
+	}
+
+	var groupresultresumemcuNew string
+	for _, x := range dataResultMcu {
+		if x.ID == idSelectedGroupResultResumeMcu {
+			groupresultresumemcuNew = x.Text
+			// mcuResumeSelectedValue = x.ID
+		}
+	}
+
+	// check group result flag per test
+	if groupresultflagpertest == "on" {
+		flagPerTest = "Y"
+	}
+
+	// check group result flag non lab
+	if groupresultflagnonlab == "on" {
+		flagNonLab = "Y"
+	}
+
+	//Form Validation
+	if strings.TrimSpace(groupresultname) == "" {
+		// Component Dropdown MCU
+		listItemResultMcuComponent := groupresult.ItemDropdown(dataResultMcu, idSelectedGroupResultResumeMcu)
+		test := groupresult.DialogNewBodyV1(
+			models.CustomTextFieldv2Prm{
+				Label:       "Group Result name",
+				Name:        "groupresultid",
+				Placeholder: "Group Result name",
+				Type:        "hidden",
+				ID:          "groupresultid",
+			},
+			models.CustomTextFieldv2Prm{
+				Label:       "Group Result Name",
+				Name:        "groupresultname",
+				Placeholder: "Group Result Name",
+				Value:       groupresultname,
+				Type:        "text", ID: "groupresultname"},
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Per Test (Dicentang Maka Ya)",
+				Name:  "groupresultflagpertest",
+				ID:    "groupresultflagpertest",
+				Value: groupresultflagpertest,
+			},
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Non Lab (Dicentang Maka Ya)",
+				Name:  "groupresultflagnonlab",
+				ID:    "groupresultflagnonlab",
+				Value: groupresultflagnonlab,
+			},
+			models.CustomDropdownv1Prm{
+				Label: "Group Result Resume MCU",
+				Name:  "groupresultresumemcu",
+				ID:    "groupresultresumemcu",
+			},
+			listItemResultMcuComponent,
+			dialogAddBodyID, groupresult.HandleJSModalAddGR(""),
+		)
+		coba := utils.ViewMulti(c, []templ.Component{
+			customtoastv2.CustomToastV2Show("Warning", "Group Result Name Kosong", "warning"),
+			test})
+		return coba
+
+	}
+
+	//Add user group service
+	dataGroupResultAdd, err := lh.GroupResultService.AddGroupResult(groupresultname, flagPerTest, flagNonLab, groupresultresumemcuNew)
+
+	if err != nil {
+		logger.Info("Error",
+			zap.Any("Error", err),
+			zap.Any("groupresultname", groupresultname),
+			zap.Any("groupresultflagpertest", groupresultflagpertest),
+			zap.Any("groupresultflagnonlab", groupresultflagnonlab),
+			zap.Any("groupresultresumemcu", groupresultresumemcu),
+		)
+
+		test := groupresult.DialogNewBodyV1(
+			models.CustomTextFieldv2Prm{
+				Label:       "Group Result name",
+				Name:        "groupresultid",
+				Placeholder: "Group Result name",
+				Type:        "hidden",
+				ID:          "groupresultid",
+			},
+			models.CustomTextFieldv2Prm{
+				Label:       "Group Result Name",
+				Name:        "groupresultname",
+				Placeholder: "Group Result Name",
+				Value:       groupresultname,
+				Type:        "text", ID: "groupresultname"},
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Per Test (Dicentang Maka Ya)",
+				Name:  "groupresultflagpertest",
+				ID:    "groupresultflagpertest",
+				Value: groupresultflagpertest,
+			},
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Non Lab (Dicentang Maka Ya)",
+				Name:  "groupresultflagnonlab",
+				ID:    "groupresultflagnonlab",
+				Value: groupresultflagnonlab,
+			},
+			models.CustomDropdownv1Prm{
+				Label: "Group Result Resume MCU",
+				Name:  "groupresultresumemcu",
+				ID:    "groupresultresumemcu",
+			},
+			listItemResultMcuComponent,
+			dialogAddBodyID, groupresult.HandleJSModalAddGR(""))
+		coba := utils.ViewMulti(c, []templ.Component{
+			customtoastv2.CustomToastV2Show("Error", err.Error(), "danger"),
+			test})
+		return coba
+	}
+	logger.Info("ADD USER GROUP",
+		zap.Any("return", dataGroupResultAdd),
+		zap.Any("groupresultname", groupresultname),
+		zap.Any("groupresultflagpertest", groupresultflagpertest),
+		zap.Any("groupresultflagnonlab", groupresultflagnonlab),
+		zap.Any("groupresultresumemcu", groupresultresumemcu),
+	)
+
+	//Get data table current page
+	dataGroupResultList, totalpage, err := lh.GroupResultService.GetListGroupResult(search, currPage, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR GET USER GROUP",
+			zap.Any("error", err),
+		)
+		return err
+	}
+
+	//New add form
+	newForm := groupresult.DialogNewBodyV1(
+		models.CustomTextFieldv2Prm{
+			Label:       "Group Result name",
+			Name:        "groupresultid",
+			Placeholder: "Group Result name",
+			Type:        "hidden",
+			ID:          "groupresultid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Group Result Name",
+			Name:        "groupresultname",
+			Placeholder: "Group Result Name",
+			Type:        "text", ID: "groupresultname"},
+		models.CustomCheckboxv1Prm{
+			Label: "Group Result Flag Per Test (Dicentang Maka Ya)",
+			Name:  "groupresultflagpertest",
+			ID:    "groupresultflagpertest",
+		},
+		models.CustomCheckboxv1Prm{
+			Label: "Group Result Flag Non Lab (Dicentang Maka Ya)",
+			Name:  "groupresultflagnonlab",
+			ID:    "groupresultflagnonlab",
+		},
+		models.CustomDropdownv1Prm{
+			Label: "Group Result Resume MCU",
+			Name:  "groupresultresumemcu",
+			ID:    "groupresultresumemcu",
+		},
+		listItemResultMcuComponent,
+		dialogAddBodyID, groupresult.HandleJSModalAddGR("#"+dialogAddID))
+
+	//new table listing
+	contentUserGroupComponent := groupresult.TableGroupResult(
+		dataGroupResultList, tableID,
+		"/dev/usergroupshoweditform",
+		"#"+dialogEditBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		"/dev/usergroupshowdeleteform",
+		"#"+dialogDeleteBodyID,
+		"outerHTML",
+		"#dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #dialogEditID")
+
+	//new pagination
+	userGroupPaginationComponent := pagination.PaginationV2(totalpage,
+		1,
+		"/dev/groupresultv1pagination",
+		paginationID,
+		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		"#"+paginationID, "outerHTML", "", "true")
+
+	toastSuccess := customtoastv2.CustomToastV2Show("Success", "Success add group result "+groupresultname, "success")
+
+	retval := []templ.Component{toastSuccess, contentUserGroupComponent, userGroupPaginationComponent, newForm}
+
+	return utils.ViewMulti(c, retval)
+}
+
 // SEARCH PROSES
 func (lh *GroupResultHandler) HandlerShowGroupResultSearchV1(c echo.Context) error {
 	search := c.QueryParam("search")
diff --git a/handlers/routes.go b/handlers/routes.go
index 9e46d2b..9220082 100644
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -238,4 +238,8 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.GET("/groupresult", devGRhandlers.HandlerShowGroupResultV1)
 	dev.GET("/searchgroupresultv1", devGRhandlers.HandlerShowGroupResultSearchV1)
 	dev.GET("/groupresultv1pagination", devGRhandlers.HandlerShowGroupResultPaginationV1)
+	dev.POST("/groupresulthandlecloseform", devGRhandlers.HandleCloseForm)
+	// form add
+	dev.POST("/groupresult/add", devGRhandlers.AddUserGroup)
+
 }
diff --git a/models/customcheckbox.models.go b/models/customcheckbox.models.go
index 0fcbbed..ba456db 100644
--- a/models/customcheckbox.models.go
+++ b/models/customcheckbox.models.go
@@ -12,7 +12,7 @@ type CustomCheckboxv1Prm struct {
 	Name        string `default:"name"`
 	Text        string `default:"text"`
 	// Type        string `default:"text"`
-	// Value       string `default:""`
+	Value    string `default:""`
 	ErrorMsg string `default:""`
 	ID       string
 }
diff --git a/services/dev/groupresult.services.go b/services/dev/groupresult.services.go
index d9c2562..51af4b3 100644
--- a/services/dev/groupresult.services.go
+++ b/services/dev/groupresult.services.go
@@ -5,6 +5,7 @@ import (
 	"cpone/models"
 	"fmt"
 	"math"
+	"strconv"
 	"strings"
 
 	dbx "cpone/package/database"
@@ -685,3 +686,91 @@ func (su *ServicesGroupResult) GetListGroupResult(search string, currentPage int
 
 	return groupresultList, totalPage, nil
 }
+
+// GET BY ID
+func (ug *ServicesGroupResult) GetGroupResultByIDV1(id string) (models.GroupResult, error) {
+	logger, _ := zap.NewProduction()
+
+	var data models.GroupResult
+	err := dbx.Handlex.Get(&data, `SELECT * FROM group_result
+	WHERE Group_ResultID = ?`, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data gr by id vs",
+			zap.String("ID", id),
+			zap.Error(err),
+		)
+		return data, fmt.Errorf("QUERY_FAILED")
+	}
+	return data, nil
+}
+
+// ADD DATA
+func (ug *ServicesGroupResult) AddGroupResult(groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, groupresultresumemcu string) (models.GroupResult, error) {
+	logger, _ := zap.NewProduction()
+	var data models.GroupResult
+	var datacek []models.GroupResult
+	// var groupresultflagpertestConvert string = ""
+	// var groupresultflagnonlabConvert string = ""
+	// var groupresultresumemcuConvert string = ""
+
+	prm := "%" + strings.TrimSpace(groupresultname) + "%"
+	qryCek := `SELECT Group_ResultName FROM group_result WHERE Group_ResultName LIKE ? AND Group_ResultIsActive = 'Y'`
+	err := dbx.Handlex.Select(&datacek, qryCek, prm)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error cek data by groupresultname",
+			zap.String("groupresultname", groupresultname),
+			zap.Any("datacek", datacek),
+		)
+		return data, fmt.Errorf("QUERY_FAILED")
+	}
+	if len(datacek) > 0 {
+		defer logger.Sync()
+		logger.Error("Group Result Name already taken by another data",
+			zap.String("groupresultname", groupresultname),
+		)
+		return data, fmt.Errorf("group result name sudah dipakai")
+	}
+	qry := `INSERT INTO group_result
+			(
+				Group_ResultName,
+				Group_ResultFlagPerTest,
+				Group_ResultFlagNonLab,
+				Group_ResultResumeMcu
+			)
+			VALUES (
+				?,
+				?,
+				?,
+				?
+			);`
+	// time.Sleep(5 * time.Second)
+	rst := dbx.Handlex.MustExec(qry, groupresultname, groupresultflagpertest, groupresultflagnonlab, groupresultresumemcu)
+	insertedID, err := rst.LastInsertId()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error Insert group result",
+			zap.Any("groupresultname", groupresultname),
+			zap.Any("groupresultflagpertest", groupresultflagpertest),
+			zap.Any("groupresultflagnonlab", groupresultflagnonlab),
+			zap.Any("groupresultresumemcu", groupresultresumemcu),
+		)
+		return data, fmt.Errorf("QUERY_FAILED")
+	}
+	s := strconv.Itoa(int(insertedID))
+	data, err = ug.GetGroupResultByIDV1(s)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get usergroup by id",
+			zap.Any("groupresultname", groupresultname),
+			zap.Any("groupresultflagpertest", groupresultflagpertest),
+			zap.Any("groupresultflagnonlab", groupresultflagnonlab),
+			zap.Any("groupresultresumemcu", groupresultresumemcu),
+		)
+		return data, fmt.Errorf("QUERY_FAILED")
+	}
+	return data, nil
+}
diff --git a/views/dev/groupresult/groupresult.templ b/views/dev/groupresult/groupresult.templ
index 4a87e7f..0d014c3 100644
--- a/views/dev/groupresult/groupresult.templ
+++ b/views/dev/groupresult/groupresult.templ
@@ -260,16 +260,23 @@ templ CssMasterGroupResultV1x() {
     #title {
         font-weight: 600;
     }
+	.dropdown-menu{
+		transform: translate3d(0px, 35px, 0px)!important;
+	}
 </style>
 }
 
 // for item dropdown
-templ ItemDropdown(dataDropdown []models.GroupResultResumeMcu) {
+templ ItemDropdown(dataDropdown []models.GroupResultResumeMcu, selectedId int) {
 	if len(dataDropdown) == 0 {
 		<option value="0" disabled selected>Tidak Ada Data</option>
 	} else {
 		for _, v := range dataDropdown {
-			<option value={ strconv.Itoa(v.ID) }>{ v.Text }</option>
+			if (selectedId == v.ID) {
+				<option value={ strconv.Itoa(v.ID) } selected>{ v.Text }</option>
+			} else {
+				<option value={ strconv.Itoa(v.ID) }>{ v.Text }</option>
+			}
 		}
 	}
 }
diff --git a/views/dev/groupresult/groupresult_templ.go b/views/dev/groupresult/groupresult_templ.go
index 11d4580..aa56db3 100644
--- a/views/dev/groupresult/groupresult_templ.go
+++ b/views/dev/groupresult/groupresult_templ.go
@@ -521,7 +521,7 @@ func CssMasterGroupResultV1x() templ.Component {
 			templ_7745c5c3_Var21 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n    body {\r\n      background-color: white;\r\n      /* padding-right: 100px;\r\n            padding-left: 100px; */\r\n    }\r\n    #div-chart {\r\n        /* overflow-x: scroll; */\r\n        margin: 40px 10vw 40px 10vw;\r\n    }\r\n    .title {\r\n        font-size:20px;\r\n        font-weight: bold;\r\n    }\r\n    #title {\r\n        font-weight: 600;\r\n    }\r\n</style>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n    body {\r\n      background-color: white;\r\n      /* padding-right: 100px;\r\n            padding-left: 100px; */\r\n    }\r\n    #div-chart {\r\n        /* overflow-x: scroll; */\r\n        margin: 40px 10vw 40px 10vw;\r\n    }\r\n    .title {\r\n        font-size:20px;\r\n        font-weight: bold;\r\n    }\r\n    #title {\r\n        font-weight: 600;\r\n    }\r\n\t.dropdown-menu{\r\n\t\ttransform: translate3d(0px, 35px, 0px)!important;\r\n\t}\r\n</style>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -533,7 +533,7 @@ func CssMasterGroupResultV1x() templ.Component {
 }
 
 // for item dropdown
-func ItemDropdown(dataDropdown []models.GroupResultResumeMcu) templ.Component {
+func ItemDropdown(dataDropdown []models.GroupResultResumeMcu, selectedId int) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -553,35 +553,68 @@ func ItemDropdown(dataDropdown []models.GroupResultResumeMcu) templ.Component {
 			}
 		} else {
 			for _, v := range dataDropdown {
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<option value=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var23 string
-				templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.ID))
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 272, Col: 37}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
-				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
-				}
-				var templ_7745c5c3_Var24 string
-				templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(v.Text)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 272, Col: 48}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</option>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
+				if selectedId == v.ID {
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<option value=\"")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var23 string
+					templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.ID))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 276, Col: 38}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" selected>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var24 string
+					templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(v.Text)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 276, Col: 58}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</option>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				} else {
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<option value=\"")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var25 string
+					templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.ID))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 278, Col: 38}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+					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
+					}
+					var templ_7745c5c3_Var26 string
+					templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(v.Text)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 278, Col: 49}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</option>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
 				}
 			}
 		}
@@ -601,9 +634,9 @@ func EmptyDiv1() templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var25 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var25 == nil {
-			templ_7745c5c3_Var25 = templ.NopComponent
+		templ_7745c5c3_Var27 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var27 == nil {
+			templ_7745c5c3_Var27 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div></div>")
@@ -628,12 +661,12 @@ func ShowGroupResultV1x(title string, cmp templ.Component, css templ.Component,
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var26 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var26 == nil {
-			templ_7745c5c3_Var26 = templ.NopComponent
+		templ_7745c5c3_Var28 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var28 == nil {
+			templ_7745c5c3_Var28 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Var27 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Var29 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 			if !templ_7745c5c3_IsBuffer {
 				templ_7745c5c3_Buffer = templ.GetBuffer()
@@ -648,7 +681,7 @@ func ShowGroupResultV1x(title string, cmp templ.Component, css templ.Component,
 			}
 			return templ_7745c5c3_Err
 		})
-		templ_7745c5c3_Err = layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var27), templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var29), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -676,21 +709,21 @@ func TableGroupResult(data []models.GroupResult, tableID string,
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var28 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var28 == nil {
-			templ_7745c5c3_Var28 = templ.NopComponent
+		templ_7745c5c3_Var30 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var30 == nil {
+			templ_7745c5c3_Var30 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var29 string
-		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
+		var templ_7745c5c3_Var31 string
+		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 301, Col: 18}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 308, Col: 18}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -723,9 +756,9 @@ func SwapTableGroupResult(pagination templ.Component, table templ.Component) tem
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var30 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var30 == nil {
-			templ_7745c5c3_Var30 = templ.NopComponent
+		templ_7745c5c3_Var32 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var32 == nil {
+			templ_7745c5c3_Var32 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = pagination.Render(ctx, templ_7745c5c3_Buffer)
@@ -751,9 +784,9 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var31 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var31 == nil {
-			templ_7745c5c3_Var31 = templ.NopComponent
+		templ_7745c5c3_Var33 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var33 == nil {
+			templ_7745c5c3_Var33 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"\">")
@@ -768,12 +801,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var32 string
-		templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(data.IDComponent)
+		var templ_7745c5c3_Var34 string
+		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(data.IDComponent)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 316, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 323, Col: 24}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -781,12 +814,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var33 string
-		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(data.Link)
+		var templ_7745c5c3_Var35 string
+		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(data.Link)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 317, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 324, Col: 22}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -794,12 +827,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var34 string
-		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxTarget)
+		var templ_7745c5c3_Var36 string
+		templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxTarget)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 319, Col: 28}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 326, Col: 28}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -807,12 +840,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var35 string
-		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxSwap)
+		var templ_7745c5c3_Var37 string
+		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxSwap)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 320, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 327, Col: 24}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -820,12 +853,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var36 string
-		templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxInclude)
+		var templ_7745c5c3_Var38 string
+		templ_7745c5c3_Var38, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxInclude)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 321, Col: 30}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 328, Col: 30}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var38))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -833,8 +866,8 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var37 templ.ComponentScript = HandleFormBeforeRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var37.Call)
+		var templ_7745c5c3_Var39 templ.ComponentScript = HandleFormBeforeRequest()
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var39.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -842,8 +875,8 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var38 templ.ComponentScript = HandleFormAfterRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var38.Call)
+		var templ_7745c5c3_Var40 templ.ComponentScript = HandleFormAfterRequest()
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var40.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -916,9 +949,9 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var39 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var39 == nil {
-			templ_7745c5c3_Var39 = templ.NopComponent
+		templ_7745c5c3_Var41 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var41 == nil {
+			templ_7745c5c3_Var41 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
@@ -929,12 +962,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var40 string
-		templ_7745c5c3_Var40, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
+		var templ_7745c5c3_Var42 string
+		templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 361, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 368, Col: 22}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var40))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -942,8 +975,8 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var41 templ.ComponentScript = hxOnLoad
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var41.Call)
+		var templ_7745c5c3_Var43 templ.ComponentScript = hxOnLoad
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var43.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -951,12 +984,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var42 string
-		templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(message)
+		var templ_7745c5c3_Var44 string
+		templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinStringErrs(message)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 362, Col: 14}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 369, Col: 14}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -969,12 +1002,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var43 string
-			templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs(v)
+			var templ_7745c5c3_Var45 string
+			templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(v)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 367, Col: 68}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 374, Col: 68}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -992,12 +1025,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var44 string
-			templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinStringErrs(v)
+			var templ_7745c5c3_Var46 string
+			templ_7745c5c3_Var46, templ_7745c5c3_Err = templ.JoinStringErrs(v)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 373, Col: 10}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 380, Col: 10}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var46))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
diff --git a/views/dev/groupresult/modaladdgroupresult.templ b/views/dev/groupresult/modaladdgroupresult.templ
new file mode 100644
index 0000000..7813986
--- /dev/null
+++ b/views/dev/groupresult/modaladdgroupresult.templ
@@ -0,0 +1,111 @@
+package groupresult
+
+import (
+	"cpone/models"
+	"cpone/component/customtextfield"
+	"cpone/component/customcheckbox"
+	"cpone/component/customdropdown"
+)
+
+templ DialogNewBodyV1(inputId models.CustomTextFieldv2Prm,
+	inputGrName models.CustomTextFieldv2Prm,
+	checkboxGrFlagPerTest models.CustomCheckboxv1Prm,
+	checkboxGrFlagNonLab models.CustomCheckboxv1Prm,
+	dropdownGrResumeMcu models.CustomDropdownv1Prm,
+	listItem templ.Component,
+	componentID string,
+	hxOnLoad templ.ComponentScript) {
+	<div id={ componentID } hx-on::load={ hxOnLoad }>
+		@customtextfield.CustomTextFieldv2(
+			inputId)
+		@customtextfield.CustomTextFieldv2(
+			inputGrName)
+		@customcheckbox.MainCustomCheckboxInput(
+			checkboxGrFlagPerTest)
+		@customcheckbox.MainCustomCheckboxInput(
+			checkboxGrFlagNonLab)
+		@customdropdown.MainCustomDropdownInput(
+			dropdownGrResumeMcu,
+			listItem)
+	</div>
+	<script>
+    document.addEventListener('htmx:afterSwap', function(event) {
+        // Reinitialize selectpicker after HTMX content swap
+        $('.selectpicker').selectpicker('refresh');
+    });
+    </script>
+}
+
+script HandleJSModalAddGR(modalID string) {
+	$(modalID).modal('hide');
+}
+
+script HandleJSModalAddGRShow(modalID string) {
+	$(modalID).modal('show')
+}
+
+templ DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
+	<div>
+		<button
+			hx-on::after-request={ HandleJSModalAddGR(modalID) }
+			hx-post={ LinkClose }
+			hx-target={ targetClose }
+			hx-swap={ hxSwapClose }
+			type="button"
+			class="btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnaddact"
+			data-dismiss="modal"
+		>
+			Batal
+		</button>
+		<button
+			type="submit"
+			class="btn btn-primary btn-shadow font-weight-bold rounded-lg btnaddact"
+		>
+			Save
+		</button>
+	</div>
+}
+
+templ DialogNewAction() {
+	<div>
+		<button
+			type="button"
+			class="btn btn-outline-secondary font-weight-bolder rounded-lg mr-4"
+			data-dismiss="modal"
+		>
+			Batal
+		</button>
+		<button
+			type="submit"
+			class="btn btn-primary btn-shadow font-weight-bold rounded-lg"
+		>
+			Save changes
+		</button>
+	</div>
+}
+
+templ BtnCloseNew() {
+	<button
+		type="button"
+		class="close"
+		data-dismiss="modal"
+		aria-label="Close"
+	>
+		<i aria-hidden="true" class="ki ki-close"></i>
+	</button>
+}
+
+templ BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
+	<button
+		hx-post={ LinkClose }
+		hx-target={ targetClose }
+		hx-swap={ hxSwapClose }
+		type="button"
+		hx-on::after-request={ HandleJSModalAddGR(modalID) }
+		class="close btnaddact"
+		data-dismiss="modal"
+		aria-label="Close"
+	>
+		<i aria-hidden="true" class="ki ki-close"></i>
+	</button>
+}
diff --git a/views/dev/groupresult/modaladdgroupresult_templ.go b/views/dev/groupresult/modaladdgroupresult_templ.go
new file mode 100644
index 0000000..84565a8
--- /dev/null
+++ b/views/dev/groupresult/modaladdgroupresult_templ.go
@@ -0,0 +1,329 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package groupresult
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import (
+	"cpone/component/customcheckbox"
+	"cpone/component/customdropdown"
+	"cpone/component/customtextfield"
+	"cpone/models"
+)
+
+func DialogNewBodyV1(inputId models.CustomTextFieldv2Prm,
+	inputGrName models.CustomTextFieldv2Prm,
+	checkboxGrFlagPerTest models.CustomCheckboxv1Prm,
+	checkboxGrFlagNonLab models.CustomCheckboxv1Prm,
+	dropdownGrResumeMcu models.CustomDropdownv1Prm,
+	listItem templ.Component,
+	componentID string,
+	hxOnLoad templ.ComponentScript) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\modaladdgroupresult.templ`, Line: 18, Col: 22}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::load=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 templ.ComponentScript = hxOnLoad
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3.Call)
+		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(
+			inputId).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
+			inputGrName).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(
+			checkboxGrFlagPerTest).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(
+			checkboxGrFlagNonLab).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInput(
+			dropdownGrResumeMcu,
+			listItem).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><script>\r\n    document.addEventListener('htmx:afterSwap', function(event) {\r\n        // Reinitialize selectpicker after HTMX content swap\r\n        $('.selectpicker').selectpicker('refresh');\r\n    });\r\n    </script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func HandleJSModalAddGR(modalID string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleJSModalAddGR_a6af`,
+		Function: `function __templ_HandleJSModalAddGR_a6af(modalID){$(modalID).modal('hide');
+}`,
+		Call:       templ.SafeScript(`__templ_HandleJSModalAddGR_a6af`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_HandleJSModalAddGR_a6af`, modalID),
+	}
+}
+
+func HandleJSModalAddGRShow(modalID string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleJSModalAddGRShow_3147`,
+		Function: `function __templ_HandleJSModalAddGRShow_3147(modalID){$(modalID).modal('show')
+}`,
+		Call:       templ.SafeScript(`__templ_HandleJSModalAddGRShow_3147`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_HandleJSModalAddGRShow_3147`, modalID),
+	}
+}
+
+func DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleJSModalAddGR(modalID))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 templ.ComponentScript = HandleJSModalAddGR(modalID)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\modaladdgroupresult.templ`, Line: 51, Col: 22}
+		}
+		_, 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("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\modaladdgroupresult.templ`, Line: 52, Col: 26}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\modaladdgroupresult.templ`, Line: 53, Col: 24}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" type=\"button\" class=\"btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnaddact\" data-dismiss=\"modal\">Batal\r</button> <button type=\"submit\" class=\"btn btn-primary btn-shadow font-weight-bold rounded-lg btnaddact\">Save\r</button></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func DialogNewAction() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var9 == nil {
+			templ_7745c5c3_Var9 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div><button type=\"button\" class=\"btn btn-outline-secondary font-weight-bolder rounded-lg mr-4\" data-dismiss=\"modal\">Batal\r</button> <button type=\"submit\" class=\"btn btn-primary btn-shadow font-weight-bold rounded-lg\">Save changes\r</button></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func BtnCloseNew() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var10 == nil {
+			templ_7745c5c3_Var10 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><i aria-hidden=\"true\" class=\"ki ki-close\"></i></button>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var11 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var11 == nil {
+			templ_7745c5c3_Var11 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleJSModalAddGR(modalID))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-post=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\modaladdgroupresult.templ`, Line: 100, Col: 21}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\modaladdgroupresult.templ`, Line: 101, Col: 25}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var14 string
+		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\modaladdgroupresult.templ`, Line: 102, Col: 23}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" type=\"button\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var15 templ.ComponentScript = HandleJSModalAddGR(modalID)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"close btnaddact\" data-dismiss=\"modal\" aria-label=\"Close\"><i aria-hidden=\"true\" class=\"ki ki-close\"></i></button>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}