Merge branch 'andy/mdpatient' of https://devone.aplikasi.web.id/gitea/andy/corporate_portal_westerindo into andy/mdpatient

tmp datepicker
search & oagination md pasien
2024-05-30 13:49:40 +07:00 · 2024-05-30 13:49:32 +07:00 · 2024-05-30 13:49:32 +07:00 · 2024-05-30 11:55:07 +07:00 · 2024-05-30 10:56:31 +07:00 · 2024-05-30 09:35:37 +07:00
23 changed files with 1227 additions and 3128 deletions
--- a/component/customdatepicker/customdatepicker.templ
+++ b/component/customdatepicker/customdatepicker.templ
@@ -0,0 +1,71 @@
+package customdatepicker 
+
+import "cpone/models"
+
+templ CustomDatePicker(inp models.CustomDatePickerPrm) {
+	<div class="form-row">
+		<label style="font-family: Poppins; font-weight: 600;">{ inp.Label }</label>
+		<div class="input-group date rounded-left-lg">
+			<input
+				type="text"
+				readonly
+				name={ inp.Name }
+				value={ inp.Value }
+				placeholder={ inp.Placeholder }
+				id="datepicker"
+				if inp.ErrorMsg == "" {
+					class="form-control bg-field border-0 h-auto "
+				} else {
+					class="form-control is-invalid bg-field border-0 h-auto "
+				}
+			/>
+			<div class="input-group-prepend">
+				<span
+					class="input-group-text bg-field border-0 rounded-lg rounded-left-0"
+					id="calendar-icon"
+				>
+					<span
+						class="iconify text-grey"
+						data-icon="heroicons-solid:calendar"
+						style="font-size: 20px;"
+					></span>
+				</span>
+			</div>
+			<div class="invalid-feedback text-danger mt-3 ml-2">
+				{ inp.ErrorMsg }
+			</div>
+		</div>
+	</div>
+	if inp.ID == "" {
+		<div class="text-danger mt-3 ml-2">
+			ID Mandatory 
+		</div>
+	}
+	// @JsDatePicker("#" + inp.ID)
+}
+
+script Format(id) {
+ 		$(id).datepicker({
+    		format: "dd/mm/yyyy",
+        });
+}
+
+script IconOnClick(id) {
+ 		$("#calendar-icon").click(function () {
+    		$(id).datepicker("show");
+        });
+}
+
+templ JsDatePicker(id string) {
+	<script>
+	var idCoba = {inp.ID}
+	$(document).ready(function () {
+        $(idDp).datepicker({
+    		format: "dd/mm/yyyy",
+        });
+        $("#calendar-icon").click(function () {
+    		$(idDp).datepicker("show");
+        });
+    });
+	</script>
+}
--- a/component/customdatepicker/customdatepicker_templ.go
+++ b/component/customdatepicker/customdatepicker_templ.go
@@ -0,0 +1,147 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package customdatepicker
+
+//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 CustomDatePicker(inp models.CustomDatePickerPrm) 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-row\"><label 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\customdatepicker\customdatepicker.templ`, Line: 7, Col: 68}
+		}
+		_, 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 date rounded-left-lg\"><input type=\"text\" readonly 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\customdatepicker\customdatepicker.templ`, Line: 12, Col: 19}
+		}
+		_, 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("\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Value)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdatepicker\customdatepicker.templ`, Line: 13, Col: 21}
+		}
+		_, 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("\" placeholder=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Placeholder)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdatepicker\customdatepicker.templ`, Line: 14, Col: 33}
+		}
+		_, 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=\"datepicker\"")
+		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 \"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control is-invalid bg-field border-0 h-auto \"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("><div class=\"input-group-prepend\"><span class=\"input-group-text bg-field border-0 rounded-lg rounded-left-0\" id=\"calendar-icon\"><span class=\"iconify text-grey\" data-icon=\"heroicons-solid:calendar\" style=\"font-size: 20px;\"></span></span></div><div class=\"invalid-feedback text-danger mt-3 ml-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdatepicker\customdatepicker.templ`, Line: 35, Col: 18}
+		}
+		_, 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("</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if inp.ID == "" {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"text-danger mt-3 ml-2\">ID Mandatory \r</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JsDatePicker(id string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script>\r\n\tvar idCoba = {inp.ID}\r\n\t$(document).ready(function () {\r\n        $(idDp).datepicker({\r\n    \t\tformat: \"dd/mm/yyyy\",\r\n        });\r\n        $(\"#calendar-icon\").click(function () {\r\n    \t\t$(idDp).datepicker(\"show\");\r\n        });\r\n    });\r\n\t</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/component/table/tablev3.templ
+++ b/component/table/tablev3.templ
@@ -10,11 +10,7 @@ templ TableV3(thName []string, thWidth []string, trComponent templ.Component) {
 				<thead>
 					<tr class="rounded-lg bg-header-table">
 						for i, item := range thName {
-							if i == (len(thName) - 1) {
-								<th scope="col" style="text-align: center;" width={ thWidth[i] }>{ item }</th>
-							} else {
-								<th scope="col" width={ thWidth[i] }>{ item }</th>
-							}
+							<th scope="col" width={ thWidth[i] }>{ item }</th>
 						}
 					</tr>
 				</thead>
--- a/component/table/tablev3_templ.go
+++ b/component/table/tablev3_templ.go
@@ -38,68 +38,35 @@ func TableV3(thName []string, thWidth []string, trComponent templ.Component) tem
 				return templ_7745c5c3_Err
 			}
 			for i, item := range thName {
-				if i == (len(thName) - 1) {
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" style=\"text-align: center;\" width=\"")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var2 string
-					templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 14, Col: 70}
-					}
-					_, 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("\">")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var3 string
-					templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(item)
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 14, Col: 79}
-					}
-					_, 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("</th>")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-				} else {
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" width=\"")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var4 string
-					templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 16, Col: 42}
-					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
-					var templ_7745c5c3_Var5 string
-					templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(item)
-					if templ_7745c5c3_Err != nil {
-						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 16, Col: 51}
-					}
-					_, 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("</th>")
-					if templ_7745c5c3_Err != nil {
-						return templ_7745c5c3_Err
-					}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" width=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var2 string
+				templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 13, Col: 41}
+				}
+				_, 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("\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var3 string
+				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(item)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 13, Col: 50}
+				}
+				_, 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("</th>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
 				}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</tr></thead> <tbody>")
