md nonlab template listing data + filter + pagination

add table & screen non lab template
2024-05-27 11:34:33 +07:00 · 2024-05-27 09:11:30 +07:00
18 changed files with 1087 additions and 1571 deletions
--- a/assets/asset-corporate-portal/css/sas.bundle.css
+++ b/assets/asset-corporate-portal/css/sas.bundle.css
@@ -294,56 +294,6 @@ a.text-white:focus {
  -webkit-box-shadow: 0 0 0 0.2rem rgba(84, 168, 255, 0.5);
  box-shadow: 0 0 0 0.2rem rgba(84, 168, 255, 0.5);
 }
-
-.btn-field {
-  color: var(--text-black);
-  background-color: var(--fieldbg) !important;
-  border-color: var(--fieldbg) !important;
-}
-.btn-field.btn-lg {
-  padding: 0.825rem 1.42rem !important;
-  font-size: 1.08rem !important;
-  line-height: 1.5 !important;
-  border-radius: 0.42rem !important;
-}
-.btn-field.btn-lg.rounded-lg {
-  padding: 0.825rem 1.42rem !important;
-  font-size: 1.08rem !important;
-  line-height: 1.5 !important;
-  border-radius: 0.85rem !important;
-}
-.btn-field:hover {
-  color: var(--text-black);
-  background-color: var(--fieldbg) !important;
-  border-color: var(--fieldbg) !important;
-}
-.btn-field:focus,
-.btn-field.focus {
-  color: var(--text-black);
-  background-color: var(--fieldbg) !important;
-  border-color: var(--fieldbg) !important;
-  -webkit-box-shadow: 0 0 0 0rem var(--fieldbg) !important;
-  box-shadow: 0 0 0 0rem var(--fieldbg) !important;
-}
-.btn-field.disabled,
-.btn-field:disabled {
-  color: var(--text-black);
-  background-color: var(--fieldbg) !important;
-  border-color: var(--fieldbg) !important;
-}
-.btn-field:not(:disabled):not(.disabled):active,
-.btn-field:not(:disabled):not(.disabled).active,
-.show > .btn-field.dropdown-toggle {
-  color: var(--text-black);
-  background-color: var(--fieldbg) !important;
-  border-color: var(--fieldbg) !important;
-}
-.btn-field:not(:disabled):not(.disabled):active:focus,
-.btn-field:not(:disabled):not(.disabled).active:focus,
-.show > .btn-field.dropdown-toggle:focus {
-  -webkit-box-shadow: 0 0 0 0rem var(--fieldbg) !important;
-  box-shadow: 0 0 0 0rem var(--fieldbg) !important;
-}
 /* COBA CUSTOM BTN */
 .btn-tosca {
  color: #ffffff;
--- a/go.mod
+++ b/go.mod
@@ -4,17 +4,18 @@ go 1.21.0

 require (
 	github.com/a-h/templ v0.2.663
+	github.com/fsnotify/fsnotify v1.7.0
 	github.com/glebarez/go-sqlite v1.22.0
+	github.com/go-sql-driver/mysql v1.8.1
+	github.com/jmoiron/sqlx v1.4.0
 	github.com/labstack/echo/v4 v4.12.0
+	github.com/spf13/viper v1.18.2
 	golang.org/x/text v0.14.0
 )

 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
@@ -24,7 +25,6 @@ require (
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.18.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
@@ -36,7 +36,7 @@ require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/google/uuid v1.5.0 // indirect
-	github.com/labstack/gommon v0.4.2 // indirect
+	github.com/labstack/gommon v0.4.2
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
--- a/go.sum
+++ b/go.sum
@@ -3,10 +3,13 @@ filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4
 github.com/a-h/templ v0.2.663 h1:aa0WMm27InkYHGjimcM7us6hJ6BLhg98ZbfaiDPyjHE=
 github.com/a-h/templ v0.2.663/go.mod h1:SA7mtYwVEajbIXFRh3vKdYm/4FYyLQAtPH1+KxzGPA8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
@@ -25,33 +28,36 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
-github.com/labstack/echo/v4 v4.11.3 h1:Upyu3olaqSHkCjs1EJJwQ3WId8b8b1hxbogyommKktM=
-github.com/labstack/echo/v4 v4.11.3/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0=
 github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM=
-github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
-github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
 github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
@@ -69,7 +75,6 @@ github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMV
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
@@ -78,43 +83,34 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
 golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 modernc.org/libc v1.37.6 h1:orZH3c5wmhIQFTXF+Nt+eeauyd+ZIt2BX6ARe+kD+aw=
--- a/handlers/dev/md.bahan.handlers.go
+++ b/handlers/dev/md.bahan.handlers.go
@@ -1,231 +0,0 @@
-package dev_handlers
-
-import (
-	breadcrumadmin "cpone/component/breadcrumbadmin"
-	navbarmenu "cpone/component/navbar"
-	"cpone/component/pagination"
-	sidebaruserprofile "cpone/component/sidebar_user_profile"
-	"cpone/models"
-	"cpone/services"
-	"cpone/utils"
-	dev_mdbahanview "cpone/views/dev/mdbahan"
-	"strconv"
-
-	"github.com/a-h/templ"
-	"github.com/labstack/echo/v4"
-	"go.uber.org/zap"
-)
-
-type MdBahanServices interface {
-	GetListMdBahan(
-		search string,
-		stationID string,
-		currentPage int,
-		rowPerPage int) ([]models.Bahan, int, error)
-	GetMdBahanBreadCrumb(title string) (models.BreadCrumbV1, error)
-	GetListSampleStation() ([]models.TmpSampleStation, error)
-}
-
-func NewMdBahanHandler(us MdBahanServices) *MdBahanHandler {
-	return &MdBahanHandler{
-		MdBahanServices: us,
-	}
-}
-
-type MdBahanHandler struct {
-	MdBahanServices MdBahanServices
-}
-
-func (lh *MdBahanHandler) HandleShowMdBahanScreen(c echo.Context) error {
-	logger, _ := zap.NewProduction()
-
-	dataMenu, err := services.GetMenu()
-	paginationID := utils.GenerateRandomID("paginationID")
-
-	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
-	}
-	dataBreadCrumb, err := lh.MdBahanServices.GetMdBahanBreadCrumb("Bahan")
-
-	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)
-	bahanList, totalPage, err := lh.MdBahanServices.GetListMdBahan("", "1", 1, 5)
-	defer logger.Sync()
-	logger.Info("GET DATA BAHAN",
-		zap.Any("data", bahanList),
-		zap.Any("err", err),
-		zap.Any("totalPage", totalPage),
-	)
-	stationList, err := lh.MdBahanServices.GetListSampleStation()
-	defer logger.Sync()
-	logger.Info("GET DATA BAHAN",
-		zap.Any("data", bahanList),
-		zap.Any("err", err),
-		zap.Any("totalPage", totalPage),
-	)
-
-	//Bahan Table
-	tableBahanID := utils.GenerateRandomID("BahanID")
-	mdBahanTable := dev_mdbahanview.TableBahan(
-		bahanList,
-		tableBahanID, "getedt", "trgtEdit", "swpEdit", "imcldEdit", "getDlt", "trgtDlt", "swpDlt", "imcldDlt")
-
-	//FIlter table
-	mdBahanFilter := dev_mdbahanview.MdBahanFilter(
-		"/dev/md/bahan/filter",
-		"input changed delay:500ms",
-		"#filter-name, #filter-station, #tableID, #paginationID",
-		"outerHTML",
-		"#"+paginationID,
-		stationList,
-		stationList[0].T_SampleStationID,
-		dev_mdbahanview.BeforeRequestContent(),
-		dev_mdbahanview.AfterRequestContent(),
-	)
-
-	//Pagination
-
-	mdbahanPagination := pagination.PaginationV3(
-		totalPage, 1,
-		"/dev/md/bahan/pagination",
-		paginationID,
-		"#filter-name, #filter-station, #tableID, #paginationID, #currpage"+paginationID,
-		"#"+paginationID,
-		"outerHTML",
-		"",
-		"",
-		dev_mdbahanview.BeforeRequestContent(),
-		dev_mdbahanview.AfterRequestContent(),
-	)
-
-	mdBahanScreen := dev_mdbahanview.MdBahanScreen(tableBahanID, paginationID, breadcrumbComponent, mdBahanTable, mdBahanFilter, mdbahanPagination)
-	cssMdBahan := dev_mdbahanview.CssMdUserGroup()
-	jsMdBahan := dev_mdbahanview.JsMdBahan()
-
-	view := dev_mdbahanview.ShowMdBahanScreen(
-		"Md Bahan",
-		mdBahanScreen,
-		cssMdBahan,
-		jsMdBahan,
-		navbarmenuComponent,
-		navbaruserComponent,
-		sidebaruserprofileComponent)
-	return utils.View(c, view)
-}
-
-func (lh *MdBahanHandler) HandleFilterMdBahan(c echo.Context) error {
-	logger, _ := zap.NewProduction()
-	var retval []templ.Component
-	filtername := c.QueryParam("filtername")
-	filterstation := c.QueryParam("filterstation")
-	tableID := c.QueryParam("tableID")
-	paginationID := c.QueryParam("paginationID")
-	bahanList, totalPage, err := lh.MdBahanServices.GetListMdBahan(filtername, filterstation, 1, 5)
-	defer logger.Sync()
-	logger.Info("GET DATA BAHAN",
-		zap.Any("data", bahanList),
-		zap.Any("err", err),
-		zap.Any("totalPage", totalPage),
-	)
-	//Bahan Table
-
-	mdBahanTable := dev_mdbahanview.TableBahan(
-		bahanList,
-		tableID, "getedt", "trgtEdit", "swpEdit", "imcldEdit", "getDlt", "trgtDlt", "swpDlt", "imcldDlt")
-	//Pagination
-
-	mdbahanPagination := pagination.PaginationV3(
-		totalPage, 1,
-		"/dev/md/bahan/pagination",
-		paginationID,
-		"#filter-name, #filter-station, #tableID, #paginationID, #currpage"+paginationID,
-		"#"+paginationID,
-		"outerHTML",
-		"",
-		"",
-		dev_mdbahanview.BeforeRequestContent(),
-		dev_mdbahanview.AfterRequestContent(),
-	)
-	retval = append(retval, mdBahanTable)
-	retval = append(retval, mdbahanPagination)
-	return utils.ViewMulti(c, retval)
-}
-func (lh *MdBahanHandler) HandlePaginationMdBahan(c echo.Context) error {
-	logger, _ := zap.NewProduction()
-	var retval []templ.Component
-	pageparam := c.QueryParam("page")
-
-	filtername := c.QueryParam("filtername")
-	filterstation := c.QueryParam("filterstation")
-	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
-	}
-	bahanList, totalPage, err := lh.MdBahanServices.GetListMdBahan(filtername, filterstation, page, 5)
-	defer logger.Sync()
-	logger.Info("GET DATA BAHAN",
-		zap.Any("data", bahanList),
-		zap.Any("err", err),
-		zap.Any("totalPage", totalPage),
-	)
-	//Bahan Table
-
-	mdBahanTable := dev_mdbahanview.TableBahan(
-		bahanList,
-		tableID, "getedt", "trgtEdit", "swpEdit", "imcldEdit", "getDlt", "trgtDlt", "swpDlt", "imcldDlt")
-	//Pagination
-
-	mdbahanPagination := pagination.PaginationV3(
-		totalPage, page,
-		"/dev/md/bahan/pagination",
-		paginationID,
-		"#filter-name, #filter-station, #tableID, #paginationID, #currpage"+paginationID,
-		"#"+paginationID,
-		"outerHTML",
-		"",
-		"",
-		dev_mdbahanview.BeforeRequestContent(),
-		dev_mdbahanview.AfterRequestContent(),
-	)
-	retval = append(retval, mdBahanTable)
-	retval = append(retval, mdbahanPagination)
-	return utils.ViewMulti(c, retval)
-}
--- a/handlers/dev/md.nonlabtemplate.handlers.go
+++ b/handlers/dev/md.nonlabtemplate.handlers.go
@@ -0,0 +1,252 @@
+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_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)
+}
+
+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(),
+	)
+
+	content := dev_mdnonlabtemplateview.MDNonLabTemplateScreen(
+		tableID,
+		paginationID,
+		searchID,
+		dialogAddID,
+		dialogAddBodyID,
+		dialogEditID,
+		dialogEditBodyID,
+		dialogDeleteID,
+		dialogDeleteBodyID,
+		breadcrumbComp,
+		tableFilter,
+		tableComp,
+		tablePagination,
+	)
+	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)
+}
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -247,11 +247,10 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.POST("/md/usergroupv2/closedeleteform", devMdUserGroupHandlers.HandleCloseFormDelete)
 	dev.POST("/md/usergroupv2/delete", devMdUserGroupHandlers.HandleDeleteUserGroup)

