step 7 : add error msg in add and edit

step 6 : fix bug after sukses edit then open delete dialog
step 5 : fix bug after sukses delete then open form edit
2024-05-27 08:04:39 +07:00 · 2024-05-25 19:36:49 +07:00 · 2024-05-25 19:08:10 +07:00 · 2024-05-25 18:32:07 +07:00 · 2024-05-25 17:49:24 +07:00 · 2024-05-25 13:29:52 +07:00
18 changed files with 2367 additions and 1465 deletions
--- a/component/customcheckbox/customcheckboxv1.templ
+++ b/component/customcheckbox/customcheckboxv1.templ
@@ -0,0 +1,25 @@
+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">
+					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>
+			</div>
+		</div>
+		<div class="invalid-feedback text-danger mt-3 ml-2 mt-5">
+			{ inp.ErrorMsg }
+		</div>
+	</div>
+}
--- a/component/customcheckbox/customcheckboxv1_templ.go
+++ b/component/customcheckbox/customcheckboxv1_templ.go
@@ -0,0 +1,143 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package customcheckbox
+
+//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/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)
+		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_7745c5c3_Buffer.WriteString("<div class=\"form-control bg-field border-0 h-auto\"><div class=\"form-group\"><label>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: 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\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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("<span></span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, 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: 17, Col: 15}
+		}
+		_, 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("</label></div></div><div class=\"invalid-feedback text-danger mt-3 ml-2 mt-5\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: 22, Col: 17}
+		}
+		_, 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("</div></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
+	})
+}
--- a/component/customtextfield/customtextfieldv2password.templ
+++ b/component/customtextfield/customtextfieldv2password.templ
@@ -1,68 +0,0 @@
-package customtextfield
-
-import "cpone/models"
-
-templ CustomTextFieldPasswordv2(inp models.CustomTextFieldv2Prm) {
-	<div class="form-group">
-		<label
-			if inp.Type == "hidden" {
-				class="text-black d-none"
-			} else {
-				class="text-black"
-			}
-			style="font-family: Poppins; font-weight: 600;"
-		>{ inp.Label } </label>
-		<div class="input-group">
-			<input
-				id={ inp.Name }
-				name={ inp.Name }
-				type={ inp.Type }
-				placeholder={ inp.Placeholder }
-				value={ inp.Value }
-				if inp.ErrorMsg =="" {
-					class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
-				} else {
-					class="form-control bg-field border-1 h-auto py-6 px-6 rounded-lg is-invalid"
-				}
-			/>
-			<div class="input-group-append">
-				<button class="btn btn-secondary" type="button" id={ "toggle-" + inp.Name }>
-					<i class="fa-solid fa-eye" id={ "icon-" + inp.Name }></i>
-				</button>
-			</div>
-		</div>
-		<div class="invalid-feedback text-danger mt-3 ml-2">
-			{ inp.ErrorMsg }
-		</div>
-	</div>
-	<script>
-        document.addEventListener('DOMContentLoaded', function () {
-            const toggleButton = document.getElementById('toggle-' + inp.Name);
-            const inputField = document.getElementById(inp.Name);
-            const icon = document.getElementById('icon-' + inp.Name);
-
-            toggleButton.addEventListener('click', function () {
-                if (inputField.type === 'password') {
-                    inputField.type = 'text';
-                    icon.classList.remove('fa-eye');
-                    icon.classList.add('fa-eye-slash');
-                } else {
-                    inputField.type = 'password';
-                    icon.classList.remove('fa-eye-slash');
-                    icon.classList.add('fa-eye');
-                }
-            });
-
-            // Initial state setup based on fieldType
-            if (fieldType === 'password') {
-                inputField.type = 'password';
-                icon.classList.add('fa-eye');
-                icon.classList.remove('fa-eye-slash');
-            } else {
-                inputField.type = 'text';
-                icon.classList.add('fa-eye-slash');
-                icon.classList.remove('fa-eye');
-            }
-        });
-    </script>
-}
--- a/component/customtextfield/customtextfieldv2password_templ.go
+++ b/component/customtextfield/customtextfieldv2password_templ.go
@@ -1,184 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.663
-package customtextfield
-
-//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/models"
-
-func CustomTextFieldPasswordv2(inp models.CustomTextFieldv2Prm) 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_7745c5c3_Buffer.WriteString("<div class=\"form-group\"><label")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if inp.Type == "hidden" {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"text-black d-none\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"text-black\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" style=\"font-family: Poppins; font-weight: 600;\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		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\customtextfield\customtextfieldv2password.templ`, Line: 14, Col: 14}
-		}
-		_, 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=\"input-group\"><input id=\"")
-		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\customtextfield\customtextfieldv2password.templ`, Line: 17, Col: 17}
-		}
-		_, 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("\" name=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfield\customtextfieldv2password.templ`, Line: 18, Col: 19}
-		}
-		_, 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("\" type=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Type)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfield\customtextfieldv2password.templ`, Line: 19, Col: 19}
-		}
-		_, 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("\" placeholder=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Placeholder)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfield\customtextfieldv2password.templ`, Line: 20, Col: 33}
-		}
-		_, 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("\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Value)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfield\customtextfieldv2password.templ`, Line: 21, Col: 21}
-		}
-		_, 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("\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if inp.ErrorMsg == "" {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control bg-field border-0 h-auto py-6 px-6 rounded-lg\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control bg-field border-1 h-auto py-6 px-6 rounded-lg is-invalid\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("><div class=\"input-group-append\"><button class=\"btn btn-secondary\" type=\"button\" id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs("toggle-" + inp.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfield\customtextfieldv2password.templ`, Line: 29, Col: 77}
-		}
-		_, 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("\"><i class=\"fa-solid fa-eye\" id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("icon-" + inp.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfield\customtextfieldv2password.templ`, Line: 30, Col: 55}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></i></button></div></div><div class=\"invalid-feedback text-danger mt-3 ml-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfield\customtextfieldv2password.templ`, Line: 35, Col: 17}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><script>\r\n        document.addEventListener('DOMContentLoaded', function () {\r\n            const toggleButton = document.getElementById('toggle-' + inp.Name);\r\n            const inputField = document.getElementById(inp.Name);\r\n            const icon = document.getElementById('icon-' + inp.Name);\r\n\r\n            toggleButton.addEventListener('click', function () {\r\n                if (inputField.type === 'password') {\r\n                    inputField.type = 'text';\r\n                    icon.classList.remove('fa-eye');\r\n                    icon.classList.add('fa-eye-slash');\r\n                } else {\r\n                    inputField.type = 'password';\r\n                    icon.classList.remove('fa-eye-slash');\r\n                    icon.classList.add('fa-eye');\r\n                }\r\n            });\r\n\r\n            // Initial state setup based on fieldType\r\n            if (fieldType === 'password') {\r\n                inputField.type = 'password';\r\n                icon.classList.add('fa-eye');\r\n                icon.classList.remove('fa-eye-slash');\r\n            } else {\r\n                inputField.type = 'text';\r\n                icon.classList.add('fa-eye-slash');\r\n                icon.classList.remove('fa-eye');\r\n            }\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
-	})
-}
--- a/handlers/dev/groupresult.handlers.go
+++ b/handlers/dev/groupresult.handlers.go
--- a/handlers/dev/mastermenuuser.handlers.go
+++ b/handlers/dev/mastermenuuser.handlers.go
@@ -1,363 +0,0 @@
-package dev_handlers
-
-import (
-	breadcrumbadmin "cpone/component/breadcrumbadmin"
-	"cpone/component/customdropdown"
-	customtextfieldsearch "cpone/component/customtextfieldsearch"
-	navbarmenu "cpone/component/navbar"
-	"cpone/component/pagination"
-	sidebaruserprofile "cpone/component/sidebar_user_profile"
-	"cpone/models"
-	globalservices "cpone/services"
-	"cpone/utils"
-	mastermenuuser "cpone/views/dev/mastermenuuser"
-	mastermenuusergroup "cpone/views/dev/mastermenuusergroup"
-	"fmt"
-	"strconv"
-
-	"github.com/a-h/templ"
-	"github.com/labstack/echo/v4"
-	"go.uber.org/zap"
-)
-
-type MasterMenuUserService interface {
-	// GetUserGroup() ([]models.UserGroup, error)
-	// GetUserGroupByID(id string) (models.UserGroup, error)
-	// try
-	GetListMasterUserGroup() ([]models.UserGroupV1, error)
-	GetListBreadCrumb(title string) (models.BreadCrumbV1, error)
-	// AddUserGroup(code string, name string) (models.UserGroupV1, error)
-	// EditUserGroup(id string, code string, name string) (models.UserGroupV1, error)
-	// DeleteUserGroup(id string) (models.UserGroupV1, error)
-	GetListMasterUserV2(search string, usergroup string, currentPage int, rowPerPage int) ([]models.MasterUser, int, error)
-	// GetUserGroupByIDV1(id string) (models.UserGroupV1, error)
-	GetUserGroupData() ([]models.UserGroupV1, error)
-}
-
-func NewMasterMenuUserHandler(us MasterMenuUserService) *MasterMenuUserHandler {
-	return &MasterMenuUserHandler{
-		MasterMenuUserService: us,
-	}
-}
-
-type MasterMenuUserHandler struct {
-	MasterMenuUserService MasterMenuUserService
-}
-
-// PAGINATION
-func (lh *MasterMenuUserHandler) HandlerShowMasterMenuUserPaginationV1(c echo.Context) error {
-	logger, _ := zap.NewProduction()
-
-	search := c.QueryParam("search")
-	usergroup := c.QueryParam("usergroup")
-	pageparam := c.QueryParam("page")
-	tableID := c.QueryParam("tableID")
-	searchID := c.QueryParam("searchID")
-
-	dropdownID := c.QueryParam("dropdownID")
-	paginationID := c.QueryParam("paginationID")
-	dialogEditBodyID := c.QueryParam("dialogEditBodyID")
-	// dialogEditID := c.QueryParam("dialogEditID")
-	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
-	// dialogDeleteID := c.QueryParam("dialogDeleteID")
-	page, err := strconv.Atoi(pageparam)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR CONVERT PAGE PARAM",
-			zap.Any("page", page),
-			zap.Any("error ", err),
-		)
-		return err
-	}
-
-	dataUserGroup, totalpage, err := lh.MasterMenuUserService.GetListMasterUserV2(search, usergroup, page, 5)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR GET USER GROUP",
-			zap.Any("error", err),
-		)
-		fmt.Println(dataUserGroup)
-		return err
-	}
-
-	contentUserGroupComponent := mastermenuuser.TableUser(
-		dataUserGroup, tableID, "/dev/usergroupshoweditform",
-		"#"+dialogEditBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"/dev/usergroupshowdeleteform",
-		"#"+dialogDeleteBodyID,
-		"outerHTML",
-		"#dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #dialogEditID")
-
-	userGroupPaginationComponent := pagination.PaginationV2(totalpage,
-		page,
-		"/dev/userv1pagination",
-		paginationID,
-		// "#tableID, #searchID, #"+searchID+", #dropdownID, #"+dropdownID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, [name='search'],  [name='usergroup']",
-		"#tableID, #searchID, #"+searchID+", #dropdownID, #"+dropdownID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, [name='search'],  [name='usergroup']",
-		"#"+paginationID, "outerHTML", "", "")
-
-	retval := []templ.Component{contentUserGroupComponent, userGroupPaginationComponent}
-
-	return utils.ViewMulti(c, retval)
-}
-
-// LISTING FUNCTION INITIAL
-func (lh *MasterMenuUserHandler) HandlerShowMasterMenuUserV1(c echo.Context) error {
-
-	logger, _ := zap.NewProduction()
-	//get sidebarmenu
-
-	dataMenu, err := globalservices.GetMenu()
-	fmt.Println(dataMenu)
-	fmt.Println(err)
-	if err != nil {
-		fmt.Println(dataMenu)
-		return err
-	}
-
-	//get user login
-	dataUser, err := globalservices.GetUserLogin()
-	fmt.Println(dataUser)
-	fmt.Println(err)
-	if err != nil {
-		fmt.Println(dataUser)
-		return err
-	}
-
-	// dropdownUserGroupInitial :=
-
-	dataUserMasterInitialSelected, err := lh.MasterMenuUserService.GetUserGroupData()
-	fmt.Println(dataUserMasterInitialSelected)
-	fmt.Println(err)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR LIST USER MASTER Selected DEV",
-			zap.Any("error", err),
-		)
-		fmt.Println(dataUserMasterInitialSelected)
-		return err
-	}
-
-	var initialSelectedUserGroup string = "0"
-	if len(dataUserMasterInitialSelected) > 0 {
-		initialSelectedUserGroup = strconv.Itoa(dataUserMasterInitialSelected[0].M_UserGroupID)
-	}
-
-	dataUserGroup, totalpage, err := lh.MasterMenuUserService.GetListMasterUserV2("", initialSelectedUserGroup, 1, 5)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR GET USER GROUP",
-			zap.Any("error", err),
-		)
-		fmt.Println(dataUserGroup)
-		return err
-	}
-
-	// si := mastermenuusergroup.ListMasterUserGroupInitial(dataUserGroup)
-
-	defer logger.Sync()
-	logger.Info("LOAD USER GROUP DEV",
-		zap.Any("data", dataUserGroup),
-	)
-
-	tableID := utils.GenerateRandomID("tablebody")
-	paginationID := utils.GenerateRandomID("paginationid")
-	searchID := utils.GenerateRandomID("searchid")
-	dropdownID := utils.GenerateRandomID("dropdownid")
-	dialogAddID := utils.GenerateRandomID("dialogaddID")
-	dialogAddBodyID := utils.GenerateRandomID("dialogaddbodyID")
-	dialogEditID := utils.GenerateRandomID("dialogEditID")
-	dialogEditBodyID := utils.GenerateRandomID("dialogEditbodyID")
-	dialogdeleteID := utils.GenerateRandomID("dialogdeleteID")
-	dialogdeleteBodyID := utils.GenerateRandomID("dialogdeletebodyID")
-
-	paramTitleBreadcrumbConvert := "Master User"
-
-	dataBreadCrumb, err := lh.MasterMenuUserService.GetListBreadCrumb(paramTitleBreadcrumbConvert)
-	fmt.Println(dataBreadCrumb)
-	fmt.Println(err)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR BREADCRUMB DEV",
-			zap.Any("error", err),
-		)
-		fmt.Println(dataBreadCrumb)
-		return err
-	}
-
-	defer logger.Sync()
-	logger.Info("LOAD BREADCRUMB DEV",
-		zap.Any("data", dataBreadCrumb),
-	)
-
-	// navbar menu
-	navbarmenuComponent := navbarmenu.NavbarMenu(dataMenu)
-
-	// navbar user
-	navbaruserComponent := navbarmenu.Navbar(dataUser)
-
-	// sidebar
-	sidebaruserprofileComponent := sidebaruserprofile.Navbaruserprofile(dataUser)
-
-	// list item
-	dataUserGroupAll, err := lh.MasterMenuUserService.GetListMasterUserGroup()
-	fmt.Println(dataUserGroupAll)
-	fmt.Println(err)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR LIST USER GROUP ALL DEV",
-			zap.Any("error", err),
-		)
-		fmt.Println(dataUserGroupAll)
-		return err
-	}
-	//Component modal add usergroup
-
-	modaladdcomponent := mastermenuuser.EmptyDiv1()
-
-	//Component modal edit usergroup
-	modalEditcomponent := mastermenuuser.EmptyDiv1()
-
-	//Component modal delete usergroup
-	modalDeletecomponent := mastermenuuser.EmptyDiv1()
-
-	//table listing user group component
-	contentUserGroupComponent := mastermenuuser.TableUser(
-		dataUserGroup, tableID,
-		"/dev/usergroupshoweditform",
-		"#"+dialogEditBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"/dev/usergroupshowdeleteform",
-		"#"+dialogdeleteBodyID,
-		"outerHTML",
-		"#dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #dialogEditID")
-
-	//filter user search component
-	// customtextfieldsearch.MainCustomTextFieldSearchV1("#"+contentIDSearch, "q", "Cari Nama Staff / Email", "text", "/dev/searchuserv1?"+link, "input changed delay:500ms, search", "#"+contentID, "#indicator", "", contentIDHtmxExtension, "[name='usergroup']")
-
-	userFilterComp := customtextfieldsearch.MainCustomTextFieldSearchV2(
-		searchID,
-		"search",
-		"Cari Nama Staff / Email",
-		"text",
-		"/dev/searchuserv1",
-		"input changed delay:500ms, search",
-		"#"+paginationID, "", "", "outerHTML",
-		"#tableID, #paginationID, #searchID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #dropdownID, [name='usergroup']")
-
-	// filter user group dropdown
-	listItemComponent := mastermenuuser.ItemDropdown(dataUserGroupAll)
-	dropdownUserGroupFilterComp := customdropdown.MainCustomDropdownV1(
-		"usergroup",
-		dropdownID,
-		"#"+paginationID,
-		"/dev/searchuserv1",
-		"",
-		"change from:select[name='usergroup'], input changed from:input[name='search']",
-		"#tableID, #paginationID, #searchID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, #dropdownID, [name='search']",
-		listItemComponent,
-	)
-
-	// pagination usergroup component
-	userGroupPaginationComponent := pagination.PaginationV2(
-		totalpage,
-		1,
-		"/dev/userv1pagination",
-		paginationID,
-		"#tableID, #searchID, #"+searchID+", #dropdownID, #"+dropdownID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, [name='search'],  [name='usergroup']",
-		"#"+paginationID,
-		"outerHTML", "", "",
-	)
-
-	//Show user group screen
-	si := mastermenuuser.ShowMasterMenuUserV1x(
-		"Master Menu",
-		mastermenuuser.ContentMasterMenuUserV1(
-			tableID,
-			paginationID,
-			searchID,
-			dropdownID,
-			dialogAddID,
-			dialogAddBodyID,
-			dialogEditID,
-			dialogEditBodyID,
-			dialogdeleteID,
-			dialogdeleteBodyID,
-			breadcrumbadmin.MainBreadcrumbAdminV1(dataBreadCrumb),
-			contentUserGroupComponent,
-			userFilterComp,
-			dropdownUserGroupFilterComp,
-			userGroupPaginationComponent,
-			modaladdcomponent,
-			modalEditcomponent,
-			modalDeletecomponent,
-		),
-
-		mastermenuusergroup.CssMasterMenuUserGroupV1x(),
-		mastermenuusergroup.JSkuV1(),
-		navbarmenuComponent,
-		navbaruserComponent,
-		sidebaruserprofileComponent,
-	)
-
-	return utils.View(c, si)
-}
-
-// SEARCH PROSES
-func (lh *MasterMenuUserHandler) HandlerShowMasterMenuUserSearchV1(c echo.Context) error {
-	search := c.QueryParam("search")
-	usergroup := c.QueryParam("usergroup")
-	searchID := c.QueryParam("searchID")
-	dropdownID := c.QueryParam("dropdownID")
-	tableID := c.QueryParam("tableID")
-	paginationID := c.QueryParam("paginationID")
-	dialogEditBodyID := c.QueryParam("dialogEditBodyID")
-	// dialogEditID := c.QueryParam("dialogEditID")
-	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
-	// dialogDeleteID := c.QueryParam("dialogDeleteID")
-
-	logger, _ := zap.NewProduction()
-
-	dataUserGroup, totalpage, err := lh.MasterMenuUserService.GetListMasterUserV2(search, usergroup, 1, 5)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR GET USER GROUP",
-			zap.Any("error", err),
-		)
-		fmt.Println(dataUserGroup)
-		return err
-	}
-
-	// totalPages := int(math.Ceil(float64(len(dataUserGroupFiltered)) / float64(rowPerPage)))
-
-	contentUserGroupComponent := mastermenuuser.TableUser(
-		dataUserGroup, tableID, "/dev/usergroupshoweditform",
-		"#"+dialogEditBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"/dev/usergroupshowdeleteform",
-		"#"+dialogDeleteBodyID,
-		"outerHTML",
-		"#dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #dialogEditID")
-
-	userGroupPaginationComponent := pagination.PaginationV2(totalpage,
-		1,
-		"/dev/userv1pagination",
-		paginationID,
-		"#tableID, #searchID, #"+searchID+", #dropdownID, #"+dropdownID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID, [name='search'],  [name='usergroup']",
-		"#"+paginationID,
-		"outerHTML",
-		"",
-		"",
-	)
-
-	// swapTable :=
-	// 	mastermenuusergroup.SwapTableUserGroup(userGroupPaginationComponent, contentUserGroupComponent)
-	retval := []templ.Component{contentUserGroupComponent, userGroupPaginationComponent}
-
-	return utils.ViewMulti(c, retval)
-	// return utils.View(c, si)
-}
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -232,11 +232,20 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	// clientgroup.GET("/usergroup/edit", mastermenuusergroupHandler.ChangeFormEdit)
 	// clientgroup.GET("/usergroup/pagination", mastermenuusergroupHandler.HandleChangePage)