@@ -134,9 +101,9 @@ func DivEmptyV3() templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var6 == nil {
-			templ_7745c5c3_Var6 = templ.NopComponent
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div></div>")
--- a/handlers/dev/md.nonlabtemplate.handlers.go
+++ b/handlers/dev/md.nonlabtemplate.handlers.go
@@ -1,682 +0,0 @@
-package dev_handlers
-
-import (
-	breadcrumadmin "cpone/component/breadcrumbadmin"
-	"cpone/component/customtextfieldsearch"
-	navbarmenu "cpone/component/navbar"
-	"cpone/component/pagination"
-	sidebaruserprofile "cpone/component/sidebar_user_profile"
-	customtoastv2 "cpone/component/toastbootstrap"
-	"cpone/models"
-	"cpone/services"
-	"cpone/utils"
-	dev_mdnonlabtemplateview "cpone/views/dev/mdnonlabtemplate"
-	"fmt"
-	"strconv"
-
-	"github.com/a-h/templ"
-	"github.com/labstack/echo/v4"
-	"go.uber.org/zap"
-)
-
-type MDNonLabTemplateServices interface {
-	GetMDNonLabTemplateBreadcrumb() (models.BreadCrumbV1, error)
-	GetMDNonLabTemplateData(search string, currentPage int, rowPerPage int) ([]models.MDNonLabTemplate, int, error)
-	DeleteDataMDNLT(id string) (models.MDNonLabTemplate, error)
-	GetMDNonLabTemplateByID(id string) (models.MDNonLabTemplate, error)
-	SaveInMemoryDetail(kode string, name string) (models.MDNonLabTemplateDetail, error)
-	ListMemoryDetail() ([]models.MDNonLabTemplateDetail, error)
-}
-
-type MDNonLabTemplateHandler struct {
-	MDNonLabTemplateServices MDNonLabTemplateServices
-}
-
-func NewMDNonLabTemplateHandler(nlt MDNonLabTemplateServices) *MDNonLabTemplateHandler {
-	return &MDNonLabTemplateHandler{
-		MDNonLabTemplateServices: nlt,
-	}
-}
-
-func (mdnlt *MDNonLabTemplateHandler) HandleShowMDNonLabTemplateScreen(c echo.Context) error {
-	logger, _ := zap.NewProduction()
-
-	tableID := utils.GenerateRandomID("tableid")
-	paginationID := utils.GenerateRandomID("paginationid")
-	searchID := utils.GenerateRandomID("searchid")
-	dialogAddID := utils.GenerateRandomID("dialogaddid")
-	dialogAddBodyID := utils.GenerateRandomID("dialogaddbodyid")
-	dialogEditID := utils.GenerateRandomID("dialogeditid")
-	dialogEditBodyID := utils.GenerateRandomID("dialogeditbodyid")
-	dialogDeleteID := utils.GenerateRandomID("dialogdeleteid")
-	dialogDeleteBodyID := utils.GenerateRandomID("dialogdeletebodyid")
-
-	dataMenu, err := services.GetMenu()
-	if err != nil {
-		fmt.Println(dataMenu)
-		return err
-	}
-
-	dataUser, err := services.GetUserLogin()
-	if err != nil {
-		fmt.Println(dataUser)
-		return err
-	}
-	defer logger.Sync()
-	logger.Info("LOAD USER DEV", zap.Any("data", dataUser))
-
-	title := "Master Non-lab Template"
-
-	dataBreadCrumb, err := mdnlt.MDNonLabTemplateServices.GetMDNonLabTemplateBreadcrumb()
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR BREADCRUMB DEV", zap.Any("error", err))
-		return err
-	}
-	defer logger.Sync()
-	logger.Info("LOAD BREADCRUMB DEV", zap.Any("data", dataBreadCrumb))
-
-	breadcrumbComp := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadCrumb)
-	navbarmenuComp := navbarmenu.NavbarMenu(dataMenu)
-	navbaruserComp := navbarmenu.Navbar(dataUser)
-	sidebarusrComp := sidebaruserprofile.Navbaruserprofile(dataUser)
-
-	dataList, totalPage, err := mdnlt.MDNonLabTemplateServices.GetMDNonLabTemplateData("", 1, 5)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR GET DATA DEV", zap.Any("error", err))
-		return err
-	}
-
-	tableComp := dev_mdnonlabtemplateview.TableNonLabTemplate(dataList,
-		tableID,
-		"/dev/md/nonlabtemplate/openedit",
-		"#"+dialogEditBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"/dev/md/nonlabtemplate/opendelete",
-		"#"+dialogDeleteBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-	)
-
-	tableFilter := customtextfieldsearch.MainCustomTextFieldSearchV3(searchID,
-		"search",
-		"Cari Nama Template",
-		"text",
-		"/dev/md/nonlabtemplate/filter",
-		"input changed delay:500ms, search",
-		"#"+paginationID,
-		"#loadingcontent", "",
-		"outerHTML",
-		"#tableID, #paginationID, #searchID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		dev_mdnonlabtemplateview.BeforeRequestContent(),
-		dev_mdnonlabtemplateview.AfterRequestContent(),
-	)
-
-	tablePagination := pagination.PaginationV3(totalPage,
-		1,
-		"/dev/md/nonlabtemplate/changepage",
-		paginationID,
-		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"#"+paginationID,
-		"outerHTML", "", "",
-		dev_mdnonlabtemplateview.BeforeRequestContent(),
-		dev_mdnonlabtemplateview.AfterRequestContent(),
-	)
-
-	// modal add detail
-	// detailAddID := utils.GenerateRandomID("detailaddID")
-	tableDetailID := utils.GenerateRandomID("tabledetailID")
-	btnAddNamaID := utils.GenerateRandomID("btnaddnamaID")
-	btnAddDetailID := utils.GenerateRandomID("btnaddDetailID")
-	tableDetailPaginationID := utils.GenerateRandomID("tabledetailpaginationID")
-	// dialogDetailEditID := utils.GenerateRandomID("dialogeditid")
-	dialogDetailEditBodyID := utils.GenerateRandomID("dialogeditbodyid")
-	// dialogDetailDeleteID := utils.GenerateRandomID("dialogdeleteid")
-	dialogDetailDeleteBodyID := utils.GenerateRandomID("dialogdeletebodyid")
-
-	btnSimpanDetail := dev_mdnonlabtemplateview.BtnAddDetail()
-	var listDetaill []models.MDNonLabTemplateDetail
-	tableDetail := dev_mdnonlabtemplateview.TableDetail(listDetaill,
-		tableDetailID,
-		"/dev/md/nonlabtemplate/detailedit",
-		"#"+dialogDetailEditBodyID,
-		"outerHTML",
-		"#dialogDetailEditBodyID, #dialogDetailEditID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID",
-		"/dev/md/nonlabtemplate/detaildelete",
-		"#"+dialogDetailDeleteBodyID,
-		"outerHTML",
-		"#dialogDetailEditBodyID, #dialogDetailEditID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID",
-	)
-
-	dialogAddBodyComp := dev_mdnonlabtemplateview.BodyFormMDNonlabTemplate(
-		dialogAddBodyID,
-		models.CustomTextFieldv2Prm{
-			Label:       "Non Lab Template Name",
-			Name:        "nonlabtemplateid",
-			Placeholder: "Non Lab Template Name",
-			Type:        "hidden",
-			ID:          "nonlabtemplateid",
-		},
-		models.CustomTextFieldv2Prm{
-			Label:       "Template Name",
-			Name:        "nonlabtemplatename",
-			Placeholder: "Template Name",
-			Type:        "text",
-			ID:          "nonlabtemplatename",
-		},
-		models.CustomCheckboxv1Prm{
-			Name:  "nonlabtemplateflag",
-			ID:    "nonlabtemplateflag",
-			Text:  "Template Fisik",
-			Value: "N",
-		},
-		models.CustomTextFieldv2Prm{
-			// Label:       "Template Name",
-			Name:        "nonlabtemplatedetailkode",
-			Placeholder: "Kode",
-			Type:        "text",
-			ID:          "nonlabtemplatedetailkode",
-		},
-		models.CustomTextFieldv2Prm{
-			// Label:       "Template Name",
-			Name:        "nonlabtemplatedetailname",
-			Placeholder: "Detail Name",
-			Type:        "text",
-			ID:          "nonlabtemplatedetailname",
-		},
-		btnSimpanDetail,
-		tableDetail,
-		dev_mdnonlabtemplateview.JSHideModal(""),
-	)
-
-	modalActioAddComp := dev_mdnonlabtemplateview.ActionFormMDNLT(
-		"/dev/md/nonlabtemplate/closeaddform",
-		"#"+dialogAddBodyID,
-		"outerHTML",
-		"#"+dialogAddID,
-	)
-
-	btnCloseModalAdd := dev_mdnonlabtemplateview.BtnCloseFormMDNLT(
-		"/dev/md/nonlabtemplate/closeaddform",
-		"#"+dialogAddBodyID,
-		"outerHTML",
-		"#"+dialogAddID,
-	)
-
-	modalAddFormComponent := dev_mdnonlabtemplateview.NonLabTemplateModalForm(
-		models.MDNonLabTemplateForm{
-			IDComponent:  "formnonlabtemplate",
-			Link:         "/dev/md/nonlabtemplate/add",
-			HxTarget:     "#" + dialogAddBodyID,
-			HxSwap:       "outerHTML",
-			HxInclude:    "#tableID, #paginationID, #searchID, #dialogAddBodyID, #dialogAddID, #dialogDeleteBodyID, #dialogEditBodyID, #" + searchID + ", #currpage" + paginationID,
-			ModalID:      dialogAddID,
-			ModalTitle:   "New - Nonlab Template",
-			DialogBody:   dialogAddBodyComp,
-			DialogAction: modalActioAddComp,
-			ButtonCLose:  btnCloseModalAdd,
-		},
-	)
-
-	// modal delete form
-	dialogDeleteComp := dev_mdnonlabtemplateview.BodyFormMDNonlabTemplate(
-		dialogDeleteBodyID,
-		models.CustomTextFieldv2Prm{
-			Label:       "Non Lab Template Name",
-			Name:        "nonlabtemplateid",
-			Placeholder: "Non Lab Template Name",
-			Type:        "hidden",
-			ID:          "nonlabtemplateid",
-		},
-		models.CustomTextFieldv2Prm{
-			Label:       "Non Lab Template Name",
-			Name:        "nonlabtemplatename",
-			Placeholder: "Non Lab Template Name",
-			Type:        "text",
-			ID:          "nonlabtemplatename",
-		},
-		models.CustomCheckboxv1Prm{
-			Name:  "nonlabtemplateflag",
-			ID:    "nonlabtemplateflag",
-			Text:  "Template Fisik",
-			Value: "N",
-		},
-		models.CustomTextFieldv2Prm{
-			// Label:       "Template Name",
-			Name:        "nonlabtemplatedetailkode",
-			Placeholder: "Kode",
-			Type:        "text",
-			ID:          "nonlabtemplatedetailkode",
-		},
-		models.CustomTextFieldv2Prm{
-			// Label:       "Template Name",
-			Name:        "nonlabtemplatedetailname",
-			Placeholder: "Detail Name",
-			Type:        "text",
-			ID:          "nonlabtemplatedetailname",
-		},
-		btnSimpanDetail,
-		tableDetail,
-		dev_mdnonlabtemplateview.JSHideModal(""),
-	)
-
-	modalActionDeleteComp := dev_mdnonlabtemplateview.ActionFormMDNLTDelete(
-		"/dev/md/nonlabtemplate/closedeleteform",
-		"#"+dialogDeleteBodyID,
-		"outerHTML",
-		"#"+dialogDeleteID,
-	)
-
-	btnCloseModalDelete := dev_mdnonlabtemplateview.BtnCloseFormMDNLT(
-		"/dev/md/nonlabtemplate/closedeleteform",
-		"#"+dialogDeleteBodyID,
-		"outerHTML",
-		"#"+dialogDeleteID,
-	)
-
-	modalDeleteFormComponent := dev_mdnonlabtemplateview.NonLabTemplateModalForm(
-		models.MDNonLabTemplateForm{
-			IDComponent:  "formnonlabtemplate",
-			Link:         "/dev/md/nonlabtemplate/delete",
-			HxTarget:     "#" + dialogDeleteBodyID,
-			HxSwap:       "outerHTML",
-			HxInclude:    "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #" + searchID + ", #currpage" + paginationID,
-			ModalID:      dialogDeleteID,
-			ModalTitle:   "Delete - Non Lab Template",
-			DialogBody:   dialogDeleteComp,
-			DialogAction: modalActionDeleteComp,
-			ButtonCLose:  btnCloseModalDelete,
-		},
-	)
-
-	content := dev_mdnonlabtemplateview.MDNonLabTemplateScreen(
-		tableID,
-		paginationID,
-		searchID,
-		dialogAddID,
-		dialogAddBodyID,
-		dialogEditID,
-		dialogEditBodyID,
-		dialogDeleteID,
-		dialogDeleteBodyID,
-		btnAddNamaID,
-		btnAddDetailID,
-		tableDetailID,
-		tableDetailPaginationID,
-		breadcrumbComp,
-		tableFilter,
-		tableComp,
-		tablePagination,
-		modalAddFormComponent,
-		modalDeleteFormComponent,
-	)
-	css := dev_mdnonlabtemplateview.CSSMDNonLabTemplate()
-	js := dev_mdnonlabtemplateview.JSSMDNonLabTemplate()
-
-	view := dev_mdnonlabtemplateview.ShowMDNonLabTemplate(
-		title,
-		content,
-		css,
-		js,
-		navbarmenuComp,
-		navbaruserComp,
-		sidebarusrComp,
-	)
-
-	return utils.View(c, view)
-}
-
-func (mdnlt *MDNonLabTemplateHandler) HandleFilterMDNonLabTemplate(c echo.Context) error {
-	search := c.QueryParam("search")
-	searchID := c.QueryParam("searchID")
-	tableID := c.QueryParam("tableID")
-	paginationID := c.QueryParam("paginationID")
-	dialogEditBodyID := c.QueryParam("dialogEditBodyID")
-	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
-	var retval []templ.Component
-	logger, _ := zap.NewProduction()
-
-	dataList, totalPage, err := mdnlt.MDNonLabTemplateServices.GetMDNonLabTemplateData(search, 1, 5)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR GET DATA", zap.Any("error", err))
-		return err
-	}
-
-	tableComp := dev_mdnonlabtemplateview.TableNonLabTemplate(dataList,
-		tableID,
-		"/dev/md/nonlabtemplate/openedit",
-		"#"+dialogEditBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"/dev/md/nonlabtemplate/opendelete",
-		"#"+dialogDeleteBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-	)
-
-	tablePagination := pagination.PaginationV3(
-		totalPage,
-		1,
-		"/dev/md/nonlabtemplate/changepage",
-		paginationID,
-		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"#"+paginationID,
-		"outerHTML", "", "",
-		dev_mdnonlabtemplateview.BeforeRequestContent(),
-		dev_mdnonlabtemplateview.AfterRequestContent(),
-	)
-
-	retval = append(retval, tableComp)
-	retval = append(retval, tablePagination)
-	return utils.ViewMulti(c, retval)
-}
-
-func (mdnlt *MDNonLabTemplateHandler) HandleChangePageMDNonLabTemplate(c echo.Context) error {
-	search := c.QueryParam("search")
-	pageparam := c.QueryParam("page")
-	tableID := c.QueryParam("tableID")
-	searchID := c.QueryParam("searchID")
-	paginationID := c.QueryParam("paginationID")
-	dialogEditBodyID := c.QueryParam("dialogEditBodyID")
-	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
-	var retval []templ.Component
-	logger, _ := zap.NewProduction()
-
-	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
-	}
-
-	dataList, totalPage, err := mdnlt.MDNonLabTemplateServices.GetMDNonLabTemplateData(search, page, 5)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("ERROR CONVERT PAGE PARAM", zap.Any("error", err))
-		return err
-	}
-
-	tableComp := dev_mdnonlabtemplateview.TableNonLabTemplate(dataList,
-		tableID,
-		"/dev/md/nonlabtemplate/openedit",
-		"#"+dialogEditBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"/dev/md/nonlabtemplate/opendelete",
-		"#"+dialogDeleteBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-	)
-
-	tablePagination := pagination.PaginationV3(
-		totalPage,
-		page,
-		"/dev/md/nonlabtemplate/changepage",
-		paginationID,
-		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"#"+paginationID,
-		"outerHTML", "", "",
-		dev_mdnonlabtemplateview.BeforeRequestContent(),
-		dev_mdnonlabtemplateview.AfterRequestContent(),
-	)
-
-	retval = append(retval, tableComp)
-	retval = append(retval, tablePagination)
-	return utils.ViewMulti(c, retval)
-}
-
-// handle add
-func (mdnlt *MDNonLabTemplateHandler) HandleCloseFormAdd(c echo.Context) error {
-	// logger, _ := zap.NewProduction()
-	dialogAddBodyID := c.FormValue("dialogAddBodyID")
-	// detailAddID := c.FormValue("detailAddID")
-
-	tableDetailID := utils.GenerateRandomID("tabledetailID")
-	// dialogDetailEditID := utils.GenerateRandomID("dialogeditid")
-	dialogDetailEditBodyID := utils.GenerateRandomID("dialogeditbodyid")
-	// dialogDetailDeleteID := utils.GenerateRandomID("dialogdeleteid")
-	dialogDetailDeleteBodyID := utils.GenerateRandomID("dialogdeletebodyid")
-
-	btnSimpanDetail := dev_mdnonlabtemplateview.BtnAddDetail()
-
-	var listDetaill []models.MDNonLabTemplateDetail
-	tableDetail := dev_mdnonlabtemplateview.TableDetail(listDetaill,
-		tableDetailID,
-		"/dev/md/nonlabtemplate/detailedit",
-		"#"+dialogDetailEditBodyID,
-		"outerHTML",
-		"#dialogDetailEditBodyID, #dialogDetailEditID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID",
-		"/dev/md/nonlabtemplate/detaildelete",
-		"#"+dialogDetailDeleteBodyID,
-		"outerHTML",
-		"#dialogDetailEditBodyID, #dialogDetailEditID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID",
-	)
-
-	newForm := dev_mdnonlabtemplateview.BodyFormMDNonlabTemplate(
-		dialogAddBodyID,
-		models.CustomTextFieldv2Prm{
-			Label:       "Non Lab Template Name",
-			Name:        "nonlabtemplateid",
-			Placeholder: "Non Lab Template Name",
-			Type:        "hidden",
-			ID:          "nonlabtemplateid",
-		},
-		models.CustomTextFieldv2Prm{
-			Label:       "Non Lab Template Name",
-			Name:        "nonlabtemplatename",
-			Placeholder: "Non Lab Template Name",
-			Type:        "text",
-			ID:          "nonlabtemplatename",
-		},
-		models.CustomCheckboxv1Prm{
-			Name:  "nonlabtemplateflag",
-			ID:    "nonlabtemplateflag",
-			Text:  "Template Fisik",
-			Value: "N",
-		},
-		models.CustomTextFieldv2Prm{
-			// Label:       "Template Name",
-			Name:        "nonlabtemplatedetailkode",
-			Placeholder: "Kode",
-			Type:        "text",
-			ID:          "nonlabtemplatedetailkode",
-		},
-		models.CustomTextFieldv2Prm{
-			// Label:       "Template Name",
-			Name:        "nonlabtemplatedetailname",
-			Placeholder: "Detail Name",
-			Type:        "text",
-			ID:          "nonlabtemplatedetailname",
-		},
-		btnSimpanDetail,
-		tableDetail,
-		dev_mdnonlabtemplateview.JSHideModal(""),
-	)
-	return utils.View(c, newForm)
-}
-
-// handle delete
-func (mdnlt *MDNonLabTemplateHandler) HandleOpenFormDelete(c echo.Context) error {
-	id := c.QueryParam("id")
-	dialogDeleteID := c.QueryParam("dialogDeleteID")
-	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
-
-	dataMDNLT, err := mdnlt.MDNonLabTemplateServices.GetMDNonLabTemplateByID(id)
-	if err != nil {
-		newForm := dev_mdnonlabtemplateview.DeleteConfirmBody(
-			models.CustomTextFieldv2Prm{Name: "nonlabtemplateid", Type: "hidden", Value: "0"},
-			dialogDeleteBodyID,
-			"Apakah anda yakin menghapus non lab template berikut ?",
-			[]string{"NAME"},
-			[]string{""},
-			dev_mdnonlabtemplateview.JSHideModal(""),
-		)
-		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Error", err.Error(), "danger"), newForm})
-	}
-
-	newForm := dev_mdnonlabtemplateview.DeleteConfirmBody(
-		models.CustomTextFieldv2Prm{Name: "nonlabtemplateid", Type: "hidden", Value: strconv.Itoa(dataMDNLT.NonLabTemplateID)},
-		dialogDeleteBodyID,
-		"Apakah anda yakin menghapus non lab template berikut ?",
-		[]string{"NAME"},
-		[]string{dataMDNLT.NonLabTemplateName},
-		dev_mdnonlabtemplateview.JSShowModal("#"+dialogDeleteID),
-	)
-	return utils.View(c, newForm)
-}
-
-func (mdnlt *MDNonLabTemplateHandler) HandleCloseFormDelete(c echo.Context) error {
-	dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID")
-	newForm := dev_mdnonlabtemplateview.DeleteConfirmBody(
-		models.CustomTextFieldv2Prm{Type: "hidden", Value: "0", Name: "nonlabtemplateid"},
-		dialogDeleteBodyID,
-		"Apakah anda yakin menghapus non lab template berikut ?",
-		[]string{"NAME"},
-		[]string{""},
-		dev_mdnonlabtemplateview.JSHideModal(""),
-	)
-	return utils.View(c, newForm)
-}
-
-func (mdnlt *MDNonLabTemplateHandler) HandleDeleteMDNLT(c echo.Context) error {
-	logger, _ := zap.NewProduction()
-	defer logger.Sync()
-
-	id := c.FormValue("nonlabtemplateid")
-	tableID := c.FormValue("tableID")
-	paginationID := c.FormValue("paginationID")
-	searchID := c.FormValue("searchID")
-	search := c.FormValue("search")
-	currPagePrm := c.FormValue("currpage" + paginationID)
-	// dialogAddBodyID := c.FormValue("dialogAddBodyID")
-	dialogDeleteID := c.FormValue("dialogDeleteID")
-	dialogEditBodyID := c.FormValue("dialogEditBodyID")
-	dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID")
-
-	currPage, err := strconv.Atoi(currPagePrm)
-	if err != nil {
-		return err
-	}
-	logger.Info("ADD NON LAB TEMPLATE PARAM", zap.Any("tableid", tableID), zap.Any("search", search), zap.Any("currPage", currPage))
-
-	// delete data from db
-	respDel, err := mdnlt.MDNonLabTemplateServices.DeleteDataMDNLT(id)
-	if err != nil {
-		logger.Info("Error", zap.Any("error", err))
-		newForm := dev_mdnonlabtemplateview.DeleteConfirmBody(
-			models.CustomTextFieldv2Prm{Name: "nonlabtemplateid", Type: "hidden", Value: ""},
-			dialogDeleteBodyID,
-			"Apakah anda yakin menghapus non lab template berikut ?",
-			[]string{"NAME"},
-			[]string{""},
-			dev_mdnonlabtemplateview.JSHideModal(""),
-		)
-		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Error", err.Error(), "danger"), newForm})
-	}
-	logger.Info("Response Delete", zap.Any("Resp", respDel))
-
-	dataNLTList, totalPage, err := mdnlt.MDNonLabTemplateServices.GetMDNonLabTemplateData(search, currPage, 5)
-	if err != nil {
-		defer logger.Sync()
-		logger.Info("Error get list data non lab template", zap.Any("error", err))
-		return err
-	}
-
-	tableComp := dev_mdnonlabtemplateview.TableNonLabTemplate(dataNLTList,
-		tableID,
-		"/dev/md/nonlabtemplate/openedit",
-		"#"+dialogEditBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"/dev/md/nonlabtemplate/opendelete",
-		"#"+dialogDeleteBodyID,
-		"outerHTML",
-		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-	)
-
-	paginationTable := pagination.PaginationV3(
-		totalPage,
-		currPage,
-		"/dev/md/nonlabtemplate/changepage",
-		paginationID,
-		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
-		"#"+paginationID,
-		"outerHTML", "", "true",
-		dev_mdnonlabtemplateview.BeforeRequestContent(),
-		dev_mdnonlabtemplateview.AfterRequestContent(),
-	)
-
-	var retVal []templ.Component
-	newForm := dev_mdnonlabtemplateview.DeleteConfirmBody(
-		models.CustomTextFieldv2Prm{Name: "nonlabtemplateid", Type: "hidden", Value: ""},
-		dialogDeleteBodyID,
-		"Apakah anda yakin menghapus non lab template berikut ?",
-		[]string{"NAME"},
-		[]string{""},
-		dev_mdnonlabtemplateview.JSHideModal("#"+dialogDeleteID),
-	)
-	toastSuccess := customtoastv2.CustomToastV2Show("Success", "Berhasil delete non lab template ", "success")
-	retVal = append(retVal, toastSuccess)
-	retVal = append(retVal, tableComp)
-	retVal = append(retVal, paginationTable)
-	retVal = append(retVal, newForm)
-
-	return utils.ViewMulti(c, retVal)
-}
-
-func (mdnlt *MDNonLabTemplateHandler) HandleAddDetail(c echo.Context) error {
-	logger, _ := zap.NewProduction()
-	defer logger.Sync()
-
-	nonlabtemplatedetailkode := c.FormValue("nonlabtemplatedetailkode")
-	nonlabtemplatedetailname := c.FormValue("nonlabtemplatedetailname")
-
-	tableDetailID := c.FormValue("tableDetailID")
-	// dialogDetailEditID := utils.GenerateRandomID("dialogeditid")
-	dialogDetailEditBodyID := utils.GenerateRandomID("dialogeditbodyid")
-	// dialogDetailDeleteID := utils.GenerateRandomID("dialogdeleteid")
-	dialogDetailDeleteBodyID := utils.GenerateRandomID("dialogdeletebodyid")
-
-	respAdd, err := mdnlt.MDNonLabTemplateServices.SaveInMemoryDetail(nonlabtemplatedetailkode, nonlabtemplatedetailname)
-	if err != nil {
-		return err
-	}
-
-	logger.Info("response save memory", zap.Any("return", respAdd))
-
-	updatedTable, err := mdnlt.MDNonLabTemplateServices.ListMemoryDetail()
-	if err != nil {
-		return err
-	}
-
-	tableComponent := dev_mdnonlabtemplateview.TableDetail(updatedTable,
-		tableDetailID,
-		"/dev/md/nonlabtemplate/detailedit",
-		"#"+dialogDetailEditBodyID,
-		"outerHTML",
-		"#dialogDetailEditBodyID, #dialogDetailEditID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID",
-		"/dev/md/nonlabtemplate/detaildelete",
-		"#"+dialogDetailDeleteBodyID,
-		"outerHTML",
-		"#dialogDetailEditBodyID, #dialogDetailEditID, #dialogDetailDeleteBodyID, #dialogDetailDeleteID",
-	)
-
-	return utils.View(c, tableComponent)
-}
-
-func (mdnlt *MDNonLabTemplateHandler) HandleAddNama(c echo.Context) error {
-	logger, _ := zap.NewProduction()
-
-	nama := c.FormValue("nonlabtemplatename")
-	fisik := c.FormValue("nonlabtemplateflag")
-
-	logger.Info("Test Button Add nama",
-		zap.Any("nama", nama),
-		zap.Any("flag", fisik),
-	)
-
-	return nil
-}
--- a/handlers/dev/md.pasien.handlers.go
+++ b/handlers/dev/md.pasien.handlers.go
@@ -0,0 +1,255 @@
+package dev_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	"cpone/component/customtextfieldsearch"
+	navbarmenu "cpone/component/navbar"
+	"cpone/component/pagination"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/services"
+	"cpone/utils"
+	dev_mdpasienview "cpone/views/dev/mdpasien"
+	"strconv"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type MdPasienServices interface {
+	GetListMdPasien(
+		search string,
+		currentPage int,
+		rowPerPage int) ([]models.Pasien, int, error)
+	GetMdPasienBreadCrumb(title string) (models.BreadCrumbV1, error)
+}
+
+func NewMdPasienHandler(us MdPasienServices) *MdPasienHandler {
+	return &MdPasienHandler{
+		MdPasienServices: us,
+	}
+}
+
+type MdPasienHandler struct {
+	MdPasienServices MdPasienServices
+}
+
+func (lh *MdPasienHandler) HandleShowMdPasienScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	dataMenu, err := services.GetMenu()
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		return err
+	}
+	paginationID := utils.GenerateRandomID("paginationID")
+	dialogAddID := utils.GenerateRandomID("dialogAdd")
+	dialogAddBodyID := utils.GenerateRandomID("dialogAddbody")
+	dialogEditID := utils.GenerateRandomID("dialogEdit")
+	dialogEditBodyID := utils.GenerateRandomID("dialogEditbody")
+	dialogDeleteID := utils.GenerateRandomID("dialogDelete")
+	dialogDeleteBodyID := utils.GenerateRandomID("dialogDeletebody")
+	tablePasienID := utils.GenerateRandomID("PasienID")
+	dataBreadCrumb, err := lh.MdPasienServices.GetMdPasienBreadCrumb("l")
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		return err
+	}
+	//get user login
+	dataUser, err := services.GetUserLogin()
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR BREADCRUMB DEV",
+			zap.Any("error", err),
+		)
+		return err
+	}
+	//Breadcrumb component
+	breadcrumbComponent := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadCrumb)
+	// navbar menu
+	navbarmenuComponent := navbarmenu.NavbarMenu(dataMenu)
+
+	// navbar user
+	navbaruserComponent := navbarmenu.Navbar(dataUser)
+
+	// sidebar
+	sidebaruserprofileComponent := sidebaruserprofile.Navbaruserprofile(dataUser)
+
+	//filter pasien component
+	filterPasien := customtextfieldsearch.MainCustomTextFieldSearchV3(
+		"filtersearch",
+		"search",
+		"PID/Nama",
+		"text",
+		"/dev/md/pasien/filter",
+		"input changed delay:500ms",
+		"#"+paginationID,
+		"indicator",
+		"",
+		"outerHTML",
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		dev_mdpasienview.BeforeRequestContent(),
+		dev_mdpasienview.AfterRequestContent(),
+	)
+
+	//table component
+	pasienlist, totalPage, err := lh.MdPasienServices.GetListMdPasien("", 1, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERRO GET DATA PASIEN",
+			zap.Any("error", err),
+		)
+		return err
+	}
+
+	tablePasien := dev_mdpasienview.TablePasien(pasienlist, tablePasienID,
+		"getEdit",
+		"trgtedt",
+		"swpedt",
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"getdlt",
+		"trgtdlt",
+		"swpdlt",
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID)
+
+	//Pagination
+	paginationPasien := pagination.PaginationV3(totalPage, 1,
+		"/dev/md/pasien/pagination",
+		paginationID,
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"#"+paginationID,
+		"outerHTML",
+		"",
+		"",
+		dev_mdpasienview.BeforeRequestContent(),
+		dev_mdpasienview.AfterRequestContent())
+
+	//Pasien Screen
+	cmpPasienContent := dev_mdpasienview.MdPasienScreen(
+		tablePasienID,
+		paginationID,
+		dialogAddID,
+		dialogAddBodyID,
+		dialogEditID,
+		dialogEditBodyID,
+		dialogDeleteID,
+		dialogDeleteBodyID,
+		breadcrumbComponent,
+		tablePasien,
+		filterPasien,
+		paginationPasien,
+		breadcrumbComponent,
+		breadcrumbComponent,
+		breadcrumbComponent)
+	jsMDpasien := dev_mdpasienview.JsMdPasien()
+	cssMdPasien := dev_mdpasienview.CssMdPasien()
+	viewMdPasienScreen := dev_mdpasienview.ShowMdPasienScreen("Master Pasien",
+		cmpPasienContent,
+		cssMdPasien,
+		jsMDpasien, navbarmenuComponent, navbaruserComponent, sidebaruserprofileComponent)
+
+	return utils.View(c, viewMdPasienScreen)
+}
+
+func (lh *MdPasienHandler) HandleSearchMdPasien(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	var retval []templ.Component
+	search := c.QueryParam("search")
+	// dialogEditBodyID := c.QueryParam("dialogEditBodyID")
+	// dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
+	tableID := c.QueryParam("tableID")
+	paginationID := c.QueryParam("paginationID")
+
+	pasienList, totalPage, err := lh.MdPasienServices.GetListMdPasien(search, 1, 5)
+	defer logger.Sync()
+	logger.Info("GET DATA BAHAN",
+		zap.Any("data", pasienList),
+		zap.Any("err", err),
+		zap.Any("totalPage", totalPage),
+	)
+	//Bahan Table
+
+	tablePasien := dev_mdpasienview.TablePasien(pasienList, tableID,
+		"getEdit",
+		"trgtedt",
+		"swpedt",
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"getdlt",
+		"trgtdlt",
+		"swpdlt",
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID)
+
+	//Pagination
+	paginationPasien := pagination.PaginationV3(totalPage, 1,
+		"/dev/md/pasien/pagination",
+		paginationID,
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"#"+paginationID,
+		"outerHTML",
+		"",
+		"",
+		dev_mdpasienview.BeforeRequestContent(),
+		dev_mdpasienview.AfterRequestContent())
+	retval = append(retval, tablePasien)
+	retval = append(retval, paginationPasien)
+	return utils.ViewMulti(c, retval)
+}
+func (lh *MdPasienHandler) HandlePaginationMdPasien(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	var retval []templ.Component
+	search := c.QueryParam("search")
+	// dialogEditBodyID := c.QueryParam("dialogEditBodyID")
+	// dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
+	pageparam := c.QueryParam("page")
+	tableID := c.QueryParam("tableID")
+	paginationID := c.QueryParam("paginationID")
+	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
+	}
+
+	pasienList, totalPage, err := lh.MdPasienServices.GetListMdPasien(search, page, 5)
+	defer logger.Sync()
+	logger.Info("GET DATA BAHAN",
+		zap.Any("data", pasienList),
+		zap.Any("err", err),
+		zap.Any("totalPage", totalPage),
+	)
+	tablePasien := dev_mdpasienview.TablePasien(pasienList, tableID,
+		"getEdit",
+		"trgtedt",
+		"swpedt",
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"getdlt",
+		"trgtdlt",
+		"swpdlt",
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID)
+
+	//Pagination
+	paginationPasien := pagination.PaginationV3(totalPage, page,
+		"/dev/md/pasien/pagination",
+		paginationID,
+		"#filtersearch, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"#"+paginationID,
+		"outerHTML",
+		"",
+		"",
+		dev_mdpasienview.BeforeRequestContent(),
+		dev_mdpasienview.AfterRequestContent())
+	retval = append(retval, tablePasien)
+	retval = append(retval, paginationPasien)
+	return utils.ViewMulti(c, retval)
+}
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -278,18 +278,6 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.POST("/md/samplestation/edit", devMDSampleStationHandlers.HandleEditMDSS)
 	dev.POST("/md/samplestation/closeeditform", devMDSampleStationHandlers.HandleCloseEditForm)