-	//MD BAHAN
-	devMdBahanServices := dev_services.NewMdBahanServices(appStore)
-	devMdBahanHandlers := dev_handlers.NewMdBahanHandler(devMdBahanServices)
-	dev.GET("/md/bahan", devMdBahanHandlers.HandleShowMdBahanScreen)
-	dev.GET("/md/bahan/filter", devMdBahanHandlers.HandleFilterMdBahan)
-	dev.GET("/md/bahan/pagination", devMdBahanHandlers.HandlePaginationMdBahan)
-
+	// nonlab template
+	devMDNonLabTemplateServices := dev_services.NewMDNonLabTemplateServices(appStore)
+	devMDNonLabTemplateHandlers := dev_handlers.NewMDNonLabTemplateHandler(devMDNonLabTemplateServices)
+	dev.GET("/md/nonlabtemplate", devMDNonLabTemplateHandlers.HandleShowMDNonLabTemplateScreen)
+	dev.GET("/md/nonlabtemplate/filter", devMDNonLabTemplateHandlers.HandleFilterMDNonLabTemplate)
+	dev.GET("/md/nonlabtemplate/changepage", devMDNonLabTemplateHandlers.HandleChangePageMDNonLabTemplate)
 }
--- a/models/bahan.models.go
+++ b/models/bahan.models.go
@@ -1,23 +0,0 @@
-package models
-
-type Bahan struct {
-	T_BahanID                int    `db:"T_BahanID"`
-	T_BahanT_SampleStationID string `db:"T_BahanT_SampleStationID"`
-	T_SampleStationID        string `db:"T_SampleStationID"`
-	T_SampleStationName      string `db:"T_SampleStationName"`
-	T_BahanCode              string `db:"T_BahanCode"`
-	T_BahanName              string `db:"T_BahanName"`
-	T_BahanLangName          string `db:"T_BahanLangName"`
-	T_BahanIsActive          string `db:"T_BahanIsActive"`
-	T_BahanCreated           string `db:"T_BahanCreated"`
-	T_BahanCreatedUserID     string `db:"T_BahanCreatedUserID"`
-	T_BahanLastUpdated       string `db:"T_BahanLastUpdated"`
-	T_BahanLastUpdatedUserID string `db:"T_BahanLastUpdatedUserID"`
-	T_BahanDeleted           string `db:"T_BahanDeleted"`
-	T_BahanDeletedUserID     string `db:"T_BahanDeletedUserID"`
-}
-
-type TmpSampleStation struct {
-	T_SampleStationID   string `db:"T_SampleStationID"`
-	T_SampleStationName string `db:"T_SampleStationName"`
-}
--- a/models/mdnonlabtemplate.models.go
+++ b/models/mdnonlabtemplate.models.go
@@ -0,0 +1,14 @@
+package models
+
+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"`
+}
--- a/services/dev/md.bahan.services.go
+++ b/services/dev/md.bahan.services.go
@@ -1,109 +0,0 @@
-package dev_services
-
-import (
-	"cpone/db"
-	"cpone/models"
-	dbx "cpone/package/database"
-	"fmt"
-	"math"
-	"strings"
-)
-
-func NewMdBahanServices(uStore db.AppStore) *MdBahanServices {
-
-	return &MdBahanServices{
-
-		MdBahanStore: uStore,
-	}
-}
-
-type MdBahanServices struct {
-	MdBahanStore db.AppStore
-}
-
-func (su *MdBahanServices) GetListMdBahan(
-	search string,
-	stationID string,
-	currentPage int,
-	rowPerPage int) ([]models.Bahan, int, error) {
-	var bahanList []models.Bahan
-	var totalData int
-	offset := (currentPage - 1) * rowPerPage
-	prm := "%" + strings.TrimSpace(search) + "%"
-	querytotal := `
-		SELECT COUNT(*)  FROM 
-		t_bahan 
-		JOIN 
-		t_samplestation
-		ON T_BahanT_SampleStationID = T_SampleStationID
-		AND T_BahanIsActive = 'Y'
-		AND T_SampleStationIsActive = 'Y'
-		WHERE (T_BahanName LIKE ? OR  T_BahanCode LIKE ? )
-		AND T_BahanT_SampleStationID = ?
-	`
-	if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm, stationID); err != nil {
-		return nil, 0, fmt.Errorf("error querying database: %v", err)
-	}
-	query := `
-		SELECT t_bahan.*,  
-		T_SampleStationName, 
-		T_SampleStationID FROM 
-		t_bahan 
-		JOIN 
-		t_samplestation
-		ON T_BahanT_SampleStationID = T_SampleStationID
-		AND T_BahanIsActive = 'Y'
-		AND T_SampleStationIsActive = 'Y'
-		WHERE (T_BahanName LIKE ? OR  T_BahanCode LIKE ? )
-		AND T_BahanT_SampleStationID = ?
-		LIMIT ? OFFSET ?
-	`
-
-	if err := dbx.Handlex.Select(&bahanList, query, prm, prm, stationID, rowPerPage, offset); err != nil {
-		return nil, 0, fmt.Errorf("error querying database: %v", err)
-	}
-	totalPage := int(math.Ceil(float64(totalData) / float64(rowPerPage)))
-
-	return bahanList, totalPage, nil
-
-}
-
-func (su *MdBahanServices) GetMdBahanBreadCrumb(title string) (models.BreadCrumbV1, error) {
-
-	ret := models.BreadCrumbV1{
-		Title: "Master Bahan",
-		Item: []models.ItemBreadCrumbV1{
-			{
-				Item: "Dashboard",
-				Url:  "/dev/dashboard",
-			},
-			{
-				Item: "Master",
-				Url:  "/dev/master",
-			},
-			{
-				Item: "Bahan",
-				Url:  "",
-			},
-		},
-	}
-
-	return ret, nil
-}
-func (su *MdBahanServices) GetListSampleStation() ([]models.TmpSampleStation, error) {
-	var stationList []models.TmpSampleStation
-	query := `
-		SELECT 
-		T_SampleStationID,
-		T_SampleStationName
-		FROM
-		t_samplestation 
-		WHERE T_SampleStationIsActive = 'Y'
-	`
-
-	if err := dbx.Handlex.Select(&stationList, query); err != nil {
-		return nil, fmt.Errorf("error querying database: %v", err)
-	}
-
-	return stationList, nil
-}
--- a/services/dev/md.nonlabtemplate.services.go
+++ b/services/dev/md.nonlabtemplate.services.go
@@ -0,0 +1,84 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strings"
+)
+
+type MDNonLabTemplateServices struct {
+	MDNonLabTemplateStore db.AppStore
+}
+
+func NewMDNonLabTemplateServices(uStore db.AppStore) *MDNonLabTemplateServices {
+	return &MDNonLabTemplateServices{
+		MDNonLabTemplateStore: uStore,
+	}
+}
+
+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
+}
--- a/views/dev/mdbahan/mdbahan.templ
+++ b/views/dev/mdbahan/mdbahan.templ
@@ -1,221 +0,0 @@
-package dev_mdbahanview
-
-import "cpone/layout"
-import "cpone/models"
-import "cpone/component/customtextfield"
-
-templ MdBahanScreen(
-	tableID string,
-	paginationID string,
-	breadcrumb templ.Component,
-	tablecontent templ.Component,
-	filterComponent templ.Component,
-	pagination 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})
-		<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"
-					>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"
-				>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>
-	</div>
-}
-
-templ CssMdUserGroup() {
-}
-
-templ JsMdBahan() {
-	<script>
-        function onLoadingStart() {
-        }
-
-        function onLoadingEnd() {
-            console.log('Loading ended');
-        }
-
-        document.addEventListener('htmx:beforeRequest', function(event) {
-            var indicator = document.querySelector('#loadingcontent');
-			console.log(event.detail.xhr)
-			console.log(event.detail.elt)
-            if (indicator) {
-                onLoadingStart();
-            }
-        });
-
-        document.addEventListener('htmx:afterRequest', function(event) {
-            var indicator = document.querySelector('#loadingcontent');
-            if (indicator) {
-                onLoadingEnd();
-            }
-        });
-    </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 MdBahanFilter(
-	hxGet string,
-	hxTrigger string,
-	hxInclude string,
-	hxSwap string,
-	hxTarget string,
-	dataStation []models.TmpSampleStation,
-	selectedIdStation string,
-	hxBeforeRequest templ.ComponentScript,
-	hxAfterRequest templ.ComponentScript,
-) {
-	<div class="container p-0">
-		<div class="row">
-			<div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6  mb-2">
-				<input
-					id="filter-name"
-					class="form-control form-control-lg bg-field border-0  rounded-lg"
-					type="text"
-					name="filtername"
-					placeholder="Name/Kode"
-					autocomplete="off"
-					hx-target={ hxTarget }
-					hx-trigger={ hxTrigger }
-					hx-include={ hxInclude }
-					hx-get={ hxGet }
-					hx-swap={ hxSwap }
-					hx-on::before-request={ hxBeforeRequest }
-					hx-on::after-request={ hxAfterRequest }
-				/>
-			</div>
-			<div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 mb-2">
-				<select
-					class="form-control form-control-lg bg-field btn-lg rounded-lg selectpicker"
-					data-live-search="true"
-					data-size="5"
-					id="filter-station"
-					autocomplete="off"
-					name="filterstation"
-					hx-trigger="change"
-					data-style="btn-field btn-lg rounded-lg"
-					data-container="form-control-lg"
-					data-live-search-placeholder="cari sample station"
-					hx-include={ hxInclude }
-					hx-get={ hxGet }
-					hx-swap={ hxSwap }
-					hx-target={ hxTarget }
-					hx-on::before-request={ hxBeforeRequest }
-					hx-on::after-request={ hxAfterRequest }
-				>
-					// hx-trigger={ hxTrigger }
-					for _, v := range dataStation {
-						if v.T_SampleStationID == selectedIdStation {
-							<option value={ v.T_SampleStationID }>{ v.T_SampleStationName }</option>
-						} else {
-							<option value={ v.T_SampleStationID }>{ v.T_SampleStationName }</option>
-						}
-					}
-				</select>
-				// <select
-				// 	class="form-control form-control-lg bg-field selectpicker"
-				// 	data-live-search="true"
-				// 	data-size="5"
-				// 	id="filter-station"
-				// 	autocomplete="off"
-				// 	hx-trigger={ hxTrigger }
-				// 	hx-include={ hxInclude }
-				// 	hx-get={ hxGet }
-				// 	hx-swap={ hxSwap }
-				// 	hx-target={ hxTarget }
-				// >
-				// 	for _, v := range dataStation {
-				// 		if v.T_SampleStationID == selectedIdStation {
-				// 			<option value={ v.T_SampleStationID }>{ v.T_SampleStationName }</option>
-				// 		} else {
-				// 			<option value={ v.T_SampleStationID }>{ v.T_SampleStationName }</option>
-				// 		}
-				// 	}
-				// </select>
-				// <select
-				// 	type="option"
-				// 	id="filter-station"
-				// 	name="filterstation"
-				// 	class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg selectpicker"
-				// 	data-live-search="true"
-				// 	data-size="5"
-				// >
-				// 	for _, v := range dataStation {
-				// 		if v.T_SampleStationID == selectedIdStation {
-				// 			<option value={ v.T_SampleStationID }>{ v.T_SampleStationName }</option>
-				// 		} else {
-				// 			<option value={ v.T_SampleStationID }>{ v.T_SampleStationName }</option>
-				// 		}
-				// 	}
-				// 	// <option>1</option>
-				// 	// <option>2</option>
-				// 	// <option>3</option>
-				// 	// <option>4</option>
-				// </select>
-			</div>
-		</div>
-	</div>
-}
-
-templ ShowMdBahanScreen(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/mdbahan/mdbahan_templ.go
+++ b/views/dev/mdbahan/mdbahan_templ.go
@@ -1,480 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.663
-package dev_mdbahanview
-
-//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/layout"
-import "cpone/models"
-import "cpone/component/customtextfield"
-
-func MdBahanScreen(
-	tableID string,
-	paginationID string,
-	breadcrumb templ.Component,
-	tablecontent templ.Component,
-	filterComponent templ.Component,
-	pagination 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 {
-			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=\"container-fluid\">")
-		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 = 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
-		}
-		templ_7745c5c3_Err = breadcrumb.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-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\">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\">Add New</button></div></div><div id=\"loading-parent\" class=\" rounded\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = filterComponent.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = tablecontent.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = pagination.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>")
-		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 CssMdUserGroup() 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_Var2 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var2 == nil {
-			templ_7745c5c3_Var2 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func JsMdBahan() 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)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script>\r\n        function onLoadingStart() {\r\n        }\r\n\r\n        function onLoadingEnd() {\r\n            console.log('Loading ended');\r\n        }\r\n\r\n        document.addEventListener('htmx:beforeRequest', function(event) {\r\n            var indicator = document.querySelector('#loadingcontent');\r\n\t\t\tconsole.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.elt)\r\n            if (indicator) {\r\n                onLoadingStart();\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                onLoadingEnd();\r\n            }\r\n        });\r\n    </script>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func BeforeRequestContent() templ.ComponentScript {
-	return templ.ComponentScript{
-		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");
-}`,
-		Call:       templ.SafeScript(`__templ_BeforeRequestContent_911f`),
-		CallInline: templ.SafeScriptInline(`__templ_BeforeRequestContent_911f`),
-	}
-}
-
-func AfterRequestContent() templ.ComponentScript {
-	return templ.ComponentScript{
-		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");
-}`,
-		Call:       templ.SafeScript(`__templ_AfterRequestContent_6cc0`),
-		CallInline: templ.SafeScriptInline(`__templ_AfterRequestContent_6cc0`),
-	}
-}
-
-func MdBahanFilter(
-	hxGet string,
-	hxTrigger string,
-	hxInclude string,
-	hxSwap string,
-	hxTarget string,
-	dataStation []models.TmpSampleStation,
-	selectedIdStation string,
-	hxBeforeRequest templ.ComponentScript,
-	hxAfterRequest 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_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 class=\"container p-0\"><div class=\"row\"><div class=\"col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6  mb-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest, hxAfterRequest)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input id=\"filter-name\" class=\"form-control form-control-lg bg-field border-0  rounded-lg\" type=\"text\" name=\"filtername\" placeholder=\"Name/Kode\" autocomplete=\"off\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 132, Col: 25}
-		}
-		_, 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-trigger=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 133, Col: 27}
-		}
-		_, 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-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 134, Col: 27}
-		}
-		_, 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-get=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 135, Col: 19}
-		}
-		_, 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(hxSwap)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 136, Col: 21}
-		}
-		_, 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-on::before-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 templ.ComponentScript = hxBeforeRequest
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var10.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_Var11 templ.ComponentScript = hxAfterRequest
-		_, 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("\"></div><div class=\"col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 mb-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest, hxAfterRequest)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<select class=\"form-control form-control-lg bg-field btn-lg rounded-lg selectpicker\" data-live-search=\"true\" data-size=\"5\" id=\"filter-station\" autocomplete=\"off\" name=\"filterstation\" hx-trigger=\"change\" data-style=\"btn-field btn-lg rounded-lg\" data-container=\"form-control-lg\" data-live-search-placeholder=\"cari sample station\" hx-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 153, Col: 27}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-get=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var13 string
-		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 154, Col: 19}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 155, Col: 21}
-		}
-		_, 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("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 156, Col: 25}
-		}
-		_, 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-on::before-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 templ.ComponentScript = hxBeforeRequest
-		_, 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-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var17 templ.ComponentScript = hxAfterRequest
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var17.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
-		}
-		for _, v := range dataStation {
-			if v.T_SampleStationID == selectedIdStation {
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<option value=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var18 string
-				templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_SampleStationID)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 163, Col: 42}
-				}
-				_, 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("\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var19 string
-				templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_SampleStationName)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 163, Col: 68}
-				}
-				_, 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("</option>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			} else {
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<option value=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var20 string
-				templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_SampleStationID)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 165, Col: 42}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
-				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_Var21 string
-				templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_SampleStationName)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 165, Col: 68}
-				}
-				_, 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("</option>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</select></div></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func ShowMdBahanScreen(title string, cmp templ.Component, css templ.Component, js templ.Component,
-	navbarmenu templ.Component,
-	navbaruser templ.Component,
-	userprofile 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 {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var22 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var22 == nil {
-			templ_7745c5c3_Var22 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Var23 := 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)
-			}
-			templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			if !templ_7745c5c3_IsBuffer {
-				_, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
-			}
-			return templ_7745c5c3_Err
-		})
-		templ_7745c5c3_Err = layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var23), templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
--- a/views/dev/mdbahan/mdbahanformmodal.templ
+++ b/views/dev/mdbahan/mdbahanformmodal.templ
@@ -1,185 +0,0 @@
-package dev_mdbahanview
-
-import "cpone/models"
-
-templ UserGroupForm(data models.UserGroupFormComponent) {
-	<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() }
-		>
-			@modalcomponent.Modal(data.ModalID,
-				data.ModalTitle,
-				data.DialogBody,
-				data.DialogAction,
-				data.ButtonCLose)
-		</form>
-	</div>
-}
-
-script HandleFormBeforeRequest() {
-	console.log("handle disable btn add");
-	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() {
-	console.log("handle enable btn add");
-
-	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 BodyFormUserGroup(inputId models.CustomTextFieldv2Prm,
-	inputCode models.CustomTextFieldv2Prm,
-	inputName models.CustomTextFieldv2Prm,
-	componentID string,
-	hxOnLoad templ.ComponentScript) {
-	<div id={ componentID } hx-on::load={ hxOnLoad }>
-		@customtextfield.CustomTextFieldv2(
-			inputId)
-		@customtextfield.CustomTextFieldv2(
-			inputCode)
-		@customtextfield.CustomTextFieldv2(
-			inputName)
-	</div>
-}
-
-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 ActionFormUserGroup(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 BtnCloseFormUserGroup(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 DeleteConfirmationBody(inputId models.CustomTextFieldv2Prm,
-	componentID string,
-	message string,
-	datHeader []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 datHeader {
-						<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 ActionFormUserGroupDelete(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/mdbahan/mdbahantable.templ
+++ b/views/dev/mdbahan/mdbahantable.templ
@@ -1,130 +0,0 @@
-package dev_mdbahanview
-
-import "cpone/component/table"
-import "cpone/models"
-import "strconv"
-
-templ TableBahan(data []models.Bahan,
-	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", "NAMA BAHAN", "SAMPLE STATION", "AKSI"},
-			[]string{"20%", "30%", "30%", "20%"},
-			RowBahan(data,
-				hxGetEdit,
-				hxTargetEdit,
-				hxSwapEdit,
-				hxIncludeEdit,
-				hxGetDelete,
-				hxTargetDelete,
-				hxSwapDelete,
-				hxIncludeDelete,
-			))
-	</div>
-}
-
-templ RowBahan(data []models.Bahan,
-	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.T_BahanCode }</td>
-			<td>{ v.T_BahanName }</td>
-			<td>{ v.T_SampleStationName }</td>
-			<td>
-				@TableAction(v.T_BahanID,
-					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/mdnonlabtemplate.templ
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplate.templ
@@ -0,0 +1,180 @@
+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,
+    breadcrumb templ.Component,
+    filterComponent templ.Component,
+    tableComponent templ.Component,
+    paginationComponent 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,})
+        <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
+            <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>
+}
+
+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/mdnonlabtemplate_templ.go
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplate_templ.go
@@ -0,0 +1,302 @@
+// 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/component/customtextfield"
+import "cpone/models"
+import "cpone/layout"
+
+func MDNonLabTemplateScreen(
+	tableID string,
+	paginationID string,
+	searchID string,
+	dialogAddID string,
+	dialogAddBodyID string,
+	dialogEditID string,
+	dialogEditBodyID string,
+	dialogDeleteID string,
+	dialogDeleteBodyID string,
+	breadcrumb templ.Component,
+	filterComponent templ.Component,
+	tableComponent templ.Component,
+	paginationComponent 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 {
+			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=\"container-fluid\">")
+		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",
+			Value: dialogAddID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddBodyID",
+			Name:  "dialogAddBodyID",
+			Type:  "hidden",
+			Value: dialogAddBodyID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID",
+			Name:  "dialogEditID",
+			Type:  "hidden",
+			Value: dialogEditID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID",
+			Name:  "dialogEditBodyID",
+			Type:  "hidden",
+			Value: dialogEditBodyID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID",
+			Name:  "dialogDeleteID",
+			Type:  "hidden",
+			Value: dialogDeleteID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteBodyID",
+			Name:  "dialogDeleteBodyID",
+			Type:  "hidden",
+			Value: dialogDeleteBodyID}).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\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = breadcrumb.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-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=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: 69, Col: 55}
+		}
+		_, 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("\">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=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: 78, Col: 51}
+		}
+		_, 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>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = filterComponent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-parent\" class=\"rounded\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tableComponent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = paginationComponent.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>")
+		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 CSSMDNonLabTemplate() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<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)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JSSMDNonLabTemplate() 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_Var5 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var5 == nil {
+			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>")
+		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 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");
+
+    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`),
+	}
+}
+
+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");
+
+    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`),
+	}
+}
+
+func ShowMDNonLabTemplate(
+	title string,
+	cmp templ.Component,
+	css templ.Component,
+	js templ.Component,
+	navbarmenu templ.Component,
+	navbaruser templ.Component,
+	userprofile 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 {
+			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_Var7 := 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)
+			}
+			templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if !templ_7745c5c3_IsBuffer {
+				_, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
+			}
+			return templ_7745c5c3_Err
+		})
+		templ_7745c5c3_Err = layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var7), templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/mdnonlabtemplate/mdnonlabtemplatetable.templ
+++ b/views/dev/mdnonlabtemplate/mdnonlabtemplatetable.templ
@@ -0,0 +1,130 @@
+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", "FLAG FISIK", "AKSI"},
+            []string{"50%", "30%", "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>{ i.NonLabTemplateFlagFisik }</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/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_mdbahanview
+package dev_mdnonlabtemplateview

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

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

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

-func TableBahan(data []models.Bahan,
+func TableNonLabTemplate(
+	data []models.MDNonLabTemplate,
 	tableID string,
 	hxGetEdit string,
 	hxTargetEdit string,
@@ -44,7 +45,7 @@ func TableBahan(data []models.Bahan,
 		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\mdbahan\mdbahantable.templ`, Line: 18, Col: 18}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 19, Col: 21}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -54,9 +55,9 @@ func TableBahan(data []models.Bahan,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"KODE", "NAMA BAHAN", "SAMPLE STATION", "AKSI"},
-			[]string{"20%", "30%", "30%", "20%"},
-			RowBahan(data,
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"NAMA TEMPLATE", "FLAG FISIK", "AKSI"},
+			[]string{"50%", "30%", "20%"},
+			ItemRow(data,
 				hxGetEdit,
 				hxTargetEdit,
 				hxSwapEdit,
@@ -80,7 +81,8 @@ func TableBahan(data []models.Bahan,
 	})
 }

-func RowBahan(data []models.Bahan,
+func ItemRow(
+	data []models.MDNonLabTemplate,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -103,20 +105,20 @@ func RowBahan(data []models.Bahan,
 		}
 		ctx = templ.ClearChildren(ctx)
 		if len(data) == 0 {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"4\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"3\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		}
-		for _, v := range data {
+		for _, i := 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(v.T_BahanCode)
+			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(i.NonLabTemplateName)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 51, Col: 22}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 53, Col: 38}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 			if templ_7745c5c3_Err != nil {
@@ -127,9 +129,9 @@ func RowBahan(data []models.Bahan,
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var5 string
-			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_BahanName)
+			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(i.NonLabTemplateFlagFisik)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 52, Col: 22}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 54, Col: 43}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 			if templ_7745c5c3_Err != nil {
@@ -139,20 +141,7 @@ func RowBahan(data []models.Bahan,
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var6 string
-			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_SampleStationName)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 53, Col: 30}
-			}
-			_, 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
-			}
-			templ_7745c5c3_Err = TableAction(v.T_BahanID,
+			templ_7745c5c3_Err = TableAction(i.NonLabTemplateID,
 				hxGetEdit,
 				hxTargetEdit,
 				hxSwapEdit,
@@ -187,7 +176,6 @@ 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)
@@ -196,9 +184,9 @@ func TableAction(
 			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
+		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\">")
@@ -209,16 +197,16 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, 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=\"")
+		_, 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_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetEdit + "?id=" + strconv.Itoa(id))
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, 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\mdbahan\mdbahantable.templ`, Line: 86, Col: 49}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 86, Col: 58}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -226,12 +214,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(hxTargetEdit)
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 87, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 87, Col: 36}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -239,12 +227,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(hxSwapEdit)
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 88, Col: 23}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 88, Col: 32}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -252,12 +240,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 89, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 89, Col: 38}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -265,12 +253,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs("#spnredt" + strconv.Itoa(id))
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs("#spnredt" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 90, Col: 47}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 90, Col: 56}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -278,8 +266,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var13 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13.Call)
+		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
 		}