-	// dev master user
-	devUSServices := dev_services.NewServicesMasterMenuUser(appStore)
-	devUShandlers := dev_handlers.NewMasterMenuUserHandler(devUSServices)
-	dev.GET("/userv1", devUShandlers.HandlerShowMasterMenuUserV1)
-	dev.GET("/searchuserv1", devUShandlers.HandlerShowMasterMenuUserSearchV1)
-	dev.GET("/userv1pagination", devUShandlers.HandlerShowMasterMenuUserPaginationV1)
-	// dev.GET("/breadcrumbv1", devUShandlers)
+	// group result
+	devGRServices := dev_services.NewServicesGroupResult(appStore)
+	devGRhandlers := dev_handlers.NewGroupResultHandler(devGRServices)
+	dev.GET("/groupresult", devGRhandlers.HandlerShowGroupResultV1)
+	dev.GET("/searchgroupresultv1", devGRhandlers.HandlerShowGroupResultSearchV1)
+	dev.GET("/groupresultv1pagination", devGRhandlers.HandlerShowGroupResultPaginationV1)
+	dev.POST("/groupresulthandlecloseform", devGRhandlers.HandleCloseForm)
+	dev.POST("/groupresulthandlecloseformedit", devGRhandlers.HandleCloseFormEdit)
+	dev.GET("/groupresultshoweditform", devGRhandlers.HandleEditForm)
+	dev.GET("/groupresultshowdeleteform", devGRhandlers.HandleDeleteForm)
+	// dev.GET("/groupresultshowdeleteform", devGRhandlers.HandleDeleteForm)
+	// form add
+	dev.POST("/groupresult/add", devGRhandlers.AddGroupResult)
+	dev.POST("/groupresult/edit", devGRhandlers.EditGroupResult)
+	dev.POST("/groupresult/delete", devGRhandlers.DeleteGroupResult)
+
 }