-	// master result nonlab template
-	devMDMRNonlabTemplateServices := dev_services.NewMDNonLabTemplateServices(appStore)
-	devMDMRNonLabTemplateHandler := dev_handlers.NewMDNonLabTemplateHandler(devMDMRNonlabTemplateServices)
-	dev.GET("/md/nonlabtemplate", devMDMRNonLabTemplateHandler.HandleShowMDNonLabTemplateScreen)
-	dev.GET("/md/nonlabtemplate/filter", devMDMRNonLabTemplateHandler.HandleFilterMDNonLabTemplate)
-	dev.GET("/md/nonlabtemplate/changepage", devMDMRNonLabTemplateHandler.HandleChangePageMDNonLabTemplate)
-	dev.GET("/md/nonlabtemplate/opendelete", devMDMRNonLabTemplateHandler.HandleOpenFormDelete)
-	dev.POST("/md/nonlabtemplate/closedeleteform", devMDMRNonLabTemplateHandler.HandleCloseFormDelete)
-	dev.POST("/md/nonlabtemplate/delete", devMDMRNonLabTemplateHandler.HandleDeleteMDNLT)
-	dev.POST("/md/nonlabtemplate/closeaddform", devMDMRNonLabTemplateHandler.HandleCloseFormAdd)
-	dev.POST("/md/nonlabtemplate/addnama", devMDMRNonLabTemplateHandler.HandleAddNama)
-
 	// masterdata nat unit
 	devMdNatUnitServices := dev_services.NewMdNatUnitServices(appStore)
 	devMdNatUnitHandlers := dev_handlers.NeWMdNatUnitHandler(devMdNatUnitServices)
@@ -333,4 +321,12 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.GET("/md/bahan/opendelete", devMdBahanHandlers.HandleOpenDeleteMdBahan)
 	dev.POST("/md/bahan/closedeleteform", devMdBahanHandlers.HandleCloseDeleteMdBahan)
 	dev.POST("/md/bahan/delete", devMdBahanHandlers.HandleDeleteMdBahan)
+
+	//MD Pasien
+	devMdPasienServices := dev_services.NewMdPasienServices(appStore)
+	devMdPasienHandlers := dev_handlers.NewMdPasienHandler(devMdPasienServices)
+	dev.GET("/md/pasien", devMdPasienHandlers.HandleShowMdPasienScreen)
+	dev.GET("/md/pasien/filter", devMdPasienHandlers.HandleSearchMdPasien)
+	dev.GET("/md/pasien/pagination", devMdPasienHandlers.HandlePaginationMdPasien)
+
 }
