step 3 : pembuatan custom text field password

step 2 : search with pagination
step 1 : templ and listing only
2024-05-24 17:38:37 +07:00 · 2024-05-24 15:10:55 +07:00 · 2024-05-24 12:42:27 +07:00
18 changed files with 1478 additions and 2380 deletions
--- a/component/customcheckbox/customcheckboxv1.templ
+++ b/component/customcheckbox/customcheckboxv1.templ
@@ -1,25 +0,0 @@
-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
@@ -1,143 +0,0 @@
-// 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
@@ -0,0 +1,68 @@
+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
@@ -0,0 +1,184 @@
+// 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
@@ -0,0 +1,363 @@
+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,20 +232,11 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	// clientgroup.GET("/usergroup/edit", mastermenuusergroupHandler.ChangeFormEdit)
 	// clientgroup.GET("/usergroup/pagination", mastermenuusergroupHandler.HandleChangePage)

-	// 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)
-
+	// 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)
 }
--- a/models/customcheckbox.models.go
+++ b/models/customcheckbox.models.go
@@ -1,18 +0,0 @@
-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
@@ -1,38 +0,0 @@
-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
@@ -0,0 +1,58 @@
+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,7 +5,6 @@ import (
 	"cpone/models"
 	"fmt"
 	"math"
-	"strconv"
 	"strings"

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

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

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

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

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

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

-func (ug *ServicesGroupResult) GetUserGroup() ([]models.UserGroup, error) {
+func (ug *ServicesMasterMenuUser) 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 *ServicesGroupResult) GetUserGroup() ([]models.UserGroup, error) {
 	return data, nil
 }

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

 	dummyBreadcrumb := []models.BreadCrumbV1{
@@ -574,24 +574,6 @@ func (su *ServicesGroupResult) GetListBreadCrumb(title string) (models.BreadCrum
 				},
 			},
 		},