--- a/models/customcheckbox.models.go
+++ b/models/customcheckbox.models.go
@@ -0,0 +1,18 @@
+package models
+
+// name string, id string, hxTarget string, hxGet string, hxIndicator string, hxTrigger string, hxInclude string,
+
+type CustomCheckboxv1Prm struct {
+	HxTarget    string `default:"hxTarget"`
+	HxGet       string `default:"hxGet"`
+	HxIndicator string `default:"hxIndicator"`
+	HxInclude   string `default:"hxInclude"`
+	HxTrigger   string `default:"hxTrigger"`
+	Label       string `default:"Label"`
+	Name        string `default:"name"`
+	Text        string `default:"text"`
+	// Type        string `default:"text"`
+	Value    string `default:""`
+	ErrorMsg string `default:""`
+	ID       string
+}
--- a/models/groupresult.models.go
+++ b/models/groupresult.models.go
@@ -0,0 +1,38 @@
+package models
+
+import "github.com/a-h/templ"
+
+type GroupResultResumeMcu struct {
+	Text string `default:"text"`
+	ID   int    `default:"id"`
+}
+
+type GroupResult struct {
+	Nomor                   string `db:"nomor"`
+	Group_ResultID          int    `db:"Group_ResultID"`
+	Group_ResultName        string `db:"Group_ResultName"`
+	Group_ResultFlagPerTest string `db:"Group_ResultFlagPerTest"`
+	Group_ResultFlagNonLab  string `db:"Group_ResultFlagNonLab"`
+	Group_ResultResumeMcu   string `db:"Group_ResultResumeMcu"`
+	Group_ResultIsActive    string `db:"Group_ResultIsActive"`
+}
+
+// form component
+type GroupResultFormComponent struct {
+	IDComponent                    string
+	Link                           string
+	HxTarget                       string
+	HxSwap                         string
+	HxInclude                      string
+	ModalID                        string
+	ModalTitle                     string
+	InputGroupResultName           CustomTextFieldv2Prm
+	InputGroupResult               CustomTextFieldv2Prm
+	CheckboxGroupResultFlagPerTest CustomCheckboxv1Prm
+	CheckboxGroupResultFlagNonLab  CustomCheckboxv1Prm
+	InputID                        CustomTextFieldv2Prm
+	DropdownGroupResultResumeMcu   CustomDropdownv1Prm
+	DialogBody                     templ.Component
+	DialogAction                   templ.Component
+	ButtonCLose                    templ.Component
+}
--- a/models/masteruser.models.go
+++ b/models/masteruser.models.go
@@ -1,58 +0,0 @@
-package models
-
-import "github.com/a-h/templ"
-
-type MasterUser struct {
-	Nomor                   string `db:"nomor"`
-	M_UserID                int    `db:"M_UserID"`
-	M_UserEmail             string `db:"M_UserEmail"`
-	M_UserFullName          string `db:"M_UserFullName"`
-	M_UserLastAccess        string `db:"M_UserLastAccess"`
-	M_UserIsLoggedIn        string `db:"M_UserIsLoggedIn"`
-	M_UserActiveToken       string `db:"M_UserActiveToken"`
-	M_UserExpiredToken      string `db:"M_UserExpiredToken"`
-	M_UserIsActive          string `db:"M_UserIsActive"`
-	M_UserCreated           string `db:"M_UserCreated"`
-	M_UserCreatedUserID     int    `db:"M_UserCreatedUserID"`
-	M_UserLastUpdated       string `db:"M_UserLastUpdated"`
-	M_UserLastUpdatedUserID int    `db:"M_UserLastUpdatedUserID"`
-	M_UserDeletedUserID     int    `db:"M_UserDeletedUserID"`
-	M_UserDeleted           string `db:"M_UserDeleted"`
-	M_UserM_UserGroupID     int    `db:"M_UserM_UserGroupID"`
-	M_UserGroupID           int    `db:"M_UserGroupID"`
-	M_UserGroupCode         string `db:"M_UserGroupCode"`
-	M_UserGroupName         string `db:"M_UserGroupName"`
-}
-
-// form component
-type UserFormComponent struct {
-	IDComponent         string
-	Link                string
-	HxTarget            string
-	HxSwap              string
-	HxInclude           string
-	ModalID             string
-	ModalTitle          string
-	InputEmail          CustomTextFieldv2Prm
-	InputPassword       CustomTextFieldv2Prm
-	InputNamaStaff      CustomTextFieldv2Prm
-	InputID             CustomTextFieldv2Prm
-	DropdownUserGroup   CustomDropdownv1Prm
-	DropdownReportGroup CustomDropdownv1Prm
-	DialogBody          templ.Component
-	DialogAction        templ.Component
-	ButtonCLose         templ.Component
-}
-
-type UserFormConfirmation struct {
-	IDComponent  string
-	Link         string
-	HxTarget     string
-	HxSwap       string
-	HxInclude    string
-	ModalID      string
-	ModalTitle   string
-	DialogBody   templ.Component
-	DialogAction templ.Component
-	ButtonCLose  templ.Component
-}
--- a/services/dev/mastermenuuser.services.go
+++ b/services/dev/mastermenuuser.services.go
@@ -5,6 +5,7 @@ import (
 	"cpone/models"
 	"fmt"
 	"math"
+	"strconv"
 	"strings"

 	dbx "cpone/package/database"
@@ -12,19 +13,18 @@ import (
 	"go.uber.org/zap"
 )

-func NewServicesMasterMenuUser(uStore db.AppStore) *ServicesMasterMenuUser {
+func NewServicesGroupResult(uStore db.AppStore) *ServicesGroupResult {

-	return &ServicesMasterMenuUser{
-
-		MasterMenuUserStore: uStore,
+	return &ServicesGroupResult{
+		GroupResultStore: uStore,
 	}
 }

-type ServicesMasterMenuUser struct {
-	MasterMenuUserStore db.AppStore
+type ServicesGroupResult struct {
+	GroupResultStore db.AppStore
 }

-func (su *ServicesMasterMenuUser) GetMasterMenus() ([]MasterMenu, error) {
+func (su *ServicesGroupResult) GetMasterMenus() ([]MasterMenu, error) {

 	// dummyBreadcrumb := []Breadcrumb{
 	// 	{
@@ -526,7 +526,7 @@ func (su *ServicesMasterMenuUser) GetMasterMenus() ([]MasterMenu, error) {
 	return dummyMenu, nil
 }

-func (ug *ServicesMasterMenuUser) GetUserGroup() ([]models.UserGroup, error) {
+func (ug *ServicesGroupResult) GetUserGroup() ([]models.UserGroup, error) {
 	data := []models.UserGroup{
 		{UserGroupID: 1, UserGroupKode: "A", UserGroupName: "UG1"},
 		{UserGroupID: 2, UserGroupKode: "B", UserGroupName: "UG2"},
@@ -535,7 +535,7 @@ func (ug *ServicesMasterMenuUser) GetUserGroup() ([]models.UserGroup, error) {
 	return data, nil
 }

-func (su *ServicesMasterMenuUser) GetListBreadCrumb(title string) (models.BreadCrumbV1, error) {
+func (su *ServicesGroupResult) GetListBreadCrumb(title string) (models.BreadCrumbV1, error) {
 	var ret models.BreadCrumbV1

 	dummyBreadcrumb := []models.BreadCrumbV1{
@@ -574,6 +574,24 @@ func (su *ServicesMasterMenuUser) GetListBreadCrumb(title string) (models.BreadC
 				},
 			},
 		},
+
+		{
+			Title: "Master Group Result",
+			Item: []models.ItemBreadCrumbV1{
+				{
+					Item: "Dashboard",
+					Url:  "/dev/dashboard",
+				},
+				{
+					Item: "Master",
+					Url:  "/dev/master",
+				},
+				{
+					Item: "Group Result",
+					Url:  "",
+				},
+			},
+		},
 	}

 	for _, breadcrumb := range dummyBreadcrumb {
@@ -590,394 +608,271 @@ func (su *ServicesMasterMenuUser) GetListBreadCrumb(title string) (models.BreadC
 	return ret, nil
 }

-// try
-func (su *ServicesMasterMenuUser) GetListMasterUserGroup() ([]models.UserGroupV1, error) {
-	var userGroupList []models.UserGroupV1
-
-	query := `
-		SELECT
-			ROW_NUMBER() OVER () AS nomor,
-			M_UserGroupID,
-			M_UserGroupCode,
-			M_UserGroupName,
-			M_UserGroupCreated,
-			M_UserGroupLastUpdated,
-			M_UserGroupIsActive
-		FROM m_usergroup
-		WHERE M_UserGroupIsActive = 'Y'
-		order by M_UserGroupID ASC
-	`
-
-	if err := dbx.Handlex.Select(&userGroupList, query); err != nil {
-		return nil, fmt.Errorf("error querying database: %v", err)
+// (LAB, NONLAB, FISIK, DOCTOR)
+// hardcore group result resume mcu
+func (ug *ServicesGroupResult) GetGroupResultResumeMcu() ([]models.GroupResultResumeMcu, error) {
+	data := []models.GroupResultResumeMcu{
+		{
+			ID:   1,
+			Text: "LAB",
+		},
+		{
+			ID:   2,
+			Text: "NONLAB",
+		},
+		{
+			ID:   3,
+			Text: "FISIK",
+		},
+		{
+			ID:   4,
+			Text: "DOCTOR",
+		},
 	}
-
-	return userGroupList, nil
-}
-
-func (su *ServicesMasterMenuUser) GetListMasterUser(searchDropdown string) ([]models.MasterUser, error) {
-	var userList []models.MasterUser
-
-	query := `
-		SELECT 
-			ROW_NUMBER() OVER () AS nomor,
-			IFNULL(M_UserEmail, '') AS M_UserEmail,
-			IFNULL(M_UserFullName, '') AS M_UserFullName,
-			IFNULL(M_UserLastAccess, '') AS M_UserLastAccess,
-			IFNULL(M_UserIsLoggedIn, '') AS M_UserIsLoggedIn,
-			IFNULL(M_UserActiveToken, '') AS M_UserActiveToken,
-			IFNULL(M_UserExpiredToken, '') AS M_UserExpiredToken,
-			IFNULL(M_UserIsActive, '') AS M_UserIsActive,
-			IFNULL(M_UserCreated, '') AS M_UserCreated,
-			IFNULL(M_UserCreatedUserID, '') AS M_UserCreatedUserID,
-			IFNULL(M_UserLastUpdated, '') AS M_UserLastUpdated,
-			IFNULL(M_UserLastUpdatedUserID, '') AS M_UserLastUpdatedUserID,
-			IFNULL(M_UserDeletedUserID, '') AS M_UserDeletedUserID,
-			IFNULL(M_UserDeleted, '') AS M_UserDeleted,
-			IFNULL(M_UserGroupCode, '') AS M_UserGroupCode,
-			IFNULL(M_UserGroupName, '') AS M_UserGroupName,
-			IFNULL(M_UserM_UserGroupID, '') AS M_UserM_UserGroupID,
-			IFNULL(M_UserGroupID, '') AS M_UserGroupID
-		FROM 
-			m_user 
-		JOIN m_usergroup
-		ON M_UserM_UserGroupID = M_UserGroupID
-		AND M_UserIsActive = 'Y'
-		AND M_UserGroupIsActive = 'Y'
-	`
-
-	if searchDropdown != "0" && searchDropdown != "" {
-		query += fmt.Sprintf("AND M_UserGroupID = '%s'", searchDropdown)
-	}
-
-	query += " ORDER BY M_UserID  ASC"
-
-	if err := dbx.Handlex.Select(&userList, query); err != nil {
-		return nil, fmt.Errorf("error querying database: %v", err)
-	}
-
-	return userList, nil
-}
-
-func (su *ServicesMasterMenuUser) GetListMasterUserFilteredBySearch(search string, searchDropdown string) ([]models.MasterUser, error) {
-	var userList []models.MasterUser
-
-	query := `
-		SELECT 
-			ROW_NUMBER() OVER () AS nomor,
-			M_UserID,
-			IFNULL(M_UserEmail, '') AS M_UserEmail,
-			IFNULL(M_UserFullName, '') AS M_UserFullName,
-			IFNULL(M_UserLastAccess, '') AS M_UserLastAccess,
-			IFNULL(M_UserIsLoggedIn, '') AS M_UserIsLoggedIn,
-			IFNULL(M_UserActiveToken, '') AS M_UserActiveToken,
-			IFNULL(M_UserExpiredToken, '') AS M_UserExpiredToken,
-			IFNULL(M_UserIsActive, '') AS M_UserIsActive,
-			IFNULL(M_UserCreated, '') AS M_UserCreated,
-			IFNULL(M_UserCreatedUserID, '') AS M_UserCreatedUserID,
-			IFNULL(M_UserLastUpdated, '') AS M_UserLastUpdated,
-			IFNULL(M_UserLastUpdatedUserID, '') AS M_UserLastUpdatedUserID,
-			IFNULL(M_UserDeletedUserID, '') AS M_UserDeletedUserID,
-			IFNULL(M_UserDeleted, '') AS M_UserDeleted,
-			IFNULL(M_UserGroupCode, '') AS M_UserGroupCode,
-			IFNULL(M_UserGroupName, '') AS M_UserGroupName,
-			IFNULL(M_UserM_UserGroupID, '') AS M_UserM_UserGroupID,
-			IFNULL(M_UserGroupID, '') AS M_UserGroupID
-		FROM 
-			m_user 
-		JOIN m_usergroup
-		ON M_UserM_UserGroupID = M_UserGroupID
-		AND M_UserIsActive = 'Y'
-		AND M_UserGroupIsActive = 'Y'
-	`
-
-	// check jika parameter search nya tidak kosong
-	if search != "" || (searchDropdown != "0" && searchDropdown != "") {
-		query += fmt.Sprintf(" AND (M_UserFullName LIKE '%%%s%%' OR M_UserEmail LIKE '%%%s%%')", search, search)
-	}
-
-	if searchDropdown != "0" && searchDropdown != "" {
-		query += fmt.Sprintf(" AND M_UserGroupID = '%s' ", searchDropdown)
-	} else {
-		search = "%%"
-	}
-
-	query += " ORDER BY M_UserID  ASC"
-
-	logger, _ := zap.NewProduction()
-	defer logger.Sync()
-	logger.Info("QUERY SEARCH ONlY FOR COUNT TOTAL PAGES PAGINATION",
-		zap.String("query search", query),
-	)
-
-	if err := dbx.Handlex.Select(&userList, query); err != nil {
-		return nil, fmt.Errorf("error querying database: %v", err)
-	}
-
-	return userList, nil
-}
-
-func (su *ServicesMasterMenuUser) GetListMasterUserPagination(search string, searchDropdown string, currentPage int, rowPerPage int) ([]models.MasterUser, error) {
-	var userList []models.MasterUser
-
-	query := `
-		SELECT 
-			ROW_NUMBER() OVER () AS nomor,
-			M_UserID,
-			IFNULL(M_UserEmail, '') AS M_UserEmail,
-			IFNULL(M_UserFullName, '') AS M_UserFullName,
-			IFNULL(M_UserLastAccess, '') AS M_UserLastAccess,
-			IFNULL(M_UserIsLoggedIn, '') AS M_UserIsLoggedIn,
-			IFNULL(M_UserActiveToken, '') AS M_UserActiveToken,
-			IFNULL(M_UserExpiredToken, '') AS M_UserExpiredToken,
-			IFNULL(M_UserIsActive, '') AS M_UserIsActive,
-			IFNULL(M_UserCreated, '') AS M_UserCreated,
-			IFNULL(M_UserCreatedUserID, '') AS M_UserCreatedUserID,
-			IFNULL(M_UserLastUpdated, '') AS M_UserLastUpdated,
-			IFNULL(M_UserLastUpdatedUserID, '') AS M_UserLastUpdatedUserID,
-			IFNULL(M_UserDeletedUserID, '') AS M_UserDeletedUserID,
-			IFNULL(M_UserDeleted, '') AS M_UserDeleted,
-			IFNULL(M_UserGroupCode, '') AS M_UserGroupCode,
-			IFNULL(M_UserGroupName, '') AS M_UserGroupName,
-			IFNULL(M_UserM_UserGroupID, '') AS M_UserM_UserGroupID,
-			IFNULL(M_UserGroupID, '') AS M_UserGroupID
-		FROM 
-			m_user 
-		JOIN m_usergroup
-		ON M_UserM_UserGroupID = M_UserGroupID
-		AND M_UserIsActive = 'Y'
-		AND M_UserGroupIsActive = 'Y'
-	`
-
-	// rmaxPerPage := 2
-	// rpage := (currentPage - 1) * rmaxPerPage
-
-	offset := (currentPage - 1) * rowPerPage
-	// offset := currentPage
-
-	if search != "" {
-		query += fmt.Sprintf(" AND (M_UserEmail LIKE '%%%s%%' OR M_UserFullName LIKE '%%%s%%')", search, search)
-	}
-	if searchDropdown != "0" && searchDropdown != "" {
-		query += fmt.Sprintf(" AND M_UserGroupID = '%s' ", searchDropdown)
-	} else {
-		search = "%%"
-	}
-
-	query += fmt.Sprintf(" ORDER BY M_UserID ASC LIMIT %d OFFSET %d", rowPerPage, offset)
-
-	logger, _ := zap.NewProduction()
-	defer logger.Sync()
-	logger.Info("QUERY SEARCH WITH PAGINATION",
-		zap.String("query search", query),
-	)
-
-	if err := dbx.Handlex.Select(&userList, query); err != nil {
-		return nil, fmt.Errorf("error querying database: %v", err)
-	}
-
-	return userList, nil
-}
-
-func (su *ServicesMasterMenuUser) GetListMasterUserGroupSearch() ([]models.UserGroupV1, error) {
-	var userGroupList []models.UserGroupV1
-
-	query := `
-		SELECT
-			ROW_NUMBER() OVER () AS nomor,
-			M_UserGroupID,
-			M_UserGroupCode,
-			M_UserGroupName,
-			M_UserGroupCreated,
-			M_UserGroupLastUpdated,
-			M_UserGroupIsActive
-		FROM m_usergroup
-		WHERE M_UserGroupIsActive = 'Y'
-	`
-	query += " order by M_UserGroupID ASC"
-
-	if err := dbx.Handlex.Select(&userGroupList, query); err != nil {
-		return nil, fmt.Errorf("error querying database: %v", err)
-	}
-
-	return userGroupList, nil
+	return data, nil
 }

 // versi 2
-func (su *ServicesMasterMenuUser) GetUserGroupData() ([]models.UserGroupV1, error) {
+func (su *ServicesGroupResult) GetListGroupResult(search string, currentPage int, rowPerPage int) ([]models.GroupResult, int, error) {
+	var groupresultList []models.GroupResult

 	logger, _ := zap.NewProduction()
 	defer logger.Sync()

-	var userList []models.UserGroupV1
-
-	queryList := `
-	SELECT *
-		FROM m_usergroup
-		WHERE M_UserGroupIsActive = 'Y'
-	order by M_UserGroupID ASC
-	LIMIT 0, 1
-	`
-
-	logger.Info("QUERY SEARCH INITIAL DATA USERGROUP",
-		zap.String("query search", queryList),
-	)
-
-	if err := dbx.Handlex.Select(&userList, queryList); err != nil {
-		return nil, fmt.Errorf("error querying database initial USERGROUP: %v", err)
-	}
-
-	return userList, nil
-}
-
-func (su *ServicesMasterMenuUser) GetListMasterUserV2(search string, usergroup string, currentPage int, rowPerPage int) ([]models.MasterUser, int, error) {
-
-	logger, _ := zap.NewProduction()
-	defer logger.Sync()
-
-	var userList []models.MasterUser
 	var totalData int
 	offset := (currentPage - 1) * rowPerPage
-	var searchUserGroup string = ""
-	if usergroup != "0" {
-		searchUserGroup = usergroup
-	}

 	prm := "%" + strings.TrimSpace(search) + "%"
-
-	// search dropdown dan inputan search
-	if usergroup != "0" {
-		querytotal := `
+	querytotal := `
 		SELECT COUNT(*) 
-		FROM m_user
-		JOIN m_usergroup
-			ON M_UserM_UserGroupID = M_UserGroupID
-			AND M_UserIsActive = 'Y'
-			AND M_UserGroupIsActive = 'Y'
-			AND (M_UserFullName LIKE ? OR M_UserEmail LIKE ?) 
-			AND M_UserGroupID = ?
-		JOIN r_reportgroup
-			ON M_UserR_ReportGroupID = R_ReportGroupID
-			AND R_ReportGroupIsActive = 'Y'
+		FROM group_result
+		WHERE Group_ResultIsActive = 'Y'
+		AND (Group_ResultName LIKE ? OR Group_ResultResumeMcu LIKE ?) 
 	`

-		logger.Info("QUERY SEARCH INITIAL TOTAL COUNT",
-			zap.String("query search", querytotal),
-		)
+	logger.Info("QUERY SEARCH INITIAL TOTAL COUNT",
+		zap.String("query search", querytotal),
+	)

-		if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm, searchUserGroup); err != nil {
-			return nil, 0, fmt.Errorf("error querying database: %v", err)
-		}
-		query := `
+	if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm); err != nil {
+		return nil, 0, fmt.Errorf("error querying database: %v", err)
+	}
+
+	query := `
 		SELECT
 			ROW_NUMBER() OVER () AS nomor,
-			M_UserID,
-			IFNULL(M_UserEmail, '') AS M_UserEmail,
-			IFNULL(M_UserFullName, '') AS M_UserFullName,
-			IFNULL(M_UserLastAccess, '') AS M_UserLastAccess,
-			IFNULL(M_UserIsLoggedIn, '') AS M_UserIsLoggedIn,
-			IFNULL(M_UserActiveToken, '') AS M_UserActiveToken,
-			IFNULL(M_UserExpiredToken, '') AS M_UserExpiredToken,
-			IFNULL(M_UserIsActive, '') AS M_UserIsActive,
-			IFNULL(M_UserCreated, '') AS M_UserCreated,
-			IFNULL(M_UserCreatedUserID, '') AS M_UserCreatedUserID,
-			IFNULL(M_UserLastUpdated, '') AS M_UserLastUpdated,
-			IFNULL(M_UserLastUpdatedUserID, '') AS M_UserLastUpdatedUserID,
-			IFNULL(M_UserDeletedUserID, '') AS M_UserDeletedUserID,
-			IFNULL(M_UserDeleted, '') AS M_UserDeleted,
-			IFNULL(M_UserGroupCode, '') AS M_UserGroupCode,
-			IFNULL(M_UserGroupName, '') AS M_UserGroupName,
-			IFNULL(M_UserM_UserGroupID, '') AS M_UserM_UserGroupID,
-			IFNULL(M_UserGroupID, '') AS M_UserGroupID,
-			M_UserIsActive
-		FROM m_user
-		JOIN m_usergroup
-			ON M_UserM_UserGroupID = M_UserGroupID
-			AND M_UserIsActive = 'Y'
-			AND M_UserGroupIsActive = 'Y'
-			AND (M_UserFullName LIKE ? OR M_UserEmail LIKE ?) 
-			AND M_UserGroupID = ?
-		JOIN r_reportgroup
-			ON M_UserR_ReportGroupID = R_ReportGroupID
-			AND R_ReportGroupIsActive = 'Y'
-		order by M_UserID ASC
+			Group_ResultID,
+			IFNULL(Group_ResultName, '') AS Group_ResultName,
+			IFNULL(Group_ResultFlagPerTest, '') AS Group_ResultFlagPerTest,
+			IFNULL(Group_ResultFlagNonLab, '') AS Group_ResultFlagNonLab,
+			IFNULL(Group_ResultResumeMcu, '') AS Group_ResultResumeMcu,
+			Group_ResultIsActive
+		FROM group_result
+		WHERE Group_ResultIsActive = 'Y'
+		AND (Group_ResultName LIKE ? OR Group_ResultResumeMcu LIKE ?) 
+		ORDER BY Group_ResultID ASC
 		LIMIT ? OFFSET ?
 	`

-		logger.Info("QUERY SEARCH INITIAL",
-			zap.String("query search", query),
-		)
+	logger.Info("QUERY SEARCH INITIAL",
+		zap.String("query search", query),
+	)

-		if err := dbx.Handlex.Select(&userList, query, prm, prm, searchUserGroup, rowPerPage, offset); err != nil {
-			return nil, 0, fmt.Errorf("error querying database: %v", err)
-		}
-	} else {
-		// search hanya inputan search
-		querytotal := `
-		SELECT COUNT(*) 
-		FROM m_user
-		JOIN m_usergroup
-			ON M_UserM_UserGroupID = M_UserGroupID
-			AND M_UserIsActive = 'Y'
-			AND M_UserGroupIsActive = 'Y'
-			AND (M_UserFullName LIKE ? OR M_UserEmail LIKE ?) 
-		JOIN r_reportgroup
-			ON M_UserR_ReportGroupID = R_ReportGroupID
-			AND R_ReportGroupIsActive = 'Y'
-	`
-
-		logger.Info("QUERY SEARCH INITIAL TOTAL COUNT",
-			zap.String("query search", querytotal),
-		)
-
-		if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm); err != nil {
-			return nil, 0, fmt.Errorf("error querying database: %v", err)
-		}
-		query := `
-		SELECT
-			ROW_NUMBER() OVER () AS nomor,
-			M_UserID,
-			IFNULL(M_UserEmail, '') AS M_UserEmail,
-			IFNULL(M_UserFullName, '') AS M_UserFullName,
-			IFNULL(M_UserLastAccess, '') AS M_UserLastAccess,
-			IFNULL(M_UserIsLoggedIn, '') AS M_UserIsLoggedIn,
-			IFNULL(M_UserActiveToken, '') AS M_UserActiveToken,
-			IFNULL(M_UserExpiredToken, '') AS M_UserExpiredToken,
-			IFNULL(M_UserIsActive, '') AS M_UserIsActive,
-			IFNULL(M_UserCreated, '') AS M_UserCreated,
-			IFNULL(M_UserCreatedUserID, '') AS M_UserCreatedUserID,
-			IFNULL(M_UserLastUpdated, '') AS M_UserLastUpdated,
-			IFNULL(M_UserLastUpdatedUserID, '') AS M_UserLastUpdatedUserID,
-			IFNULL(M_UserDeletedUserID, '') AS M_UserDeletedUserID,
-			IFNULL(M_UserDeleted, '') AS M_UserDeleted,
-			IFNULL(M_UserGroupCode, '') AS M_UserGroupCode,
-			IFNULL(M_UserGroupName, '') AS M_UserGroupName,
-			IFNULL(M_UserM_UserGroupID, '') AS M_UserM_UserGroupID,
-			IFNULL(M_UserGroupID, '') AS M_UserGroupID,
-			M_UserIsActive
-		FROM m_user
-		JOIN m_usergroup
-			ON M_UserM_UserGroupID = M_UserGroupID
-			AND M_UserIsActive = 'Y'
-			AND M_UserGroupIsActive = 'Y'
-			AND (M_UserFullName LIKE ? OR M_UserEmail LIKE ?) 
-		JOIN r_reportgroup
-			ON M_UserR_ReportGroupID = R_ReportGroupID
-			AND R_ReportGroupIsActive = 'Y'
-		order by M_UserID ASC
-		LIMIT ? OFFSET ?
-	`
-
-		logger.Info("QUERY SEARCH INITIAL",
-			zap.String("query search", query),
-		)
-
-		if err := dbx.Handlex.Select(&userList, query, prm, prm, rowPerPage, offset); err != nil {
-			return nil, 0, fmt.Errorf("error querying database: %v", err)
-		}
+	if err := dbx.Handlex.Select(&groupresultList, query, prm, prm, rowPerPage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error querying database: %v", err)
 	}

 	totalPage := int(math.Ceil(float64(totalData) / float64(rowPerPage)))

-	return userList, totalPage, nil
+	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 
+	Group_ResultID,
+    Group_ResultName,
+    CASE 
+        WHEN Group_ResultFlagPerTest = 'Y' THEN 'on' 
+        ELSE Group_ResultFlagPerTest 
+    END AS Group_ResultFlagPerTest,
+    CASE 
+        WHEN Group_ResultFlagNonLab = 'Y' THEN 'on' 
+        ELSE Group_ResultFlagNonLab 
+    END AS Group_ResultFlagNonLab,
+    Group_ResultResumeMcu,
+    Group_ResultIsActive
+	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
+}
+
+// EDIT DATA
+func (ug *ServicesGroupResult) EditGroupResult(id string, groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, groupresultresumemcu string) (models.GroupResult, error) {
+	logger, _ := zap.NewProduction()
+	var data models.GroupResult
+	var datacek []models.GroupResult
+
+	prm := "%" + strings.TrimSpace(groupresultname) + "%"
+	qryCek := `SELECT Group_ResultName FROM group_result WHERE Group_ResultName LIKE ? AND Group_ResultIsActive = 'Y' AND Group_ResultID <> ?`
+	err := dbx.Handlex.Select(&datacek, qryCek, prm, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error cek data by code",
+			zap.String("groupresultname", groupresultname),
+			zap.Any("datacek", datacek),
+		)
+		return data, fmt.Errorf("QUERY_FAILED")
+	}
+	if len(datacek) > 0 {
+		defer logger.Sync()
+		logger.Error("Code already taken by another data",
+			zap.String("groupresultname", groupresultname),
+		)
+		return data, fmt.Errorf("group result name sudah dipakai")
+	}
+
+	qry := `UPDATE group_result
+			SET Group_ResultName = ?,
+			Group_ResultFlagPerTest = ?,
+			Group_ResultFlagNonLab = ?,
+			Group_ResultResumeMcu = ?
+			WHERE Group_ResultID = ?`
+	// time.Sleep(5 * time.Second)
+	rst := dbx.Handlex.MustExec(qry, groupresultname, groupresultflagpertest, groupresultflagnonlab, groupresultresumemcu, id)
+	_, err = rst.RowsAffected()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error Update group result",
+			zap.Any("groupresultname", groupresultname),
+			zap.Any("groupresultflagpertest", groupresultflagpertest),
+			zap.Any("groupresultflagnonlab", groupresultflagnonlab),
+			zap.Any("groupresultresumemcu", groupresultresumemcu),
+		)
+		return data, fmt.Errorf("QUERY_FAILED")
+	}
+
+	data, err = ug.GetGroupResultByIDV1(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get group result 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
+}
+
+// DELETE DATA
+func (ug *ServicesGroupResult) DeleteGroupResult(id string) (models.GroupResult, error) {
+	logger, _ := zap.NewProduction()
+	var data models.GroupResult
+	qry := `UPDATE group_result
+			SET Group_ResultIsActive = 'N'
+			WHERE Group_ResultID = ?;`
+	// time.Sleep(5 * time.Second)
+	rst := dbx.Handlex.MustExec(qry, id)
+	_, err := rst.RowsAffected()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error delete group result",
+			zap.String("id", id),
+		)
+		return data, fmt.Errorf("QUERY_FAILED")
+	}
+
+	data, err = ug.GetGroupResultByIDV1(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get group result by id",
+			zap.String("id", id),
+		)
+		return data, fmt.Errorf("QUERY_FAILED")
+	}
+	return data, nil
 }
--- a/views/dev/mastermenuuser/mastermenuuser.templ
+++ b/views/dev/mastermenuuser/mastermenuuser.templ
@@ -1,4 +1,4 @@
-package mastermenuuser
+package groupresult

 import (
 	"cpone/layout"
@@ -10,11 +10,10 @@ import (
 )

 // "cpone/component/sidebar_user_profile"
-templ ContentMasterMenuUserV1(
+templ ContentGroupResultV1(
 	tableID string,
 	paginationID string,
 	searchID string,
-	dropdownID string,
 	dialogAddID string,
 	dialogAddBodyID string,
 	dialogEditID string,
@@ -23,9 +22,8 @@ templ ContentMasterMenuUserV1(
 	dialogDeleteBodyID string,
 	breadcrumb templ.Component,
 	tablecontent templ.Component,
-	filterUser templ.Component,
-	filterUserGroup templ.Component,
-	paginationUser templ.Component,
+	filter templ.Component,
+	paginationGroupResult templ.Component,
 	modaladdform templ.Component,
 	modalEditform templ.Component,
 	modalDeleteform templ.Component,
@@ -39,10 +37,6 @@ templ ContentMasterMenuUserV1(
 			Name:  "paginationID",
 			Type:  "hidden",
 			Value: paginationID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dropdownID",
-			Name:  "dropdownID",
-			Type:  "hidden",
-			Value: dropdownID})
 		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "searchID",
 			Name:  "searchID",
 			Type:  "hidden",
@@ -95,18 +89,10 @@ templ ContentMasterMenuUserV1(
 				>Add New</button>
 			</div>
 		</div>
-		// @filterUser
-		<div class="row">
-			<div class="col-6">
-				@filterUserGroup
-			</div>
-			<div class="col-6">
-				@filterUser
-			</div>
-		</div>
+		@filter
 		// table content
 		@tablecontent
-		@paginationUser
+		@paginationGroupResult
 		<div class="d-flex justify-content-center text-primary">
 			<div class="htmx-indicator spinner-border text-primary" role="status" id="indicator">
 				<span class="sr-only"></span>
@@ -119,11 +105,11 @@ templ ContentMasterMenuUserV1(
 		@modalEditform
 		@modalDeleteform
 		// @modalcomponent.Modal("dialogEdit", "Edit - User Group", DialogEditBody("", ""), DialogEditAction(), BtnCloseNew())
-		@JSkuMasterUserV1()
+		@JSkuGroupResultV1()
 	</div>
 }

-templ TableRowMasterUserV1(data []models.MasterUser,
+templ TableRowGroupResultV1(data []models.GroupResult,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -139,11 +125,12 @@ templ TableRowMasterUserV1(data []models.MasterUser,
 	}
 	for _, v := range data {
 		<tr>
-			<td>{ v.M_UserEmail }</td>
-			<td>{ v.M_UserFullName }</td>
-			<td>{ v.M_UserGroupName }</td>
+			<td>{ v.Group_ResultName }</td>
+			<td>{ v.Group_ResultFlagPerTest }</td>
+			<td>{ v.Group_ResultFlagNonLab }</td>
+			<td>{ v.Group_ResultResumeMcu }</td>
 			<td>
-				@TableAction(v.M_UserID, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete)
+				@TableAction(v.Group_ResultID, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete)
 			</td>
 		</tr>
 	}
@@ -192,7 +179,7 @@ templ TableAction(
 	</div>
 }

-templ DialogDeleteMasterUserActionV1() {
+templ DialogDeleteGroupResultActionV1() {
 	<div>
 		<button
 			type="button"
@@ -210,7 +197,7 @@ templ DialogDeleteMasterUserActionV1() {
 	</div>
 }

-templ BtnCloseDeleteMasterUserV1() {
+templ BtnCloseDeleteGroupResultV1() {
 	<button
 		type="button"
 		class="close"
@@ -221,7 +208,7 @@ templ BtnCloseDeleteMasterUserV1() {
 	</button>
 }

-templ JSkuMasterUserV1() {
+templ JSkuGroupResultV1() {
 	<script>
 		 function ShowLoading(evt) {
        document
@@ -243,7 +230,7 @@ templ JSkuMasterUserV1() {
 	</script>
 }

-templ CssMasterMenuUserV1x() {
+templ CssMasterGroupResultV1x() {
 	<link
 		rel="stylesheet"
 		href="assets/css/googlefont/poppins.css"
@@ -273,16 +260,23 @@ templ CssMasterMenuUserV1x() {
    #title {
        font-weight: 600;
    }
+	.dropdown-menu{
+		transform: translate3d(0px, 35px, 0px)!important;
+	}
 </style>
 }

 // for item dropdown
-templ ItemDropdown(dataDropdown []models.UserGroupV1) {
+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.M_UserGroupID) }>{ v.M_UserGroupName }</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>
+			}
 		}
 	}
 }
@@ -292,7 +286,7 @@ templ EmptyDiv1() {
 	<div></div>
 }

-templ ShowMasterMenuUserV1x(title string, cmp templ.Component, css templ.Component, js templ.Component,
+templ ShowGroupResultV1x(title string, cmp templ.Component, css templ.Component, js templ.Component,
 	navbarmenu templ.Component,
 	navbaruser templ.Component,
 	userprofile templ.Component) {
@@ -302,7 +296,7 @@ templ ShowMasterMenuUserV1x(title string, cmp templ.Component, css templ.Compone
 }

 // table
-templ TableUser(data []models.MasterUser, tableID string,
+templ TableGroupResult(data []models.GroupResult, tableID string,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -312,18 +306,18 @@ templ TableUser(data []models.MasterUser, tableID string,
 	hxSwapDelete string,
 	hxIncludeDelete string) {
 	<div id={ tableID } hx-swap-oob="true">
-		@tablecomponent.TableV3([]string{"EMAIL", "NAMA STAFF", "USERGROUP", "AKSI"},
-			[]string{"30%", "30%", "20%", "20%"},
-			TableRowMasterUserV1(data, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete))
+		@tablecomponent.TableV3([]string{"GROUP RESULT NAME", "RESULT FLAG PER TEST", "RESULT FLAG NON LAB", "RESULT RESUME MCU", "AKSI"},
+			[]string{"20%", "20%", "20%", "20%", "20%"},
+			TableRowGroupResultV1(data, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete))
 	</div>
 }

-templ SwapTableUser(pagination templ.Component, table templ.Component) {
+templ SwapTableGroupResult(pagination templ.Component, table templ.Component) {
 	@pagination
 	@table
 }

-templ UserForm(data models.UserFormComponent) {
+templ GroupResultForm(data models.GroupResultFormComponent) {
 	<div class="">
 		<form
 			id={ data.IDComponent }
--- a/views/dev/mastermenuuser/mastermenuuser_templ.go
+++ b/views/dev/mastermenuuser/mastermenuuser_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

 // templ: version: v0.2.663
-package mastermenuuser
+package groupresult

 //lint:file-ignore SA4006 This context is only used if a nested component is present.

@@ -20,11 +20,10 @@ import (
 )

 // "cpone/component/sidebar_user_profile"
-func ContentMasterMenuUserV1(
+func ContentGroupResultV1(
 	tableID string,
 	paginationID string,
 	searchID string,
-	dropdownID string,
 	dialogAddID string,
 	dialogAddBodyID string,
 	dialogEditID string,
@@ -33,9 +32,8 @@ func ContentMasterMenuUserV1(
 	dialogDeleteBodyID string,
 	breadcrumb templ.Component,
 	tablecontent templ.Component,
-	filterUser templ.Component,
-	filterUserGroup templ.Component,
-	paginationUser templ.Component,
+	filter templ.Component,
+	paginationGroupResult templ.Component,
 	modaladdform templ.Component,
 	modalEditform templ.Component,
 	modalDeleteform templ.Component,
@@ -70,13 +68,6 @@ func ContentMasterMenuUserV1(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dropdownID",
-			Name:  "dropdownID",
-			Type:  "hidden",
-			Value: dropdownID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "searchID",
 			Name:  "searchID",
 			Type:  "hidden",
@@ -141,7 +132,7 @@ func ContentMasterMenuUserV1(
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogAddID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 85, Col: 37}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 79, Col: 37}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -154,29 +145,17 @@ func ContentMasterMenuUserV1(
 		var templ_7745c5c3_Var3 string
 		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogAddID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 94, Col: 36}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 88, Col: 36}
 		}
 		_, 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("\">Add New</button></div></div><div class=\"row\"><div class=\"col-6\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Add New</button></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = filterUserGroup.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"col-6\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = filterUser.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		templ_7745c5c3_Err = filter.Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -184,7 +163,7 @@ func ContentMasterMenuUserV1(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = paginationUser.Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = paginationGroupResult.Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -204,7 +183,7 @@ func ContentMasterMenuUserV1(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = JSkuMasterUserV1().Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = JSkuGroupResultV1().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -219,7 +198,7 @@ func ContentMasterMenuUserV1(
 	})
 }

-func TableRowMasterUserV1(data []models.MasterUser,
+func TableRowGroupResultV1(data []models.GroupResult,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -252,9 +231,9 @@ func TableRowMasterUserV1(data []models.MasterUser,
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var5 string
-			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_UserEmail)
+			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.Group_ResultName)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 142, Col: 22}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 128, Col: 27}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 			if templ_7745c5c3_Err != nil {
@@ -265,9 +244,9 @@ func TableRowMasterUserV1(data []models.MasterUser,
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var6 string
-			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_UserFullName)
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.Group_ResultFlagPerTest)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 143, Col: 25}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 129, Col: 34}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 			if templ_7745c5c3_Err != nil {
@@ -278,9 +257,9 @@ func TableRowMasterUserV1(data []models.MasterUser,
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var7 string
-			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_UserGroupName)
+			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.Group_ResultFlagNonLab)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 144, Col: 26}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 130, Col: 33}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 			if templ_7745c5c3_Err != nil {
@@ -290,7 +269,20 @@ func TableRowMasterUserV1(data []models.MasterUser,
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = TableAction(v.M_UserID, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete).Render(ctx, templ_7745c5c3_Buffer)
+			var templ_7745c5c3_Var8 string
+			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.Group_ResultResumeMcu)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 131, Col: 32}
+			}
+			_, 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("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = TableAction(v.Group_ResultID, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -324,21 +316,21 @@ func TableAction(
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var8 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var8 == nil {
-			templ_7745c5c3_Var8 = templ.NopComponent
+		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 class=\"row px-5 d-flex justify-content-around\"><a id=\"btneditug\" type=\"button\" class=\"btneditug col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetEdit + "?id=" + strconv.Itoa(id))
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetEdit + "?id=" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 168, Col: 49}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 155, Col: 49}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -346,12 +338,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 169, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 156, Col: 27}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -359,12 +351,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 170, Col: 23}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 157, Col: 23}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -372,12 +364,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 171, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 158, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -385,12 +377,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var13 string
-		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetDelete + "?id=" + strconv.Itoa(id))
+		var templ_7745c5c3_Var14 string
+		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetDelete + "?id=" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 182, Col: 51}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 169, Col: 51}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -398,12 +390,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
+		var templ_7745c5c3_Var15 string
+		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 183, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 170, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -411,12 +403,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 184, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 171, Col: 25}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -424,12 +416,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 185, Col: 31}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 172, Col: 31}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -444,7 +436,7 @@ func TableAction(
 	})
 }

-func DialogDeleteMasterUserActionV1() templ.Component {
+func DialogDeleteGroupResultActionV1() 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 {
@@ -452,9 +444,9 @@ func DialogDeleteMasterUserActionV1() templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var17 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var17 == nil {
-			templ_7745c5c3_Var17 = templ.NopComponent
+		templ_7745c5c3_Var18 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var18 == nil {
+			templ_7745c5c3_Var18 = 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=\"button\" class=\"btn btn-primary btn-shadow font-weight-bold rounded-lg\">Yakin\r</button></div>")
@@ -468,7 +460,7 @@ func DialogDeleteMasterUserActionV1() templ.Component {
 	})
 }

-func BtnCloseDeleteMasterUserV1() templ.Component {
+func BtnCloseDeleteGroupResultV1() 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 {
@@ -476,9 +468,9 @@ func BtnCloseDeleteMasterUserV1() templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var18 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var18 == nil {
-			templ_7745c5c3_Var18 = templ.NopComponent
+		templ_7745c5c3_Var19 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var19 == nil {
+			templ_7745c5c3_Var19 = 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>")
@@ -492,7 +484,7 @@ func BtnCloseDeleteMasterUserV1() templ.Component {
 	})
 }

-func JSkuMasterUserV1() templ.Component {
+func JSkuGroupResultV1() 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 {
@@ -500,9 +492,9 @@ func JSkuMasterUserV1() templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var19 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var19 == nil {
-			templ_7745c5c3_Var19 = templ.NopComponent
+		templ_7745c5c3_Var20 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var20 == nil {
+			templ_7745c5c3_Var20 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script>\r\n\t\t function ShowLoading(evt) {\r\n        document\r\n          .getElementById(\"modalLoadEdit\")\r\n          .setAttribute(\"style\", \"display:block !important;\");\r\n        document\r\n          .getElementById(\"modalbdyEdit\")\r\n          .setAttribute(\"style\", \"display:none !important;\");\r\n\t\t  console.log(evt);\r\n      }\r\n      function ShowForm() {\r\n        document\r\n          .getElementById(\"modalLoadEdit\")\r\n          .setAttribute(\"style\", \"display:none !important;\");\r\n        document\r\n          .getElementById(\"modalbdyEdit\")\r\n          .setAttribute(\"style\", \"display:block !important;;\");\r\n      }\r\n\t</script>")
@@ -516,32 +508,7 @@ func JSkuMasterUserV1() templ.Component {
 	})
 }

-func CssMasterMenuUserV1x() 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_Var20 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var20 == nil {
-			templ_7745c5c3_Var20 = 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>")
-		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
-	})
-}
-
-// for item dropdown
-func ItemDropdown(dataDropdown []models.UserGroupV1) templ.Component {
+func CssMasterGroupResultV1x() 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 {
@@ -554,6 +521,31 @@ func ItemDropdown(dataDropdown []models.UserGroupV1) 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\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
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+// for item dropdown
+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 {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var22 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var22 == nil {
+			templ_7745c5c3_Var22 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
 		if len(dataDropdown) == 0 {
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<option value=\"0\" disabled selected>Tidak Ada Data</option>")
 			if templ_7745c5c3_Err != nil {
@@ -561,35 +553,68 @@ func ItemDropdown(dataDropdown []models.UserGroupV1) 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_Var22 string
-				templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.M_UserGroupID))
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 285, Col: 48}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
-				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_Var23 string
-				templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_UserGroupName)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 285, Col: 70}
-				}
-				_, 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("</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
+					}
 				}
 			}
 		}
@@ -609,9 +634,9 @@ func EmptyDiv1() templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var24 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var24 == nil {
-			templ_7745c5c3_Var24 = 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>")
@@ -625,7 +650,7 @@ func EmptyDiv1() templ.Component {
 	})
 }

-func ShowMasterMenuUserV1x(title string, cmp templ.Component, css templ.Component, js templ.Component,
+func ShowGroupResultV1x(title string, cmp templ.Component, css templ.Component, js templ.Component,
 	navbarmenu templ.Component,
 	navbaruser templ.Component,
 	userprofile templ.Component) templ.Component {
@@ -636,12 +661,12 @@ func ShowMasterMenuUserV1x(title string, cmp templ.Component, css templ.Componen
 			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_Var28 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var28 == nil {
+			templ_7745c5c3_Var28 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Var26 := 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()
@@ -656,7 +681,7 @@ func ShowMasterMenuUserV1x(title string, cmp templ.Component, css templ.Componen
 			}
 			return templ_7745c5c3_Err
 		})
-		templ_7745c5c3_Err = layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var26), 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
 		}
@@ -668,7 +693,7 @@ func ShowMasterMenuUserV1x(title string, cmp templ.Component, css templ.Componen
 }

 // table
-func TableUser(data []models.MasterUser, tableID string,
+func TableGroupResult(data []models.GroupResult, tableID string,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -684,21 +709,21 @@ func TableUser(data []models.MasterUser, tableID string,
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var27 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var27 == nil {
-			templ_7745c5c3_Var27 = 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_Var28 string
-		templ_7745c5c3_Var28, 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\mastermenuuser\mastermenuuser.templ`, Line: 314, 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_Var28))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -706,9 +731,9 @@ func TableUser(data []models.MasterUser, tableID string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"EMAIL", "NAMA STAFF", "USERGROUP", "AKSI"},
-			[]string{"30%", "30%", "20%", "20%"},
-			TableRowMasterUserV1(data, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete)).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"GROUP RESULT NAME", "RESULT FLAG PER TEST", "RESULT FLAG NON LAB", "RESULT RESUME MCU", "AKSI"},
+			[]string{"20%", "20%", "20%", "20%", "20%"},
+			TableRowGroupResultV1(data, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete)).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -723,7 +748,7 @@ func TableUser(data []models.MasterUser, tableID string,
 	})
 }

-func SwapTableUser(pagination templ.Component, table templ.Component) templ.Component {
+func SwapTableGroupResult(pagination templ.Component, table templ.Component) 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 {
@@ -731,9 +756,9 @@ func SwapTableUser(pagination templ.Component, table templ.Component) templ.Comp
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var29 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var29 == nil {
-			templ_7745c5c3_Var29 = 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,7 +776,7 @@ func SwapTableUser(pagination templ.Component, table templ.Component) templ.Comp
 	})
 }

-func UserForm(data models.UserFormComponent) templ.Component {
+func GroupResultForm(data models.GroupResultFormComponent) 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 {
@@ -759,9 +784,9 @@ func UserForm(data models.UserFormComponent) templ.Component {
 			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_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=\"\">")
@@ -776,12 +801,12 @@ func UserForm(data models.UserFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var31 string
-		templ_7745c5c3_Var31, 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\mastermenuuser\mastermenuuser.templ`, Line: 329, 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_Var31))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -789,12 +814,12 @@ func UserForm(data models.UserFormComponent) 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.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\mastermenuuser\mastermenuuser.templ`, Line: 330, 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_Var32))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -802,12 +827,12 @@ func UserForm(data models.UserFormComponent) 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.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\mastermenuuser\mastermenuuser.templ`, Line: 332, 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_Var33))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -815,12 +840,12 @@ func UserForm(data models.UserFormComponent) 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.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\mastermenuuser\mastermenuuser.templ`, Line: 333, 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_Var34))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -828,12 +853,12 @@ func UserForm(data models.UserFormComponent) 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.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\mastermenuuser\mastermenuuser.templ`, Line: 334, 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_Var35))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var38))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -841,8 +866,8 @@ func UserForm(data models.UserFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var36 templ.ComponentScript = HandleFormBeforeRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var36.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
 		}
@@ -850,8 +875,8 @@ func UserForm(data models.UserFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var37 templ.ComponentScript = HandleFormAfterRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var37.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
 		}
@@ -924,9 +949,9 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var38 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var38 == nil {
-			templ_7745c5c3_Var38 = 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)
@@ -937,12 +962,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var39 string
-		templ_7745c5c3_Var39, 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\mastermenuuser\mastermenuuser.templ`, Line: 374, 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_Var39))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -950,8 +975,8 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var40 templ.ComponentScript = hxOnLoad
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var40.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
 		}
@@ -959,12 +984,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var41 string
-		templ_7745c5c3_Var41, 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\mastermenuuser\mastermenuuser.templ`, Line: 375, 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_Var41))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -977,12 +1002,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(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\mastermenuuser\mastermenuuser.templ`, Line: 380, 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_Var42))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -1000,12 +1025,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_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\mastermenuuser\mastermenuuser.templ`, Line: 386, 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_Var43))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var46))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
--- a/views/dev/groupresult/modaladdgroupresult.templ
+++ b/views/dev/groupresult/modaladdgroupresult.templ
@@ -1,50 +1,53 @@
-package mastermenuuser
+package groupresult

 import (
 	"cpone/models"
 	"cpone/component/customtextfield"
+	"cpone/component/customcheckbox"
 	"cpone/component/customdropdown"
 )