--- a/models/mdnonlabtemplate.models.go
+++ b/models/mdnonlabtemplate.models.go
@@ -1,47 +0,0 @@
-package models
-
-import "github.com/a-h/templ"
-
-type MDNonLabTemplate struct {
-	NonLabTemplateID                int    `db:"NonlabTemplateID"`
-	NonLabTemplateName              string `db:"NonlabTemplateName"`
-	NonLabTemplateFlagFisik         string `db:"NonlabTemplateFlagFisik"`
-	NonLabTemplateIsActive          string `db:"NonlabTemplateIsActive"`
-	NonLabTemplateCreated           string `db:"NonlabTemplateCreated"`
-	NonLabTemplateCreatedUserID     string `db:"NonlabTemplateUserID"`
-	NonLabTemplateLastUpdated       string `db:"NonlabTemplateLastUpdated"`
-	NonLabTemplateLastUpdatedUserID string `db:"NonlabTemplateLastUpdatedUserID"`
-	NonLabTemplateDelete            string `db:"NonlabTemplateDelete"`
-	NonlabTemplateDeleteUserID      string `db:"NonlabTemplateDeleteUserID"`
-}
-
-type MDNonLabTemplateDetail struct {
-	NonlabTemplateDetailID               int    `db:"NonlabTemplateDetailID"`
-	NonlabTemplateDetailNonlabTemplateID int    `db:"NonlabTemplateDetailNonlabTemplateID"`
-	NonlabTemplateDetailCode             string `db:"NonlabTemplateDetailCode"`
-	NonlabTemplateDetailName             string `db:"NonlabTemplateDetailName"`
-	NonlabTemplateDetailFlagActive       string `db:"NonlabTemplateDetailFlagActive"`
-	NonlabTemplateDetailIsActive         string `db:"NonlabTemplateDetailIsActive"`
-}
-
-type InputDetailNonLabTemplate struct {
-	NonLabTemplateName      string `db:"NonlabTemplateName"`
-	NonLabTemplateFlagFisik string `db:"NonlabTemplateFlagFisik"`
-	NonLabTemplatDetail     []MDNonLabTemplateDetail
-}
-
-type MDNonLabTemplateForm struct {
-	IDComponent       string
-	Link              string
-	HxTarget          string
-	HxSwap            string
-	HxInclude         string
-	ModalID           string
-	ModalTitle        string
-	InputID           CustomTextFieldv2Prm
-	InputNama         CustomTextFieldv2Prm
-	CheckboxFlagFisik CustomCheckboxv1Prm
-	DialogBody        templ.Component
-	DialogAction      templ.Component
-	ButtonCLose       templ.Component
-}
--- a/models/pasien.models.go
+++ b/models/pasien.models.go
@@ -0,0 +1,47 @@
+package models
+
+type Pasien struct {
+	M_PatientID                     int    `db:"M_PatientID"`
+	M_PatientNoReg                  string `db:"M_PatientNoReg"`
+	M_PatientM_TitleID              string `db:"M_PatientM_TitleID"`
+	M_PatientPrefix                 string `db:"M_PatientPrefix"`
+	M_PatientName                   string `db:"M_PatientName"`
+	M_PatientSuffix                 string `db:"M_PatientSuffix"`
+	M_PatientGender                 string `db:"M_PatientGender"`
+	M_PatientDOB                    string `db:"M_PatientDOB"`
+	M_PatientReligionCode           string `db:"M_PatientReligionCode"`
+	M_PatientReligionSystem         string `db:"M_PatientReligionSystem"`
+	M_PatientBloodTypeCode          string `db:"M_PatientBloodTypeCode"`
+	M_PatientBloodTypeSystem        string `db:"M_PatientBloodTypeSystem"`
+	M_PatientBloodRhCode            string `db:"M_PatientBloodRhCode"`
+	M_PatientBloodRhSystem          string `db:"M_PatientBloodRhSystem"`
+	M_PatientEducationCode          string `db:"M_PatientEducationCode"`
+	M_PatientEducationSystem        string `db:"M_PatientEducationSystem"`
+	M_PatientCitizenship            string `db:"M_PatientCitizenship"`
+	M_PatientEtnicCode              string `db:"M_PatientEtnicCode"`
+	M_PatientEtnicSystem            string `db:"M_PatientEtnicSystem"`
+	M_PatientIdentifierCode         string `db:"M_PatientIdentifierCode"`
+	M_PatientIdentifierSystem       string `db:"M_PatientIdentifierSystem"`
+	M_PatientIdentifierValue        string `db:"M_PatientIdentifierValue"`
+	M_PatientJob                    string `db:"M_PatientJob"`
+	M_PatientPosisi                 string `db:"M_PatientPosisi"`
+	M_PatientDivisi                 string `db:"M_PatientDivisi"`
+	M_PatientHp                     string `db:"M_PatientHp"`
+	M_PatientEmail                  string `db:"M_PatientEmail"`
+	M_PatientPhoto                  string `db:"M_PatientPhoto"`
+	M_PatientPhotoLastUpdated       string `db:"M_PatientPhotoLastUpdated"`
+	M_PatientPhotoLastUpdatedUserID string `db:"M_PatientPhotoLastUpdatedUserID"`
+	M_PatientAddress                string `db:"M_PatientAddress"`
+	M_PatientAddressRegionalCd      string `db:"M_PatientAddressRegionalCd"`
+	M_PatientAddressCity            string `db:"M_PatientAddressCity"`
+	M_PatientAddressDistrict        string `db:"M_PatientAddressDistrict"`
+	M_PatientAddressState           string `db:"M_PatientAddressState"`
+	M_PatientAddressCountry         string `db:"M_PatientAddressCountry"`
+	M_PatientIsActive               string `db:"M_PatientIsActive"`
+	M_PatientCreated                string `db:"M_PatientCreated"`
+	M_PatientCreatedUserID          string `db:"M_PatientCreatedUserID"`
+	M_PatientLastUpdated            string `db:"M_PatientLastUpdated"`
+	M_PatientLastUpdatedUserID      string `db:"M_PatientLastUpdatedUserID"`
+	M_PatientDeletedUserID          string `db:"M_PatientDeletedUserID"`
+	M_PatientDeleted                string `db:"M_PatientDeleted"`
+}
--- a/models/terminology.models.go
+++ b/models/terminology.models.go
@@ -0,0 +1,27 @@
+package models
+
+type TerminologyV0 struct {
+	ResourceType    string `db:"resource_type"`
+	AttributePath   string `db:"attribute_path"`
+	Code            string `db:"code"`
+	ParentCode      string `db:"parent_code"`
+	Display         string `db:"display"`
+	DisplayEn       string `db:"display_en"`
+	CodeSystem      string `db:"code_system"`
+	OrderNo         uint   `db:"order_no"`
+	FtIndex         string `db:"ft_index"`
+	UseInd          bool   `db:"use_ind"`
+	Description     string `db:"description"`
+	StatusCd        string `db:"status_cd"`
+	CreatedDttm     string `db:"created_dttm"`
+	CreatedUserID   uint   `db:"created_user_id"`
+	UpdatedDttm     string `db:"updated_dttm"`
+	UpdatedUserID   uint   `db:"updated_user_id"`
+	NullifiedDttm   string `db:"nullified_dttm"`
+	NullifiedUserID uint   `db:"nullified_user_id"`
+}
+
+type TerminologyParamv0 struct {
+	AttributePath string `json:"AttributePath"`
+	CodeSystem    string `json:"CodeSystem"`
+}
--- a/services/app.services.go
+++ b/services/app.services.go
@@ -1,8 +1,14 @@
 package services