-
-		{
-			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 {
@@ -608,271 +590,394 @@ func (su *ServicesGroupResult) GetListBreadCrumb(title string) (models.BreadCrum
 	return ret, nil
 }

-// (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 data, nil
-}
-
-// versi 2
-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 totalData int
-	offset := (currentPage - 1) * rowPerPage
-
-	prm := "%" + strings.TrimSpace(search) + "%"
-	querytotal := `
-		SELECT COUNT(*) 
-		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),
-	)
-
-	if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm); err != nil {
-		return nil, 0, fmt.Errorf("error querying database: %v", err)
-	}
+// try
+func (su *ServicesMasterMenuUser) GetListMasterUserGroup() ([]models.UserGroupV1, error) {
+	var userGroupList []models.UserGroupV1

 	query := `
 		SELECT
 			ROW_NUMBER() OVER () AS nomor,
-			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 ?
+			M_UserGroupID,
+			M_UserGroupCode,
+			M_UserGroupName,
+			M_UserGroupCreated,
+			M_UserGroupLastUpdated,
+			M_UserGroupIsActive
+		FROM m_usergroup
+		WHERE M_UserGroupIsActive = 'Y'
+		order by M_UserGroupID ASC
 	`

-	logger.Info("QUERY SEARCH INITIAL",
+	if err := dbx.Handlex.Select(&userGroupList, query); err != nil {
+		return nil, fmt.Errorf("error querying database: %v", err)
+	}
+
+	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(&groupresultList, query, prm, prm, rowPerPage, offset); err != nil {
-		return nil, 0, fmt.Errorf("error querying database: %v", err)
+	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
+}
+
+// versi 2
+func (su *ServicesMasterMenuUser) GetUserGroupData() ([]models.UserGroupV1, error) {
+
+	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 := `
+		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'
+	`
+
+		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 := `
+		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
+		LIMIT ? OFFSET ?
+	`
+
+		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)
+		}
 	}

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

-	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
+	return userList, totalPage, nil
 }
--- a/views/dev/groupresult/modaleditgroupresult.templ
+++ b/views/dev/groupresult/modaleditgroupresult.templ
@@ -1,101 +0,0 @@
-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/mastermenuuser/mastermenuuser.templ
+++ b/views/dev/mastermenuuser/mastermenuuser.templ
@@ -1,4 +1,4 @@
-package groupresult
+package mastermenuuser

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

 // "cpone/component/sidebar_user_profile"
-templ ContentGroupResultV1(
+templ ContentMasterMenuUserV1(
 	tableID string,
 	paginationID string,
 	searchID string,
+	dropdownID string,
 	dialogAddID string,
 	dialogAddBodyID string,
 	dialogEditID string,
@@ -22,8 +23,9 @@ templ ContentGroupResultV1(
 	dialogDeleteBodyID string,
 	breadcrumb templ.Component,
 	tablecontent templ.Component,
-	filter templ.Component,
-	paginationGroupResult templ.Component,
+	filterUser templ.Component,
+	filterUserGroup templ.Component,
+	paginationUser templ.Component,
 	modaladdform templ.Component,
 	modalEditform templ.Component,
 	modalDeleteform templ.Component,
@@ -37,6 +39,10 @@ templ ContentGroupResultV1(
 			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",
@@ -89,10 +95,18 @@ templ ContentGroupResultV1(
 				>Add New</button>
 			</div>
 		</div>
-		@filter
+		// @filterUser
+		<div class="row">
+			<div class="col-6">
+				@filterUserGroup
+			</div>
+			<div class="col-6">
+				@filterUser
+			</div>
+		</div>
 		// table content
 		@tablecontent
-		@paginationGroupResult
+		@paginationUser
 		<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>
@@ -105,11 +119,11 @@ templ ContentGroupResultV1(
 		@modalEditform
 		@modalDeleteform
 		// @modalcomponent.Modal("dialogEdit", "Edit - User Group", DialogEditBody("", ""), DialogEditAction(), BtnCloseNew())
-		@JSkuGroupResultV1()
+		@JSkuMasterUserV1()
 	</div>
 }

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

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

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

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

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

 // for item dropdown
-templ ItemDropdown(dataDropdown []models.GroupResultResumeMcu, selectedId int) {
+templ ItemDropdown(dataDropdown []models.UserGroupV1) {
 	if len(dataDropdown) == 0 {
 		<option value="0" disabled selected>Tidak Ada Data</option>
 	} else {
 		for _, v := range dataDropdown {
-			if (selectedId == v.ID) {
-				<option value={ strconv.Itoa(v.ID) } selected>{ v.Text }</option>
-			} else {
-				<option value={ strconv.Itoa(v.ID) }>{ v.Text }</option>
-			}
+			<option value={ strconv.Itoa(v.M_UserGroupID) }>{ v.M_UserGroupName }</option>
 		}
 	}
 }
@@ -286,7 +292,7 @@ templ EmptyDiv1() {
 	<div></div>
 }

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

 // table
-templ TableGroupResult(data []models.GroupResult, tableID string,
+templ TableUser(data []models.MasterUser, tableID string,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -306,18 +312,18 @@ templ TableGroupResult(data []models.GroupResult, tableID string,
 	hxSwapDelete string,
 	hxIncludeDelete string) {
 	<div id={ tableID } hx-swap-oob="true">
-		@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))
+		@tablecomponent.TableV3([]string{"EMAIL", "NAMA STAFF", "USERGROUP", "AKSI"},
+			[]string{"30%", "30%", "20%", "20%"},
+			TableRowMasterUserV1(data, hxGetEdit, hxTargetEdit, hxSwapEdit, hxIncludeEdit, hxGetDelete, hxTargetDelete, hxSwapDelete, hxIncludeDelete))
 	</div>
 }

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

-templ GroupResultForm(data models.GroupResultFormComponent) {
+templ UserForm(data models.UserFormComponent) {
 	<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 groupresult
+package mastermenuuser

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

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

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

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

-func DialogDeleteGroupResultActionV1() templ.Component {
+func DialogDeleteMasterUserActionV1() 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 {
@@ -444,9 +452,9 @@ func DialogDeleteGroupResultActionV1() 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_Var17 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var17 == nil {
+			templ_7745c5c3_Var17 = 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>")
@@ -460,7 +468,7 @@ func DialogDeleteGroupResultActionV1() templ.Component {
 	})
 }

-func BtnCloseDeleteGroupResultV1() templ.Component {
+func BtnCloseDeleteMasterUserV1() 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 {
@@ -468,9 +476,9 @@ func BtnCloseDeleteGroupResultV1() 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_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("<button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><i aria-hidden=\"true\" class=\"ki ki-close\"></i></button>")
@@ -484,7 +492,7 @@ func BtnCloseDeleteGroupResultV1() templ.Component {
 	})
 }

-func JSkuGroupResultV1() templ.Component {
+func JSkuMasterUserV1() 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 {
@@ -492,9 +500,9 @@ func JSkuGroupResultV1() templ.Component {
 			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
+		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("<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>")
@@ -508,7 +516,32 @@ func JSkuGroupResultV1() templ.Component {
 	})
 }

-func CssMasterGroupResultV1x() 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 {
 	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 {
@@ -521,31 +554,6 @@ func CssMasterGroupResultV1x() templ.Component {
 			templ_7745c5c3_Var21 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n    body {\r\n      background-color: white;\r\n      /* padding-right: 100px;\r\n            padding-left: 100px; */\r\n    }\r\n    #div-chart {\r\n        /* overflow-x: scroll; */\r\n        margin: 40px 10vw 40px 10vw;\r\n    }\r\n    .title {\r\n        font-size:20px;\r\n        font-weight: bold;\r\n    }\r\n    #title {\r\n        font-weight: 600;\r\n    }\r\n\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 {
@@ -553,68 +561,35 @@ func ItemDropdown(dataDropdown []models.GroupResultResumeMcu, selectedId int) te
 			}
 		} else {
 			for _, v := range dataDropdown {
-				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
-					}
+				_, 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
 				}
 			}
 		}
@@ -634,9 +609,9 @@ func EmptyDiv1() templ.Component {
 			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_Var24 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var24 == nil {
+			templ_7745c5c3_Var24 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div></div>")
@@ -650,7 +625,7 @@ func EmptyDiv1() templ.Component {
 	})
 }

-func ShowGroupResultV1x(title string, cmp templ.Component, css templ.Component, js templ.Component,
+func ShowMasterMenuUserV1x(title string, cmp templ.Component, css templ.Component, js templ.Component,
 	navbarmenu templ.Component,
 	navbaruser templ.Component,
 	userprofile templ.Component) templ.Component {
@@ -661,12 +636,12 @@ func ShowGroupResultV1x(title string, cmp templ.Component, css templ.Component,
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var28 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var28 == nil {
-			templ_7745c5c3_Var28 = templ.NopComponent
+		templ_7745c5c3_Var25 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var25 == nil {
+			templ_7745c5c3_Var25 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Var29 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Var26 := 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()
@@ -681,7 +656,7 @@ func ShowGroupResultV1x(title string, cmp templ.Component, css templ.Component,
 			}
 			return templ_7745c5c3_Err
 		})
-		templ_7745c5c3_Err = layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var29), templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var26), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -693,7 +668,7 @@ func ShowGroupResultV1x(title string, cmp templ.Component, css templ.Component,
 }

 // table
-func TableGroupResult(data []models.GroupResult, tableID string,
+func TableUser(data []models.MasterUser, tableID string,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -709,21 +684,21 @@ func TableGroupResult(data []models.GroupResult, tableID string,
 			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_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 id=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var31 string
-		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
+		var templ_7745c5c3_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 308, Col: 18}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 314, Col: 18}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -731,9 +706,9 @@ func TableGroupResult(data []models.GroupResult, tableID string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		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)
+		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)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -748,7 +723,7 @@ func TableGroupResult(data []models.GroupResult, tableID string,
 	})
 }

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

-func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
+func UserForm(data models.UserFormComponent) 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 {
@@ -784,9 +759,9 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var33 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var33 == nil {
-			templ_7745c5c3_Var33 = 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 class=\"\">")
@@ -801,12 +776,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var34 string
-		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(data.IDComponent)
+		var templ_7745c5c3_Var31 string
+		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(data.IDComponent)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 323, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 329, 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_Var31))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -814,12 +789,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var35 string
-		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(data.Link)
+		var templ_7745c5c3_Var32 string
+		templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(data.Link)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 324, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 330, Col: 22}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -827,12 +802,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var36 string
-		templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxTarget)
+		var templ_7745c5c3_Var33 string
+		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxTarget)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 326, Col: 28}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 332, Col: 28}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -840,12 +815,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var37 string
-		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxSwap)
+		var templ_7745c5c3_Var34 string
+		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxSwap)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 327, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 333, Col: 24}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -853,12 +828,12 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var38 string
-		templ_7745c5c3_Var38, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxInclude)
+		var templ_7745c5c3_Var35 string
+		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxInclude)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 328, Col: 30}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 334, Col: 30}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var38))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -866,8 +841,8 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var39 templ.ComponentScript = HandleFormBeforeRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var39.Call)
+		var templ_7745c5c3_Var36 templ.ComponentScript = HandleFormBeforeRequest()
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var36.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -875,8 +850,8 @@ func GroupResultForm(data models.GroupResultFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var40 templ.ComponentScript = HandleFormAfterRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var40.Call)
+		var templ_7745c5c3_Var37 templ.ComponentScript = HandleFormAfterRequest()
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var37.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -949,9 +924,9 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var41 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var41 == nil {
-			templ_7745c5c3_Var41 = templ.NopComponent
+		templ_7745c5c3_Var38 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var38 == nil {
+			templ_7745c5c3_Var38 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
@@ -962,12 +937,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(componentID)
+		var templ_7745c5c3_Var39 string
+		templ_7745c5c3_Var39, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 368, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 374, Col: 22}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var39))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -975,8 +950,8 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var43 templ.ComponentScript = hxOnLoad
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var43.Call)
+		var templ_7745c5c3_Var40 templ.ComponentScript = hxOnLoad
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var40.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -984,12 +959,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var44 string
-		templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinStringErrs(message)
+		var templ_7745c5c3_Var41 string
+		templ_7745c5c3_Var41, templ_7745c5c3_Err = templ.JoinStringErrs(message)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 369, Col: 14}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 375, Col: 14}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var41))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -1002,12 +977,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var45 string
-			templ_7745c5c3_Var45, templ_7745c5c3_Err = templ.JoinStringErrs(v)
+			var templ_7745c5c3_Var42 string
+			templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(v)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 374, Col: 68}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 380, Col: 68}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var45))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -1025,12 +1000,12 @@ func DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var46 string
-			templ_7745c5c3_Var46, templ_7745c5c3_Err = templ.JoinStringErrs(v)
+			var templ_7745c5c3_Var43 string
+			templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs(v)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\groupresult.templ`, Line: 380, Col: 10}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\mastermenuuser.templ`, Line: 386, Col: 10}
 			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var46))
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
--- a/views/dev/groupresult/modaladdgroupresult.templ
+++ b/views/dev/groupresult/modaladdgroupresult.templ
@@ -1,53 +1,50 @@
-package groupresult
+package mastermenuuser

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

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

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

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

 templ DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
 	<div>
 		<button
-			hx-on::after-request={ HandleJSModalAddGR(modalID) }
+			hx-on::after-request={ HandleJSModalAddUG(modalID) }
 			hx-post={ LinkClose }
 			hx-target={ targetClose }
 			hx-swap={ hxSwapClose }
@@ -101,7 +98,7 @@ templ BtnCloseNewV1(LinkClose string, targetClose string, hxSwapClose string, mo
 		hx-target={ targetClose }
 		hx-swap={ hxSwapClose }
 		type="button"
-		hx-on::after-request={ HandleJSModalAddGR(modalID) }
+		hx-on::after-request={ HandleJSModalAddUG(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 groupresult
+package mastermenuuser

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

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

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

-func DialogNewBodyV1(inputId models.CustomTextFieldv2Prm,
-	inputGrName models.CustomTextFieldv2Prm,
-	checkboxGrFlagPerTest models.CustomCheckboxv1Prm,
-	checkboxGrFlagNonLab models.CustomCheckboxv1Prm,
-	dropdownGrResumeMcu models.CustomDropdownv1Prm,
-	listItem templ.Component,
+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,
 	componentID string,
 	hxOnLoad templ.ComponentScript) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
@@ -48,7 +50,7 @@ func DialogNewBodyV1(inputId models.CustomTextFieldv2Prm,
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\groupresult\modaladdgroupresult.templ`, Line: 18, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\modaladduser.templ`, Line: 20, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -73,27 +75,31 @@ func DialogNewBodyV1(inputId models.CustomTextFieldv2Prm,
 			return templ_7745c5c3_Err
 		}
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			inputGrName).Render(ctx, templ_7745c5c3_Buffer)
+			inputUsername).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(
-			checkboxGrFlagPerTest).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
+			inputPassword).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(
-			checkboxGrFlagNonLab).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
+			inputUserfullname).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInput(
-			dropdownGrResumeMcu,
-			listItem).Render(ctx, templ_7745c5c3_Buffer)
+			inputDropdownUserGroup, listItemUserGroup).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><script>\r\n    document.addEventListener('htmx:afterSwap', function(event) {\r\n        // Reinitialize selectpicker after HTMX content swap\r\n        $('.selectpicker').selectpicker('refresh');\r\n    });\r\n    </script>")
+		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>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -104,23 +110,23 @@ func DialogNewBodyV1(inputId models.CustomTextFieldv2Prm,
 	})
 }

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

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

@@ -141,7 +147,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, HandleJSModalAddGR(modalID))
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleJSModalAddUG(modalID))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -149,7 +155,7 @@ func DialogNewActionV1(LinkClose string, targetClose string, hxSwapClose string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var5 templ.ComponentScript = HandleJSModalAddGR(modalID)
+		var templ_7745c5c3_Var5 templ.ComponentScript = HandleJSModalAddUG(modalID)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var5.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -161,7 +167,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\groupresult\modaladdgroupresult.templ`, Line: 51, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\modaladduser.templ`, Line: 48, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
@@ -174,7 +180,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\groupresult\modaladdgroupresult.templ`, Line: 52, Col: 26}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\modaladduser.templ`, Line: 49, Col: 26}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 		if templ_7745c5c3_Err != nil {
@@ -187,7 +193,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\groupresult\modaladdgroupresult.templ`, Line: 53, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\modaladduser.templ`, Line: 50, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 		if templ_7745c5c3_Err != nil {
@@ -265,7 +271,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, HandleJSModalAddGR(modalID))
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleJSModalAddUG(modalID))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -276,7 +282,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\groupresult\modaladdgroupresult.templ`, Line: 100, Col: 21}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\modaladduser.templ`, Line: 97, Col: 21}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 		if templ_7745c5c3_Err != nil {
@@ -289,7 +295,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\groupresult\modaladdgroupresult.templ`, Line: 101, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\modaladduser.templ`, Line: 98, Col: 25}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
 		if templ_7745c5c3_Err != nil {
@@ -302,7 +308,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\groupresult\modaladdgroupresult.templ`, Line: 102, Col: 23}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mastermenuuser\modaladduser.templ`, Line: 99, Col: 23}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 		if templ_7745c5c3_Err != nil {
@@ -312,7 +318,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 = HandleJSModalAddGR(modalID)
+		var templ_7745c5c3_Var15 templ.ComponentScript = HandleJSModalAddUG(modalID)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
--- a/views/dev/mastermenuuser/modaledituser.templ
+++ b/views/dev/mastermenuuser/modaledituser.templ
@@ -0,0 +1,79 @@
+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>
+}
--- 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 groupresult
+package mastermenuuser

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

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

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

-func DialogEditForm(groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, listItem templ.Component) templ.Component {
+func DialogEditForm(code string, name string) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -32,55 +30,26 @@ func DialogEditForm(groupresultname string, groupresultflagpertest string, group
 		ctx = templ.ClearChildren(ctx)
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
 			models.CustomTextFieldv2Prm{
-				Label:       "Group Result name",
-				Name:        "groupresultid",
-				Placeholder: "Group Result name",
-				Type:        "hidden",
-				ID:          "groupresultid",
+				Label:       "Kode user group",
+				Name:        "usergroupcode",
+				Placeholder: "Kode user Group",
+				Type:        "text",
+				Value:       code,
 			}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
 			models.CustomTextFieldv2Prm{
-				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,
+				Label:       "Nama User Group",
+				Name:        "usergroupname",
+				Placeholder: "Nama User Group",
+				Type:        "text",
+				Value:       name,
 			}).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)
 		}
@@ -88,7 +57,7 @@ func DialogEditForm(groupresultname string, groupresultflagpertest string, group
 	})
 }

-func DialogEditBody(groupresultname string, groupresultflagpertest string, groupresultflagnonlab string, listItem templ.Component) templ.Component {
+func DialogEditBody(code string, name string) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -105,7 +74,7 @@ func DialogEditBody(groupresultname string, groupresultflagpertest string, group
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = DialogEditForm(groupresultname, groupresultflagpertest, groupresultflagnonlab, listItem).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = DialogEditForm(code, name).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
Author	SHA1	Message	Date
sindhu	983f77757f	step 3 : pembuatan custom text field password	2024-05-24 17:38:37 +07:00
sindhu	35b1daf2c5	step 2 : search with pagination	2024-05-24 15:10:55 +07:00
sindhu	9f6785a59e	step 1 : templ and listing only	2024-05-24 12:42:27 +07:00