-templ DialogNewBodyV1(
-	inputId models.CustomTextFieldv2Prm,
-	inputUsername models.CustomTextFieldv2Prm,
-	inputPassword models.CustomTextFieldv2Prm,
-	inputUserfullname models.CustomTextFieldv2Prm,
-	inputDropdownUserGroup models.CustomDropdownv1Prm,
-	listItemUserGroup templ.Component,
-	inputDropdownReportGroup models.CustomDropdownv1Prm,
-	listItemReportGroup templ.Component,
+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(
-			inputUsername)
-		@customtextfield.CustomTextFieldv2(
-			inputPassword)
-		@customtextfield.CustomTextFieldv2(
-			inputUserfullname)
+			inputGrName)
+		@customcheckbox.MainCustomCheckboxInput(
+			checkboxGrFlagPerTest)
+		@customcheckbox.MainCustomCheckboxInput(
+			checkboxGrFlagNonLab)
 		@customdropdown.MainCustomDropdownInput(
-			inputDropdownUserGroup, listItemUserGroup)
-		@customdropdown.MainCustomDropdownInput(
-			inputDropdownReportGroup, listItemReportGroup)
+			dropdownGrResumeMcu,
+			listItem)
 	</div>
+	<script>
+    document.addEventListener('htmx:afterSwap', function(event) {
+        // Reinitialize selectpicker after HTMX content swap
+        $('.selectpicker').selectpicker('refresh');
+    });
+    </script>
 }