-import "cpone/models"
+import (
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"

-//Func get menu sidebar
+	"go.uber.org/zap"
+)
+
+// Func get menu sidebar
 func GetMenu() ([]models.Menu, error) {

 	// dummyBreadcrumb := []Breadcrumb{
@@ -515,6 +521,30 @@ func GetUserLogin() (models.User, error) {
 	return a, nil
 }

-func GetTerminology(attributePath string, codeSystem string) {
+func GetTerminologyList(inp models.TerminologyParamv0) ([]models.TerminologyV0, error) {
+	logger, _ := zap.NewProduction()
+	defer logger.Sync()

+	var term []models.TerminologyV0
+
+	query := `
+		SELECT
+			*
+		FROM terminology
+		WHERE status_cd = 'normal'
+		AND code_system = ?
+		AND attribute_path = ?
+	`
+
+	logger.Info("QUERY SEARCH TERMINOLOGY",
+		zap.String("query search", query),
+	)
+
+	if err := dbx.Handlex.Select(&term, query,
+		inp.CodeSystem,
+		inp.CodeSystem); err != nil {
+		return nil, fmt.Errorf("error querying database terminology: %v", err)
+	}
+
+	return term, nil
 }
--- a/services/dev/md.nonlabtemplate.services.go
+++ b/services/dev/md.nonlabtemplate.services.go
@@ -1,277 +0,0 @@
-package dev_services
-
-import (
-	"cpone/db"
-	"cpone/models"
-	dbx "cpone/package/database"
-	"fmt"
-	"math"
-	"strconv"
-	"strings"
-
-	"go.uber.org/zap"
-)
-
-type MDNonLabTemplateServices struct {
-	MDNonLabTemplateStore db.AppStore
-	DetailStore           []models.MDNonLabTemplateDetail
-	addChan               chan models.MDNonLabTemplateDetail
-	delChan               chan models.MDNonLabTemplateDetail
-}
-
-func NewMDNonLabTemplateServices(uStore db.AppStore) *MDNonLabTemplateServices {
-	aChan := make(chan models.MDNonLabTemplateDetail)
-	dChan := make(chan models.MDNonLabTemplateDetail)
-
-	serv := MDNonLabTemplateServices{
-		MDNonLabTemplateStore: uStore,
-		DetailStore:           []models.MDNonLabTemplateDetail{},
-		addChan:               aChan,
-		delChan:               dChan,
-	}
-
-	go serv.runner()
-	return &serv
-}
-
-func (mdnlt *MDNonLabTemplateServices) runner() {
-	for {
-		select {
-		case x := <-mdnlt.addChan:
-			mdnlt.DetailStore = append(mdnlt.DetailStore, x)
-		case y := <-mdnlt.delChan:
-			mdnlt.DetailStore = append(mdnlt.DetailStore, y)
-		}
-	}
-}
-
-func (mdnlt *MDNonLabTemplateServices) GetMDNonLabTemplateBreadcrumb() (models.BreadCrumbV1, error) {
-	var ret models.BreadCrumbV1
-
-	breadcrumb := models.BreadCrumbV1{
-		Title: "Master Non-lab Template",
-		Item: []models.ItemBreadCrumbV1{
-			{
-				Item: "Dashboard",
-				Url:  "/dev/dashboard",
-			},
-			{
-				Item: "Master",
-				Url:  "/dev/master",
-			},
-			{
-				Item: "Non-lab Template",
-				Url:  "",
-			},
-		},
-	}
-
-	ret = breadcrumb
-	return ret, nil
-}
-
-func (mdnlt *MDNonLabTemplateServices) GetMDNonLabTemplateData(search string, currentPage int, rowPerPage int) ([]models.MDNonLabTemplate, int, error) {
-	var ret []models.MDNonLabTemplate
-	var totalData int
-
-	offset := (currentPage - 1) * rowPerPage
-	prm := "%" + strings.TrimSpace(search) + "%"
-	query := `
-		SELECT COUNT(*)
-		FROM nonlab_template
-		WHERE NonlabTemplateIsActive = 'Y'
-		AND (NonlabTemplateName LIKE ?)
-	`
-	if err := dbx.Handlex.Get(&totalData, query, prm); err != nil {
-		return nil, 0, fmt.Errorf("error querying databases: %v", err)
-	}
-
-	query = `
-		SELECT
-		NonlabTemplateID,
-		NonlabTemplateName,
-		NonlabTemplateFlagFisik,
-		NonlabTemplateIsActive,
-		NonlabTemplateCreated,
-		NonlabTemplateLastUpdated
-		FROM nonlab_template
-		WHERE NonlabTemplateIsActive = 'Y'
-		AND (NonlabTemplateName LIKE ?)
-		ORDER BY NonlabTemplateID ASC
-		LIMIT ? OFFSET ?
-	`
-	if err := dbx.Handlex.Select(&ret, query, prm, rowPerPage, offset); err != nil {
-		return nil, 0, fmt.Errorf("error querying database: %v", err)
-	}
-
-	totalPage := int(math.Ceil(float64(totalData) / float64(rowPerPage)))
-
-	return ret, totalPage, nil
-}
-
-func (mdnlt *MDNonLabTemplateServices) GetMDNonLabTemplateByID(id string) (models.MDNonLabTemplate, error) {
-	logger, _ := zap.NewProduction()
-	var ret models.MDNonLabTemplate
-
-	q := `
-		SELECT
-		NonlabTemplateID,
-		NonlabTemplateName,
-		NonlabTemplateFlagFisik,
-		NonlabTemplateIsActive,
-		NonlabTemplateCreated,
-		NonlabTemplateLastUpdated
-		FROM nonlab_template
-		WHERE NonlabTemplateID = ?
-	`
-	err := dbx.Handlex.Get(&ret, q, id)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error get data non lab template by id vs",
-			zap.String("ID", id),
-			zap.Error(err),
-		)
-		return ret, fmt.Errorf("QUERY FAILED GET DATA BY ID")
-	}
-	return ret, nil
-}
-
-func (mdnlt *MDNonLabTemplateServices) GetListingDetailByID(id string) ([]models.MDNonLabTemplateDetail, error) {
-	logger, _ := zap.NewProduction()
-	var ret []models.MDNonLabTemplateDetail
-
-	q := `
-		SELECT
-		NonlabTemplateDetailID,
-		NonlabTemplateDetailNonlabTemplateID,
-		NonlabTemplateDetailCode,
-		NonlabTemplateDetailName,
-		NonlabTemplateDetailIsActive
-		FROM nonlab_template_detail
-		WHERE NonlabTemplateDetailIsActive = 'Y'
-		AND NonlabTemplateDetailNonlabTemplateID = ?
-	`
-
-	if err := dbx.Handlex.Select(&ret, q, id); err != nil {
-		defer logger.Sync()
-		logger.Error("Error get detail",
-			zap.String("ID", id),
-			zap.Error(err),
-		)
-		return nil, fmt.Errorf("error get list detail: %v", err)
-	}
-
-	return ret, nil
-}
-
-func (mdnlt *MDNonLabTemplateServices) AddDataMDNLT(input models.InputDetailNonLabTemplate) (models.MDNonLabTemplate, error) {
-	logger, _ := zap.NewProduction()
-	var ret models.MDNonLabTemplate
-
-	// cek duplicate non lab template name
-	var count int
-	prm := "%" + input.NonLabTemplateName + "%"
-	q := `SELECT COUNT(*) FROM nonlab_template WHERE NonlabTemplateIsActive = 'Y' AND NonlabTemplateName LIKE ?`
-	err := dbx.Handlex.Get(&count, q, prm)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("cek duplicate", zap.Any("name", input.NonLabTemplateName))
-		return ret, fmt.Errorf("query failed to cek duplicate")
-	}
-	if count > 0 {
-		defer logger.Sync()
-		logger.Error("duplicate data", zap.Any("name", input.NonLabTemplateName))
-		return ret, fmt.Errorf("duplicate code or name")
-	}
-
-	// insert data
-	tx, err := dbx.Handlex.Beginx()
-	if err != nil {
-		return ret, err
-	}
-	defer tx.Rollback()
-
-	qnlt := `
-		INSERT INTO nonlab_template (
-			NonlabTemplateName,
-			NonlabTemplateFlagFisik,
-			NonlabTemplateCreated
-		) VALUES (?,?,NOW());
-	`
-	rsp := tx.MustExec(qnlt, input.NonLabTemplateName, input.NonLabTemplateFlagFisik)
-	insertedID, err := rsp.LastInsertId()
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("failed insert data template", zap.Any("name", input.NonLabTemplateName), zap.Any("flag fisik", input.NonLabTemplateFlagFisik))
-		return ret, fmt.Errorf("query failed insert data template")
-	}
-
-	qry, err := tx.Preparex(`
-		INSERT INTO nonlab_template_detail (
-			NonlabTemplateDetailNonlabTemplateID,
-			NonlabTemplateDetailCode,
-			NonlabTemplateDetailName,
-			NonlabTemplateDetailFlagActive
-		) VALUES (?,?,?,?)
-	`)
-	if err != nil {
-		return ret, fmt.Errorf("query failed: %v", err)
-	}
-	defer qry.Close()
-
-	for _, detail := range input.NonLabTemplatDetail {
-		_, err := qry.Exec(
-			insertedID,
-			detail.NonlabTemplateDetailCode,
-			detail.NonlabTemplateDetailName,
-			detail.NonlabTemplateDetailFlagActive,
-		)
-		if err != nil {
-			return ret, fmt.Errorf("query insert detail failed: %v", err)
-		}
-	}
-
-	if err := tx.Commit(); err != nil {
-		return ret, fmt.Errorf("commit query failed: %v", err)
-	}
-
-	s := strconv.Itoa(int(insertedID))
-	return mdnlt.GetMDNonLabTemplateByID(s)
-}
-
-func (mdnlt *MDNonLabTemplateServices) DeleteDataMDNLT(id string) (models.MDNonLabTemplate, error) {
-	logger, _ := zap.NewProduction()
-	var ret models.MDNonLabTemplate
-
-	q := `
-		UPDATE nonlab_template
-		SET 
-		NonlabTemplateIsActive = 'N',
-		NonlabTemplateLastUpdated = NOW()
-		WHERE NonlabTemplateID = ?
-	`
-	dlt := dbx.Handlex.MustExec(q, id)
-	_, err := dlt.RowsAffected()
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error delete sample station", zap.String("id", id))
-		return ret, fmt.Errorf("query failed delete non lab template")
-	}
-
-	return mdnlt.GetMDNonLabTemplateByID(id)
-}
-
-func (mdnlt *MDNonLabTemplateServices) SaveInMemoryDetail(kode string, name string) (models.MDNonLabTemplateDetail, error) {
-	data := models.MDNonLabTemplateDetail{
-		NonlabTemplateDetailCode: kode,
-		NonlabTemplateDetailName: name,
-	}
-
-	mdnlt.addChan <- data
-
-	return data, nil
-}
-
-func (mdnlt *MDNonLabTemplateServices) ListMemoryDetail() ([]models.MDNonLabTemplateDetail, error) {
-	return mdnlt.DetailStore, nil
-}
--- a/services/dev/md.pasien.services.go
+++ b/services/dev/md.pasien.services.go
@@ -0,0 +1,87 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strings"
+)
+
+func NewMdPasienServices(uStore db.AppStore) *MdPasienServices {
+
+	return &MdPasienServices{
+
+		MdPasienStore: uStore,
+	}
+}
+
+type MdPasienServices struct {
+	MdPasienStore db.AppStore
+}
+
+func (su *MdPasienServices) GetListMdPasien(
+	search string,
+	currentPage int,
+	rowPerPage int) ([]models.Pasien, int, error) {
+	var pasienList []models.Pasien
+	var totalData int
+	offset := (currentPage - 1) * rowPerPage
+	prm := "%" + strings.TrimSpace(search) + "%"
+
+	querytotal := `
+		SELECT COUNT(*)
+		FROM m_patient
+		JOIN m_title 
+		ON M_PatientM_TitleID = M_TitleID
+		AND M_TitleIsActive = 'Y'
+		WHERE 
+		(M_PatientNoReg LIKE ? OR M_PatientName LIKE ?)
+		AND M_PatientIsActive = 'Y'
+	`
+	if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm); err != nil {
+		return nil, 0, fmt.Errorf("error querying database: %v", err)
+	}
+	query := `
+		SELECT m_patient.*
+		FROM m_patient
+		JOIN m_title 
+		ON M_PatientM_TitleID = M_TitleID
+		AND M_TitleIsActive = 'Y'
+		WHERE 
+		(M_PatientNoReg LIKE ? OR M_PatientName LIKE ?)
+		AND M_PatientIsActive = 'Y'
+		LIMIT ? OFFSET ?
+	`
+
+	if err := dbx.Handlex.Select(&pasienList, 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 pasienList, totalPage, nil
+
+}
+func (su *MdPasienServices) GetMdPasienBreadCrumb(title string) (models.BreadCrumbV1, error) {
+
+	ret := models.BreadCrumbV1{
+		Title: "Master Pasien",
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/dev/dashboard",
+			},
+			{
+				Item: "Master",
+				Url:  "/dev/master",
+			},
+			{
+				Item: "Pasien",
+				Url:  "",
+			},
+		},
+	}
+
+	return ret, nil
+}
--- a/views/dev/mdnonlabtemplate/mdnonlabtemplate.templ
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplate.templ
@@ -1,205 +0,0 @@
-package dev_mdnonlabtemplateview
-
-import "cpone/component/customtextfield"
-import "cpone/models"
-import "cpone/layout"
-
-templ MDNonLabTemplateScreen(
-    tableID string,
-    paginationID string,
-    searchID string,
-    dialogAddID string,
-    dialogAddBodyID string,
-    dialogEditID string,
-    dialogEditBodyID string,
-    dialogDeleteID string,
-    dialogDeleteBodyID string,
-    btnAddNamaID string,
-    btnAddDetailID string,
-    tableDetailID string,
-    tableDetailPaginationID string,
-    breadcrumb templ.Component,
-    filterComponent templ.Component,
-    tableComponent templ.Component,
-    paginationComponent templ.Component,
-    modalAddForm templ.Component,
-    modalDeleteForm templ.Component,
-) {
-    <div class="container-fluid">
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
-            Name: "tableID",
-            Type: "hidden",
-            Value: tableID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
-            Name: "paginationID",
-            Type: "hidden",
-            Value: paginationID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "searchID",
-            Name: "searchID",
-            Type: "hidden",
-            Value: searchID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddID",
-            Name: "dialogAddID",
-            Type: "hidden",
-            Value: dialogAddID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddBodyID",
-            Name: "dialogAddBodyID",
-            Type: "hidden",
-            Value: dialogAddBodyID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID",
-            Name: "dialogEditID",
-            Type: "hidden",
-            Value: dialogEditID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID",
-            Name: "dialogEditBodyID",
-            Type: "hidden",
-            Value: dialogEditBodyID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID",
-            Name: "dialogDeleteID",
-            Type: "hidden",
-            Value: dialogDeleteID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteBodyID",
-            Name: "dialogDeleteBodyID",
-            Type: "hidden",
-            Value: dialogDeleteBodyID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "btnAddNamaID",
-            Name: "btnAddNamaID",
-            Type: "hidden",
-            Value: btnAddNamaID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "btnAddDetailID",
-            Name: "btnAddDetailID",
-            Type: "hidden",
-            Value: btnAddDetailID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableDetailID",
-            Name: "tableDetailID",
-            Type: "hidden",
-            Value: tableDetailID,})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableDetailPaginationID",
-            Name: "tableDetailPaginationID",
-            Type: "hidden",
-            Value: tableDetailPaginationID,})
-        <div class="row align-items-center mb-10">
-            <div class="col-md-10 col-sm-12 p-0">
-                @breadcrumb
-            </div>
-            <div class="col-md-2 d-none d-lg-block d-xl-block d-md-block d-sm-none">
-                <div class="d-flex justify-content-end">
-                    <button 
-                        type="button"
-                        class="btn btn-primary"
-                        data-toggle="modal"
-                        data-target={ "#" + dialogAddID }
-                    >Add New</button>
-                </div>
-            </div>
-            <div class="col-md-2 d-block d-lg-none d-xl-none d-md-none d-sm-block justify-content-center px-5">
-                <button 
-                    type="button" 
-                    class="btn btn-primary btn-block"
-                    data-toggle="modal"
-                    data-target={ "#" + dialogAddID }
-                >Add New</button>
-            </div>
-        </div>
-        @filterComponent
-        <div id="loading-parent" class="rounded">
-            @tableComponent
-            @paginationComponent
-            @modalAddForm
-            @modalDeleteForm
-            <div id="loading-child" class="rounded bg-transparent">
-                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
-                    <span class="sr-only">Loading...</span>
-                </div>
-            </div>            
-        </div>
-        <div id="loadingcontent"></div>
-    </div>
-}
-
-templ CSSMDNonLabTemplate() {
-	<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>
-        body {
-        background-color: white;
-        /* padding-right: 100px;
-                padding-left: 100px; */
-        }
-        #div-chart {
-            /* overflow-x: scroll; */
-            margin: 40px 10vw 40px 10vw;
-        }
-        .title {
-            font-size:20px;
-            font-weight: bold;
-        }
-        #title {
-            font-weight: 600;
-        }
-        
-    </style>    
-}
-
-templ JSSMDNonLabTemplate() {
-    <script>
-        document.addEventListener('htmx:beforeRequest', function(event) {
-            var indicator = document.querySelector('#loadingcontent');
-            if (indicator) {
-                console.log('Loading Start')
-            }
-        });
-
-        document.addEventListener('htmx:afterRequest', function(event) {
-            var indicator = document.querySelector('#loadingcontent');
-            if (indicator) {
-                console.log('Loading End')
-            }
-        });
-    </script>
-}
-
-script BeforeRequestContent() {
-    const loadingParent = document.getElementById("loading-parent");
-    const loadingChild = document.getElementById("loading-child");
-    const loadingSpinner = document.getElementById("loading-spinner");
-
-    loadingParent.classList.add("overlay");
-    loadingParent.classList.add("overlay-block");
-    loadingChild.classList.add("overlay-layer");
-    loadingSpinner.classList.remove("d-none");
-}
-
-script AfterRequestContent() {
-    const loadingParent = document.getElementById("loading-parent");
-    const loadingChild = document.getElementById("loading-child");
-    const loadingSpinner = document.getElementById("loading-spinner");
-
-    loadingParent.classList.remove("overlay");
-    loadingParent.classList.remove("overlay-block");
-    loadingChild.classList.remove("overlay-layer");
-    loadingSpinner.classList.add("d-none");
-}
-
-templ ShowMDNonLabTemplate(
-    title string, 
-    cmp templ.Component, 
-    css templ.Component,
-    js templ.Component,
-    navbarmenu templ.Component,
-    navbaruser templ.Component,
-    userprofile templ.Component) {
-        @layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile) {
-            @cmp
-        }
-    }
--- a/views/dev/mdnonlabtemplate/mdnonlabtemplatedetailtable.templ
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplatedetailtable.templ
@@ -1,110 +0,0 @@
-package dev_mdnonlabtemplateview
-
-import "cpone/models"
-import "cpone/component/table"
-import "strconv"
-
-templ TableDetail(data []models.MDNonLabTemplateDetail,
-	tableID string,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-
-) {
-    <div id={ tableID } hx-swap-oob="true">
-        @tablecomponent.TableV3([]string{"KODE", "TEST", "AKSI"},
-        []string{"20%","60%","20%"},
-        RowTableDetail(data,
-            hxGetEdit,
-            hxTargetEdit,
-            hxSwapEdit,
-            hxIncludeEdit,
-            hxGetDelete,
-            hxTargetDelete,
-            hxSwapDelete,
-            hxIncludeDelete,
-        ))
-    </div>
-}
-
-templ RowTableDetail(data []models.MDNonLabTemplateDetail,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) {
-    if len(data) == 0 {
-        <tr>
-            <td colspan="3" class="text-center">Belum ada data</td>
-        </tr>
-    }
-    for _, d := range data {
-        <tr>
-            <td>{ d.NonlabTemplateDetailCode }</td>
-            <td>{ d.NonlabTemplateDetailName }</td>
-            <td>
-                @ActionTableDetail(d.NonlabTemplateDetailID,
-                    hxGetEdit,
-                    hxTargetEdit,
-                    hxSwapEdit,
-                    hxIncludeEdit,
-                    hxGetDelete,
-                    hxTargetDelete,
-                    hxSwapDelete,
-                    hxIncludeDelete,
-                )
-            </td>
-        </tr>
-    }
-}
-
-templ ActionTableDetail(id int,
-    hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) {
-    <div class="row px-5 d-flex justify-content-around">
-        <a 
-            type="button"
-            class="btnactionnlt col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm"
-            hx-get={ hxGetDelete + "?id=" + strconv.Itoa(id) }
-            hx-target={ hxTargetDelete }
-            hx-swap={ hxSwapDelete }
-            hx-include={ hxIncludeDelete }
-            hx-indicator={ "#spnrdel" + strconv.Itoa(id) }
-            hx-on::before-request={ HandleBeforeRequestRow(strconv.Itoa(id)) }
-            hx-on::after-request={ HandleAfterRequestRow(strconv.Itoa(id)) }            
-        >
-            <span id={ "spnrdel" + strconv.Itoa(id) } class="htmx-indicator spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-            <i class="flaticon2-trash"></i>
-        </a>
-        <a
-			type="button"
-			class="btnactiongr col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm"
-			hx-get={ hxGetEdit + "?id=" + strconv.Itoa(id) }
-			hx-target={ hxTargetEdit }
-			hx-swap={ hxSwapEdit }
-			hx-include={ hxIncludeEdit }
-			hx-indicator={ "#spnredt" + strconv.Itoa(id) }
-			hx-on::before-request={ HandleBeforeRequestRow(strconv.Itoa(id)) }
-			hx-on::after-request={ HandleAfterRequestRow(strconv.Itoa(id)) }        
-        >
-            <span id={ "spnredt" + strconv.Itoa(id) } class="htmx-indicator spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-            Pilih
-        </a>
-    </div>
-}
--- a/views/dev/mdnonlabtemplate/mdnonlabtemplatedetailtable_templ.go
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplatedetailtable_templ.go
@@ -1,407 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.663
-package dev_mdnonlabtemplateview
-
-//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"
-import "cpone/component/table"
-import "strconv"
-
-func TableDetail(data []models.MDNonLabTemplateDetail,
-	tableID string,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_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 id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 19, 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("\" hx-swap-oob=\"true\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"KODE", "TEST", "AKSI"},
-			[]string{"20%", "60%", "20%"},
-			RowTableDetail(data,
-				hxGetEdit,
-				hxTargetEdit,
-				hxSwapEdit,
-				hxIncludeEdit,
-				hxGetDelete,
-				hxTargetDelete,
-				hxSwapDelete,
-				hxIncludeDelete,
-			)).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
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func RowTableDetail(data []models.MDNonLabTemplateDetail,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var3 == nil {
-			templ_7745c5c3_Var3 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		if len(data) == 0 {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"3\" class=\"text-center\">Belum ada data</td></tr>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		for _, d := range data {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var4 string
-			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(d.NonlabTemplateDetailCode)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 52, Col: 44}
-			}
-			_, 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("</td><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var5 string
-			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(d.NonlabTemplateDetailName)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 53, 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("</td><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = ActionTableDetail(d.NonlabTemplateDetailID,
-				hxGetEdit,
-				hxTargetEdit,
-				hxSwapEdit,
-				hxIncludeEdit,
-				hxGetDelete,
-				hxTargetDelete,
-				hxSwapDelete,
-				hxIncludeDelete,
-			).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td></tr>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func ActionTableDetail(id int,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var6 == nil {
-			templ_7745c5c3_Var6 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row px-5 d-flex justify-content-around\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleBeforeRequestRow(strconv.Itoa(id)), HandleAfterRequestRow(strconv.Itoa(id)))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactionnlt col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm\" hx-get=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, 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\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 84, Col: 60}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 85, Col: 38}
-		}
-		_, 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("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 86, Col: 34}
-		}
-		_, 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("\" hx-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 87, Col: 40}
-		}
-		_, 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("\" hx-indicator=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs("#spnrdel" + strconv.Itoa(id))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 88, Col: 56}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var12 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var13 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><span id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 92, Col: 51}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"htmx-indicator spinner-border spinner-border-sm\" role=\"status\" aria-hidden=\"true\"></span> <i class=\"flaticon2-trash\"></i></a> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleBeforeRequestRow(strconv.Itoa(id)), HandleAfterRequestRow(strconv.Itoa(id)))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactiongr col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm\" hx-get=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, 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\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 98, Col: 49}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 99, Col: 27}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var17 string
-		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 100, Col: 23}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var18 string
-		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 101, Col: 29}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var19 string
-		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs("#spnredt" + strconv.Itoa(id))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 102, Col: 47}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var20 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var21 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><span id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var22 string
-		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs("spnredt" + strconv.Itoa(id))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatedetailtable.templ`, Line: 106, Col: 51}
-		}
-		_, 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("\" class=\"htmx-indicator spinner-border spinner-border-sm\" role=\"status\" aria-hidden=\"true\"></span> Pilih\r</a></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/views/dev/mdnonlabtemplate/mdnonlabtemplatemodal.templ
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplatemodal.templ
@@ -1,235 +0,0 @@
-package dev_mdnonlabtemplateview
-
-import "cpone/models"
-import "cpone/component/modal"
-import "cpone/component/customtextfield"
-import "cpone/component/customcheckbox"
-
-templ NonLabTemplateModalForm(data models.MDNonLabTemplateForm) {
-    <div class="">
-        <form
-            id={ data.IDComponent }
-            hx-post={ data.Link }
-            class="form"
-            hx-target={ data.HxTarget }
-            hx-swap={ data.HxSwap }
-            hx-include={ data.HxInclude }
-            hx-indicator=".formloading"
-            hx-on::before-request={ HandleFormBeforeRequest() }
-            hx-on::after-request={ HandleFormAfterRequest() }
-        >
-            if data.ModalTitle == "Delete - Non Lab Template" {
-                @modalcomponent.Modal(data.ModalID,
-                    data.ModalTitle,
-                    data.DialogBody,
-                    data.DialogAction,
-                    data.ButtonCLose,
-                )                
-            }
-            @modalcomponent.ModalXL(data.ModalID,
-                data.ModalTitle,
-                data.DialogBody,
-                data.DialogAction,
-                data.ButtonCLose,
-            )
-        </form>
-    </div>
-}
-
-script HandleFormBeforeRequest() {
-    const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    for (let i=0; i < btnActCancel.length; i++) {
-        btnActCancel[i].setAttribute('disabled', 'true');
-    }
-    for (let i=0; i < btnActSaveData.length; i++) {
-        btnActSaveData[i].setAttribute('disabled', 'true');
-    }
-}
-
-script HandleFormAfterRequest() {
-    const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    for (let i=0; i < btnActCancel.length; i++) {
-        btnActCancel[i].removeAttribute('disabled');
-    }
-    for (let i=0; i < btnActSaveData.length; i++) {
-        btnActSaveData[i].removeAttribute('disabled');
-    }    
-}
-
-templ BodyFormMDNonlabTemplate(
-    componentID string,
-    inputID models.CustomTextFieldv2Prm,
-    inputName models.CustomTextFieldv2Prm,
-    flagFisik models.CustomCheckboxv1Prm,
-    kodeDetail models.CustomTextFieldv2Prm,
-    namaDetail models.CustomTextFieldv2Prm,
-    btnDetail templ.Component,
-    tableDetail templ.Component,
-    hxOnLoad templ.ComponentScript,
-) {
-    <div id={ componentID } hx-on::load={ hxOnLoad }>
-        @customtextfield.CustomTextFieldv2(inputID)
-        <div class="row">
-            <div class="col-8">
-                @customtextfield.CustomTextFieldv2(inputName)
-            </div>
-            <div class="col-4">
-                @customcheckbox.MainCustomCheckboxInput(flagFisik)
-            </div>
-        </div>
-        <div class="row align-items-center">
-            <div class="col-3">
-                @customtextfield.CustomTextFieldv2(kodeDetail)
-            </div>
-            <div class="col-8">
-                @customtextfield.CustomTextFieldv2(namaDetail)
-            </div>
-            <div class="col-1">
-                @btnDetail
-            </div>
-        </div>
-        <h6 class="font-weight-bold">Detail Hasil</h6>
-        @tableDetail
-    </div>
-}
-
-templ BtnAddNama(
-    btnAddNamaID string,
-) {
-    <button
-        type="button"
-        class="btn btnaddnama btn-outline-secondary font-weight-bolder rounded-lg"
-        aria-label="Add Detail"
-        data-target={ "#"+btnAddNamaID }
-    >
-        Simpan
-    </button>
-}
-
-templ BtnAddDetail(
-    btnAddNamaID string,
-) {
-    <button 
-        type="button" 
-        class="btn btnadddetail"
-        aria-label="Add Detail"
-        data-targer={ "#"+btnAddNamaID }
-    >
-        <i aria-hidden="true" class="ki ki-solid-plus icon-2x text-primary"></i>
-    </button>
-}
-
-script JSHideModal(modalID string) {
-    $(modalID).modal('hide')
-}
-
-script JSShowModal(modalID string) {
-    $(modalID).modal('show')
-	const btnActCancel = document.querySelectorAll('.btnactcancel');
-	const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-	for (let i = 0; i < btnActCancel.length; i++) {
-			btnActCancel[i].removeAttribute('disabled');
-		
-	}
-	for (let i = 0; i < btnActSaveData.length; i++) {
-			btnActSaveData[i].removeAttribute('disabled');
-	}
-}
-
-templ ActionFormMDNLT(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-    <div>
-		<button
-			hx-on::after-request={ JSHideModal(modalID) }
-			hx-post={ LinkClose }
-			hx-target={ targetClose }
-			hx-swap={ hxSwapClose }
-			hx-indicator=".cancelloading"
-			type="button"
-			class="btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel "
-			data-dismiss="modal"
-		>
-			<span class="htmx-indicator spinner-border spinner-border-sm cancelloading" role="status" aria-hidden="true"></span>
-			Batal
-		</button>
-		<button
-			type="submit"
-			class="btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata"
-		>
-			<span class="htmx-indicator spinner-border spinner-border-sm formloading" role="status" aria-hidden="true"></span>
-			Simpan
-		</button>        
-    </div>
-}
-
-templ BtnCloseFormMDNLT(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-    <button 
-        hx-post={ LinkClose }
-        hx-target={ targetClose }
-        hx-swap={ hxSwapClose }
-        type="button" 
-        hx-on::after-request={ JSHideModal(modalID) }
-        class="close btnactcancel"
-        data-dismiss="modal"
-        aria-label="Close"
-    >
-        <i aria-hidden="true" class="ki ki-close"></i>
-    </button>
-}
-
-templ DeleteConfirmBody(
-    inputID models.CustomTextFieldv2Prm,
-    componentID string,
-    message string,
-    dataHeader []string,
-    dataText []string,
-    hxOnLoad templ.ComponentScript,
-) {
-    <div id={ componentID } hx-on::load={ hxOnLoad }>
-        <p>{ message }</p>
-        <div class="card rounded-lg">
-            <div class="card-body d-flex flex-row">
-                <div class="d-flex flex-column">
-                    for _, v := range dataHeader {
-                        <div class="mb-1 mt-1 text-disabled font-weight-bold mr-5">{ v }</div>
-                    }
-                </div>
-                <div class="d-flex flex-column">
-                    for _, v := range dataText {
-                        <div class="mb-1 mt-1 font-weight-bold">{ v }</div>
-                    }
-                </div>                
-            </div>
-        </div>
-        @customtextfield.CustomTextFieldv2(inputID)
-    </div>
-}
-
-templ ActionFormMDNLTDelete(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-    <div>
-		<button
-			hx-on::after-request={ JSHideModal(modalID) }
-			hx-post={ LinkClose }
-			hx-target={ targetClose }
-			hx-swap={ hxSwapClose }
-			hx-indicator=".cancelloading"
-			type="button"
-			class="btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel"
-			data-dismiss="modal"
-		>
-			<span class="htmx-indicator spinner-border spinner-border-sm cancelloading" role="status" aria-hidden="true"></span>
-			Batal
-		</button>
-		<button
-			type="submit"
-			class="btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata"
-		>
-			<span class="htmx-indicator spinner-border spinner-border-sm formloading" role="status" aria-hidden="true"></span>
-			Yakin
-		</button>        
-    </div>
-}
--- a/views/dev/mdnonlabtemplate/mdnonlabtemplatemodal_templ.go
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplatemodal_templ.go
@@ -1,760 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.663
-package dev_mdnonlabtemplateview
-
-//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"
-import "cpone/component/modal"
-import "cpone/component/customtextfield"
-import "cpone/component/customcheckbox"
-
-func NonLabTemplateModalForm(data models.MDNonLabTemplateForm) 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=\"\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleFormBeforeRequest(), HandleFormAfterRequest())
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<form id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(data.IDComponent)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 11, Col: 33}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(data.Link)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 12, Col: 31}
-		}
-		_, 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("\" class=\"form\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxTarget)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 14, Col: 37}
-		}
-		_, 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("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxSwap)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 15, Col: 33}
-		}
-		_, 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("\" hx-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxInclude)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 16, Col: 39}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\".formloading\" hx-on::before-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 templ.ComponentScript = HandleFormBeforeRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 templ.ComponentScript = HandleFormAfterRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if data.ModalTitle == "Delete - Non Lab Template" {
-			templ_7745c5c3_Err = modalcomponent.Modal(data.ModalID,
-				data.ModalTitle,
-				data.DialogBody,
-				data.DialogAction,
-				data.ButtonCLose,
-			).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = modalcomponent.ModalXL(data.ModalID,
-			data.ModalTitle,
-			data.DialogBody,
-			data.DialogAction,
-			data.ButtonCLose,
-		).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</form></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func HandleFormBeforeRequest() templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_HandleFormBeforeRequest_5ffd`,
-		Function: `function __templ_HandleFormBeforeRequest_5ffd(){const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    for (let i=0; i < btnActCancel.length; i++) {
-        btnActCancel[i].setAttribute('disabled', 'true');
-    }
-    for (let i=0; i < btnActSaveData.length; i++) {
-        btnActSaveData[i].setAttribute('disabled', 'true');
-    }
-}`,
-		Call:       templ.SafeScript(`__templ_HandleFormBeforeRequest_5ffd`),
-		CallInline: templ.SafeScriptInline(`__templ_HandleFormBeforeRequest_5ffd`),
-	}
-}
-
-func HandleFormAfterRequest() templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_HandleFormAfterRequest_a7c5`,
-		Function: `function __templ_HandleFormAfterRequest_a7c5(){const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    for (let i=0; i < btnActCancel.length; i++) {
-        btnActCancel[i].removeAttribute('disabled');
-    }
-    for (let i=0; i < btnActSaveData.length; i++) {
-        btnActSaveData[i].removeAttribute('disabled');
-    }    
-}`,
-		Call:       templ.SafeScript(`__templ_HandleFormAfterRequest_a7c5`),
-		CallInline: templ.SafeScriptInline(`__templ_HandleFormAfterRequest_a7c5`),
-	}
-}
-
-func BodyFormMDNonlabTemplate(
-	componentID string,
-	inputID models.CustomTextFieldv2Prm,
-	inputName models.CustomTextFieldv2Prm,
-	flagFisik models.CustomCheckboxv1Prm,
-	kodeDetail models.CustomTextFieldv2Prm,
-	namaDetail models.CustomTextFieldv2Prm,
-	btnDetail templ.Component,
-	tableDetail templ.Component,
-	hxOnLoad templ.ComponentScript,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var9 == nil {
-			templ_7745c5c3_Var9 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 74, Col: 25}
-		}
-		_, 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("\" hx-on::load=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var11 templ.ComponentScript = hxOnLoad
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputID).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row\"><div class=\"col-8\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputName).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-4\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(flagFisik).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div class=\"row align-items-center\"><div class=\"col-3\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(kodeDetail).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-8\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(namaDetail).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-1\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = btnDetail.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><h6 class=\"font-weight-bold\">Detail Hasil</h6>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = tableDetail.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
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func BtnAddNama(
-	btnAddNamaID string,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var12 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var12 == nil {
-			templ_7745c5c3_Var12 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button type=\"button\" class=\"btn btnaddnama btn-outline-secondary font-weight-bolder rounded-lg\" aria-label=\"Add Detail\" data-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var13 string
-		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs("#" + btnAddNamaID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 107, Col: 38}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Simpan\r</button>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func BtnAddDetail() 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_Var14 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var14 == nil {
-			templ_7745c5c3_Var14 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button type=\"button\" class=\"btn btnadddetail\" aria-label=\"Add Detail\"><i aria-hidden=\"true\" class=\"ki ki-solid-plus icon-2x text-primary\"></i></button>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func JSHideModal(modalID string) templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_JSHideModal_4530`,
-		Function: `function __templ_JSHideModal_4530(modalID){$(modalID).modal('hide')
-}`,
-		Call:       templ.SafeScript(`__templ_JSHideModal_4530`, modalID),
-		CallInline: templ.SafeScriptInline(`__templ_JSHideModal_4530`, modalID),
-	}
-}
-
-func JSShowModal(modalID string) templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_JSShowModal_0500`,
-		Function: `function __templ_JSShowModal_0500(modalID){$(modalID).modal('show')
-	const btnActCancel = document.querySelectorAll('.btnactcancel');
-	const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-	for (let i = 0; i < btnActCancel.length; i++) {
-			btnActCancel[i].removeAttribute('disabled');
-		
-	}
-	for (let i = 0; i < btnActSaveData.length; i++) {
-			btnActSaveData[i].removeAttribute('disabled');
-	}
-}`,
-		Call:       templ.SafeScript(`__templ_JSShowModal_0500`, modalID),
-		CallInline: templ.SafeScriptInline(`__templ_JSShowModal_0500`, modalID),
-	}
-}
-
-func ActionFormMDNLT(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var15 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var15 == nil {
-			templ_7745c5c3_Var15 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal(modalID))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 templ.ComponentScript = JSHideModal(modalID)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var17 string
-		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 145, Col: 22}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var18 string
-		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 146, Col: 26}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var19 string
-		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 147, Col: 24}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\".cancelloading\" type=\"button\" class=\"btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel \" data-dismiss=\"modal\"><span class=\"htmx-indicator spinner-border spinner-border-sm cancelloading\" role=\"status\" aria-hidden=\"true\"></span> Batal\r</button> <button type=\"submit\" class=\"btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata\"><span class=\"htmx-indicator spinner-border spinner-border-sm formloading\" role=\"status\" aria-hidden=\"true\"></span> Simpan\r</button></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func BtnCloseFormMDNLT(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var20 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var20 == nil {
-			templ_7745c5c3_Var20 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal(modalID))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 168, Col: 27}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var22 string
-		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 169, Col: 31}
-		}
-		_, 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("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var23 string
-		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 170, Col: 29}
-		}
-		_, 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("\" type=\"button\" hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var24 templ.ComponentScript = JSHideModal(modalID)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var24.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"close btnactcancel\" data-dismiss=\"modal\" aria-label=\"Close\"><i aria-hidden=\"true\" class=\"ki ki-close\"></i></button>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func DeleteConfirmBody(
-	inputID models.CustomTextFieldv2Prm,
-	componentID string,
-	message string,
-	dataHeader []string,
-	dataText []string,
-	hxOnLoad templ.ComponentScript,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var25 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var25 == nil {
-			templ_7745c5c3_Var25 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var26 string
-		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 189, Col: 25}
-		}
-		_, 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("\" hx-on::load=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var27 templ.ComponentScript = hxOnLoad
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var27.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><p>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var28 string
-		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(message)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 190, Col: 20}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</p><div class=\"card rounded-lg\"><div class=\"card-body d-flex flex-row\"><div class=\"d-flex flex-column\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, v := range dataHeader {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"mb-1 mt-1 text-disabled font-weight-bold mr-5\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var29 string
-			templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(v)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 195, Col: 86}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
-			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
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"d-flex flex-column\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, v := range dataText {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"mb-1 mt-1 font-weight-bold\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var30 string
-			templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(v)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 200, Col: 67}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
-			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
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputID).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func ActionFormMDNLTDelete(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var31 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var31 == nil {
-			templ_7745c5c3_Var31 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal(modalID))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var32 templ.ComponentScript = JSHideModal(modalID)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var32.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var33 string
-		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 213, Col: 22}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var34 string
-		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 214, Col: 26}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var35 string
-		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatemodal.templ`, Line: 215, Col: 24}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\".cancelloading\" type=\"button\" class=\"btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel\" data-dismiss=\"modal\"><span class=\"htmx-indicator spinner-border spinner-border-sm cancelloading\" role=\"status\" aria-hidden=\"true\"></span> Batal\r</button> <button type=\"submit\" class=\"btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata\"><span class=\"htmx-indicator spinner-border spinner-border-sm formloading\" role=\"status\" aria-hidden=\"true\"></span> Yakin\r</button></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
--- a/views/dev/mdnonlabtemplate/mdnonlabtemplatetable.templ
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplatetable.templ
@@ -1,129 +0,0 @@
-package dev_mdnonlabtemplateview
-
-import "cpone/models"
-import "cpone/component/table"
-import "strconv"
-
-templ TableNonLabTemplate(
-    data []models.MDNonLabTemplate,
-    tableID string,
-    hxGetEdit string,
-    hxTargetEdit string,
-    hxSwapEdit string,
-    hxIncludeEdit string,
-    hxGetDelete string,
-    hxTargetDelete string,
-    hxSwapDelete string,
-    hxIncludeDelete string,
-) {
-    <div id={ tableID } hx-swap-oob="true">
-        @tablecomponent.TableV3([]string{"NAMA TEMPLATE", "AKSI"},
-            []string{"80%","20%"},
-            ItemRow(data,
-                hxGetEdit,
-                hxTargetEdit,
-                hxSwapEdit,
-                hxIncludeEdit,
-                hxGetDelete,
-                hxTargetDelete,
-                hxSwapDelete,
-                hxIncludeDelete,
-        ))
-    </div>
-}
-
-templ ItemRow(
-    data []models.MDNonLabTemplate,
-    hxGetEdit string,
-    hxTargetEdit string,
-    hxSwapEdit string,
-    hxIncludeEdit string,
-    hxGetDelete string,
-    hxTargetDelete string,
-    hxSwapDelete string,
-    hxIncludeDelete string,
-) {
-    if len(data) == 0 {
-        <tr>
-            <td colspan="3" class="text-center">Data Tidak Ditemukan</td>
-        </tr>
-    }
-    for _, i := range data {
-        <tr>
-            <td>{ i.NonLabTemplateName }</td>
-            <td>
-                @TableAction(i.NonLabTemplateID,
-                    hxGetEdit,
-                    hxTargetEdit,
-                    hxSwapEdit,
-                    hxIncludeEdit,
-                    hxGetDelete,
-                    hxTargetDelete,
-                    hxSwapDelete,
-                    hxIncludeDelete,
-                )
-            </td>
-        </tr>
-    }
-}
-
-templ TableAction(
-    id int,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,    
-) {
-    <div class="row px-5 d-flex justify-content-around">
-        <a 
-            type="button"
-            class="btnactionnlt col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm"
-            hx-get={ hxGetEdit + "?id=" + strconv.Itoa(id) }
-            hx-target={ hxTargetEdit }
-            hx-swap={ hxSwapEdit }
-            hx-include={ hxIncludeEdit }
-            hx-indicator={ "#spnredt" + strconv.Itoa(id) }
-            hx-on::before-request={ HandleBeforeRequestRow(strconv.Itoa(id)) }
-            hx-on::after-request={ HandleAfterRequestRow(strconv.Itoa(id)) }
-        >
-            <span id={ "spnredt" + strconv.Itoa(id) } class="htmx-indicator spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-            Edit
-        </a>
-        <a 
-			type="button"
-			class="btnactionnlt col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2 btn-sm"
-			hx-get={ hxGetDelete + "?id=" + strconv.Itoa(id) }
-			hx-target={ hxTargetDelete }
-			hx-swap={ hxSwapDelete }
-			hx-include={ hxIncludeDelete }
-			hx-indicator={ "#spnrdel" + strconv.Itoa(id) }
-            hx-on::before-request={ HandleBeforeRequestRow(strconv.Itoa(id)) }
-            hx-on::after-request={ HandleAfterRequestRow(strconv.Itoa(id)) }
-        >
-            <span id={ "spnrdel" + strconv.Itoa(id) } class="htmx-indicator spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-            Hapus
-        </a>
-    </div>
-}
-
-script HandleBeforeRequestRow(id string) {
-    var cusid_ele = document.getElementsByClassName('btnactionnlt');
-    for (var i = 0; i < cusid_ele.length; ++i) {
-        var item = cusid_ele[i];
-        item.classList.add('disabled');
-    }
-    console.log(id);
-}
-
-script HandleAfterRequestRow(id string) {
-    var cusid_ele = document.getElementsByClassName('btnactionnlt');
-    for (var i = 0; i < cusid_ele.length; ++i) {
-        var item = cusid_ele[i];
-        item.classList.remove('disabled');
-    }
-    console.log(id);
-}
--- a/views/dev/mdpasien/mdpasien.templ
+++ b/views/dev/mdpasien/mdpasien.templ
@@ -0,0 +1,204 @@
+package dev_mdpasienview
+
+import "cpone/component/customtextfield"
+import "cpone/layout"
+import "cpone/models"
+
+templ MdPasienScreen(tableID string,
+	paginationID string,
+	dialogAddID string,
+	dialogAddBodyID string,
+	dialogEditID string,
+	dialogEditBodyID string,
+	dialogDeleteID string,
+	dialogDeleteBodyID string,
+	breadcrumb templ.Component,
+	tablecontent templ.Component,
+	filterComponent templ.Component,
+	pagination templ.Component,
+	dialogAddCmp templ.Component,
+	dialogEditCmp templ.Component,
+	dialogDeleteCmp templ.Component) {
+	<div class="container-fluid">
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddID",
+			Name:  "dialogAddID",
+			Type:  "hidden",
+			Value: dialogAddID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddBodyID",
+			Name:  "dialogAddBodyID",
+			Type:  "hidden",
+			Value: dialogAddBodyID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID",
+			Name:  "dialogEditID",
+			Type:  "hidden",
+			Value: dialogEditID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID",
+			Name:  "dialogEditBodyID",
+			Type:  "hidden",
+			Value: dialogEditBodyID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID",
+			Name:  "dialogDeleteID",
+			Type:  "hidden",
+			Value: dialogDeleteID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteBodyID",
+			Name:  "dialogDeleteBodyID",
+			Type:  "hidden",
+			Value: dialogDeleteBodyID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+			Name:  "tableID",
+			Type:  "hidden",
+			Value: tableID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+			Name:  "paginationID",
+			Type:  "hidden",
+			Value: paginationID})
+		<div class="row align-items-center mb-10">
+			<div class="col-md-10 col-sm-12 p-0 ">
+				@breadcrumb
+			</div>
+			<div class="col-md-2 d-none d-lg-block d-xl-block d-md-block d-sm-none">
+				// <div class="d-block align-items-center">
+				<div class="d-flex justify-content-end">
+					<button
+						type="button"
+						class="btn btn-primary"
+						data-toggle="modal"
+						data-target={ "#" + dialogAddID }
+					>Add New</button>
+				</div>
+			</div>
+			<div class="col-md-2 d-block d-lg-none d-xl-none d-md-none d-sm-block justify-content-center px-5">
+				<button
+					type="button"
+					class="btn btn-primary btn-block"
+					data-toggle="modal"
+					data-target={ "#" + dialogAddID }
+				>Add New</button>
+			</div>
+		</div>
+		<div id="loading-parent" class=" rounded">
+			@filterComponent
+			@tablecontent
+			@pagination
+			<div id="loading-child" class=" rounded bg-transparent">
+				// <div class="spinner spinner-lg spinner-primary"></div>
+				<div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
+					<span class="sr-only">Loading...</span>
+				</div>
+			</div>
+		</div>
+		<div id="loadingcontent"></div>
+		@dialogAddCmp
+		@dialogEditCmp
+		@dialogDeleteCmp
+	</div>
+}
+
+templ CssMdPasien() {
+}
+
+templ JsMdPasien() {
+	<script>
+		document.addEventListener('htmx:afterSwap', function(event) {
+			// Reinitialize selectpicker after HTMX content swap
+			$('.selectpicker').selectpicker('refresh');
+		});
+    
+        document.addEventListener('htmx:beforeRequest', function(event) {
+            console.log("Before Request")
+			console.log(event.detail.xhr)
+			console.log(event.detail.target)
+            
+        });
+
+        document.addEventListener('htmx:afterRequest', function(event) {
+            console.log("After Request")
+            console.log(event.detail.xhr)
+			console.log(event.detail.target)
+        });
+        document.addEventListener('htmx:historyCacheError', function(event) {
+            console.log("Error History Cache Error")
+            console.log(event.detail.cause)
+			
+        });
+        document.addEventListener('htmx:historyCacheMissError', function(event) {
+            console.log("Error History Cache Miss Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.path)
+			
+        });
+        document.addEventListener('htmx:oobErrorNoTarget', function(event) {
+            console.log("Error OOB No Target")
+            console.log(event.detail.content)
+        });
+        document.addEventListener('htmx:onLoadError', function(event) {
+            console.log("Error On Load")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.target)
+            console.log(event.detail.exception)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:responseError', function(event) {
+            console.log("Error Response")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:sendError', function(event) {
+            console.log("Error Send Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:sseError', function(event) {
+            console.log("Error Sse ")
+            console.log(event.detail.xhr)
+            console.log(event.detail.error)
+            console.log(event.detail.source)
+        });
+		document.addEventListener('htmx:swapError', function(event) {
+            console.log("Error Swap Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log("Target Swap: "+event.detail.target)
+            console.log(event.detail.requestConfig)
+        });
+		document.addEventListener('htmx:targetError', function(event) {
+            console.log("Error target")
+            console.log(event.detail.elt)
+            console.log("Target ID: "+event.detail.target)
+        });
+    </script>
+}
+
+script BeforeRequestContent() {
+			const loadingParent = document.getElementById("loading-parent");
+			const loadingChild = document.getElementById("loading-child");
+			const loadingSpinner = document.getElementById("loading-spinner");
+
+			loadingParent.classList.add("overlay");
+			loadingParent.classList.add("overlay-block");
+			loadingChild.classList.add("overlay-layer");
+			loadingSpinner.classList.remove("d-none");
+}
+
+script AfterRequestContent() {
+			const loadingParent = document.getElementById("loading-parent");
+			const loadingChild = document.getElementById("loading-child");
+			const loadingSpinner = document.getElementById("loading-spinner");
+
+			loadingParent.classList.remove("overlay");
+			loadingParent.classList.remove("overlay-block");
+			loadingChild.classList.remove("overlay-layer");
+			loadingSpinner.classList.add("d-none");
+}
+
+templ ShowMdPasienScreen(title string, cmp templ.Component, css templ.Component, js templ.Component,
+	navbarmenu templ.Component,
+	navbaruser templ.Component,
+	userprofile templ.Component) {
+	@layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile) {
+		@cmp
+	}
+}
--- a/views/dev/mdnonlabtemplate/mdnonlabtemplate_templ.go
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplate_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

 // templ: version: v0.2.663
-package dev_mdnonlabtemplateview
+package dev_mdpasienview

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

@@ -11,30 +11,24 @@ import "io"
 import "bytes"

 import "cpone/component/customtextfield"
-import "cpone/models"
 import "cpone/layout"
+import "cpone/models"

-func MDNonLabTemplateScreen(
-	tableID string,
+func MdPasienScreen(tableID string,
 	paginationID string,
-	searchID string,
 	dialogAddID string,
 	dialogAddBodyID string,
 	dialogEditID string,
 	dialogEditBodyID string,
 	dialogDeleteID string,
 	dialogDeleteBodyID string,
-	btnAddNamaID string,
-	btnAddDetailID string,
-	tableDetailID string,
-	tableDetailPaginationID string,
 	breadcrumb templ.Component,
+	tablecontent templ.Component,
 	filterComponent templ.Component,
-	tableComponent templ.Component,
-	paginationComponent templ.Component,
-	modalAddForm templ.Component,
-	modalDeleteForm templ.Component,
-) templ.Component {
+	pagination templ.Component,
+	dialogAddCmp templ.Component,
+	dialogEditCmp templ.Component,
+	dialogDeleteCmp 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 {
@@ -51,27 +45,6 @@ func MDNonLabTemplateScreen(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
-			Name:  "tableID",
-			Type:  "hidden",
-			Value: tableID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
-			Name:  "paginationID",
-			Type:  "hidden",
-			Value: paginationID}).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",
-			Value: searchID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddID",
 			Name:  "dialogAddID",
 			Type:  "hidden",
@@ -114,35 +87,21 @@ func MDNonLabTemplateScreen(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "btnAddNamaID",
-			Name:  "btnAddNamaID",
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+			Name:  "tableID",
 			Type:  "hidden",
-			Value: btnAddNamaID}).Render(ctx, templ_7745c5c3_Buffer)
+			Value: tableID}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "btnAddDetailID",
-			Name:  "btnAddDetailID",
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+			Name:  "paginationID",
 			Type:  "hidden",
-			Value: btnAddDetailID}).Render(ctx, templ_7745c5c3_Buffer)
+			Value: paginationID}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableDetailID",
-			Name:  "tableDetailID",
-			Type:  "hidden",
-			Value: tableDetailID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableDetailPaginationID",
-			Name:  "tableDetailPaginationID",
-			Type:  "hidden",
-			Value: tableDetailPaginationID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row align-items-center mb-10\"><div class=\"col-md-10 col-sm-12 p-0\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row align-items-center mb-10\"><div class=\"col-md-10 col-sm-12 p-0 \">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -157,7 +116,7 @@ func MDNonLabTemplateScreen(
 		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\mdnonlabtemplate\mdnonlabtemplate.templ`, Line: 91, Col: 55}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasien.templ`, Line: 66, Col: 37}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -170,13 +129,13 @@ func MDNonLabTemplateScreen(
 		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\mdnonlabtemplate\mdnonlabtemplate.templ`, Line: 100, Col: 51}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasien.templ`, Line: 75, 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 id=\"loading-parent\" class=\" rounded\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -184,27 +143,31 @@ func MDNonLabTemplateScreen(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-parent\" class=\"rounded\">")