@@ -287,8 +275,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var14 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.Call)
+		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
 		}
@@ -296,12 +284,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("spnredt" + strconv.Itoa(id))
+		var templ_7745c5c3_Var14 string
+		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs("spnredt" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 94, Col: 42}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 94, Col: 51}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -313,16 +301,16 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, 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=\"")
+		_, 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=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetDelete + "?id=" + strconv.Itoa(id))
+		var templ_7745c5c3_Var15 string
+		templ_7745c5c3_Var15, 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\mdbahan\mdbahantable.templ`, Line: 100, Col: 51}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 100, Col: 51}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -330,12 +318,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(hxTargetDelete)
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 101, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 101, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -343,12 +331,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(hxSwapDelete)
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 102, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 102, Col: 25}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -356,12 +344,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var19 string
-		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 103, Col: 31}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 103, Col: 31}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -369,12 +357,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var20 string
-		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs("#spnrdel" + strconv.Itoa(id))
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs("#spnrdel" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 104, Col: 47}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 104, Col: 47}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -382,8 +370,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var21 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21.Call)
+		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
 		}
@@ -391,8 +379,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var22 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
+		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
 		}
@@ -400,12 +388,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var23 string
-		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
+		var templ_7745c5c3_Var22 string
+		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 108, Col: 42}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplatetable.templ`, Line: 108, Col: 51}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -422,30 +410,30 @@ func TableAction(

 func HandleBeforeRequestRow(id string) templ.ComponentScript {
 	return templ.ComponentScript{
-		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)
+		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);
 }`,
-		Call:       templ.SafeScript(`__templ_HandleBeforeRequestRow_7d4f`, id),
-		CallInline: templ.SafeScriptInline(`__templ_HandleBeforeRequestRow_7d4f`, id),
+		Call:       templ.SafeScript(`__templ_HandleBeforeRequestRow_d88d`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleBeforeRequestRow_d88d`, id),
 	}
 }

 func HandleAfterRequestRow(id string) templ.ComponentScript {
 	return templ.ComponentScript{
-		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)
+		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);
 }`,
-		Call:       templ.SafeScript(`__templ_HandleAfterRequestRow_ce9e`, id),
-		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_ce9e`, id),
+		Call:       templ.SafeScript(`__templ_HandleAfterRequestRow_9c9f`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_9c9f`, id),
 	}
 }
Author	SHA1	Message	Date
adibwp	1860ae0a9d	md nonlab template listing data + filter + pagination	2024-05-27 11:34:33 +07:00
adibwp	db2f68c8c0	add table & screen non lab template	2024-05-27 09:11:30 +07:00