-script HandleJSModalAddUG(modalID string) {
-	$(modalID).modal('hide')
+script HandleJSModalAddGR(modalID string) {
+	$(modalID).modal('hide');
 }

-script HandleJSModalAddUGShow(modalID string) {
+script HandleJSModalAddGRShow(modalID string) {
 	$(modalID).modal('show')
 }

 templ DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
 	<div>
 		<button
-			hx-on::after-request={ HandleJSModalAddUG(modalID) }
+			hx-on::after-request={ HandleJSModalAddGR(modalID) }
 			hx-post={ LinkClose }
 			hx-target={ targetClose }
 			hx-swap={ hxSwapClose }
@@ -98,7 +101,7 @@ templ BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, mo
 		hx-target={ targetClose }
 		hx-swap={ hxSwapClose }
 		type="button"
-		hx-on::after-request={ HandleJSModalAddUG(modalID) }
+		hx-on::after-request={ HandleJSModalAddGR(modalID) }
 		class="close btnaddact"
 		data-dismiss="modal"
 		aria-label="Close"
--- a/views/dev/groupresult/modaladdgroupresult_templ.go
+++ b/views/dev/groupresult/modaladdgroupresult_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

 // templ: version: v0.2.663
-package mastermenuuser
+package groupresult

 //lint:file-ignore SA4006 This context is only used if a nested component is present.

@@ -11,20 +11,18 @@ import "io"
 import "bytes"

 import (
+	"cpone/component/customcheckbox"
 	"cpone/component/customdropdown"
 	"cpone/component/customtextfield"
 	"cpone/models"
 )

-func DialogNewBodyV1(
-	inputId models.CustomTextFieldv2Prm,
-	inputUsername models.CustomTextFieldv2Prm,
-	inputPassword models.CustomTextFieldv2Prm,
-	inputUserfullname models.CustomTextFieldv2Prm,
-	inputDropdownUserGroup models.CustomDropdownv1Prm,
-	listItemUserGroup templ.Component,
-	inputDropdownReportGroup models.CustomDropdownv1Prm,
-	listItemReportGroup templ.Component,
+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) {
@@ -50,7 +48,7 @@ func DialogNewBodyV1(
 		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\mastermenuuser\modaladduser.templ`, Line: 20, Col: 22}
+			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 {
@@ -75,31 +73,27 @@ func DialogNewBodyV1(
 			return templ_7745c5c3_Err
 		}
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			inputUsername).Render(ctx, templ_7745c5c3_Buffer)
+			inputGrName).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			inputPassword).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(
+			checkboxGrFlagPerTest).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			inputUserfullname).Render(ctx, templ_7745c5c3_Buffer)
+		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(
-			inputDropdownUserGroup, listItemUserGroup).Render(ctx, templ_7745c5c3_Buffer)
+			dropdownGrResumeMcu,
+			listItem).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInput(
-			inputDropdownReportGroup, listItemReportGroup).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		_, 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
 		}
@@ -110,23 +104,23 @@ func DialogNewBodyV1(
 	})
 }

-func HandleJSModalAddUG(modalID string) templ.ComponentScript {
+func HandleJSModalAddGR(modalID string) templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_HandleJSModalAddUG_da6c`,
-		Function: `function __templ_HandleJSModalAddUG_da6c(modalID){$(modalID).modal('hide')
+		Name: `__templ_HandleJSModalAddGR_a6af`,
+		Function: `function __templ_HandleJSModalAddGR_a6af(modalID){$(modalID).modal('hide');
 }`,
-		Call:       templ.SafeScript(`__templ_HandleJSModalAddUG_da6c`, modalID),
-		CallInline: templ.SafeScriptInline(`__templ_HandleJSModalAddUG_da6c`, modalID),
+		Call:       templ.SafeScript(`__templ_HandleJSModalAddGR_a6af`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_HandleJSModalAddGR_a6af`, modalID),
 	}
 }

-func HandleJSModalAddUGShow(modalID string) templ.ComponentScript {
+func HandleJSModalAddGRShow(modalID string) templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_HandleJSModalAddUGShow_3147`,
-		Function: `function __templ_HandleJSModalAddUGShow_3147(modalID){$(modalID).modal('show')
+		Name: `__templ_HandleJSModalAddGRShow_3147`,
+		Function: `function __templ_HandleJSModalAddGRShow_3147(modalID){$(modalID).modal('show')
 }`,
-		Call:       templ.SafeScript(`__templ_HandleJSModalAddUGShow_3147`, modalID),
-		CallInline: templ.SafeScriptInline(`__templ_HandleJSModalAddUGShow_3147`, modalID),
+		Call:       templ.SafeScript(`__templ_HandleJSModalAddGRShow_3147`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_HandleJSModalAddGRShow_3147`, modalID),
 	}
 }

@@ -147,7 +141,7 @@ func DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleJSModalAddUG(modalID))
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleJSModalAddGR(modalID))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -155,7 +149,7 @@ func DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var5 templ.ComponentScript = HandleJSModalAddUG(modalID)
+		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
@@ -167,7 +161,7 @@ func DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string,
 		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\mastermenuuser\modaladduser.templ`, Line: 48, Col: 22}
+			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 {
@@ -180,7 +174,7 @@ func DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string,
 		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\mastermenuuser\modaladduser.templ`, Line: 49, Col: 26}
+			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 {
@@ -193,7 +187,7 @@ func DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string,
 		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\mastermenuuser\modaladduser.templ`, Line: 50, Col: 24}
+			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 {
@@ -271,7 +265,7 @@ func BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, mod
 			templ_7745c5c3_Var11 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleJSModalAddUG(modalID))
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleJSModalAddGR(modalID))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -282,7 +276,7 @@ func BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, mod
 		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\mastermenuuser\modaladduser.templ`, Line: 97, Col: 21}
+			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 {
@@ -295,7 +289,7 @@ func BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, mod
 		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\mastermenuuser\modaladduser.templ`, Line: 98, Col: 25}
+			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 {
@@ -308,7 +302,7 @@ func BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, mod
 		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\mastermenuuser\modaladduser.templ`, Line: 99, Col: 23}
+			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 {
@@ -318,7 +312,7 @@ func BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, mod
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var15 templ.ComponentScript = HandleJSModalAddUG(modalID)
+		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
--- a/views/dev/groupresult/modaleditgroupresult.templ
+++ b/views/dev/groupresult/modaleditgroupresult.templ
@@ -0,0 +1,101 @@
+package groupresult
+
+import (
+	"cpone/models"
+	"cpone/component/customtextfield"
+	"cpone/component/customcheckbox"
+	"cpone/component/customdropdown"
+)
+
+templ DialogEditForm(groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, listItem templ.Component) {
+	@customtextfield.CustomTextFieldv2(
+		models.CustomTextFieldv2Prm{
+			Label:       "Group Result name",
+			Name:        "groupresultid",
+			Placeholder: "Group Result name",
+			Type:        "hidden",
+			ID:          "groupresultid",
+		})
+	@customtextfield.CustomTextFieldv2(
+		models.CustomTextFieldv2Prm{
+			Label:       "Group Result Name",
+			Name:        "groupresultname",
+			Placeholder: "Group Result Name",
+			Value:       groupresultname,
+			Type:        "text", ID: "groupresultname"})
+	@customcheckbox.MainCustomCheckboxInput(
+		models.CustomCheckboxv1Prm{
+			Label: "Group Result Flag Per Test (Dicentang Maka Ya)",
+			Name:  "groupresultflagpertest",
+			ID:    "groupresultflagpertest",
+			Value: groupresultflagpertest,
+		})
+	@customcheckbox.MainCustomCheckboxInput(
+		models.CustomCheckboxv1Prm{
+			Label: "Group Result Flag Non Lab (Dicentang Maka Ya)",
+			Name:  "groupresultflagnonlab",
+			ID:    "groupresultflagnonlab",
+			Value: groupresultflagnonlab,
+		})
+	@customdropdown.MainCustomDropdownInput(
+		models.CustomDropdownv1Prm{
+			Label: "Group Result Resume MCU",
+			Name:  "groupresultresumemcu",
+			ID:    "groupresultresumemcu",
+		},
+		listItem)
+}
+
+templ DialogEditBody(groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, listItem templ.Component) {
+	<div id="modalbdyEdit">
+		@DialogEditForm(groupresultname, groupresultflagpertest, groupresultflagnonlab, listItem)
+	</div>
+	<div>
+		// <div class="text-center text-primary" id="modalLoadEdit" style="">
+		// 	<div class="spinner-border" role="status"></div>
+		// </div>
+	</div>
+}
+
+templ LoadingSpinner() {
+	<div id="modalbdyEdit">
+		<div class="text-center text-primary">
+			<div class="spinner-border" role="status"></div>
+		</div>
+	</div>
+}
+
+templ DialogEditAction() {
+	<div>
+		<button
+			id="btledit"
+			type="button"
+			hx-swap="delete"
+			hx-target="#modalbdyEdit"
+			onclick="htmx.trigger('.btneditusgp', 'htmx:abort')"
+			class="btn btn-outline-secondary font-weight-bolder rounded-lg mr-4"
+			data-dismiss="modal"
+		>
+			Batal
+		</button>
+		<button
+			type="button"
+			class="btn btn-primary btn-shadow font-weight-bold rounded-lg"
+		>
+			Save changes
+		</button>
+	</div>
+}
+
+templ BtnCloseEdit() {
+	<button
+		type="button"
+		class="close"
+		data-dismiss="modal"
+		aria-label="Close"
+		hx-target="#modalbdyEdit"
+		onclick="htmx.trigger('.btneditusgp', 'htmx:abort')"
+	>
+		<i aria-hidden="true" class="ki ki-close"></i>
+	</button>
+}
--- a/views/dev/groupresult/modaleditgroupresult_templ.go
+++ b/views/dev/groupresult/modaleditgroupresult_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

 // templ: version: v0.2.663
-package mastermenuuser
+package groupresult

 //lint:file-ignore SA4006 This context is only used if a nested component is present.

@@ -11,11 +11,13 @@ import "io"
 import "bytes"

 import (
+	"cpone/component/customcheckbox"
+	"cpone/component/customdropdown"
 	"cpone/component/customtextfield"
 	"cpone/models"
 )

-func DialogEditForm(code string, name string) templ.Component {
+func DialogEditForm(groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, listItem templ.Component) 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 {
@@ -30,26 +32,55 @@ func DialogEditForm(code string, name string) templ.Component {
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
 			models.CustomTextFieldv2Prm{
-				Label:       "Kode user group",
-				Name:        "usergroupcode",
-				Placeholder: "Kode user Group",
-				Type:        "text",
-				Value:       code,
+				Label:       "Group Result name",
+				Name:        "groupresultid",
+				Placeholder: "Group Result name",
+				Type:        "hidden",
+				ID:          "groupresultid",
 			}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
 			models.CustomTextFieldv2Prm{
-				Label:       "Nama User Group",
-				Name:        "usergroupname",
-				Placeholder: "Nama User Group",
-				Type:        "text",
-				Value:       name,
+				Label:       "Group Result Name",
+				Name:        "groupresultname",
+				Placeholder: "Group Result Name",
+				Value:       groupresultname,
+				Type:        "text", ID: "groupresultname"}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Per Test (Dicentang Maka Ya)",
+				Name:  "groupresultflagpertest",
+				ID:    "groupresultflagpertest",
+				Value: groupresultflagpertest,
 			}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
+		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(
+			models.CustomCheckboxv1Prm{
+				Label: "Group Result Flag Non Lab (Dicentang Maka Ya)",
+				Name:  "groupresultflagnonlab",
+				ID:    "groupresultflagnonlab",
+				Value: groupresultflagnonlab,
+			}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInput(
+			models.CustomDropdownv1Prm{
+				Label: "Group Result Resume MCU",
+				Name:  "groupresultresumemcu",
+				ID:    "groupresultresumemcu",
+			},
+			listItem).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		if !templ_7745c5c3_IsBuffer {
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
 		}
@@ -57,7 +88,7 @@ func DialogEditForm(code string, name string) templ.Component {
 	})
 }

-func DialogEditBody(code string, name string) templ.Component {
+func DialogEditBody(groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, listItem templ.Component) 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 {
@@ -74,7 +105,7 @@ func DialogEditBody(code string, name string) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = DialogEditForm(code, name).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = DialogEditForm(groupresultname, groupresultflagpertest, groupresultflagnonlab, listItem).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/dev/mastermenuuser/modaledituser.templ
+++ b/views/dev/mastermenuuser/modaledituser.templ
@@ -1,79 +0,0 @@
-package mastermenuuser
-
-import (
-	"cpone/models"
-	"cpone/component/customtextfield"
-)
-
-templ DialogEditForm(code string, name string) {
-	@customtextfield.CustomTextFieldv2(
-		models.CustomTextFieldv2Prm{
-			Label:       "Kode user group",
-			Name:        "usergroupcode",
-			Placeholder: "Kode user Group",
-			Type:        "text",
-			Value:       code,
-		})
-	@customtextfield.CustomTextFieldv2(
-		models.CustomTextFieldv2Prm{
-			Label:       "Nama User Group",
-			Name:        "usergroupname",
-			Placeholder: "Nama User Group",
-			Type:        "text",
-			Value:       name,
-		})
-}
-
-templ DialogEditBody(code string, name string) {
-	<div id="modalbdyEdit">
-		@DialogEditForm(code, name)
-	</div>
-	<div>
-		// <div class="text-center text-primary" id="modalLoadEdit" style="">
-		// 	<div class="spinner-border" role="status"></div>
-		// </div>
-	</div>
-}
-
-templ LoadingSpinner() {
-	<div id="modalbdyEdit">
-		<div class="text-center text-primary">
-			<div class="spinner-border" role="status"></div>
-		</div>
-	</div>
-}
-
-templ DialogEditAction() {
-	<div>
-		<button
-			id="btledit"
-			type="button"
-			hx-swap="delete"
-			hx-target="#modalbdyEdit"
-			onclick="htmx.trigger('.btneditusgp', 'htmx:abort')"
-			class="btn btn-outline-secondary font-weight-bolder rounded-lg mr-4"
-			data-dismiss="modal"
-		>
-			Batal
-		</button>
-		<button
-			type="button"
-			class="btn btn-primary btn-shadow font-weight-bold rounded-lg"
-		>
-			Save changes
-		</button>
-	</div>
-}
-
-templ BtnCloseEdit() {
-	<button
-		type="button"
-		class="close"
-		data-dismiss="modal"
-		aria-label="Close"
-		hx-target="#modalbdyEdit"
-		onclick="htmx.trigger('.btneditusgp', 'htmx:abort')"
-	>
-		<i aria-hidden="true" class="ki ki-close"></i>
-	</button>
-}
Author	SHA1	Message	Date
sindhu	6c7986c676	step 7 : add error msg in add and edit	2024-05-27 08:04:39 +07:00
sindhu	67b9f36d29	step 6 : fix bug after sukses edit then open delete dialog	2024-05-25 19:36:49 +07:00
sindhu	0490d17d2a	step 5 : fix bug after sukses delete then open form edit	2024-05-25 19:08:10 +07:00
sindhu	cd0d3aee08	step 4 : delete group result	2024-05-25 18:32:07 +07:00
sindhu	eaabf29fda	step 3 : edit data group result	2024-05-25 17:49:24 +07:00
sindhu	d13384ab64	step 2 : add data group result with form validation	2024-05-25 13:29:52 +07:00
sindhu	9cc14fd92c	step 1 : listing, search and pagination group result	2024-05-24 22:48:03 +07:00