+		templ_7745c5c3_Err = tablecontent.Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = tableComponent.Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = pagination.Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = paginationComponent.Render(ctx, templ_7745c5c3_Buffer)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\" rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem;\" role=\"status\"><span class=\"sr-only\">Loading...</span></div></div></div><div id=\"loadingcontent\"></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = modalAddForm.Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = dialogAddCmp.Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = modalDeleteForm.Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = dialogEditCmp.Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\"rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem;\" role=\"status\"><span class=\"sr-only\">Loading...</span></div></div></div><div id=\"loadingcontent\"></div></div>")
+		templ_7745c5c3_Err = dialogDeleteCmp.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
 		}
@@ -215,7 +178,7 @@ func MDNonLabTemplateScreen(
 	})
 }

-func CSSMDNonLabTemplate() templ.Component {
+func CssMdPasien() 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 {
@@ -228,10 +191,6 @@ func CSSMDNonLabTemplate() templ.Component {
 			templ_7745c5c3_Var4 = 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        \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)
 		}
@@ -239,7 +198,7 @@ func CSSMDNonLabTemplate() templ.Component {
 	})
 }

-func JSSMDNonLabTemplate() templ.Component {
+func JsMdPasien() 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 {
@@ -252,7 +211,7 @@ func JSSMDNonLabTemplate() templ.Component {
 			templ_7745c5c3_Var5 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script>\r\n        document.addEventListener('htmx:beforeRequest', function(event) {\r\n            var indicator = document.querySelector('#loadingcontent');\r\n            if (indicator) {\r\n                console.log('Loading Start')\r\n            }\r\n        });\r\n\r\n        document.addEventListener('htmx:afterRequest', function(event) {\r\n            var indicator = document.querySelector('#loadingcontent');\r\n            if (indicator) {\r\n                console.log('Loading End')\r\n            }\r\n        });\r\n    </script>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script>\r\n\t\tdocument.addEventListener('htmx:afterSwap', function(event) {\r\n\t\t\t// Reinitialize selectpicker after HTMX content swap\r\n\t\t\t$('.selectpicker').selectpicker('refresh');\r\n\t\t});\r\n    \r\n        document.addEventListener('htmx:beforeRequest', function(event) {\r\n            console.log(\"Before Request\")\r\n\t\t\tconsole.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n            \r\n        });\r\n\r\n        document.addEventListener('htmx:afterRequest', function(event) {\r\n            console.log(\"After Request\")\r\n            console.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n        });\r\n        document.addEventListener('htmx:historyCacheError', function(event) {\r\n            console.log(\"Error History Cache Error\")\r\n            console.log(event.detail.cause)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:historyCacheMissError', function(event) {\r\n            console.log(\"Error History Cache Miss Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.path)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:oobErrorNoTarget', function(event) {\r\n            console.log(\"Error OOB No Target\")\r\n            console.log(event.detail.content)\r\n        });\r\n        document.addEventListener('htmx:onLoadError', function(event) {\r\n            console.log(\"Error On Load\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.target)\r\n            console.log(event.detail.exception)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:responseError', function(event) {\r\n            console.log(\"Error Response\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sendError', function(event) {\r\n            console.log(\"Error Send Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sseError', function(event) {\r\n            console.log(\"Error Sse \")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.error)\r\n            console.log(event.detail.source)\r\n        });\r\n\t\tdocument.addEventListener('htmx:swapError', function(event) {\r\n            console.log(\"Error Swap Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target Swap: \"+event.detail.target)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n\t\tdocument.addEventListener('htmx:targetError', function(event) {\r\n            console.log(\"Error target\")\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target ID: \"+event.detail.target)\r\n        });\r\n    </script>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -265,43 +224,39 @@ func JSSMDNonLabTemplate() templ.Component {

 func BeforeRequestContent() templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_BeforeRequestContent_5717`,
-		Function: `function __templ_BeforeRequestContent_5717(){const loadingParent = document.getElementById("loading-parent");
-    const loadingChild = document.getElementById("loading-child");
-    const loadingSpinner = document.getElementById("loading-spinner");
+		Name: `__templ_BeforeRequestContent_911f`,
+		Function: `function __templ_BeforeRequestContent_911f(){const loadingParent = document.getElementById("loading-parent");
+			const loadingChild = document.getElementById("loading-child");
+			const loadingSpinner = document.getElementById("loading-spinner");

-    loadingParent.classList.add("overlay");
-    loadingParent.classList.add("overlay-block");
-    loadingChild.classList.add("overlay-layer");
-    loadingSpinner.classList.remove("d-none");
+			loadingParent.classList.add("overlay");
+			loadingParent.classList.add("overlay-block");
+			loadingChild.classList.add("overlay-layer");
+			loadingSpinner.classList.remove("d-none");
 }`,
-		Call:       templ.SafeScript(`__templ_BeforeRequestContent_5717`),
-		CallInline: templ.SafeScriptInline(`__templ_BeforeRequestContent_5717`),
+		Call:       templ.SafeScript(`__templ_BeforeRequestContent_911f`),
+		CallInline: templ.SafeScriptInline(`__templ_BeforeRequestContent_911f`),
 	}
 }

 func AfterRequestContent() templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_AfterRequestContent_077f`,
-		Function: `function __templ_AfterRequestContent_077f(){const loadingParent = document.getElementById("loading-parent");
-    const loadingChild = document.getElementById("loading-child");
-    const loadingSpinner = document.getElementById("loading-spinner");
+		Name: `__templ_AfterRequestContent_6cc0`,
+		Function: `function __templ_AfterRequestContent_6cc0(){const loadingParent = document.getElementById("loading-parent");
+			const loadingChild = document.getElementById("loading-child");
+			const loadingSpinner = document.getElementById("loading-spinner");

-    loadingParent.classList.remove("overlay");
-    loadingParent.classList.remove("overlay-block");
-    loadingChild.classList.remove("overlay-layer");
-    loadingSpinner.classList.add("d-none");
+			loadingParent.classList.remove("overlay");
+			loadingParent.classList.remove("overlay-block");
+			loadingChild.classList.remove("overlay-layer");
+			loadingSpinner.classList.add("d-none");
 }`,
-		Call:       templ.SafeScript(`__templ_AfterRequestContent_077f`),
-		CallInline: templ.SafeScriptInline(`__templ_AfterRequestContent_077f`),
+		Call:       templ.SafeScript(`__templ_AfterRequestContent_6cc0`),
+		CallInline: templ.SafeScriptInline(`__templ_AfterRequestContent_6cc0`),
 	}
 }

-func ShowMDNonLabTemplate(
-	title string,
-	cmp templ.Component,
-	css templ.Component,
-	js templ.Component,
+func ShowMdPasienScreen(title string, cmp templ.Component, css templ.Component, js templ.Component,
 	navbarmenu templ.Component,
 	navbaruser templ.Component,
 	userprofile templ.Component) templ.Component {
--- a/views/dev/mdpasien/mdpasientable.templ
+++ b/views/dev/mdpasien/mdpasientable.templ
@@ -0,0 +1,131 @@
+package dev_mdpasienview
+
+import "cpone/component/table"
+import "cpone/models"
+import "strconv"
+
+templ TablePasien(data []models.Pasien,
+	tableID string,
+	hxGetEdit string,
+	hxTargetEdit string,
+	hxSwapEdit string,
+	hxIncludeEdit string,
+	hxGetDelete string,
+	hxTargetDelete string,
+	hxSwapDelete string,
+	hxIncludeDelete string,
+) {
+	<div id={ tableID } hx-swap-oob="true">
+		@tablecomponent.TableV3([]string{"PID", "NAMA", "NO HP", "JENIS KELAMIN", "AKSI"},
+			[]string{"20%", "30%", "10%", "20%", "20%"},
+			RowPasien(data,
+				hxGetEdit,
+				hxTargetEdit,
+				hxSwapEdit,
+				hxIncludeEdit,
+				hxGetDelete,
+				hxTargetDelete,
+				hxSwapDelete,
+				hxIncludeDelete,
+			))
+	</div>
+}
+
+templ RowPasien(data []models.Pasien,
+	hxGetEdit string,
+	hxTargetEdit string,
+	hxSwapEdit string,
+	hxIncludeEdit string,
+	hxGetDelete string,
+	hxTargetDelete string,
+	hxSwapDelete string,
+	hxIncludeDelete string,
+) {
+	if len(data) == 0 {
+		<tr>
+			<td colspan="4" class="text-center">Data Tidak Ditemukan</td>
+		</tr>
+	}
+	for _, v := range data {
+		<tr>
+			<td>{ v.M_PatientNoReg }</td>
+			<td>{ v.M_PatientName }</td>
+			<td>{ v.M_PatientHp }</td>
+			<td>{ v.M_PatientGender }</td>
+			<td>
+				@TableAction(v.M_PatientID,
+					hxGetEdit,
+					hxTargetEdit,
+					hxSwapEdit,
+					hxIncludeEdit,
+					hxGetDelete,
+					hxTargetDelete,
+					hxSwapDelete,
+					hxIncludeDelete,
+				)
+			</td>
+		</tr>
+	}
+}
+
+templ TableAction(
+	id int,
+	hxGetEdit string,
+	hxTargetEdit string,
+	hxSwapEdit string,
+	hxIncludeEdit string,
+	hxGetDelete string,
+	hxTargetDelete string,
+	hxSwapDelete string,
+	hxIncludeDelete string,
+
+) {
+	<div class="row px-5 d-flex justify-content-around">
+		<a
+			type="button"
+			class="btnactbhn col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm"
+			hx-get={ hxGetEdit + "?id=" + strconv.Itoa(id) }
+			hx-target={ hxTargetEdit }
+			hx-swap={ hxSwapEdit }
+			hx-include={ hxIncludeEdit }
+			hx-indicator={ "#spnredt" + strconv.Itoa(id) }
+			hx-on::before-request={ HandleBeforeRequestRow(strconv.Itoa(id)) }
+			hx-on::after-request={ HandleAfterRequestRow(strconv.Itoa(id)) }
+		>
+			<span id={ "spnredt" + strconv.Itoa(id) } class="htmx-indicator spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+			Edit
+		</a>
+		<a
+			type="button"
+			class=" btnactbhn col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2 btn-sm"
+			hx-get={ hxGetDelete + "?id=" + strconv.Itoa(id) }
+			hx-target={ hxTargetDelete }
+			hx-swap={ hxSwapDelete }
+			hx-include={ hxIncludeDelete }
+			hx-indicator={ "#spnrdel" + strconv.Itoa(id) }
+			hx-on::before-request={ HandleBeforeRequestRow(strconv.Itoa(id)) }
+			hx-on::after-request={ HandleAfterRequestRow(strconv.Itoa(id)) }
+		>
+			<span id={ "spnrdel" + strconv.Itoa(id) } class="htmx-indicator spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
+			Hapus
+		</a>
+	</div>
+}
+
+script HandleBeforeRequestRow(id string) {
+	var cusid_ele = document.getElementsByClassName('btnactbhn');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.add('disabled');
+	}
+	console.log(id)
+}
+
+script HandleAfterRequestRow(id string) {
+	var cusid_ele = document.getElementsByClassName('btnactbhn');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.remove('disabled');
+	}
+	console.log(id)
+}
--- a/views/dev/mdnonlabtemplate/mdnonlabtemplatetable_templ.go
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplatetable_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

 // templ: version: v0.2.663
-package dev_mdnonlabtemplateview
+package dev_mdpasienview

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

@@ -10,12 +10,11 @@ import "context"
 import "io"
 import "bytes"

-import "cpone/models"
 import "cpone/component/table"
+import "cpone/models"
 import "strconv"

-func TableNonLabTemplate(
-	data []models.MDNonLabTemplate,
+func TablePasien(data []models.Pasien,
 	tableID string,
 	hxGetEdit string,
 	hxTargetEdit string,
@@ -45,7 +44,7 @@ func TableNonLabTemplate(
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 19, Col: 21}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 18, Col: 18}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -55,9 +54,9 @@ func TableNonLabTemplate(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"NAMA TEMPLATE", "AKSI"},
-			[]string{"80%", "20%"},
-			ItemRow(data,
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"PID", "NAMA", "NO HP", "JENIS KELAMIN", "AKSI"},
+			[]string{"20%", "30%", "10%", "20%", "20%"},
+			RowPasien(data,
 				hxGetEdit,
 				hxTargetEdit,
 				hxSwapEdit,
@@ -81,8 +80,7 @@ func TableNonLabTemplate(
 	})
 }

-func ItemRow(
-	data []models.MDNonLabTemplate,
+func RowPasien(data []models.Pasien,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -105,20 +103,20 @@ func ItemRow(
 		}
 		ctx = templ.ClearChildren(ctx)
 		if len(data) == 0 {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"3\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"4\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		for _, i := range data {
+		for _, v := range data {
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var4 string
-			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(i.NonLabTemplateName)
+			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_PatientNoReg)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 53, Col: 38}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 51, Col: 25}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 			if templ_7745c5c3_Err != nil {
@@ -128,7 +126,46 @@ func ItemRow(
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			templ_7745c5c3_Err = TableAction(i.NonLabTemplateID,
+			var templ_7745c5c3_Var5 string
+			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_PatientName)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 52, Col: 24}
+			}
+			_, 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("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_PatientHp)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 53, Col: 22}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_PatientGender)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 54, Col: 26}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = TableAction(v.M_PatientID,
 				hxGetEdit,
 				hxTargetEdit,
 				hxSwapEdit,
@@ -163,6 +200,7 @@ func TableAction(
 	hxTargetDelete string,
 	hxSwapDelete string,
 	hxIncludeDelete 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)
@@ -171,9 +209,9 @@ func TableAction(
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var5 == nil {
-			templ_7745c5c3_Var5 = templ.NopComponent
+		templ_7745c5c3_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\">")
@@ -184,16 +222,16 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactionnlt col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactbhn col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, 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\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 85, Col: 58}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 87, Col: 49}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -201,12 +239,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, 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\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 86, Col: 36}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 88, Col: 27}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -214,12 +252,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, 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\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 87, Col: 32}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 89, Col: 23}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -227,12 +265,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, 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\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 88, Col: 38}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 90, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -240,12 +278,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("#spnredt" + strconv.Itoa(id))
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs("#spnredt" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 89, Col: 56}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 91, Col: 47}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -253,8 +291,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var11 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11.Call)
+		var templ_7745c5c3_Var14 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -262,8 +300,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var12 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
+		var templ_7745c5c3_Var15 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -271,12 +309,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("spnredt" + strconv.Itoa(id))
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs("spnredt" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 93, Col: 51}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 95, Col: 42}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -288,16 +326,16 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactionnlt col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2 btn-sm\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\" btnactbhn col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2 btn-sm\" hx-get=\"")
 		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_Var17 string
+		templ_7745c5c3_Var17, 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\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 99, Col: 51}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 101, 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_Var17))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -305,12 +343,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_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 100, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 102, 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_Var18))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -318,12 +356,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_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 101, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 103, 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_Var19))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -331,12 +369,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_Var20 string
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 102, Col: 31}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 104, 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_Var20))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -344,12 +382,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var18 string
-		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs("#spnrdel" + strconv.Itoa(id))
+		var templ_7745c5c3_Var21 string
+		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs("#spnrdel" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 103, Col: 47}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 105, Col: 47}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -357,8 +395,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var19 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var19.Call)
+		var templ_7745c5c3_Var22 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -366,8 +404,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var20 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20.Call)
+		var templ_7745c5c3_Var23 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var23.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -375,12 +413,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 107, Col: 51}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdpasien\mdpasientable.templ`, Line: 109, Col: 42}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -397,30 +435,30 @@ func TableAction(

 func HandleBeforeRequestRow(id string) templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_HandleBeforeRequestRow_d88d`,
-		Function: `function __templ_HandleBeforeRequestRow_d88d(id){var cusid_ele = document.getElementsByClassName('btnactionnlt');
-    for (var i = 0; i < cusid_ele.length; ++i) {
-        var item = cusid_ele[i];
-        item.classList.add('disabled');
-    }
-    console.log(id);
+		Name: `__templ_HandleBeforeRequestRow_7d4f`,
+		Function: `function __templ_HandleBeforeRequestRow_7d4f(id){var cusid_ele = document.getElementsByClassName('btnactbhn');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.add('disabled');
+	}
+	console.log(id)
 }`,
-		Call:       templ.SafeScript(`__templ_HandleBeforeRequestRow_d88d`, id),
-		CallInline: templ.SafeScriptInline(`__templ_HandleBeforeRequestRow_d88d`, id),
+		Call:       templ.SafeScript(`__templ_HandleBeforeRequestRow_7d4f`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleBeforeRequestRow_7d4f`, id),
 	}
 }

 func HandleAfterRequestRow(id string) templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_HandleAfterRequestRow_9c9f`,
-		Function: `function __templ_HandleAfterRequestRow_9c9f(id){var cusid_ele = document.getElementsByClassName('btnactionnlt');
-    for (var i = 0; i < cusid_ele.length; ++i) {
-        var item = cusid_ele[i];
-        item.classList.remove('disabled');
-    }
-    console.log(id);
+		Name: `__templ_HandleAfterRequestRow_ce9e`,
+		Function: `function __templ_HandleAfterRequestRow_ce9e(id){var cusid_ele = document.getElementsByClassName('btnactbhn');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.remove('disabled');
+	}
+	console.log(id)
 }`,
-		Call:       templ.SafeScript(`__templ_HandleAfterRequestRow_9c9f`, id),
-		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_9c9f`, id),
+		Call:       templ.SafeScript(`__templ_HandleAfterRequestRow_ce9e`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_ce9e`, id),
 	}
 }
Author	SHA1	Message	Date
Sas Andy	2e61efa16f	Merge branch 'andy/mdpatient' of https://devone.aplikasi.web.id/gitea/andy/corporate_portal_westerindo into andy/mdpatient	2024-05-30 13:49:40 +07:00
Sas Andy	429dd01928	tmp datepicker	2024-05-30 13:49:32 +07:00
Sas Andy	50f08ec99f	search & oagination md pasien	2024-05-30 13:49:32 +07:00
sindhu	1ed188e3ff	add get terminology list in app services	2024-05-30 11:55:07 +07:00
Sas Andy	6aaa3b92e5	tmp datepicker	2024-05-30 10:56:31 +07:00
Sas Andy	edebafa39c	modal xl	2024-05-30 09:35:37 +07:00
Sas Andy	ac8cd1072e	Merge branch 'andy/mdpatient' of https://devone.aplikasi.web.id/gitea/andy/corporate_portal_westerindo into andy/mdpatient	2024-05-29 16:32:10 +07:00
Sas Andy	0ac2756517	search & oagination md pasien	2024-05-29 16:31:55 +07:00
Sas Andy	66ee6a7839	search & oagination md pasien	2024-05-29 16:30:42 +07:00