feature/hasil-fisik-k3

fix pagination
add styling
2024-06-12 18:56:37 +07:00 · 2024-06-10 11:55:23 +07:00 · 2024-06-10 11:40:07 +07:00 · 2024-06-10 10:12:41 +07:00 · 2024-06-08 09:48:39 +07:00 · 2024-06-07 09:36:57 +07:00
70 changed files with 10304 additions and 10206 deletions
--- a/assets/asset-corporate-portal/css/sas.bundle.css
+++ b/assets/asset-corporate-portal/css/sas.bundle.css
@@ -294,6 +294,56 @@ 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/assets/mcu/patient.html
+++ b/assets/mcu/patient.html
@@ -0,0 +1,631 @@
+<!DOCTYPE html>
+<!--
+		Template Name: Metronic - Bootstrap 4 HTML, React, Angular 9 & VueJS Admin Dashboard Theme
+		Author: KeenThemes
+		Website: http://www.keenthemes.com/
+		Contact: support@keenthemes.com
+		Follow: www.twitter.com/keenthemes
+		Dribbble: www.dribbble.com/keenthemes
+		Like: www.facebook.com/keenthemes
+		Purchase: https://1.envato.market/EA4JP
+		Renew Support: https://1.envato.market/EA4JP
+		License: You must have a valid license purchased only from themeforest(the above link) in order to legally use the theme for your project.
+		-->
+<html lang="en">
+  <!--begin::Head-->
+  <head>
+    <base href="../" />
+    <meta charset="utf-8" />
+    <title>Company Portal | { title }</title>
+    <meta name="description" content="Company Portal" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <!--begin::Fonts-->
+    <link rel="stylesheet" href="assets/css/googlefont/poppins.css" />
+    <!--end::Fonts-->
+    <!--begin::Page Custom Styles(used by this page)-->
+    <link
+      href="assets/css/pages/login/login-1.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <!--end::Page Custom Styles-->
+    <!--begin::Global Theme Styles(used by all pages)-->
+    <link
+      href="assets/plugins/global/plugins.bundle.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="assets/plugins/custom/prismjs/prismjs.bundle.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link href="assets/css/style.bundle.css" rel="stylesheet" type="text/css" />
+    <!--end::Global Theme Styles-->
+    <!--begin::Layout Themes(used by all pages)-->
+    <link
+      href="assets/css/themes/layout/header/base/light.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="assets/css/themes/layout/header/menu/light.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="assets/css/themes/layout/brand/dark.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="assets/css/themes/layout/aside/dark.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <!--end::Layout Themes-->
+    <link
+      rel="shortcut icon"
+      href="asset-corporate-portal/media/logo/logo-small.jpg"
+    />
+    <!--end::Layout Themes SAS-->
+    <link
+      href="asset-corporate-portal/css/sas.bundle.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.18/css/bootstrap-select.min.css"
+    />
+
+    <style>
+      .filter-option-inner-inner {
+        margin-top: 1.2vh;
+        color: var(--text-disabled);
+      }
+      .bootstrap-select > .dropdown-toggle.bs-placeholder.btn {
+        color: var(--text-disabled);
+      }
+
+      .bootstrap-select.btn-group .dropdown-menu {
+        min-width: 100%;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+        position: sticky;
+      }
+
+      .dropdown-menu {
+        transform: translate3d(0px, 0px, 0px) !important;
+      }
+
+      /* mik */
+      .input-container {
+        position: relative;
+      }
+
+      .input-label {
+        position: absolute;
+        right: 20px;
+        transform: translateY(-50%);
+        pointer-events: none;
+        transition: all 0.2s ease;
+      }
+      .input-field:not(:placeholder-shown) + .input-label {
+        top: 50%;
+        font-size: 12px;
+        color: var(--secondary-hover);
+      }
+    </style>
+  </head>
+  <!--end::Head-->
+  <!--begin::Body-->
+  <body
+    id="kt_body"
+    class="bg-white header-fixed header-mobile-fixed subheader-enabled subheader-fixed subheader-mobile-fixed aside-enabled aside-fixed aside-minimize-hoverable page-loading"
+  >
+    <style></style>
+    <!--begin::Main-->
+
+    <div class="wrapperx p-5 h-100">
+      <div class="row">
+        <div class="col-lg-10">
+          <!--begin::Row 1-->
+          <div class="form-row">
+            <div class="col-md-6 col-lg-2">
+              <label
+                for="input1"
+                class="font-weight-bolder"
+                style="font-family: Poppins"
+                >Sapaan</label
+              >
+              <select
+                class="selectpicker form-control"
+                id="select1"
+                data-live-search="true"
+                data-size="4"
+                data-style="bg-field btn-lg rounded-lg btn-custom-selectpicker"
+              >
+                <option value="mr">Tn</option>
+                <option value="mrs">Ny</option>
+                <option value="ms">Nn</option>
+              </select>
+            </div>
+            <div class="col-md-6 col-lg-3">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Imbuhan Awal</label
+              >
+              <input
+                type="text"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Imbuhan Awal 1"
+              />
+            </div>
+            <div class="col-md-6 col-lg-5">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Nama
+              </label>
+              <input
+                type="text"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Imbuhan Awal 2"
+              />
+            </div>
+            <div class="col-md-6 col-lg-2">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Imbuhan Akhir</label
+              >
+              <input
+                type="text"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Imbuhan Awal 2"
+              />
+            </div>
+          </div>
+          <!--end::Row 1-->
+          <!--begin::Row 2-->
+          <div class="row mt-5">
+            <div class="col-md-6">
+              <!-- begin::Jenis Kelamin -->
+              <div class="form-row">
+                <label
+                  for="input1"
+                  style="font-family: Poppins; font-weight: 600"
+                  >Jenis Kelamin</label
+                >
+                <select
+                  class="selectpicker form-control"
+                  id="select1"
+                  data-live-search="true"
+                  data-size="4"
+                  data-style="bg-field btn-lg rounded-lg btn-custom-selectpicker"
+                >
+                  <option value="default">Pilih Jenis Kelamin</option>
+                  <option value="mr">Perempuan</option>
+                  <option value="mrs">Laki-Laki</option>
+                </select>
+              </div>
+              <!-- end::Jenis Kelamin -->
+            </div>
+            <div class="col-md-6">
+              <!-- begin::Tanggal Lahir -->
+              <div class="form-row">
+                <label style="font-family: Poppins; font-weight: 600"
+                  >Tanggal Lahir</label
+                >
+                <div class="input-group date bg-field border-0 rounded-lg">
+                  <input
+                    type="text"
+                    class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                    readonly
+                    placeholder="Pilih Tanggal"
+                    id="datepicker"
+                  />
+                  <div class="input-group-prepend">
+                    <span
+                      class="input-group-text bg-field border-0 rounded-lg"
+                      id="calendar-icon"
+                    >
+                      <span
+                        class="iconify text-grey"
+                        data-icon="heroicons-solid:calendar"
+                        style="font-size: 20px"
+                      ></span>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <!-- end::Tanggal Lahir -->
+            </div>
+          </div>
+          <!--end::Row 2-->
+          <!--begin::Row 3-->
+          <div class="row mt-5">
+            <div class="col-lg-6">
+              <!-- begin::Umur -->
+              <div class="form-row">
+                <div class="col">
+                  <label
+                    for="input1"
+                    style="font-family: Poppins; font-weight: 600"
+                    >Umur</label
+                  >
+                  <div class="input-container">
+                    <input
+                      type="text"
+                      id="myInput"
+                      class="input-field form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                    />
+                    <label for="myInput" class="input-label">Tahun</label>
+                  </div>
+                </div>
+                <div class="col mt-8">
+                  <div class="input-container">
+                    <input
+                      type="text"
+                      id="myInput"
+                      class="input-field form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                    />
+                    <label for="myInput" class="input-label">Bulan</label>
+                  </div>
+                </div>
+                <div class="col mt-8">
+                  <div class="input-container">
+                    <input
+                      type="text"
+                      id="myInput"
+                      class="input-field form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                    />
+                    <label for="myInput" class="input-label">Hari</label>
+                  </div>
+                </div>
+              </div>
+              <!-- end::Umur -->
+            </div>
+            <div class="col-lg-6">
+              <!-- begin::Darah -->
+              <div class="form-row">
+                <!-- begin::Golongan Darah -->
+                <div class="col">
+                  <label
+                    for="input1"
+                    style="font-family: Poppins; font-weight: 600"
+                    >Golongan Darah</label
+                  >
+                  <select
+                    class="selectpicker form-control"
+                    id="select1"
+                    data-live-search="true"
+                    data-size="4"
+                    data-style="bg-field btn-lg rounded-lg btn-custom-selectpicker"
+                  >
+                    <option value="default">Pilih Golongan Darah</option>
+                    <option value="">O</option>
+                    <option value="">A</option>
+                    <option value="">B</option>
+                    <option value="">AB</option>
+                  </select>
+                </div>
+                <!-- end::Golongan Darah -->
+                <!-- begin::Rhesus -->
+                <div class="col">
+                  <label style="font-family: Poppins; font-weight: 600"
+                    >Rhesus</label
+                  >
+                  <select
+                    class="selectpicker form-control"
+                    id="select1"
+                    data-live-search="true"
+                    data-size="5"
+                    data-style="bg-field btn-lg rounded-lg btn-custom-selectpicker"
+                  >
+                    <option value="default">Pilih Rhesus</option>
+                    <option value="">-</option>
+                    <option value="">+</option>
+                  </select>
+                </div>
+                <!-- end::Rhesus -->
+              </div>
+              <!-- end::Darah -->
+            </div>
+          </div>
+          <!--end::Row 3-->
+          <!--begin::Row 4-->
+          <div class="row mt-5">
+            <!--begin::Pekerjaan-->
+            <div class="col-md-6">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Pekerjaan</label
+              >
+              <input
+                type="text"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Pekerjaan"
+              />
+            </div>
+            <!--end::Pekerjaan-->
+            <!--begin::Departemen-->
+            <div class="col-md-6">
+              <div class="form-row">
+                <label
+                  for="input1"
+                  style="font-family: Poppins; font-weight: 600"
+                  >Departemen</label
+                >
+                <input
+                  type="text"
+                  class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                  placeholder="Departemen"
+                />
+              </div>
+            </div>
+            <!--end::Departemen-->
+          </div>
+          <!--end::Row 4-->
+          <!--begin::Row 5-->
+          <div class="row mt-5">
+            <!--begin::Posisi-->
+            <div class="col-md-6">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Posisi</label
+              >
+              <input
+                type="text"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Posisi"
+              />
+            </div>
+            <!--end::Posisi-->
+            <!--Begin::Pendidikan Terakhir-->
+            <div class="col-md-6">
+              <div class="form-row">
+                <label style="font-family: Poppins; font-weight: 600"
+                  >Pendidikan Terakhir</label
+                >
+                <select
+                  class="selectpicker form-control"
+                  id="select1"
+                  data-live-search="true"
+                  data-size="5"
+                  data-style="bg-field btn-lg rounded-lg btn-custom-selectpicker"
+                >
+                  <option value="default">Pilih Pendidikan Terakhir</option>
+                  <option value="mr">SMA/SLTA/Sederajat</option>
+                  <option value="mrs">D3</option>
+                  <option value="ms">Sarjana</option>
+                  <option value="ms">Magister</option>
+                  <option value="ms">Doktor</option>
+                </select>
+              </div>
+            </div>
+            <!--end::Pendidikan Terakhir-->
+          </div>
+          <!--end::Row 5-->
+          <!--begin::Row 6-->
+          <div class="row mt-5">
+            <!--begin::Kewarganegaraan-->
+            <div class="col-md-6">
+              <div class="form-row">
+                <label
+                  for="input1"
+                  style="font-family: Poppins; font-weight: 600"
+                  >Kewarganegaraan</label
+                >
+                <div class="form-control border-0 h-auto p-0 mt-3">
+                  <div class="form-group">
+                    <div
+                      class="justify-content-between"
+                      style="display: flex; gap: 20px"
+                    >
+                      <label
+                        style="display: flex; align-items: center; gap: 5px"
+                      >
+                        <input type="radio" name="nationality" value="wni" />
+                        <p style="margin: 0">WNI</p>
+                      </label>
+                      <label
+                        style="display: flex; align-items: center; gap: 5px"
+                      >
+                        <input type="radio" name="nationality" value="wna" />
+                        <p style="margin: 0">WNA</p>
+                      </label>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <!--end::Kewarganegaraan-->
+            <!--Begin::Etnis-->
+            <div class="col-md-6">
+              <div class="form-row">
+                <label style="font-family: Poppins; font-weight: 600"
+                  >Etnis</label
+                >
+                <select
+                  class="selectpicker form-control"
+                  id="select1"
+                  data-live-search="true"
+                  data-size="4"
+                  data-style="bg-field btn-lg rounded-lg btn-custom-selectpicker"
+                >
+                  <option value="default">Pilih Etnis</option>
+                  <option value="">Jawa</option>
+                  <option value="">Sunda</option>
+                  <option value="">Batak</option>
+                  <option value="">Betawi</option>
+                  <option value="">Dayak</option>
+                </select>
+              </div>
+            </div>
+            <!--end::Etnis-->
+          </div>
+          <!--end::Row 6-->
+          <!--begin::Row 7-->
+          <div class="row mt-5">
+            <!--begin::Identitas-->
+            <div class="col-md-6">
+              <div class="form-row">
+                <div class="col">
+                  <label
+                    for="input1"
+                    style="font-family: Poppins; font-weight: 600"
+                    >Identitas</label
+                  >
+                  <select
+                    class="selectpicker form-control"
+                    id="select1"
+                    data-live-search="true"
+                    data-style="bg-field btn-lg rounded-lg btn-custom-selectpicker"
+                    data-size="4"
+                  >
+                    <option value="default">Pilih Identitas</option>
+                    <option value="">KTP</option>
+                    <option value="">SIM</option>
+                    <option value="">Paspor</option>
+                    <option value="">Kartu Pelajar</option>
+                    <option value="">Surat Keterangan</option>
+                  </select>
+                </div>
+              </div>
+            </div>
+            <!--end::Identitas-->
+            <!--Begin::Nomor Identitas-->
+            <div class="col-md-6">
+              <div class="form-row">
+                <div class="col">
+                  <label
+                    for="input1"
+                    style="font-family: Poppins; font-weight: 600"
+                    >Nomor Identitas</label
+                  >
+                  <input
+                    type="text"
+                    class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                    placeholder="Nomor Identitas"
+                  />
+                </div>
+              </div>
+            </div>
+            <!--end::Nomor Identitas-->
+          </div>
+          <!--end::Row 7-->
+          <!--begin::Row 8-->
+          <div class="row mt-5">
+            <!--begin::Nomor Hp-->
+            <div class="col-md-6">
+              <div class="form-row">
+                <div class="col">
+                  <label
+                    for="input1"
+                    style="font-family: Poppins; font-weight: 600"
+                    >Nomor HP</label
+                  >
+                  <input
+                    type="text"
+                    class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                    placeholder="Nomor HP"
+                  />
+                </div>
+              </div>
+            </div>
+            <!--end::Nomor Hp-->
+            <!--Begin::Email-->
+            <div class="col-md-6">
+              <div class="form-row">
+                <div class="col">
+                  <label
+                    for="input1"
+                    style="font-family: Poppins; font-weight: 600"
+                    >Email</label
+                  >
+                  <input
+                    type="text"
+                    class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                    placeholder="Email"
+                  />
+                </div>
+              </div>
+            </div>
+            <!--end::Email-->
+          </div>
+          <!--end::Row 8-->
+        </div>
+        <div class="col-lg-2">
+          <!-- person.png start -->
+          <div class="row">
+            <div class="col">
+              <img
+                src="asset-corporate-portal/media/person/person.png"
+                style="display: block; width: 13vw"
+              />
+            </div>
+          </div>
+
+          <div class="row mt-5">
+            <div class="col">
+              <button
+                class="btn bg-primary-transparent text-center text-primary"
+                style="width: 13vw; font-weight: 600"
+              >
+                Update Foto
+              </button>
+            </div>
+          </div>
+          <!-- person.png end -->
+        </div>
+      </div>
+    </div>
+
+    <!--end::Main-->
+    <script src="asset-corporate-portal/js/ktappsetting.js"></script>
+    <!-- iconify -->
+    <script src="assets/js/iconify/iconify.min.js"></script>
+    <!--end::Global Config-->
+    <!--begin::Global Theme Bundle(used by all pages)-->
+    <script src="assets/plugins/global/plugins.bundle.js"></script>
+    <script src="assets/plugins/custom/prismjs/prismjs.bundle.js"></script>
+    <script src="assets/js/scripts.bundle.js"></script>
+    <script src="assets/js/pages/crud/forms/widgets/bootstrap-datepicker.js"></script>
+
+    <script>
+      function ShowLoading() {
+        document
+          .getElementById("demo")
+          .setAttribute("style", "display:block !important;");
+        document
+          .getElementById("a")
+          .setAttribute("style", "display:none !important;");
+      }
+      function ShowForm() {
+        document
+          .getElementById("demo")
+          .setAttribute("style", "display:none !important;");
+        document
+          .getElementById("a")
+          .setAttribute("style", "display:block !important;;");
+      }
+
+      $(document).ready(function () {
+        // $(".selectpicker").selectpicker();
+        $(".selectpicker").selectpicker({
+          dropupAuto: false,
+        });
+        $("#datepicker").datepicker({
+          format: "dd/mm/yyyy",
+        });
+        $("#calendar-icon").click(function () {
+          $("#datepicker").datepicker("show");
+        });
+      });
+    </script>
+    <!--end::Global Theme Bundle-->
+
+    <!--end::Page Scripts-->
+  </body>
+  <!--end::Body-->
+</html>
--- a/assets/stephen/isi-hasil-fisik-k3.html
+++ b/assets/stephen/isi-hasil-fisik-k3.html
--- a/component/customdropdown/customdropdown.templ
+++ b/component/customdropdown/customdropdown.templ
@@ -30,30 +30,8 @@ templ MainCustomDropdownInput(inp models.CustomDropdownv1Prm, listItem templ.Com
 			name={ inp.Name }
 			class="form-control bg-field selectpicker"
 			data-live-search="true"
-			data-size="5"
-			id={ inp.ID }
-		>
-			@listItem
-		</select>
-		<div class="invalid-feedback text-danger mt-3 ml-2 mt-5">
-			{ inp.ErrorMsg }
-		</div>
-	</div>
-}
-
-templ MainCustomDropdownInputV0(inp models.CustomDropdownv1Prm, listItem templ.Component) {
-	<div class="form-group customDP">
-		<label class="text-black" style="font-family: Poppins; font-weight: 600;">{ inp.Label } </label>
-		<select
-			name={ inp.Name }
-			if inp.ErrorMsg =="" {
-				class="form-control form-control-lg bg-field btn-lg rounded-lg selectpicker"
-			} else {
-				class="form-control form-control-lg bg-field btn-lg rounded-lg selectpicker is-invalid"
-			}
-			data-live-search="true"
-			data-size="5"
 			data-style="bg-field btn-lg rounded-lg btn-custom-selectpicker"
+			data-size="5"
 			id={ inp.ID }
 		>
 			@listItem
@@ -82,3 +60,60 @@ templ MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string
 		</select>
 	</div>
 }
+
+templ CustomDropdownFilter(
+	idCmp string,
+	hxName string,
+	hxInclude string,
+	hxGet string,
+	hxSwap string,
+	hxTarget string,
+	hxTrigger string,
+	hxBeforeRequest templ.ComponentScript,
+	hxAfterRequest templ.ComponentScript,
+	listItem templ.Component) {
+	<select
+		class="form-control form-control-lg bg-field btn-lg rounded-lg selectpicker"
+		data-live-search="true"
+		data-size="5"
+		data-style="btn-field btn-lg rounded-lg"
+		data-live-search-placeholder="cari ..."
+		id={ idCmp }
+		name={ hxName }
+		hx-include={ hxInclude }
+		hx-get={ hxGet }
+		hx-swap={ hxSwap }
+		hx-target={ hxTarget }
+		hx-trigger={ hxTrigger }
+		hx-on::before-request={ hxBeforeRequest }
+		hx-on::after-request={ hxAfterRequest }
+	>
+		@listItem
+	</select>
+}
+
+templ CustomDropdownForm(
+	inp models.CustomDropdownV2Prm) {
+	<div class="form-group">
+		<label class="text-black" style="font-family: Poppins; font-weight: 600;">{ inp.Label } </label>
+		<select
+			if inp.ErrorMsg =="" {
+				class="form-control form-control-lg bg-field btn-lg rounded-lg selectpicker"
+			} else {
+				class="form-control form-control-lg bg-field btn-lg rounded-lg selectpicker is-invalid"
+			}
+			data-live-search="true"
+			data-size="5"
+			title={ inp.Placeholder }
+			data-style="btn-field btn-lg rounded-lg"
+			data-live-search-placeholder="cari ..."
+			name={ inp.Name }
+			id={ inp.ID }
+		>
+			@inp.ListItem
+		</select>
+		<div class="invalid-feedback text-danger mt-3 ml-2">
+			{ inp.ErrorMsg }
+		</div>
+	</div>
+}
--- a/component/customdropdown/customdropdown_templ.go
+++ b/component/customdropdown/customdropdown_templ.go
@@ -174,14 +174,14 @@ func MainCustomDropdownInput(inp models.CustomDropdownv1Prm, listItem templ.Comp
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"form-control bg-field selectpicker\" data-live-search=\"true\" data-size=\"5\" id=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"form-control bg-field selectpicker\" data-live-search=\"true\" data-style=\"bg-field btn-lg rounded-lg btn-custom-selectpicker\" data-size=\"5\" id=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var12 string
 		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 34, Col: 14}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 35, Col: 14}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 		if templ_7745c5c3_Err != nil {
@@ -202,7 +202,7 @@ func MainCustomDropdownInput(inp models.CustomDropdownv1Prm, listItem templ.Comp
 		var templ_7745c5c3_Var13 string
 		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 39, Col: 17}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 40, Col: 17}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
 		if templ_7745c5c3_Err != nil {
@@ -219,105 +219,6 @@ func MainCustomDropdownInput(inp models.CustomDropdownv1Prm, listItem templ.Comp
 	})
 }

-func MainCustomDropdownInputV0(inp models.CustomDropdownv1Prm, listItem templ.Component) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var14 == nil {
-			templ_7745c5c3_Var14 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"form-group customDP\"><label class=\"text-black\" style=\"font-family: Poppins; font-weight: 600;\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Label)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 46, Col: 87}
-		}
-		_, 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("</label> <select name=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 48, Col: 18}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if inp.ErrorMsg == "" {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control form-control-lg bg-field btn-lg rounded-lg selectpicker\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control form-control-lg bg-field btn-lg rounded-lg selectpicker is-invalid\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" data-live-search=\"true\" data-size=\"5\" data-style=\"bg-field btn-lg rounded-lg btn-custom-selectpicker\" id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var17 string
-		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 57, Col: 14}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = listItem.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</select><div class=\"invalid-feedback text-danger mt-3 ml-2 mt-5\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var18 string
-		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 62, Col: 17}
-		}
-		_, 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("</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 MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string, hxIndicator string, hxTrigger string, hxInclude string, listItem templ.Component) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
@@ -326,21 +227,21 @@ func MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string,
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var19 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var19 == nil {
-			templ_7745c5c3_Var19 = templ.NopComponent
+		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var14 == nil {
+			templ_7745c5c3_Var14 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"form-control bg-field border-0 h-auto\"><select name=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var20 string
-		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(name)
+		var templ_7745c5c3_Var15 string
+		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(name)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 70, Col: 14}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 48, Col: 14}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -348,12 +249,12 @@ func MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(id)
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(id)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 74, Col: 10}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 52, Col: 10}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -361,12 +262,12 @@ func MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var22 string
-		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 75, Col: 17}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 53, Col: 17}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -374,12 +275,12 @@ func MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var23 string
-		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 76, Col: 23}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 54, Col: 23}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -387,12 +288,12 @@ func MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var24 string
-		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(hxIndicator)
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxIndicator)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 77, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 55, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -400,12 +301,12 @@ func MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var25 string
-		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		var templ_7745c5c3_Var20 string
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 78, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 56, Col: 25}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -413,12 +314,12 @@ func MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var26 string
-		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		var templ_7745c5c3_Var21 string
+		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 79, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 57, Col: 25}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -440,3 +341,271 @@ func MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string,
 		return templ_7745c5c3_Err
 	})
 }
+
+func CustomDropdownFilter(
+	idCmp string,
+	hxName string,
+	hxInclude string,
+	hxGet string,
+	hxSwap string,
+	hxTarget string,
+	hxTrigger string,
+	hxBeforeRequest templ.ComponentScript,
+	hxAfterRequest templ.ComponentScript,
+	listItem templ.Component) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			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_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\" data-style=\"btn-field btn-lg rounded-lg\" data-live-search-placeholder=\"cari ...\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var23 string
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(idCmp)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 81, Col: 12}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" name=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(hxName)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 82, Col: 15}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var25 string
+		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 83, Col: 24}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var26 string
+		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 84, Col: 16}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var27 string
+		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 85, Col: 18}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
+		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_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 86, Col: 22}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var29 string
+		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 87, Col: 24}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var30 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var30.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_Var31 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var31.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = listItem.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</select>")
+		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 CustomDropdownForm(
+	inp models.CustomDropdownV2Prm) 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_Var32 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var32 == nil {
+			templ_7745c5c3_Var32 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"form-group\"><label class=\"text-black\" style=\"font-family: Poppins; font-weight: 600;\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var33 string
+		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Label)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 98, Col: 87}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</label> <select")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if inp.ErrorMsg == "" {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control form-control-lg bg-field btn-lg rounded-lg selectpicker\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control form-control-lg bg-field btn-lg rounded-lg selectpicker is-invalid\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" data-live-search=\"true\" data-size=\"5\" title=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var34 string
+		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Placeholder)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 107, Col: 26}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" data-style=\"btn-field btn-lg rounded-lg\" data-live-search-placeholder=\"cari ...\" name=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var35 string
+		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 110, Col: 18}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var36 string
+		templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 111, Col: 14}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = inp.ListItem.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</select><div class=\"invalid-feedback text-danger mt-3 ml-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var37 string
+		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 116, Col: 17}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/component/customradiobutton/customradiobuttoninline.templ
+++ b/component/customradiobutton/customradiobuttoninline.templ
@@ -20,17 +20,3 @@ templ MainCustomRadioButtonInput(inp models.CustomRadioButtonv1Prm) {
 		</div>
 	</div>
 }
-
-templ MainCustomRadioButtonInputV0(inp models.CustomRadioButtonv1Prm, itemRadioButton templ.Component) {
-	<div class="">
-		<label class="text-black" style="font-family: Poppins; font-weight: 600">{ inp.Label }</label>
-		<div class="form-control" style="border:none; padding: unset;">
-			<div class="form-group">
-				@itemRadioButton
-			</div>
-		</div>
-		<div class="invalid-feedback text-danger mt-3 ml-2 mt-5">
-			{ inp.ErrorMsg }
-		</div>
-	</div>
-}
--- a/component/customradiobutton/customradiobuttoninline_templ.go
+++ b/component/customradiobutton/customradiobuttoninline_templ.go
@@ -87,61 +87,3 @@ func MainCustomRadioButtonInput(inp models.CustomRadioButtonv1Prm) templ.Compone
 		return templ_7745c5c3_Err
 	})
 }
-
-func MainCustomRadioButtonInputV0(inp models.CustomRadioButtonv1Prm, itemRadioButton 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_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"\"><label class=\"text-black\" style=\"font-family: Poppins; font-weight: 600\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Label)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customradiobutton\customradiobuttoninline.templ`, Line: 26, Col: 86}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</label><div class=\"form-control\" style=\"border:none; padding: unset;\"><div class=\"form-group\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = itemRadioButton.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div class=\"invalid-feedback text-danger mt-3 ml-2 mt-5\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customradiobutton\customradiobuttoninline.templ`, Line: 33, Col: 17}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
--- a/component/customtextfield/customtextfieldv2.templ
+++ b/component/customtextfield/customtextfieldv2.templ
@@ -19,9 +19,9 @@ templ CustomTextFieldv2(inp models.CustomTextFieldv2Prm) {
 			placeholder={ inp.Placeholder }
 			value={ inp.Value }
 			if inp.ErrorMsg =="" {
-				class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+				class="form-control bg-field border-0 form-control-lg bg-field rounded-lg"
 			} else {
-				class="form-control bg-field border-1 h-auto py-6 px-6 rounded-lg is-invalid"
+				class="form-control bg-field border-1 form-control-lg bg-field rounded-lg is-invalid"
 			}
 		/>
 		<div class="invalid-feedback text-danger mt-3 ml-2">
--- a/component/customtextfield/customtextfieldv2_templ.go
+++ b/component/customtextfield/customtextfieldv2_templ.go
@@ -123,12 +123,12 @@ func CustomTextFieldv2(inp models.CustomTextFieldv2Prm) templ.Component {
 			return templ_7745c5c3_Err
 		}
 		if inp.ErrorMsg == "" {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control bg-field border-0 h-auto py-6 px-6 rounded-lg\"")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control bg-field border-0 form-control-lg bg-field rounded-lg\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
 		} else {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control bg-field border-1 h-auto py-6 px-6 rounded-lg is-invalid\"")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"form-control bg-field border-1 form-control-lg bg-field rounded-lg is-invalid\"")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
--- a/component/customuploadfotodokterv0/customuploadfotodokterv0.templ
+++ b/component/customuploadfotodokterv0/customuploadfotodokterv0.templ
@@ -1,76 +0,0 @@
-package customuploadfotodokterv0
-
-import "cpone/models"
-
-templ CustomUploadFotoWithPreviewDokterV0(prm models.CustomUploadFotoPrmV0) {
-	<div class="row">
-		<div class="col-4">
-			<img
-				id={ prm.ID + "-preview-image" }
-				if prm.LinkFoto == "" {
-					src="asset-corporate-portal/media/person/person.png"
-				} else {
-					src={ prm.LinkFoto }
-				}
-				style="display: block; width: 13vw"
-			/>
-		</div>
-	</div>
-	<div class="row mt-5">
-		<div class="col-4">
-			<button
-				class="btn bg-primary-transparent text-center text-primary"
-				style="width: 13vw; font-weight: 600"
-				id="updateFotoButton"
-				type="button"
-			>
-				{ prm.Label }
-			</button>
-			<input
-				type="file"
-				id={ prm.ID }
-				name={ prm.Name }
-				accept={ prm.Accept }
-				style="display: none;"
-			/>
-			<input
-				type="text"
-				style="display: none;"
-				name="doctorfotobase64string"
-				id="doctorfotobase64string"
-				value={ prm.Value }
-			/>
-		</div>
-	</div>
-	@OnSelect(prm.ID)
-}
-
-script OnSelect(id string) {
-	const updateFotoButton = document.getElementById('updateFotoButton');
-	const fileInput = document.getElementById(id);
-	const previewImage = document.getElementById(id+"-preview-image");
-
-	updateFotoButton.addEventListener('click', function() {
-        fileInput.click();
-    });
-
-	fileInput.addEventListener('change', function() {
-		const fileName = fileInput.files[0].name;
-
-		if (fileInput.files.length > 0) {
-			if (fileInput.files[0].size > 500000) {
-				fileInput.value = "";
-				Swal.fire("Warning", "File is too big!", "warning");
-			} else {
-				const reader = new FileReader();
-				reader.onload = function(e) {
-					const base64String = e.target.result;
-					previewImage.src = base64String;
-					$('#doctorfotobase64string').val(base64String)
-				};
-				reader.readAsDataURL(fileInput.files[0]);
-				// previewImage.src = URL.createObjectURL(fileInput.files[0]);
-			}
-		}
-	})
-}
--- a/component/customuploadfotodokterv0/customuploadfotodokterv0_templ.go
+++ b/component/customuploadfotodokterv0/customuploadfotodokterv0_templ.go
@@ -1,183 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.663
-package customuploadfotodokterv0
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import "context"
-import "io"
-import "bytes"
-
-import "cpone/models"
-
-func CustomUploadFotoWithPreviewDokterV0(prm models.CustomUploadFotoPrmV0) 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=\"row\"><div class=\"col-4\"><img id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(prm.ID + "-preview-image")
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customuploadfotodokterv0\customuploadfotodokterv0.templ`, Line: 9, Col: 34}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if prm.LinkFoto == "" {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" src=\"asset-corporate-portal/media/person/person.png\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" src=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var3 string
-			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(prm.LinkFoto)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customuploadfotodokterv0\customuploadfotodokterv0.templ`, Line: 13, Col: 23}
-			}
-			_, 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("\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" style=\"display: block; width: 13vw\"></div></div><div class=\"row mt-5\"><div class=\"col-4\"><button class=\"btn bg-primary-transparent text-center text-primary\" style=\"width: 13vw; font-weight: 600\" id=\"updateFotoButton\" type=\"button\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(prm.Label)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customuploadfotodokterv0\customuploadfotodokterv0.templ`, Line: 27, Col: 15}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</button> <input type=\"file\" id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(prm.ID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customuploadfotodokterv0\customuploadfotodokterv0.templ`, Line: 31, Col: 15}
-		}
-		_, 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("\" name=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(prm.Name)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customuploadfotodokterv0\customuploadfotodokterv0.templ`, Line: 32, Col: 19}
-		}
-		_, 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("\" accept=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(prm.Accept)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customuploadfotodokterv0\customuploadfotodokterv0.templ`, Line: 33, Col: 23}
-		}
-		_, 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("\" style=\"display: none;\"> <input type=\"text\" style=\"display: none;\" name=\"doctorfotobase64string\" id=\"doctorfotobase64string\" value=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(prm.Value)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customuploadfotodokterv0\customuploadfotodokterv0.templ`, Line: 41, Col: 21}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = OnSelect(prm.ID).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func OnSelect(id string) templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_OnSelect_d389`,
-		Function: `function __templ_OnSelect_d389(id){const updateFotoButton = document.getElementById('updateFotoButton');
-	const fileInput = document.getElementById(id);
-	const previewImage = document.getElementById(id+"-preview-image");
-
-	updateFotoButton.addEventListener('click', function() {
-        fileInput.click();
-    });
-
-	fileInput.addEventListener('change', function() {
-		const fileName = fileInput.files[0].name;
-
-		if (fileInput.files.length > 0) {
-			if (fileInput.files[0].size > 500000) {
-				fileInput.value = "";
-				Swal.fire("Warning", "File is too big!", "warning");
-			} else {
-				const reader = new FileReader();
-				reader.onload = function(e) {
-					const base64String = e.target.result;
-					previewImage.src = base64String;
-					$('#doctorfotobase64string').val(base64String)
-				};
-				reader.readAsDataURL(fileInput.files[0]);
-				// previewImage.src = URL.createObjectURL(fileInput.files[0]);
-			}
-		}
-	})
-}`,
-		Call:       templ.SafeScript(`__templ_OnSelect_d389`, id),
-		CallInline: templ.SafeScriptInline(`__templ_OnSelect_d389`, id),
-	}
-}
--- a/component/navbar/navbar.templ
+++ b/component/navbar/navbar.templ
@@ -40,6 +40,50 @@ templ Navbar(dataUser models.User) {
 	</div>
 }

+templ NavbarWithLogo(dataUser models.User) {
+	<div id="kt_header" class="header">
+		<!--begin::Container-->
+		<div class="container-fluid  d-flex align-items-stretch justify-content-between">
+			<!--begin::Header Menu Wrapper-->
+			<div class="header-menu-wrapper header-menu-wrapper-left" id="kt_header_menu_wrapper">
+				<a class="navbar-brand" href="#">
+					<img
+						src="/asset-corporate-portal/media/landingpage/logo.png"
+						width="126"
+						height="40"
+						class="d-inline-block align-top"
+						alt="Your Brand"
+					/>
+				</a>			
+			</div>
+			<!--end::Header Menu Wrapper-->
+			<!--begin::Topbar-->
+			<div class="topbar">
+				<!--begin::User-->
+				<div class="topbar-item">
+					<div
+						class="btn btn-icon btn-icon-mobile w-auto btn-clean d-flex align-items-center btn-lg px-2"
+						id="kt_quick_user_toggle"
+					>
+						<span
+							class="text-muted font-weight-bold font-size-base d-none d-md-inline mr-1"
+						>Hi,</span>
+						<span
+							class="text-dark-50 font-weight-bolder font-size-base d-none d-md-inline mr-3"
+						>{ dataUser.Username }</span>
+						<span class="bg-primary-transparent p-3" style="border-radius: 50%; width: 40px; height: 40px;">
+							<span class="iconify text-primary" data-icon="gravity-ui:person"></span>
+						</span>
+					</div>
+				</div>
+				<!--end::User-->
+			</div>
+			<!--end::Topbar-->
+		</div>
+		<!--end::Container-->
+	</div>
+}
+
 templ NavbarMenu(datamenu []models.Menu) {
 	<div class="aside-menu-wrapper flex-column-fluid" id="kt_aside_menu_wrapper">
 		<!--begin::Menu Container-->
--- a/component/navbar/navbar_templ.go
+++ b/component/navbar/navbar_templ.go
@@ -53,7 +53,7 @@ func Navbar(dataUser models.User) templ.Component {
 	})
 }

-func NavbarMenu(datamenu []models.Menu) templ.Component {
+func NavbarWithLogo(dataUser models.User) 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 {
@@ -66,6 +66,43 @@ func NavbarMenu(datamenu []models.Menu) templ.Component {
 			templ_7745c5c3_Var3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"kt_header\" class=\"header\"><!--begin::Container--><div class=\"container-fluid  d-flex align-items-stretch justify-content-between\"><!--begin::Header Menu Wrapper--><div class=\"header-menu-wrapper header-menu-wrapper-left\" id=\"kt_header_menu_wrapper\"><a class=\"navbar-brand\" href=\"#\"><img src=\"/asset-corporate-portal/media/landingpage/logo.png\" width=\"126\" height=\"40\" class=\"d-inline-block align-top\" alt=\"Your Brand\"></a></div><!--end::Header Menu Wrapper--><!--begin::Topbar--><div class=\"topbar\"><!--begin::User--><div class=\"topbar-item\"><div class=\"btn btn-icon btn-icon-mobile w-auto btn-clean d-flex align-items-center btn-lg px-2\" id=\"kt_quick_user_toggle\"><span class=\"text-muted font-weight-bold font-size-base d-none d-md-inline mr-1\">Hi,</span> <span class=\"text-dark-50 font-weight-bolder font-size-base d-none d-md-inline mr-3\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(dataUser.Username)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\navbar\navbar.templ`, Line: 73, Col: 26}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</span> <span class=\"bg-primary-transparent p-3\" style=\"border-radius: 50%; width: 40px; height: 40px;\"><span class=\"iconify text-primary\" data-icon=\"gravity-ui:person\"></span></span></div></div><!--end::User--></div><!--end::Topbar--></div><!--end::Container--></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 NavbarMenu(datamenu []models.Menu) 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("<div class=\"aside-menu-wrapper flex-column-fluid\" id=\"kt_aside_menu_wrapper\"><!--begin::Menu Container--><div id=\"kt_aside_menu\" class=\"aside-menu my-4 \" data-menu-vertical=\"1\" data-menu-scroll=\"1\" data-menu-dropdown-timeout=\"500\"><!--begin::Menu Nav--><ul class=\"menu-nav \">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
--- 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/employeeanalytic.handlers.go
+++ b/handlers/dev/employeeanalytic.handlers.go
@@ -0,0 +1,180 @@
+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_employeeanalytic "cpone/views/dev/employeeanalytic"
+	"strconv"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type EmployeeAnalyticServices interface {
+	GetEmployeeAnalyticBreadcrumb(title string) (models.BreadCrumbV1, error)
+	DummyDataTest() ([]models.EmployeeAnalytic, error)
+	ListingEmployeeAnalytic(search string, startdate string, enddate string, currentpage int, rowperpage int) ([]models.EmployeeAnalytic, int, error)
+}
+
+type EmployeeAnalyticHandler struct {
+	EmployeeAnalyticServices EmployeeAnalyticServices
+}
+
+func NewEmployeeAnalyticHandler(ea EmployeeAnalyticServices) *EmployeeAnalyticHandler {
+	return &EmployeeAnalyticHandler{
+		EmployeeAnalyticServices: ea,
+	}
+}
+
+func (ea *EmployeeAnalyticHandler) HandleShowEmployeeAnalyticScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	title := "PT. Sadhana Abiyasa Sampoerna"
+
+	listID := utils.GenerateRandomID("listid")
+	paginationID := utils.GenerateRandomID("paginationid")
+
+	user, err := services.GetUserLogin()
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get user dev", zap.Any("error", err))
+		return err
+	}
+
+	dataBreadcrumb, err := ea.EmployeeAnalyticServices.GetEmployeeAnalyticBreadcrumb(title)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb dev", zap.Any("error", err))
+		return err
+	}
+	defer logger.Sync()
+
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+
+	listingData, totalPage, err := ea.EmployeeAnalyticServices.ListingEmployeeAnalytic("", "", "", 1, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get listing data", zap.Any("error", err), zap.Any("total", totalPage))
+		return err
+	}
+	listingcomponent := dev_employeeanalytic.ListingData(listingData, listID)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/dev/employeeanalytic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	filtercomponent := dev_employeeanalytic.FilterListing(
+		"/dev/employeeanalytic/filter",
+		"input changed delay:500ms",
+		"#searchID, #startdateID, #enddateID, #listID, #paginationID",
+		"outerHTML",
+		"#"+paginationID,
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	content := dev_employeeanalytic.EmployeeAnalyticScreen(
+		listID,
+		paginationID,
+		breadcrumb,
+		filtercomponent,
+		listingcomponent,
+		paginationcomponent,
+	)
+	css := dev_employeeanalytic.CSSEmployeeAnalytic()
+	js := dev_employeeanalytic.JSEmployeeAnalytic()
+
+	view := dev_employeeanalytic.ShowEmployeeAnalytic(title, content, css, js, navbaruser, sidbaruser)
+	return utils.View(c, view)
+}
+
+func (ea *EmployeeAnalyticHandler) HandlePagination(c echo.Context) error {
+
+	pageparam := c.QueryParam("page")
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+	search := c.QueryParam("search")
+	startdate := c.QueryParam("startdate")
+	enddate := c.QueryParam("enddate")
+
+	var retVal []templ.Component
+	logger, _ := zap.NewProduction()
+	page, err := strconv.Atoi(pageparam)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error convert page param")
+		return err
+	}
+
+	listdata, totalPage, err := ea.EmployeeAnalyticServices.ListingEmployeeAnalytic(search, startdate, enddate, page, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error convert page param")
+		return err
+	}
+	listcomponent := dev_employeeanalytic.ListingData(listdata, listID)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/dev/employeeanalytic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	retVal = append(retVal, listcomponent)
+	retVal = append(retVal, paginationcomponent)
+	return utils.ViewMulti(c, retVal)
+}
+
+func (ea *EmployeeAnalyticHandler) HandleFilter(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	search := c.QueryParam("search")
+	startdate := c.QueryParam("startdate")
+	enddate := c.QueryParam("enddate")
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+
+	dataList, totalPage, err := ea.EmployeeAnalyticServices.ListingEmployeeAnalytic(search, startdate, enddate, 1, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error Get Listing Data", zap.Any("error", err))
+		return err
+	}
+
+	listcomponent := dev_employeeanalytic.ListingData(dataList, listID)
+	paginationcomponent := pagination.PaginationV3(
+		totalPage, 1,
+		"/dev/employeeanalytic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID, "outerHTML", "", "",
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	var retval []templ.Component
+	retval = append(retval, listcomponent)
+	retval = append(retval, paginationcomponent)
+	return utils.ViewMulti(c, retval)
+}
--- a/handlers/dev/groupresult.handlers.go
+++ b/handlers/dev/groupresult.handlers.go
@@ -411,10 +411,9 @@ func (lh *GroupResultHandler) HandlerShowGroupResultV1(c echo.Context) error {
 		Link:        "/dev/groupresult/delete",
 		HxTarget:    "#" + dialogdeleteBodyID,
 		HxSwap:      "outerHTML",
-		// HxInclude:   "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID,
-		HxInclude:  "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID + ", #dialogEditBodyID, #dialogEditID",
-		ModalID:    dialogdeleteID,
-		ModalTitle: "Delete-User Group",
+		HxInclude:   "#tableID, #paginationID, #searchID,#dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID,
+		ModalID:     dialogdeleteID,
+		ModalTitle:  "Delete-User Group",
 		DialogBody: groupresult.DeleteConfirmationBody(
 			models.CustomTextFieldv2Prm{Type: "hidden", Value: "0", Name: "groupresultid"},
 			dialogdeleteBodyID, "Apakah anda yakin menghapus user group berikut ?",
@@ -1250,7 +1249,6 @@ func (lh *GroupResultHandler) HandleDeleteForm(c echo.Context) error {
 	id := c.QueryParam("id")
 	dialogDeleteID := c.QueryParam("dialogDeleteID")
 	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
-
 	dataGroupList, err := lh.GroupResultService.GetGroupResultByIDV1(id)
 	if err != nil {
 		// test := mastermenuusergrouptryandy.DialogNewBody(code, name, "", "Name cannot empty")
@@ -1265,6 +1263,7 @@ func (lh *GroupResultHandler) HandleDeleteForm(c echo.Context) error {
 			customtoastv2.CustomToastV2Show("Error", err.Error(), "danger"),
 			test})
 		return coba
+
 	}

 	form := groupresult.DeleteConfirmationBody(
--- a/handlers/dev/md.bahan.handlers.go
+++ b/handlers/dev/md.bahan.handlers.go
@@ -0,0 +1,954 @@
+package dev_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	"cpone/component/pagination"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	customtoastv2 "cpone/component/toastbootstrap"
+	"cpone/models"
+	"cpone/services"
+	"cpone/utils"
+	dev_mdbahanview "cpone/views/dev/mdbahan"
+	"strconv"
+	"strings"
+
+	"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(isFilter bool) ([]models.TmpSampleStation, error)
+	AddMdBahan(code string, name string, stationid string) (bool, error)
+	EditMdBahan(id string, code string, name string, stationid string) (bool, error)
+	GetMdBahanByID(id string) (models.Bahan, error)
+	DeleteMdBahan(id string) (bool, 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")
+	modalAddID := utils.GenerateRandomID("modalAdd")
+	modalAddBodyID := utils.GenerateRandomID("modalAddbody")
+	modalEditID := utils.GenerateRandomID("modalEdit")
+	modalEditBodyID := utils.GenerateRandomID("modalEditbody")
+	modalDeleteID := utils.GenerateRandomID("modalDelete")
+	modalDeleteBodyID := utils.GenerateRandomID("modalDeletebody")
+	tableBahanID := utils.GenerateRandomID("BahanID")
+
+	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("", "0", 1, 5)
+	defer logger.Sync()
+	logger.Info("GET DATA BAHAN",
+		zap.Any("data", bahanList),
+		zap.Any("err", err),
+		zap.Any("totalPage", totalPage),
+	)
+	stationListFilter, err := lh.MdBahanServices.GetListSampleStation(true)
+	defer logger.Sync()
+	logger.Info("GET STATION LIST Filter",
+		zap.Any("err", err),
+	)
+	stationList, err := lh.MdBahanServices.GetListSampleStation(false)
+	defer logger.Sync()
+	logger.Info("GET STATION LIST ",
+		zap.Any("err", err),
+	)
+
+	//Bahan Table
+	// #dialogDeleteBodyID, #dialogDeleteID
+	mdBahanTable := dev_mdbahanview.TableBahan(
+		bahanList,
+		tableBahanID,
+		"/dev/md/bahan/openedit",
+		"#"+modalEditBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		"/dev/md/bahan/opendelete",
+		"#"+modalDeleteBodyID,
+		"outerHTML",
+		"#dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #dialogEditID")
+
+	//FIlter table
+	mdBahanFilter := dev_mdbahanview.MdBahanFilter(
+		"/dev/md/bahan/filter",
+		"input changed delay:500ms",
+		"#filter-name, #filter-station, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"outerHTML",
+		"#"+paginationID,
+		stationListFilter,
+		stationListFilter[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, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID,  #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"#"+paginationID,
+		"outerHTML",
+		"",
+		"",
+		dev_mdbahanview.BeforeRequestContent(),
+		dev_mdbahanview.AfterRequestContent(),
+	)
+	//Form Add
+	modalAddBody := dev_mdbahanview.BodyFormBahan(
+		"",
+		models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+			Name:        "kodebahan",
+			Placeholder: "Kode Bahan",
+			Type:        "text"},
+		models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+			Name:        "namabahan",
+			Placeholder: "Nama Bahan",
+			Type:        "text"},
+		models.CustomDropdownV2Prm{
+			Name:     "stationid",
+			Label:    "Sample Station",
+			ListItem: dev_mdbahanview.ListItemStation(stationList, 0),
+		},
+		modalAddBodyID,
+		dev_mdbahanview.JsShowModal(""),
+	)
+	modalAddAction := dev_mdbahanview.ActionFormBahan("/dev/md/bahan/closeaddform", "#"+modalAddBodyID, "outerHTML", "#"+modalAddID)
+	modalAddBtnCls := dev_mdbahanview.BtnCloseFormBahan("/dev/md/bahan/closeaddform", "#"+modalAddBodyID, "outerHTML", "#"+modalAddID)
+	modalAddBahan := dev_mdbahanview.BahanForm(models.BahanFormComponent{
+		IDComponent:  "",
+		Link:         "/dev/md/bahan/add",
+		HxTarget:     "#" + modalAddBodyID,
+		HxSwap:       "outerHTML",
+		HxInclude:    "#filter-name, #filter-station, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage" + paginationID,
+		ModalID:      modalAddID,
+		ModalTitle:   "New-Bahan",
+		DialogBody:   modalAddBody,
+		DialogAction: modalAddAction,
+		ButtonCLose:  modalAddBtnCls,
+	})
+
+	//Form Edit
+	modalEditBody := dev_mdbahanview.BodyFormBahan(
+		"",
+		models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+			Name:        "kodebahan",
+			Placeholder: "Kode Bahan",
+			Type:        "text"},
+		models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+			Name:        "namabahan",
+			Placeholder: "Nama Bahan",
+			Type:        "text"},
+		models.CustomDropdownV2Prm{
+			Name:     "stationid",
+			Label:    "Sample Station",
+			ListItem: dev_mdbahanview.ListItemStation(stationList, 0),
+		},
+		modalEditBodyID,
+		dev_mdbahanview.JsShowModal(""),
+	)
+	modalEditAction := dev_mdbahanview.ActionFormBahan("/dev/md/bahan/closeeditform", "#"+modalEditBodyID, "outerHTML", "#"+modalEditID)
+	modalEditBtnCls := dev_mdbahanview.BtnCloseFormBahan("/dev/md/bahan/closeeditform", "#"+modalEditBodyID, "outerHTML", "#"+modalEditID)
+	modalEditBahan := dev_mdbahanview.BahanForm(models.BahanFormComponent{
+		IDComponent:  "",
+		Link:         "/dev/md/bahan/edit",
+		HxTarget:     "#" + modalEditBodyID,
+		HxSwap:       "outerHTML",
+		HxInclude:    "#filter-name, #filter-station, #tableID, #paginationID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage" + paginationID,
+		ModalID:      modalEditID,
+		ModalTitle:   "Edit-Bahan",
+		DialogBody:   modalEditBody,
+		DialogAction: modalEditAction,
+		ButtonCLose:  modalEditBtnCls,
+	})
+
+	//Form Delete
+	modalDeleteBody := dev_mdbahanview.DeleteConfirmationBody(
+		"",
+		modalDeleteBodyID,
+		"Apakah anda yakin menghapus bahan berikut ?",
+		[]string{"Kode", "Nama Bahan", "Sample Station"},
+		[]string{"", "", ""}, dev_mdbahanview.JsShowModal(""))
+	modalDeleteAction := dev_mdbahanview.ActionFormBahanDelete("/dev/md/bahan/closedeleteform", "#"+modalDeleteBodyID, "outerHTML", "#"+modalDeleteID)
+	modalDeleteBtnCls := dev_mdbahanview.BtnCloseFormBahan("/dev/md/bahan/closedeleteform", "#"+modalDeleteBodyID, "outerHTML", "#"+modalDeleteID)
+	modalDeleteBahan := dev_mdbahanview.BahanForm(models.BahanFormComponent{
+		IDComponent:  "",
+		Link:         "/dev/md/bahan/delete",
+		HxTarget:     "#" + modalDeleteBodyID,
+		HxSwap:       "outerHTML",
+		HxInclude:    "#filter-name, #filter-station, #tableID, #paginationID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage" + paginationID,
+		ModalID:      modalDeleteID,
+		ModalTitle:   "Delete-Bahan",
+		DialogBody:   modalDeleteBody,
+		DialogAction: modalDeleteAction,
+		ButtonCLose:  modalDeleteBtnCls,
+	})
+
+	mdBahanScreen := dev_mdbahanview.MdBahanScreen(
+		tableBahanID,
+		paginationID,
+		modalAddID,
+		modalAddBodyID,
+		modalEditID,
+		modalEditBodyID,
+		modalDeleteID,
+		modalDeleteBodyID,
+		breadcrumbComponent,
+		mdBahanTable,
+		mdBahanFilter,
+		mdbahanPagination,
+		modalAddBahan,
+		modalEditBahan,
+		modalDeleteBahan)
+	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")
+	dialogEditBodyID := c.QueryParam("dialogEditBodyID")
+	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
+	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,
+		"/dev/md/bahan/openedit",
+		"#"+dialogEditBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		"/dev/md/bahan/opendelete",
+		"#"+dialogDeleteBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID")
+	//Pagination
+
+	mdbahanPagination := pagination.PaginationV3(
+		totalPage, 1,
+		"/dev/md/bahan/pagination",
+		paginationID,
+		"#filter-name, #filter-station, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #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")
+	dialogEditBodyID := c.QueryParam("dialogEditBodyID")
+	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
+	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,
+		"/dev/md/bahan/openedit",
+		"#"+dialogEditBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		"/dev/md/bahan/opendelete",
+		"#"+dialogDeleteBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID")
+	//Pagination
+
+	mdbahanPagination := pagination.PaginationV3(
+		totalPage, page,
+		"/dev/md/bahan/pagination",
+		paginationID,
+		"#filter-name, #filter-station, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #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) HandleCloseFormAddMdBahan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	stationList, err := lh.MdBahanServices.GetListSampleStation(false)
+	defer logger.Sync()
+	logger.Info("GET DATA STATIOn",
+		zap.Any("err", err),
+	)
+	dialogAddBodyID := c.FormValue("dialogAddBodyID")
+	dialogAddID := c.FormValue("dialogAddID")
+
+	modalAddBody := dev_mdbahanview.BodyFormBahan(
+		"",
+		models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+			Name:        "kodebahan",
+			Placeholder: "Kode Bahan",
+			Type:        "text"},
+		models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+			Name:        "namabahan",
+			Placeholder: "Nama Bahan",
+			Type:        "text"},
+		models.CustomDropdownV2Prm{
+			Name:     "stationid",
+			Label:    "Sample Station",
+			ListItem: dev_mdbahanview.ListItemStation(stationList, 0),
+		},
+		dialogAddBodyID,
+		dev_mdbahanview.JsHideModal("#"+dialogAddID),
+	)
+	return utils.View(c, modalAddBody)
+}
+func (lh *MdBahanHandler) HandleAddMdBahan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	code := c.FormValue("kodebahan")
+	name := c.FormValue("namabahan")
+	stationIDPrm := c.FormValue("stationid")
+	tableID := c.FormValue("tableID")
+	paginationID := c.FormValue("paginationID")
+	filtername := c.FormValue("filtername")
+	filterstation := c.FormValue("filterstation")
+	currPagePrm := c.FormValue("currpage" + paginationID)
+	dialogAddBodyID := c.FormValue("dialogAddBodyID")
+	// searchID := c.FormValue("searchID")
+	dialogAddID := c.FormValue("dialogAddID")
+	dialogEditBodyID := c.FormValue("dialogEditBodyID")
+	dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID")
+	currPage, err := strconv.Atoi(currPagePrm)
+	if err != nil {
+		return err
+	}
+	stationID, err := strconv.Atoi(stationIDPrm)
+	if err != nil {
+		return err
+	}
+	formValidation := ""
+	codeValidation := ""
+	nameValidation := ""
+	stationValidation := ""
+
+	if strings.TrimSpace(code) == "" {
+		formValidation = "Code bahan tidak boleh kosong"
+		codeValidation = "Code bahan tidak boleh kosong"
+		nameValidation = ""
+		stationValidation = ""
+	}
+	if strings.TrimSpace(name) == "" {
+		formValidation = "Nama bahan tidak boleh kosong"
+		codeValidation = ""
+		stationValidation = ""
+		nameValidation = "Nama bahan tidak boleh kosong"
+	}
+	if stationID == 0 {
+		formValidation = "Pilih salah satu station"
+		codeValidation = ""
+		nameValidation = ""
+		stationValidation = "Pilih salah satu station"
+	}
+	if strings.TrimSpace(code) == "" && strings.TrimSpace(name) == "" {
+		formValidation = "Code,nama, dan station bahan tidak boleh kosong"
+		codeValidation = "Code bahan tidak boleh kosong"
+		stationValidation = "Pilih salah satu station"
+		nameValidation = "Nama bahan tidak boleh kosong"
+
+	}
+	stationList, err := lh.MdBahanServices.GetListSampleStation(false)
+	defer logger.Sync()
+	logger.Info("GET DATA STATIOn",
+		zap.Any("err", err),
+	)
+	if formValidation != "" || codeValidation != "" || nameValidation != "" || stationValidation != "" {
+		newForm := dev_mdbahanview.BodyFormBahan(
+			"",
+			models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+				Name:        "kodebahan",
+				Placeholder: "Kode Bahan",
+				Value:       code,
+				ErrorMsg:    codeValidation,
+				Type:        "text"},
+			models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+				Name:        "namabahan",
+				Placeholder: "Nama Bahan",
+				ErrorMsg:    nameValidation,
+				Value:       name,
+				Type:        "text"},
+			models.CustomDropdownV2Prm{
+				Name:     "stationid",
+				Label:    "Sample Station",
+				ErrorMsg: stationValidation,
+				ListItem: dev_mdbahanview.ListItemStation(stationList, stationID),
+			},
+			dialogAddBodyID,
+			dev_mdbahanview.JsShowModal(""),
+		)
+		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Warning", formValidation, "warning"), newForm})
+	}
+	_, err = lh.MdBahanServices.AddMdBahan(code, name, stationIDPrm)
+	if err != nil {
+		newForm := dev_mdbahanview.BodyFormBahan(
+			"",
+			models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+				Name:        "kodebahan",
+				Placeholder: "Kode Bahan",
+				Value:       code,
+				Type:        "text"},
+			models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+				Name:        "namabahan",
+				Placeholder: "Nama Bahan",
+				Value:       name,
+				Type:        "text"},
+			models.CustomDropdownV2Prm{
+				Name:     "stationid",
+				Label:    "Sample Station",
+				ListItem: dev_mdbahanview.ListItemStation(stationList, int(stationID)),
+			},
+			dialogAddBodyID,
+			dev_mdbahanview.JsShowModal(""),
+		)
+		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Gagal", err.Error(), "danger"), newForm})
+	}
+
+	bahanList, totalPage, err := lh.MdBahanServices.GetListMdBahan(filtername, filterstation, currPage, 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,
+		"/dev/md/bahan/openedit",
+		"#"+dialogEditBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		"/dev/md/bahan/opendelete",
+		"#"+dialogDeleteBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID")
+
+	//Pagination
+
+	mdbahanPagination := pagination.PaginationV3(
+		totalPage, currPage,
+		"/dev/md/bahan/pagination",
+		paginationID,
+		"#filter-name, #filter-station, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID,  #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"#"+paginationID,
+		"outerHTML",
+		"",
+		"true",
+		dev_mdbahanview.BeforeRequestContent(),
+		dev_mdbahanview.AfterRequestContent(),
+	)
+	//Form Add
+	modalAddBody := dev_mdbahanview.BodyFormBahan(
+		"",
+		models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+			Name:        "kodebahan",
+			Placeholder: "Kode Bahan",
+			Type:        "text"},
+		models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+			Name:        "namabahan",
+			Placeholder: "Nama Bahan",
+			Type:        "text"},
+		models.CustomDropdownV2Prm{
+			Name:     "stationid",
+			Label:    "Sample Station",
+			ListItem: dev_mdbahanview.ListItemStation(stationList, 0),
+		},
+		dialogAddBodyID,
+		dev_mdbahanview.JsHideModal("#"+dialogAddID),
+	)
+
+	toastSuccess := customtoastv2.CustomToastV2Show("Success", "Success add bahan ", "success")
+	retval := []templ.Component{toastSuccess, mdBahanTable, mdbahanPagination, modalAddBody}
+	// time.Sleep(20 * time.Second)
+	return utils.ViewMulti(c, retval)
+}
+func (lh *MdBahanHandler) HandleOpenEditMdBahan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.QueryParam("id")
+	dialogEditID := c.QueryParam("dialogEditID")
+	dialogEditBodyID := c.QueryParam("dialogEditBodyID")
+	stationList, err := lh.MdBahanServices.GetListSampleStation(false)
+	defer logger.Sync()
+	logger.Info("GET DATA STATION",
+		zap.Any("err", err),
+	)
+	dataBahan, err := lh.MdBahanServices.GetMdBahanByID(id)
+	if err != nil {
+		newForm := dev_mdbahanview.BodyFormBahan(
+			id,
+			models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+				Name:        "kodebahan",
+				Placeholder: "Kode Bahan",
+				Type:        "text"},
+			models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+				Name:        "namabahan",
+				Placeholder: "Nama Bahan",
+				Type:        "text"},
+			models.CustomDropdownV2Prm{
+				Name:     "stationid",
+				Label:    "Sample Station",
+				ListItem: dev_mdbahanview.ListItemStation(stationList, dataBahan.T_BahanT_SampleStationID),
+			},
+			dialogEditBodyID,
+			dev_mdbahanview.JsHideModal(""),
+		)
+		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Error", "Get data bahan error", "danger"), newForm})
+	}
+	newForm := dev_mdbahanview.BodyFormBahan(
+		id,
+		models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+			Name:        "kodebahan",
+			Placeholder: "Kode Bahan",
+			Value:       dataBahan.T_BahanCode,
+			Type:        "text"},
+		models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+			Name:        "namabahan",
+			Placeholder: "Nama Bahan",
+			Value:       dataBahan.T_BahanName,
+			Type:        "text"},
+		models.CustomDropdownV2Prm{
+			Name:     "stationid",
+			Label:    "Sample Station",
+			ListItem: dev_mdbahanview.ListItemStation(stationList, dataBahan.T_BahanT_SampleStationID),
+		},
+		dialogEditBodyID,
+		dev_mdbahanview.JsShowModal("#"+dialogEditID),
+	)
+	return utils.View(c, newForm)
+}
+func (lh *MdBahanHandler) HandleCloseFormEditMdBahan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	stationList, err := lh.MdBahanServices.GetListSampleStation(false)
+	dialogEditID := c.FormValue("dialogEditID")
+	dialogEditBodyID := c.FormValue("dialogEditBodyID")
+	defer logger.Sync()
+	logger.Info("GET DATA STATION",
+		zap.Any("err", err),
+		zap.Any("dialogeditbodyid", dialogEditBodyID),
+	)
+
+	modalAddBody := dev_mdbahanview.BodyFormBahan(
+		"",
+		models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+			Name:        "kodebahan",
+			Placeholder: "Kode Bahan",
+			Type:        "text"},
+		models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+			Name:        "namabahan",
+			Placeholder: "Nama Bahan",
+			Type:        "text"},
+		models.CustomDropdownV2Prm{
+			Name:     "stationid",
+			Label:    "Sample Station",
+			ListItem: dev_mdbahanview.ListItemStation(stationList, 0),
+		},
+		dialogEditBodyID,
+		dev_mdbahanview.JsHideModal("#"+dialogEditID),
+	)
+	return utils.View(c, modalAddBody)
+}
+func (lh *MdBahanHandler) HandleEditMdBahan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	code := c.FormValue("kodebahan")
+	name := c.FormValue("namabahan")
+	id := c.FormValue("bahanid")
+	stationIDPrm := c.FormValue("stationid")
+	tableID := c.FormValue("tableID")
+	paginationID := c.FormValue("paginationID")
+	filtername := c.FormValue("filtername")
+	filterstation := c.FormValue("filterstation")
+	currPagePrm := c.FormValue("currpage" + paginationID)
+	// dialogAddBodyID := c.FormValue("dialogAddBodyID")
+	// searchID := c.FormValue("searchID")
+	dialogEditID := c.FormValue("dialogEditID")
+	dialogEditBodyID := c.FormValue("dialogEditBodyID")
+	dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID")
+	currPage, err := strconv.Atoi(currPagePrm)
+	if err != nil {
+		return err
+	}
+	stationID, err := strconv.Atoi(stationIDPrm)
+	if err != nil {
+		return err
+	}
+	formValidation := ""
+	codeValidation := ""
+	nameValidation := ""
+	stationValidation := ""
+
+	if strings.TrimSpace(code) == "" {
+		formValidation = "Code bahan tidak boleh kosong"
+		codeValidation = "Code bahan tidak boleh kosong"
+		nameValidation = ""
+		stationValidation = ""
+	}
+	if strings.TrimSpace(name) == "" {
+		formValidation = "Nama bahan tidak boleh kosong"
+		codeValidation = ""
+		stationValidation = ""
+		nameValidation = "Nama bahan tidak boleh kosong"
+	}
+	if stationID == 0 {
+		formValidation = "Pilih salah satu station"
+		codeValidation = ""
+		nameValidation = ""
+		stationValidation = "Pilih salah satu station"
+	}
+	if strings.TrimSpace(code) == "" && strings.TrimSpace(name) == "" {
+		formValidation = "Code,nama, dan station bahan tidak boleh kosong"
+		codeValidation = "Code bahan tidak boleh kosong"
+		stationValidation = "Pilih salah satu station"
+		nameValidation = "Nama bahan tidak boleh kosong"
+
+	}
+	stationList, err := lh.MdBahanServices.GetListSampleStation(false)
+	defer logger.Sync()
+	logger.Info("GET DATA STATIOn",
+		zap.Any("err", err),
+	)
+	if formValidation != "" || codeValidation != "" || nameValidation != "" || stationValidation != "" {
+		newForm := dev_mdbahanview.BodyFormBahan(
+			id,
+			models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+				Name:        "kodebahan",
+				Placeholder: "Kode Bahan",
+				Value:       code,
+				ErrorMsg:    codeValidation,
+				Type:        "text"},
+			models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+				Name:        "namabahan",
+				Placeholder: "Nama Bahan",
+				ErrorMsg:    nameValidation,
+				Value:       name,
+				Type:        "text"},
+			models.CustomDropdownV2Prm{
+				Name:     "stationid",
+				Label:    "Sample Station",
+				ErrorMsg: stationValidation,
+				ListItem: dev_mdbahanview.ListItemStation(stationList, stationID),
+			},
+			dialogEditBodyID,
+			dev_mdbahanview.JsShowModal(""),
+		)
+		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Warning", formValidation, "warning"), newForm})
+	}
+	_, err = lh.MdBahanServices.EditMdBahan(id, code, name, stationIDPrm)
+	if err != nil {
+		newForm := dev_mdbahanview.BodyFormBahan(
+			id,
+			models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+				Name:        "kodebahan",
+				Placeholder: "Kode Bahan",
+				Value:       code,
+				Type:        "text"},
+			models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+				Name:        "namabahan",
+				Placeholder: "Nama Bahan",
+				Value:       name,
+				Type:        "text"},
+			models.CustomDropdownV2Prm{
+				Name:     "stationid",
+				Label:    "Sample Station",
+				ListItem: dev_mdbahanview.ListItemStation(stationList, int(stationID)),
+			},
+			dialogEditBodyID,
+			dev_mdbahanview.JsShowModal(""),
+		)
+		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Gagal", err.Error(), "danger"), newForm})
+	}
+
+	bahanList, totalPage, err := lh.MdBahanServices.GetListMdBahan(filtername, filterstation, currPage, 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,
+		"/dev/md/bahan/openedit",
+		"#"+dialogEditBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		"/dev/md/bahan/opendelete",
+		"#"+dialogDeleteBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID")
+
+	//Pagination
+
+	mdbahanPagination := pagination.PaginationV3(
+		totalPage, currPage,
+		"/dev/md/bahan/pagination",
+		paginationID,
+		"#filter-name, #filter-station, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"#"+paginationID,
+		"outerHTML",
+		"",
+		"true",
+		dev_mdbahanview.BeforeRequestContent(),
+		dev_mdbahanview.AfterRequestContent(),
+	)
+	//Form Add
+	modalAddBody := dev_mdbahanview.BodyFormBahan(
+		"",
+		models.CustomTextFieldv2Prm{Label: "Kode Bahan",
+			Name:        "kodebahan",
+			Placeholder: "Kode Bahan",
+			Type:        "text"},
+		models.CustomTextFieldv2Prm{Label: "Nama Bahan",
+			Name:        "namabahan",
+			Placeholder: "Nama Bahan",
+			Type:        "text"},
+		models.CustomDropdownV2Prm{
+			Name:     "stationid",
+			Label:    "Sample Station",
+			ListItem: dev_mdbahanview.ListItemStation(stationList, 0),
+		},
+		dialogEditBodyID,
+		dev_mdbahanview.JsHideModal("#"+dialogEditID),
+	)
+
+	toastSuccess := customtoastv2.CustomToastV2Show("Success", "Success edit bahan ", "success")
+	retval := []templ.Component{toastSuccess, mdBahanTable, mdbahanPagination, modalAddBody}
+	// time.Sleep(20 * time.Second)
+	return utils.ViewMulti(c, retval)
+}
+func (lh *MdBahanHandler) HandleOpenDeleteMdBahan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.QueryParam("id")
+	dialogDeleteID := c.QueryParam("dialogDeleteID")
+	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
+
+	dataBahan, err := lh.MdBahanServices.GetMdBahanByID(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("GET DATA BAHAN",
+			zap.Any("err", err),
+		)
+		newForm := dev_mdbahanview.DeleteConfirmationBody(
+			"",
+			dialogDeleteBodyID,
+			"Apakah anda yakin menghapus bahan berikut ?",
+			[]string{"Kode", "Nama Bahan", "Sample Station"},
+			[]string{"", "", ""}, dev_mdbahanview.JsShowModal(""))
+		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Error", "Get data bahan error", "danger"), newForm})
+	}
+	newForm := dev_mdbahanview.DeleteConfirmationBody(
+		strconv.Itoa(dataBahan.T_BahanID),
+		dialogDeleteBodyID,
+		"Apakah anda yakin menghapus bahan berikut ?",
+		[]string{"Kode", "Nama Bahan", "Sample Station"},
+		[]string{dataBahan.T_BahanCode, dataBahan.T_BahanName, dataBahan.T_SampleStationName}, dev_mdbahanview.JsShowModal("#"+dialogDeleteID))
+	return utils.View(c, newForm)
+}
+func (lh *MdBahanHandler) HandleCloseDeleteMdBahan(c echo.Context) error {
+
+	dialogDeleteID := c.FormValue("dialogDeleteID")
+	dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID")
+	newForm := dev_mdbahanview.DeleteConfirmationBody(
+		"",
+		dialogDeleteBodyID,
+		"Apakah anda yakin menghapus bahan berikut ?",
+		[]string{"Kode", "Nama Bahan", "Sample Station"},
+		[]string{"", "", ""}, dev_mdbahanview.JsHideModal("#"+dialogDeleteID))
+	return utils.View(c, newForm)
+}
+
+func (lh *MdBahanHandler) HandleDeleteMdBahan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.FormValue("bahanid")
+
+	tableID := c.FormValue("tableID")
+	paginationID := c.FormValue("paginationID")
+	filtername := c.FormValue("filtername")
+	filterstation := c.FormValue("filterstation")
+	currPagePrm := c.FormValue("currpage" + paginationID)
+	// dialogAddBodyID := c.FormValue("dialogAddBodyID")
+	// searchID := c.FormValue("searchID")
+	dialogDeleteID := c.FormValue("dialogDeleteID")
+	dialogEditBodyID := c.FormValue("dialogEditBodyID")
+	dialogDeleteBodyID := c.FormValue("dialogDeleteBodyID")
+	currPage, err := strconv.Atoi(currPagePrm)
+	if err != nil {
+		return err
+	}
+
+	_, err = lh.MdBahanServices.DeleteMdBahan(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERR DELETE MD BAHAN",
+			zap.Any("err", err),
+		)
+		newForm := dev_mdbahanview.DeleteConfirmationBody(
+			"",
+			dialogDeleteBodyID,
+			"Apakah anda yakin menghapus bahan berikut ?",
+			[]string{"Kode", "Nama Bahan", "Sample Station"},
+			[]string{"", "", ""}, dev_mdbahanview.JsShowModal(""))
+		return utils.ViewMulti(c, []templ.Component{customtoastv2.CustomToastV2Show("Error", "Get data bahan error", "danger"), newForm})
+	}
+	bahanList, totalPage, err := lh.MdBahanServices.GetListMdBahan(filtername, filterstation, currPage, 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,
+		"/dev/md/bahan/openedit",
+		"#"+dialogEditBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		"/dev/md/bahan/opendelete",
+		"#"+dialogDeleteBodyID,
+		"outerHTML",
+		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID")
+
+	//Pagination
+
+	mdbahanPagination := pagination.PaginationV3(
+		totalPage, currPage,
+		"/dev/md/bahan/pagination",
+		paginationID,
+		"#filter-name, #filter-station, #tableID, #paginationID, #dialogAddID, #dialogAddBodyID, #dialogEditID, #dialogEditBodyID, #dialogDeleteBodyID, #dialogDeleteID, #currpage"+paginationID,
+		"#"+paginationID,
+		"outerHTML",
+		"",
+		"true",
+		dev_mdbahanview.BeforeRequestContent(),
+		dev_mdbahanview.AfterRequestContent(),
+	)
+
+	toastSuccess := customtoastv2.CustomToastV2Show("Success", "Berhasil hapus bahan", "success")
+	newForm := dev_mdbahanview.DeleteConfirmationBody(
+		"",
+		dialogDeleteBodyID,
+		"Apakah anda yakin menghapus bahan berikut ?",
+		[]string{"Kode", "Nama Bahan", "Sample Station"},
+		[]string{"", "", ""}, dev_mdbahanview.JsHideModal("#"+dialogDeleteID))
+	return utils.ViewMulti(c, []templ.Component{toastSuccess, mdBahanTable, mdbahanPagination, newForm})
+}
--- a/handlers/dev/md.doctor.handlers.go
+++ b/handlers/dev/md.doctor.handlers.go
--- a/handlers/dev/md.samplestation.handlers.go
+++ b/handlers/dev/md.samplestation.handlers.go
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -66,6 +66,7 @@ func SetupRoutesPublic(app *echo.Echo, appStore db.AppStore) {
 	l := public_services.NewServicesLandingPage(public_services.LandingPage{}, appStore)
 	lh := public_handlers.NewLandingPageHandler(l)
 	public.GET("landingpage", lh.ShowLandingPage)
+	public.GET("home", lh.ShowLandingPage)
 	loginHdr := public_handlers.NewLoginHandler(l)
 	public.GET("login", loginHdr.HandlerShowLogin)

@@ -232,20 +233,12 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	// clientgroup.GET("/usergroup/edit", mastermenuusergroupHandler.ChangeFormEdit)
 	// clientgroup.GET("/usergroup/pagination", mastermenuusergroupHandler.HandleChangePage)

-	//New User Group
-	devMdUserGroupServices := dev_services.NewMdUserGroupServices(appStore)
-	devMdUserGroupHandlers := dev_handlers.NewMdUserGroupHandler(devMdUserGroupServices)
-	dev.GET("/md/usergroupv2", devMdUserGroupHandlers.HandleShowMdUserGroupScreen)
-	dev.GET("/md/usergroupv2/filter", devMdUserGroupHandlers.HandleFilterMdUserGroup)
-	dev.GET("/md/usergroupv2/changepage", devMdUserGroupHandlers.HandleChangePageMdUserGroup)
-	dev.POST("/md/usergroupv2/closeaddform", devMdUserGroupHandlers.HandleCloseFormAdd)
-	dev.POST("/md/usergroupv2/add", devMdUserGroupHandlers.HandleAddUserGroup)
-	dev.GET("/md/usergroupv2/openedit", devMdUserGroupHandlers.HandleOpenEditForm)
-	dev.POST("/md/usergroupv2/closeeditform", devMdUserGroupHandlers.HandleCloseFormEdit)
-	dev.POST("/md/usergroupv2/edit", devMdUserGroupHandlers.HandleEditUserGroup)
-	dev.GET("/md/usergroupv2/opendelete", devMdUserGroupHandlers.HandleOpenDeleteForm)
-	dev.POST("/md/usergroupv2/closedeleteform", devMdUserGroupHandlers.HandleCloseFormDelete)
-	dev.POST("/md/usergroupv2/delete", devMdUserGroupHandlers.HandleDeleteUserGroup)
+	// employee analytic
+	devEmplAnaServices := dev_services.NewEmployeeAnalyticServices(appStore)
+	devEmplAnaHandler := dev_handlers.NewEmployeeAnalyticHandler(devEmplAnaServices)
+	dev.GET("/employeeanalytic", devEmplAnaHandler.HandleShowEmployeeAnalyticScreen)
+	dev.GET("/employeeanalytic/changepage", devEmplAnaHandler.HandlePagination)
+	dev.GET("/employeeanalytic/filter", devEmplAnaHandler.HandleFilter)

 	// group result
 	devGRServices := dev_services.NewServicesGroupResult(appStore)
@@ -262,6 +255,37 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.POST("/groupresult/add", devGRhandlers.AddGroupResult)
 	dev.POST("/groupresult/edit", devGRhandlers.EditGroupResult)
 	dev.POST("/groupresult/delete", devGRhandlers.DeleteGroupResult)
+
+	//New User Group
+	devMdUserGroupServices := dev_services.NewMdUserGroupServices(appStore)
+	devMdUserGroupHandlers := dev_handlers.NewMdUserGroupHandler(devMdUserGroupServices)
+	dev.GET("/md/usergroupv2", devMdUserGroupHandlers.HandleShowMdUserGroupScreen)
+	dev.GET("/md/usergroupv2/filter", devMdUserGroupHandlers.HandleFilterMdUserGroup)
+	dev.GET("/md/usergroupv2/changepage", devMdUserGroupHandlers.HandleChangePageMdUserGroup)
+	dev.POST("/md/usergroupv2/closeaddform", devMdUserGroupHandlers.HandleCloseFormAdd)
+	dev.POST("/md/usergroupv2/add", devMdUserGroupHandlers.HandleAddUserGroup)
+	dev.GET("/md/usergroupv2/openedit", devMdUserGroupHandlers.HandleOpenEditForm)
+	dev.POST("/md/usergroupv2/closeeditform", devMdUserGroupHandlers.HandleCloseFormEdit)
+	dev.POST("/md/usergroupv2/edit", devMdUserGroupHandlers.HandleEditUserGroup)
+	dev.GET("/md/usergroupv2/opendelete", devMdUserGroupHandlers.HandleOpenDeleteForm)
+	dev.POST("/md/usergroupv2/closedeleteform", devMdUserGroupHandlers.HandleCloseFormDelete)
+	dev.POST("/md/usergroupv2/delete", devMdUserGroupHandlers.HandleDeleteUserGroup)
+
+	// md sample station
+	devMDSampleStationServices := dev_services.NewMDSampleStationServices(appStore)
+	devMDSampleStationHandlers := dev_handlers.NewMDSampleStationHandler(devMDSampleStationServices)
+	dev.GET("/md/samplestation", devMDSampleStationHandlers.HandleShowMDSampleStationScreen)
+	dev.GET("/md/samplestation/filter", devMDSampleStationHandlers.HandleFilterMDSS)
+	dev.GET("/md/samplestation/changepage", devMDSampleStationHandlers.HandleChangePageSampleStation)
+	dev.POST("/md/samplestation/add", devMDSampleStationHandlers.HandleAddMDSampleStation)
+	dev.POST("/md/samplestation/closeaddform", devMDSampleStationHandlers.HandleCloseFormAdd)
+	dev.GET("/md/samplestation/opendelete", devMDSampleStationHandlers.HandleOpenDeleteForm)
+	dev.POST("/md/samplestation/closedeleteform", devMDSampleStationHandlers.HandleCloseFormDelete)
+	dev.POST("/md/samplestation/delete", devMDSampleStationHandlers.HandleDeleteMDSS)
+	dev.GET("/md/samplestation/openedit", devMDSampleStationHandlers.HandleOpenEditForm)
+	dev.POST("/md/samplestation/edit", devMDSampleStationHandlers.HandleEditMDSS)
+	dev.POST("/md/samplestation/closeeditform", devMDSampleStationHandlers.HandleCloseEditForm)
+
 	// masterdata nat unit
 	devMdNatUnitServices := dev_services.NewMdNatUnitServices(appStore)
 	devMdNatUnitHandlers := dev_handlers.NeWMdNatUnitHandler(devMdNatUnitServices)
@@ -291,16 +315,18 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.GET("/md/groupresultv2/opendelete", devMdGRhandlers.HandleOpenDeleteForm)
 	dev.POST("/md/groupresultv2/closedeleteform", devMdGRhandlers.HandleCloseFormDelete)
 	dev.POST("/md/groupresultv2/delete", devMdGRhandlers.HandleDeleteUserGroup)
-
-	// doctor v2
-	devMdDCServices := dev_services.NewServicesMdDoctor(appStore)
-	devMdDChandlers := dev_handlers.NewMdDoctorHandler(devMdDCServices)
-	dev.GET("/md/doctorv2", devMdDChandlers.HandleShowMdDoctorScreen)
-	dev.GET("/md/doctorv2/filter", devMdDChandlers.HandleFilterMdDoctor)
-	dev.GET("/md/doctorv2/changepage", devMdDChandlers.HandleChangePageMdDoctor)
-	dev.POST("/md/doctorv2/closeaddform", devMdDChandlers.HandleCloseFormAdd)
-	dev.POST("/md/doctorv2/add", devMdDChandlers.HandleAddMdDoctor)
-	dev.GET("/md/doctorv2/openedit", devMdDChandlers.HandleOpenEditForm)
-	dev.POST("/md/doctorv2/closeeditform", devMdDChandlers.HandleCloseFormEdit)
-	// dev.POST("/md/doctorv2/edit", devMdDChandlers.HandleEditMdDoctor)
+	//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)
+	dev.POST("/md/bahan/add", devMdBahanHandlers.HandleAddMdBahan)
+	dev.POST("/md/bahan/closeaddform", devMdBahanHandlers.HandleCloseFormAddMdBahan)
+	dev.GET("/md/bahan/openedit", devMdBahanHandlers.HandleOpenEditMdBahan)
+	dev.POST("/md/bahan/closeeditform", devMdBahanHandlers.HandleCloseFormEditMdBahan)
+	dev.POST("/md/bahan/edit", devMdBahanHandlers.HandleEditMdBahan)
+	dev.GET("/md/bahan/opendelete", devMdBahanHandlers.HandleOpenDeleteMdBahan)
+	dev.POST("/md/bahan/closedeleteform", devMdBahanHandlers.HandleCloseDeleteMdBahan)
+	dev.POST("/md/bahan/delete", devMdBahanHandlers.HandleDeleteMdBahan)
 }
--- a/layout/layout_employee_analytic.templ
+++ b/layout/layout_employee_analytic.templ
@@ -0,0 +1,174 @@
+package layout
+
+templ EmployeeAnalyticLayout(
+    title string, 
+    css templ.Component, 
+    js templ.Component,
+    navbaruser templ.Component,
+    sidebaruser templ.Component,
+) {
+	<!DOCTYPE html>
+    <html lang="en">
+		<!--begin::Head-->
+		<head>
+			<base href="/"/>
+			<meta charset="utf-8"/>
+			<title>Company Portal | { title }</title>
+			<meta name="description" content="Company Portal"/>
+			<meta
+				name="viewport"
+				content="width=device-width, initial-scale=1, shrink-to-fit=no"
+			/>
+			<!--begin::Fonts-->
+			<link
+				rel="stylesheet"
+				href="assets/css/googlefont/poppins.css"
+			/>
+			<!--end::Fonts-->
+			<!--begin::Page Custom Styles(used by this page)-->
+			<link
+				href="assets/css/pages/login/login-1.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<!--end::Page Custom Styles-->
+			<!--begin::Global Theme Styles(used by all pages)-->
+			<link
+				href="assets/plugins/global/plugins.bundle.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				href="assets/plugins/custom/prismjs/prismjs.bundle.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link href="assets/css/style.bundle.css" rel="stylesheet" type="text/css"/>
+			<!--end::Global Theme Styles-->
+			<!--begin::Layout Themes(used by all pages)-->
+			<link
+				href="assets/css/themes/layout/header/base/light.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				href="assets/css/themes/layout/header/menu/light.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				href="assets/css/themes/layout/brand/dark.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				href="assets/css/themes/layout/aside/dark.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<!--end::Layout Themes-->
+			<link
+				rel="shortcut icon"
+				href="asset-corporate-portal/media/logo/logo-small.jpg"
+			/>
+			<!--end::Layout Themes SAS-->
+			<link
+				href="asset-corporate-portal/css/sas.bundle.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				rel="stylesheet"
+				href="assets/css/googlefont/publicsans.css"
+			/>
+			<link
+				rel="stylesheet"
+				href="assets/css/googlefont/roboto.css"
+			/>
+			<!-- slick -->
+			<link
+				rel="stylesheet"
+				type="text/css"
+				href="assets/css/slick/slick.css"
+			/>
+			<link
+				rel="stylesheet"
+				type="text/css"
+				href="assets/css/slick/slick-theme.css"
+			/>
+			@css
+		</head>
+		<!--end::Head-->
+        <!--begin::Body-->
+        <body id="kt_body" class="header-fixed header-mobile-fixed subheader-enabled subheader-fixed subheader-mobile-fixed aside-enabled aside-fixed aside-minimize-hoverable page-loading bg-white">
+            <script src="assets/js/htmx/htmx.min.js"></script>
+			<!--start::Navbar Mobile-->
+			<div id="kt_header_mobile" class="header-mobile align-items-center  header-mobile-fixed ">
+				<!--begin::Logo-->
+				<a href="index.html">
+					<img alt="Logo" src="asset-corporate-portal/media/logo/logo.png" style="object-fit: contain;height: 4vh;"/>
+				</a>
+				<!--end::Logo-->
+				<!--begin::Toolbar-->
+				<div class="d-flex align-items-center">
+					<!--begin::Topbar Mobile Toggle-->
+					<button class="btn btn-hover-text-primary p-0 ml-2" id="kt_header_mobile_topbar_toggle">
+						<span class="svg-icon svg-icon-xl">
+							<!--begin::Svg Icon | path:/assets/media/svg/icons/General/User.svg-->
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								xmlns:xlink="http://www.w3.org/1999/xlink"
+								width="24px"
+								height="24px"
+								viewBox="0 0 24 24"
+								version="1.1"
+							>
+								<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+									<polygon points="0 0 24 0 24 24 0 24"></polygon>
+									<path
+										d="M12,11 C9.790861,11 8,9.209139 8,7 C8,4.790861 9.790861,3 12,3 C14.209139,3 16,4.790861 16,7 C16,9.209139 14.209139,11 12,11 Z"
+										fill="#000000"
+										fill-rule="nonzero"
+										opacity="0.3"
+									></path>
+									<path
+										d="M3.00065168,20.1992055 C3.38825852,15.4265159 7.26191235,13 11.9833413,13 C16.7712164,13 20.7048837,15.2931929 20.9979143,20.2 C21.0095879,20.3954741 20.9979143,21 20.2466999,21 C16.541124,21 11.0347247,21 3.72750223,21 C3.47671215,21 2.97953825,20.45918 3.00065168,20.1992055 Z"
+										fill="#000000"
+										fill-rule="nonzero"
+									></path>
+								</g>
+							</svg><!--end::Svg Icon-->
+						</span>
+					</button>
+					<!--end::Topbar Mobile Toggle-->
+				</div>
+				<!--end::Toolbar-->
+			</div>
+			<!--start::Navbar Mobile-->
+            <!--start::Navbar Laptop With Sidebar-->			
+            <div class="mb-24 mt-8" style="padding-left: 10vw; padding-right: 10vw;">
+                <div class="align-item-center">
+					@navbaruser
+				</div>
+                <div class="mt-16">
+                    { children... }
+                </div>
+            </div>
+            <!--end::Navbar Laptop With Sidebar-->
+            @sidebaruser
+			<!--begin::Global Config(global config for global JS scripts)-->
+			<script src="asset-corporate-portal/js/ktappsetting.js"></script>
+			<!--end::Global Config-->
+			<!--begin::Global Theme Bundle(used by all pages)-->
+			<script src="assets/plugins/global/plugins.bundle.js"></script>
+			<script src="assets/plugins/custom/prismjs/prismjs.bundle.js"></script>
+			<script src="assets/js/scripts.bundle.js"></script>
+			<!--end::Global Theme Bundle-->
+			<script src="assets/js/iconify/iconify.min.js"></script>
+			// bootstrap datepicker
+			<script src="assets/js/pages/crud/forms/widgets/bootstrap-datepicker.js"></script>
+			@js
+			<!--end::Page Scripts-->
+        </body>
+    </html>
+}
--- a/layout/layout_employee_analytic_templ.go
+++ b/layout/layout_employee_analytic_templ.go
@@ -0,0 +1,94 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package layout
+
+//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"
+
+func EmployeeAnalyticLayout(
+	title string,
+	css templ.Component,
+	js templ.Component,
+	navbaruser templ.Component,
+	sidebaruser 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("<!doctype html><html lang=\"en\"><!--begin::Head--><head><base href=\"/\"><meta charset=\"utf-8\"><title>Company Portal | ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(title)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layout\layout_employee_analytic.templ`, Line: 16, Col: 34}
+		}
+		_, 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("</title><meta name=\"description\" content=\"Company Portal\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\"><!--begin::Fonts--><link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><!--end::Fonts--><!--begin::Page Custom Styles(used by this page)--><link href=\"assets/css/pages/login/login-1.css\" rel=\"stylesheet\" type=\"text/css\"><!--end::Page Custom Styles--><!--begin::Global Theme Styles(used by all pages)--><link href=\"assets/plugins/global/plugins.bundle.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/plugins/custom/prismjs/prismjs.bundle.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/css/style.bundle.css\" rel=\"stylesheet\" type=\"text/css\"><!--end::Global Theme Styles--><!--begin::Layout Themes(used by all pages)--><link href=\"assets/css/themes/layout/header/base/light.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/css/themes/layout/header/menu/light.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/css/themes/layout/brand/dark.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/css/themes/layout/aside/dark.css\" rel=\"stylesheet\" type=\"text/css\"><!--end::Layout Themes--><link rel=\"shortcut icon\" href=\"asset-corporate-portal/media/logo/logo-small.jpg\"><!--end::Layout Themes SAS--><link href=\"asset-corporate-portal/css/sas.bundle.css\" rel=\"stylesheet\" type=\"text/css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><!-- slick --><link rel=\"stylesheet\" type=\"text/css\" href=\"assets/css/slick/slick.css\"><link rel=\"stylesheet\" type=\"text/css\" href=\"assets/css/slick/slick-theme.css\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = css.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</head><!--end::Head--><!--begin::Body--><body id=\"kt_body\" class=\"header-fixed header-mobile-fixed subheader-enabled subheader-fixed subheader-mobile-fixed aside-enabled aside-fixed aside-minimize-hoverable page-loading bg-white\"><script src=\"assets/js/htmx/htmx.min.js\"></script><!--start::Navbar Mobile--><div id=\"kt_header_mobile\" class=\"header-mobile align-items-center  header-mobile-fixed \"><!--begin::Logo--><a href=\"index.html\"><img alt=\"Logo\" src=\"asset-corporate-portal/media/logo/logo.png\" style=\"object-fit: contain;height: 4vh;\"></a><!--end::Logo--><!--begin::Toolbar--><div class=\"d-flex align-items-center\"><!--begin::Topbar Mobile Toggle--><button class=\"btn btn-hover-text-primary p-0 ml-2\" id=\"kt_header_mobile_topbar_toggle\"><span class=\"svg-icon svg-icon-xl\"><!--begin::Svg Icon | path:/assets/media/svg/icons/General/User.svg--><svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"24px\" height=\"24px\" viewBox=\"0 0 24 24\" version=\"1.1\"><g stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"><polygon points=\"0 0 24 0 24 24 0 24\"></polygon> <path d=\"M12,11 C9.790861,11 8,9.209139 8,7 C8,4.790861 9.790861,3 12,3 C14.209139,3 16,4.790861 16,7 C16,9.209139 14.209139,11 12,11 Z\" fill=\"#000000\" fill-rule=\"nonzero\" opacity=\"0.3\"></path> <path d=\"M3.00065168,20.1992055 C3.38825852,15.4265159 7.26191235,13 11.9833413,13 C16.7712164,13 20.7048837,15.2931929 20.9979143,20.2 C21.0095879,20.3954741 20.9979143,21 20.2466999,21 C16.541124,21 11.0347247,21 3.72750223,21 C3.47671215,21 2.97953825,20.45918 3.00065168,20.1992055 Z\" fill=\"#000000\" fill-rule=\"nonzero\"></path></g></svg><!--end::Svg Icon--></span></button><!--end::Topbar Mobile Toggle--></div><!--end::Toolbar--></div><!--start::Navbar Mobile--><!--start::Navbar Laptop With Sidebar--><div class=\"mb-24 mt-8\" style=\"padding-left: 10vw; padding-right: 10vw;\"><div class=\"align-item-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = navbaruser.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"mt-16\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><!--end::Navbar Laptop With Sidebar-->")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = sidebaruser.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--begin::Global Config(global config for global JS scripts)--><script src=\"asset-corporate-portal/js/ktappsetting.js\"></script><!--end::Global Config--><!--begin::Global Theme Bundle(used by all pages)--><script src=\"assets/plugins/global/plugins.bundle.js\"></script><script src=\"assets/plugins/custom/prismjs/prismjs.bundle.js\"></script><script src=\"assets/js/scripts.bundle.js\"></script><!--end::Global Theme Bundle--><script src=\"assets/js/iconify/iconify.min.js\"></script><script src=\"assets/js/pages/crud/forms/widgets/bootstrap-datepicker.js\"></script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = js.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Page Scripts--></body></html>")
+		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/layout/playground_layout.templ
+++ b/layout/playground_layout.templ
@@ -3,18 +3,6 @@ package layout
 // LAYOUT PLAYGROUND
 templ PlaygroundLayout(title string, css templ.Component, js templ.Component) {
 	<!DOCTYPE html>
-	<!--
-		Template Name: Metronic - Bootstrap 4 HTML, React, Angular 9 & VueJS Admin Dashboard Theme
-		Author: KeenThemes
-		Website: http://www.keenthemes.com/
-		Contact: support@keenthemes.com
-		Follow: www.twitter.com/keenthemes
-		Dribbble: www.dribbble.com/keenthemes
-		Like: www.facebook.com/keenthemes
-		Purchase: https://1.envato.market/EA4JP
-		Renew Support: https://1.envato.market/EA4JP
-		License: You must have a valid license purchased only from themeforest(the above link) in order to legally use the theme for your project.
-		-->
 	<html lang="en">
 		<!--begin::Head-->
 		<head>
--- a/layout/playground_layout_templ.go
+++ b/layout/playground_layout_templ.go
@@ -24,14 +24,14 @@ func PlaygroundLayout(title string, css templ.Component, js templ.Component) tem
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!doctype html><!--\r\n\t\tTemplate Name: Metronic - Bootstrap 4 HTML, React, Angular 9 & VueJS Admin Dashboard Theme\r\n\t\tAuthor: KeenThemes\r\n\t\tWebsite: http://www.keenthemes.com/\r\n\t\tContact: support@keenthemes.com\r\n\t\tFollow: www.twitter.com/keenthemes\r\n\t\tDribbble: www.dribbble.com/keenthemes\r\n\t\tLike: www.facebook.com/keenthemes\r\n\t\tPurchase: https://1.envato.market/EA4JP\r\n\t\tRenew Support: https://1.envato.market/EA4JP\r\n\t\tLicense: You must have a valid license purchased only from themeforest(the above link) in order to legally use the theme for your project.\r\n\t\t--><html lang=\"en\"><!--begin::Head--><head><base href=\"/\"><meta charset=\"utf-8\"><title>Company Portal | ")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!doctype html><html lang=\"en\"><!--begin::Head--><head><base href=\"/\"><meta charset=\"utf-8\"><title>Company Portal | ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(title)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layout\playground_layout.templ`, Line: 23, Col: 34}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layout\playground_layout.templ`, Line: 11, Col: 34}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
--- a/models/bahan.models.go
+++ b/models/bahan.models.go
@@ -0,0 +1,38 @@
+package models
+
+import "github.com/a-h/templ"
+
+type Bahan struct {
+	T_BahanID                int    `db:"T_BahanID"`
+	T_BahanT_SampleStationID int    `db:"T_BahanT_SampleStationID"`
+	T_SampleStationID        int    `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   int    `db:"T_SampleStationID"`
+	T_SampleStationName string `db:"T_SampleStationName"`
+}
+
+type BahanFormComponent struct {
+	IDComponent  string
+	Link         string
+	HxTarget     string
+	HxSwap       string
+	HxInclude    string
+	ModalID      string
+	ModalTitle   string
+	DialogBody   templ.Component
+	DialogAction templ.Component
+	ButtonCLose  templ.Component
+}
--- a/models/customdropdown.models.go
+++ b/models/customdropdown.models.go
@@ -1,5 +1,7 @@
 package models

+import "github.com/a-h/templ"
+
 // name string, id string, hxTarget string, hxGet string, hxIndicator string, hxTrigger string, hxInclude string,

 type CustomDropdownv1Prm struct {
@@ -16,3 +18,19 @@ type CustomDropdownv1Prm struct {
 	ErrorMsg string `default:""`
 	ID       string
 }
+type CustomDropdownV2Prm struct {
+	HxTarget    string `default:"hxTarget"`
+	HxGet       string `default:"hxGet"`
+	HxIndicator string `default:"hxIndicator"`
+	HxInclude   string `default:"hxInclude"`
+	HxTrigger   string `default:"hxTrigger"`
+	HxSwap      string `default:"HxSwap"`
+	Label       string `default:"Label"`
+	Name        string `default:"name"`
+	Placeholder string `default:"Placeholder"`
+	// Type        string `default:"text"`
+	// Value       string `default:""`
+	ErrorMsg string `default:""`
+	ID       string
+	ListItem templ.Component
+}
--- a/models/customuploadfotov0.models.go
+++ b/models/customuploadfotov0.models.go
@@ -1,10 +0,0 @@
-package models
-
-type CustomUploadFotoPrmV0 struct {
-	ID       string `desc:"ID"`
-	Name     string `desc:"name"`
-	Accept   string `desc:"ekstension acc (.png, .jpg, .jpeg)"`
-	Label    string `desc:"label title"`
-	LinkFoto string
-	Value    string `desc:""`
-}
--- a/models/doctor.models.go
+++ b/models/doctor.models.go
@@ -1,193 +0,0 @@
-package models
-
-import (
-	"database/sql"
-
-	"github.com/a-h/templ"
-)
-
-type DoctorV1 struct {
-	Nomor                          string `db:"nomor"`
-	M_DoctorID                     int    `db:"M_DoctorID"`
-	M_DoctorM_TitleID              int    `db:"M_DoctorM_TitleID"`
-	M_DoctorCode                   string `db:"M_DoctorCode"`
-	M_DoctorPrefix                 string `db:"M_DoctorPrefix"`
-	M_DoctorPrefix2                string `db:"M_DoctorPrefix2"`
-	M_DoctorName                   string `db:"M_DoctorName"`
-	M_DoctorSuffix                 string `db:"M_DoctorSuffix"`
-	M_DoctorSuffix2                string `db:"M_DoctorSuffix2"`
-	M_DoctorGender                 string `db:"M_DoctorGender"`
-	M_DoctorDOB                    string `db:"M_DoctorDOB"`
-	M_DoctorReligionCode           string `db:"M_DoctorReligionCode"`
-	M_DoctorReligionSystem         string `db:"M_DoctorReligionSystem"`
-	M_DoctorBloodTypeCode          string `db:"M_DoctorBloodTypeCode"`
-	M_DoctorBloodTypeSystem        string `db:"M_DoctorBloodTypeSystem"`
-	M_DoctorBloodRhCode            string `db:"M_DoctorBloodRhCode"`
-	M_DoctorBloodRhSystem          string `db:"M_DoctorBloodRhSystem"`
-	M_DoctorEducationCode          string `db:"M_DoctorEducationCode"`
-	M_DoctorEducationSystem        string `db:"M_DoctorEducationSystem"`
-	M_DoctorCitizenship            string `db:"M_DoctorCitizenship"`
-	M_DoctorEtnicCode              string `db:"M_DoctorEtnicCode"`
-	M_DoctorEtnicSystem            string `db:"M_DoctorEtnicSystem"`
-	M_DoctorIdentifierCode         string `db:"M_DoctorIdentifierCode"`
-	M_DoctorIdentifierSystem       string `db:"M_DoctorIdentifierSystem"`
-	M_DoctorIdentifierValue        string `db:"M_DoctorIdentifierValue"`
-	M_DoctorHp                     string `db:"M_DoctorHp"`
-	M_DoctorEmail                  string `db:"M_DoctorEmail"`
-	M_DoctorM_SpecialistID         string `db:"M_DoctorM_SpecialistID"`
-	M_DoctorPhoto                  string `db:"M_DoctorPhoto"`
-	M_DoctorPhotoLastUpdated       string `db:"M_DoctorPhotoLastUpdated"`
-	M_DoctorPhotoLastUpdatedUserID string `db:"M_DoctorPhotoLastUpdatedUserID"`
-	M_SpecialistID                 string `db:"M_SpecialistID"`
-	M_SpecialistName               string `db:"M_SpecialistName"`
-	M_TitleName                    string `db:"M_TitleName"`
-	M_DoctorAddress                string `db:"M_DoctorAddress"`
-	M_DoctorAddressRegionalCd      int    `db:"M_DoctorAddressRegionalCd"`
-	M_DoctorAddressRT              string `db:"M_DoctorAddressRT"`
-	M_DoctorAddressRW              string `db:"M_DoctorAddressRW"`
-	M_DoctorAddressCity            string `db:"M_DoctorAddressCity"`
-	M_DoctorAddressVillage         string `db:"M_DoctorAddressVillage"`
-	M_DoctorAddressDistrict        string `db:"M_DoctorAddressDistrict"`
-	M_DoctorAddressState           string `db:"M_DoctorAddressState"`
-	M_DoctorAddressCountry         string `db:"M_DoctorAddressCountry"`
-	M_DoctorCreated                string `db:"M_DoctorCreated"`
-	M_DoctorCreatedUserID          string `db:"M_DoctorCreatedUserID"`
-	M_DoctorLastUpdated            string `db:"M_DoctorLastUpdated"`
-	M_DoctorLastUpdatedUserID      string `db:"M_DoctorLastUpdatedUserID"`
-	M_DoctorDeletedUserID          string `db:"M_DoctorDeletedUserID"`
-	M_DoctorDeleted                string `db:"M_DoctorDeleted"`
-	M_DoctorIsActive               string `db:"M_DoctorIsActive"`
-}
-
-// doctor json
-type DoctorJSONv1 struct {
-	M_DoctorID                     int    `db:"M_DoctorID"`
-	M_DoctorM_TitleID              int    `db:"M_DoctorM_TitleID"`
-	M_DoctorCode                   string `db:"M_DoctorCode"`
-	M_DoctorPrefix                 string `db:"M_DoctorPrefix"`
-	M_DoctorPrefix2                string `db:"M_DoctorPrefix2"`
-	M_DoctorName                   string `db:"M_DoctorName"`
-	M_DoctorSuffix                 string `db:"M_DoctorSuffix"`
-	M_DoctorSuffix2                string `db:"M_DoctorSuffix2"`
-	M_DoctorGender                 string `db:"M_DoctorGender"`
-	M_DoctorDOB                    string `db:"M_DoctorDOB"`
-	M_DoctorReligionCode           string `db:"M_DoctorReligionCode"`
-	M_DoctorReligionSystem         string `db:"M_DoctorReligionSystem"`
-	M_DoctorBloodTypeCode          string `db:"M_DoctorBloodTypeCode"`
-	M_DoctorBloodTypeSystem        string `db:"M_DoctorBloodTypeSystem"`
-	M_DoctorBloodRhCode            string `db:"M_DoctorBloodRhCode"`
-	M_DoctorBloodRhSystem          string `db:"M_DoctorBloodRhSystem"`
-	M_DoctorEducationCode          string `db:"M_DoctorEducationCode"`
-	M_DoctorEducationSystem        string `db:"M_DoctorEducationSystem"`
-	M_DoctorCitizenship            string `db:"M_DoctorCitizenship"`
-	M_DoctorEtnicCode              string `db:"M_DoctorEtnicCode"`
-	M_DoctorEtnicSystem            string `db:"M_DoctorEtnicSystem"`
-	M_DoctorIdentifierCode         string `db:"M_DoctorIdentifierCode"`
-	M_DoctorIdentifierSystem       string `db:"M_DoctorIdentifierSystem"`
-	M_DoctorIdentifierValue        string `db:"M_DoctorIdentifierValue"`
-	M_DoctorHp                     string `db:"M_DoctorHp"`
-	M_DoctorEmail                  string `db:"M_DoctorEmail"`
-	M_DoctorM_SpecialistID         int    `db:"M_DoctorM_SpecialistID"`
-	M_DoctorPhoto                  string `db:"M_DoctorPhoto"`
-	M_DoctorPhotoLastUpdated       string `db:"M_DoctorPhotoLastUpdated"`
-	M_DoctorPhotoLastUpdatedUserID string `db:"M_DoctorPhotoLastUpdatedUserID"`
-	M_DoctorAddress                string `db:"M_DoctorAddress"`
-	M_DoctorAddressRegionalCd      string `db:"M_DoctorAddressRegionalCd"`
-	M_DoctorAddressRT              string `db:"M_DoctorAddressRT"`
-	M_DoctorAddressRW              string `db:"M_DoctorAddressRW"`
-	M_DoctorAddressCity            string `db:"M_DoctorAddressCity"`
-	M_DoctorAddressVillage         string `db:"M_DoctorAddressVillage"`
-	M_DoctorAddressDistrict        string `db:"M_DoctorAddressDistrict"`
-	M_DoctorAddressState           string `db:"M_DoctorAddressState"`
-	M_DoctorAddressCountry         string `db:"M_DoctorAddressCountry"`
-	M_DoctorIsActive               string `db:"M_DoctorIsActive"`
-	M_DoctorCreated                string `db:"M_DoctorCreated"`
-	M_DoctorCreatedUserID          int    `db:"M_DoctorCreatedUserID"`
-	M_DoctorLastUpdated            string `db:"M_DoctorLastUpdated"`
-	M_DoctorLastUpdatedUserID      int    `db:"M_DoctorLastUpdatedUserID"`
-	M_DoctorDeletedUserID          int    `db:"M_DoctorDeletedUserID"`
-	M_DoctorDeleted                string `db:"M_DoctorDeleted"`
-}
-
-// title
-type TitleSapaan struct {
-	M_TitleID                int    `db:"M_TitleID"`
-	M_TitleName              string `db:"M_TitleName"`
-	M_TitleGender            string `db:"M_TitleGender"`
-	M_TitleOrder             string `db:"M_TitleOrder"`
-	M_TitleIsActive          string `db:"M_TitleIsActive"`
-	M_TitleCreated           string `db:"M_TitleCreated"`
-	M_TitleCreatedUserID     string `db:"M_TitleCreatedUserID"`
-	M_TitleLastUpdated       string `db:"M_TitleLastUpdated"`
-	M_TitleLastUpdatedUserID string `db:"M_TitleLastUpdatedUserID"`
-	M_TitleDeleted           string `db:"M_TitleDeleted"`
-	M_TitleDeletedUserID     string `db:"M_TitleDeletedUserID"`
-}
-
-type SpecialistV0 struct {
-	M_SpecialistID                int    `db:"M_SpecialistID"`
-	M_SpecialistName              string `db:"M_SpecialistName"`
-	M_SpecialistIsActive          string `db:"M_SpecialistIsActive"`
-	M_SpecialistCreated           string `db:"M_SpecialistCreated"`
-	M_SpecialistCreatedUserID     string `db:"M_SpecialistCreatedUserID"`
-	M_SpecialistLastUpdated       string `db:"M_SpecialistLastUpdated"`
-	M_SpecialistLastUpdatedUserID string `db:"M_SpecialistLastUpdatedUserID"`
-	M_SpecialistDeleted           string `db:"M_SpecialistDeleted"`
-	M_SpecialistDeletedUserID     string `db:"M_SpecialistDeletedUserID"`
-}
-
-// hardcode dropdown(jenis kelamin)
-type HardCodeDropdownJKV0 struct {
-	ID   int    `json:"ID"`
-	Text string `json:"Text"`
-}
-
-// hardcode radio button(jenis kelamin)
-type HardCodeRadioButtonV0 struct {
-	ID   int    `json:"ID"`
-	Text string `json:"Text"`
-	Name string `json:"Name"`
-}
-
-// TerminologySelected
-type TerminologySelectedV0 struct {
-	ResourceType    string         `json:"resource_type"`
-	AttributePath   string         `json:"attribute_path"`
-	Code            string         `json:"code"`
-	ParentCode      string         `json:"parent_code"`
-	Display         string         `json:"display"`
-	DisplayEn       string         `json:"display_en"`
-	CodeSystem      string         `json:"code_system"`
-	OrderNo         uint           `json:"order_no"`
-	FtIndex         sql.NullString `json:"ft_index"`
-	UseInd          bool           `json:"use_ind"`
-	Description     sql.NullString `json:"description"`
-	StatusCd        string         `json:"status_cd"`
-	CreatedDttm     string         `json:"created_dttm"`
-	CreatedUserID   uint           `json:"created_user_id"`
-	UpdatedDttm     string         `json:"updated_dttm"`
-	UpdatedUserID   uint           `json:"updated_user_id"`
-	NullifiedDttm   string         `json:"nullified_dttm"`
-	NullifiedUserID uint           `json:"nullified_user_id"`
-}
-
-// form component
-type DoctorFormComponent struct {
-	IDComponent string
-	Link        string
-	HxTarget    string
-	HxSwap      string
-	HxInclude   string
-	ModalID     string
-	ModalTitle  string
-	InputID     CustomTextFieldv2Prm
-	// InputGroupResultName           CustomTextFieldv2Prm
-	// InputGroupResult               CustomTextFieldv2Prm
-	// CheckboxGroupResultFlagPerTest CustomCheckboxv1Prm
-	// CheckboxGroupResultFlagNonLab  CustomCheckboxv1Prm
-
-	DropdownDoctorSapaan CustomDropdownv1Prm
-	DialogBody           templ.Component
-	DialogAction         templ.Component
-	ButtonCLose          templ.Component
-}
--- a/models/employeeanalytic.models.go
+++ b/models/employeeanalytic.models.go
@@ -0,0 +1,15 @@
+package models
+
+type EmployeeAnalytic struct {
+	Mgm_McuID                     int    `db:"Mgm_McuID"`
+	Mgm_McuLabel                  string `db:"Mgm_McuLabel"`
+	Mgm_McuFlagRelasiBayarSendiri string `db:"Mgm_McuFlagRelasiBayarSendiri"`
+	Mgm_McuBisaTambahPemeriksaan  string `db:"Mgm_McuBisaTambahPemeriksaan"`
+	Mgm_McuCorporateID            int    `db:"Mgm_McuCorporateID"`
+	Mgm_McuNumber                 string `db:"Mgm_McuNumber"`
+	Mgm_McuNumberNational         string `db:"Mgm_McuNumberNational"`
+	Mgm_McuNote                   string `db:"Mgm_McuNote"`
+	Mgm_McuStartDate              string `db:"Mgm_McuStartDate"`
+	Mgm_McuEndDate                string `db:"Mgm_McuEndDate"`
+	Mgm_McuIsActive               string `db:"Mgm_McuIsActive"`
+}
--- a/models/samplestation.models.go
+++ b/models/samplestation.models.go
@@ -0,0 +1,47 @@
+package models
+
+import "github.com/a-h/templ"
+
+type MDSampleStation struct {
+	T_SampleStationID          int    `db:"T_SampleStationID"`
+	T_SampleStationCode        string `db:"T_SampleStationCode"`
+	T_SampleStationName        string `db:"T_SampleStationName"`
+	T_SampleStationNat_GroupID string `db:"T_SampleStationNat_GroupID"`
+	T_SampleStationIsNonLab    string `db:"T_SampleStationIsNonLab"`
+	T_SampleStationIsActive    string `db:"T_SampleStationIsActive"`
+}
+
+type MDSampleStationForm struct {
+	IDComponent  string
+	Link         string
+	HxTarget     string
+	HxSwap       string
+	HxInclude    string
+	ModalID      string
+	ModalTitle   string
+	InputID      CustomTextFieldv2Prm
+	InputCode    CustomTextFieldv2Prm
+	InputName    CustomTextFieldv2Prm
+	InputGroup   CustomDropdownv1Prm
+	DialogBody   templ.Component
+	DialogAction templ.Component
+	ButtonClose  templ.Component
+}
+
+type MDSampleStationConfirmation struct {
+	IDComponent  string
+	Link         string
+	HxTarget     string
+	HxSwap       string
+	HxInclude    string
+	ModalID      string
+	ModalTitle   string
+	DialogBody   templ.Component
+	DialogAction templ.Component
+	ButtonClose  templ.Component
+}
+
+type MDSampleStationGroup struct {
+	ID    int    `default:"id"`
+	Group string `default:"group"`
+}
--- a/services/dev/employeeanalytic.services.go
+++ b/services/dev/employeeanalytic.services.go
@@ -0,0 +1,128 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+
+	"go.uber.org/zap"
+)
+
+type EmployeeAnalyticServices struct {
+	EmployeeAnalyticStore db.AppStore
+}
+
+func NewEmployeeAnalyticServices(uStore db.AppStore) *EmployeeAnalyticServices {
+	return &EmployeeAnalyticServices{
+		EmployeeAnalyticStore: uStore,
+	}
+}
+
+func (ea *EmployeeAnalyticServices) GetEmployeeAnalyticBreadcrumb(title string) (models.BreadCrumbV1, error) {
+	breadcrumb := models.BreadCrumbV1{
+		Title: title,
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/dev/dashboard",
+			},
+			{
+				Item: "Employee Health Medical Analytic",
+				Url:  "",
+			},
+		},
+	}
+
+	return breadcrumb, nil
+}
+
+func (ea *EmployeeAnalyticServices) DummyDataTest() ([]models.EmployeeAnalytic, error) {
+	employees := []models.EmployeeAnalytic{
+		{
+			Mgm_McuID:                     1,
+			Mgm_McuLabel:                  "Employee 1",
+			Mgm_McuFlagRelasiBayarSendiri: "Yes",
+			Mgm_McuBisaTambahPemeriksaan:  "No",
+			Mgm_McuCorporateID:            101,
+			Mgm_McuNumber:                 "EMP001",
+			Mgm_McuNumberNational:         "NAT001",
+			Mgm_McuNote:                   "Lorem ipsum dolor sit amet.",
+			Mgm_McuStartDate:              "2024-01-01",
+			Mgm_McuEndDate:                "2024-12-31",
+			Mgm_McuIsActive:               "Y",
+		},
+		{
+			Mgm_McuID:                     2,
+			Mgm_McuLabel:                  "Employee 2",
+			Mgm_McuFlagRelasiBayarSendiri: "No",
+			Mgm_McuBisaTambahPemeriksaan:  "Yes",
+			Mgm_McuCorporateID:            102,
+			Mgm_McuNumber:                 "EMP002",
+			Mgm_McuNumberNational:         "NAT002",
+			Mgm_McuNote:                   "Lorem ipsum dolor sit amet consectetur.",
+			Mgm_McuStartDate:              "2024-02-15",
+			Mgm_McuEndDate:                "2024-11-30",
+			Mgm_McuIsActive:               "Y",
+		},
+	}
+
+	return employees, nil
+}
+
+func (ea *EmployeeAnalyticServices) ListingEmployeeAnalytic(search string, startdate string, enddate string, currentpage int, rowperpage int) ([]models.EmployeeAnalytic, int, error) {
+	logger, _ := zap.NewProduction()
+	var ret []models.EmployeeAnalytic
+	var totalData int
+
+	if len(startdate) == 0 {
+		startdate = "1900-01-01"
+	}
+	if len(enddate) == 0 {
+		enddate = "9999-12-12"
+	}
+
+	prmLabel := "%" + search + "%"
+	offset := (currentpage - 1) * rowperpage
+	q := `
+		SELECT COUNT(*)
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuLabel LIKE ?
+		AND Mgm_McuStartDate >= ?
+		AND Mgm_McuEndDate <= ?
+	`
+	if err := dbx.Handlex.Get(&totalData, q, prmLabel, startdate, enddate); err != nil {
+		return nil, 0, fmt.Errorf("error query get total data: %v", err)
+	}
+
+	q = `
+		SELECT
+		Mgm_McuID,
+		Mgm_McuLabel,
+		Mgm_McuFlagRelasiBayarSendiri,
+		Mgm_McuBisaTambahPemeriksaan,
+		Mgm_McuCorporateID,
+		Mgm_McuNumber,
+		Mgm_McuNumberNational,
+		Mgm_McuNote,
+		DATE_FORMAT(Mgm_McuStartDate, '%d-%m-%Y') AS Mgm_McuStartDate,
+		DATE_FORMAT(Mgm_McuEndDate, '%d-%m-%Y') AS Mgm_McuEndDate,
+		Mgm_McuIsActive
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuLabel LIKE ?
+		AND Mgm_McuStartDate >= ?
+		AND Mgm_McuEndDate <= ?
+		ORDER BY Mgm_McuID ASC
+		LIMIT ? OFFSET ?
+	`
+	if err := dbx.Handlex.Select(&ret, q, prmLabel, startdate, enddate, rowperpage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error query get data: %v", err)
+	}
+	logger.Info("Resp", zap.Any("Respsone", ret))
+
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowperpage)))
+	return ret, totalPage, nil
+}
--- a/services/dev/md.bahan.services.go
+++ b/services/dev/md.bahan.services.go
@@ -0,0 +1,251 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strings"
+
+	"go.uber.org/zap"
+)
+
+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) + "%"
+	filterStation := ""
+	if stationID != "0" {
+		filterStation = "AND T_BahanT_SampleStationID = " + stationID
+
+	}
+	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 ? )
+		
+	` + filterStation
+	if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm); 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 ? )
+		` + filterStation + `
+		LIMIT ? OFFSET ?
+	`
+
+	if err := dbx.Handlex.Select(&bahanList, query, prm, prm, rowPerPage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error querying database: %v", err)
+	}
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowPerPage)))
+
+	return 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(isFilter bool) ([]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)
+	}
+	if isFilter {
+		stationList = append(
+			[]models.TmpSampleStation{{T_SampleStationID: 0, T_SampleStationName: "Semua"}}, stationList...)
+	}
+
+	return stationList, nil
+}
+func (su *MdBahanServices) AddMdBahan(code string, name string, stationid string) (bool, error) {
+	logger, _ := zap.NewProduction()
+	var datacek []models.Bahan
+	qryCek := `SELECT T_BahanCode FROM t_bahan WHERE T_BahanCode = ? AND T_BahanIsActive = 'Y'`
+	err := dbx.Handlex.Select(&datacek, qryCek, code)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error cek data by code",
+			zap.String("code", code),
+			zap.Any("datacek", datacek),
+		)
+		return false, fmt.Errorf("query cek failed")
+	}
+	if len(datacek) > 0 {
+		defer logger.Sync()
+		logger.Error("Code already taken by another data",
+			zap.String("code", code),
+		)
+		return false, fmt.Errorf("code sudah dipakai")
+	}
+	query := `
+		INSERT INTO t_bahan(
+		T_BahanT_SampleStationID,
+		T_BahanCode,
+		T_BahanName,
+		T_BahanCreated,
+		T_BahanCreatedUserID)
+		VALUES(?,?,?, NOW(), 1)
+
+	`
+	rst := dbx.Handlex.MustExec(query, stationid, code, name)
+	_, err = rst.LastInsertId()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error Insert t bahan",
+			zap.Any("code", err),
+		)
+		return false, fmt.Errorf("insert data failed")
+	}
+
+	return true, nil
+}
+func (ug *MdBahanServices) GetMdBahanByID(id string) (models.Bahan, error) {
+	logger, _ := zap.NewProduction()
+
+	var data models.Bahan
+	err := dbx.Handlex.Get(&data,
+		`SELECT t_bahan.*,
+		T_SampleStationID,
+		T_SampleStationName
+		FROM t_bahan
+		JOIN 
+		t_samplestation
+		ON T_BahanT_SampleStationID = T_SampleStationID
+		AND T_BahanIsActive = 'Y'
+		AND T_SampleStationIsActive = 'Y'
+		WHERE T_BahanID = ? `, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data bahan by id vs",
+			zap.String("ID", id),
+			zap.Error(err),
+		)
+		return data, fmt.Errorf("get bahan failed")
+	}
+	return data, nil
+}
+func (su *MdBahanServices) EditMdBahan(id string, code string, name string, stationid string) (bool, error) {
+	logger, _ := zap.NewProduction()
+	var datacek []models.Bahan
+	qryCek := `SELECT T_BahanCode FROM t_bahan WHERE T_BahanCode = ? AND T_BahanIsActive = 'Y' AND T_BahanID <> ?`
+	err := dbx.Handlex.Select(&datacek, qryCek, code, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error cek data by code",
+			zap.String("code", code),
+			zap.Any("datacek", datacek),
+		)
+		return false, fmt.Errorf("query cek failed")
+	}
+	if len(datacek) > 0 {
+		defer logger.Sync()
+		logger.Error("Code already taken by another data",
+			zap.String("code", code),
+		)
+		return false, fmt.Errorf("code sudah dipakai")
+	}
+	query := `
+		UPDATE t_bahan SET
+		T_BahanCode = ?,
+		T_BahanName = ?,
+		T_BahanT_SampleStationID = ?
+		WHERE T_BahanID = ?
+	`
+	rst := dbx.Handlex.MustExec(query, code, name, stationid, id)
+	_, err = rst.LastInsertId()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error edit t bahan",
+			zap.Any("code", err),
+		)
+		return false, fmt.Errorf("edit data failed")
+	}
+
+	return true, nil
+}
+func (su *MdBahanServices) DeleteMdBahan(id string) (bool, error) {
+	logger, _ := zap.NewProduction()
+
+	query := `
+		UPDATE t_bahan
+			SET T_BahanIsActive = 'N',
+			T_BahanDeleted = NOW(),
+			T_BahanDeletedUserID = '1'
+			WHERE T_BahanID = ?
+	`
+	rst := dbx.Handlex.MustExec(query, id)
+	_, err := rst.LastInsertId()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error edit t bahan",
+			zap.Any("code", err),
+		)
+		return false, fmt.Errorf("edit data failed")
+	}
+
+	return true, nil
+}
--- a/services/dev/md.doctor.services.go
+++ b/services/dev/md.doctor.services.go
--- a/services/dev/md.samplestation.services.go
+++ b/services/dev/md.samplestation.services.go
@@ -0,0 +1,277 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strconv"
+	"strings"
+
+	"go.uber.org/zap"
+)
+
+func NewMDSampleStationServices(uStore db.AppStore) *MDSampleStationServices {
+	return &MDSampleStationServices{
+		MDSampleStationStore: uStore,
+	}
+}
+
+type MDSampleStationServices struct {
+	MDSampleStationStore db.AppStore
+}
+
+func (ss *MDSampleStationServices) GetMDSampleStationBreadcrumb() (models.BreadCrumbV1, error) {
+	var ret models.BreadCrumbV1
+
+	Breadcrumb := models.BreadCrumbV1{
+		Title: "Master Sample Station",
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/dev/dashboard",
+			},
+			{
+				Item: "Master",
+				Url:  "/dev/master",
+			},
+			{
+				Item: "Sample Stasion",
+				Url:  "",
+			},
+		},
+	}
+
+	ret = Breadcrumb
+	return ret, nil
+}
+
+func (ss *MDSampleStationServices) GetListSampleStation(search string, currentPage int, rowPerPage int) ([]models.MDSampleStation, int, error) {
+	var sampleStationList []models.MDSampleStation
+	var totalData int
+
+	offset := (currentPage - 1) * rowPerPage
+	prm := "%" + strings.TrimSpace(search) + "%"
+	querytotal := `
+	SELECT COUNT(*)
+	FROM t_samplestation 
+	WHERE T_SampleStationIsActive = 'Y' AND (T_SampleStationCode LIKE ? OR T_SampleStationName LIKE ?)
+	`
+	if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm); err != nil {
+		return nil, 0, fmt.Errorf("error query get total data: %v", err)
+	}
+
+	query := `
+	SELECT
+	T_SampleStationID,
+	T_SampleStationCode,
+	T_SampleStationName,
+	T_SampleStationNat_GroupID,
+	T_SampleStationIsNonLab,
+	T_SampleStationIsActive
+	FROM t_samplestation
+	WHERE T_SampleStationIsActive = 'Y'
+	AND (T_SampleStationCode LIKE ? OR T_SampleStationName LIKE ?)
+	ORDER BY T_SampleStationID ASC
+	LIMIT ? OFFSET ?
+	`
+	if err := dbx.Handlex.Select(&sampleStationList, query, prm, prm, rowPerPage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error query database: %v", err)
+	}
+
+	for i := range sampleStationList {
+		if len(sampleStationList[i].T_SampleStationIsNonLab) == 0 {
+			sampleStationList[i].T_SampleStationIsNonLab = "LAB"
+		}
+	}
+
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowPerPage)))
+
+	return sampleStationList, totalPage, nil
+}
+
+func (ss *MDSampleStationServices) GetMDSampleStationByID(id string) (models.MDSampleStation, error) {
+	logger, _ := zap.NewProduction()
+
+	var ret models.MDSampleStation
+	q := `
+		SELECT
+		T_SampleStationID,
+		T_SampleStationCode,
+		T_SampleStationName,
+		T_SampleStationNat_GroupID,
+		T_SampleStationIsNonLab,
+		T_SampleStationIsActive		
+		FROM t_samplestation 
+		WHERE T_SampleStationID = ?`
+
+	err := dbx.Handlex.Get(&ret, q, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data by ID", zap.String("ID", id), zap.Error(err))
+		return ret, fmt.Errorf("query get data by id failed")
+	}
+
+	if len(ret.T_SampleStationIsNonLab) == 0 {
+		ret.T_SampleStationIsNonLab = "LAB"
+	}
+
+	return ret, nil
+}
+
+func (ss *MDSampleStationServices) GetListGroupSampleStation() ([]models.MDSampleStationGroup, error) {
+	data := []models.MDSampleStationGroup{
+		{
+			ID:    1,
+			Group: "RADIODIAGNOSTIC",
+		},
+		{
+			ID:    2,
+			Group: "ELEKTROMEDIS",
+		},
+		{
+			ID:    3,
+			Group: "LAB",
+		},
+		{
+			ID:    4,
+			Group: "OTHERS",
+		},
+	}
+	return data, nil
+}
+
+func (ss *MDSampleStationServices) AddMDSampleStation(code string, name string, group string) (models.MDSampleStation, error) {
+	logger, _ := zap.NewProduction()
+	var data models.MDSampleStation
+
+	if strings.ToUpper(group) == "LAB" {
+		group = " "
+	}
+
+	// cek existing code & name
+	var count int
+	var prmCode = "%" + code + "%"
+	var prmName = "%" + name + "%"
+	q := `
+		SELECT COUNT(*)
+		FROM t_samplestation
+		WHERE (T_SampleStationCode LIKE ? OR T_SampleStationName LIKE ?) 
+		AND T_SampleStationIsActive = 'Y'
+	`
+	err := dbx.Handlex.Get(&count, q, prmCode, prmName)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("cek duplicate", zap.Any("code", prmCode), zap.Any("name", prmName))
+		return data, fmt.Errorf("query failed to cek duplicate")
+	}
+	if count > 0 {
+		defer logger.Sync()
+		logger.Error("duplicate data", zap.Any("code", code), zap.Any("name", name))
+		return data, fmt.Errorf("duplicate code or name")
+	}
+
+	q = `
+		INSERT INTO t_samplestation (
+			T_SampleStationCode,
+			T_SampleStationName,
+			T_SampleStationIsNonLab,
+			T_SampleStationCreated,
+			T_SampleStationCreatedUserID
+		) VALUES (?,?,?,NOW(),1);
+	`
+	rst := dbx.Handlex.MustExec(q, code, name, group)
+	insertedID, err := rst.LastInsertId()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("error insert data", zap.Any("code", code), zap.Any("name", name), zap.Any("group", group))
+		return data, fmt.Errorf("query failed insert data")
+	}
+
+	s := strconv.Itoa(int(insertedID))
+
+	return ss.GetMDSampleStationByID(s)
+}
+
+func (ss *MDSampleStationServices) EditMDSampleStation(id string, code string, name string, group string) (models.MDSampleStation, error) {
+	logger, _ := zap.NewProduction()
+	var ret models.MDSampleStation
+
+	if strings.ToUpper(group) == "LAB" {
+		group = " "
+	}
+
+	// cek existeing code & name
+	var count int
+	var prmCode = "%" + code + "%"
+	var prmName = "%" + name + "%"
+	q := `
+		SELECT COUNT(*)
+		FROM t_samplestation
+		WHERE (T_SampleStationCode LIKE ? OR T_SampleStationName LIKE ?) 
+		AND T_SampleStationIsActive = 'Y'
+		AND T_SampleStationID <> ?
+	`
+	err := dbx.Handlex.Get(&count, q, prmCode, prmName, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("cek duplicate", zap.Any("code", code), zap.Any("name", name))
+		return ret, fmt.Errorf("query failed to cek duplicate")
+	}
+	if count > 0 {
+		defer logger.Sync()
+		logger.Error("duplicate data", zap.Any("code", code), zap.Any("name", name))
+		return ret, fmt.Errorf("duplicate code or name")
+	}
+
+	// update data
+	q = `
+		UPDATE t_samplestation SET 
+			T_SampleStationCode = ?,
+			T_SampleStationName = ?,
+			T_SampleStationIsNonLab = ?,
+			T_SampleStationLastUpdated = NOW(),
+			T_SampleStationLastUpdatedUserID = 1
+		WHERE T_SampleStationID = ?;
+	`
+	updt := dbx.Handlex.MustExec(q, code, name, group, id)
+	_, err = updt.RowsAffected()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("error update data", zap.Any("code", code), zap.Any("name", name), zap.Any("group", group))
+		return ret, fmt.Errorf("query failed to update data")
+	}
+
+	return ss.GetMDSampleStationByID(id)
+}
+
+func (ss *MDSampleStationServices) DeleteMDSampleStation(id string) (models.MDSampleStation, error) {
+	logger, _ := zap.NewProduction()
+	var ret models.MDSampleStation
+
+	q := `
+	UPDATE t_samplestation
+	SET 
+	T_SampleStationIsActive = 'N',
+	T_SampleStationDeleted = NOW(),
+	T_SampleStationDeletedUserID = '1'
+	WHERE T_SampleStationID = ?;
+	`
+	dlt := dbx.Handlex.MustExec(q, id)
+	_, err := dlt.RowsAffected()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error delete sample station", zap.String("id", id))
+		return ret, fmt.Errorf("query failed")
+	}
+
+	ret, err = ss.GetMDSampleStationByID(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get sample station id", zap.String("id", id))
+		return ret, fmt.Errorf("query failed")
+	}
+
+	return ret, nil
+}
--- a/uploads/doctor/sas02daefc0d842c82ff4ed284f103919da.jpeg
+++ b/uploads/doctor/sas02daefc0d842c82ff4ed284f103919da.jpeg
--- a/uploads/doctor/sas23a552cabaf06d58032c5a15bf1a5de5.443990901
+++ b/uploads/doctor/sas23a552cabaf06d58032c5a15bf1a5de5.443990901
--- a/uploads/doctor/sas31ef4383458421aff961372622e4093f.png
+++ b/uploads/doctor/sas31ef4383458421aff961372622e4093f.png
--- a/uploads/doctor/sas8d5150bae06cbb1a487b581064ad934b.png
+++ b/uploads/doctor/sas8d5150bae06cbb1a487b581064ad934b.png
--- a/uploads/doctor/sasb35bcee2cfbeea6dd6f7a27385fd23b8.319687001
+++ b/uploads/doctor/sasb35bcee2cfbeea6dd6f7a27385fd23b8.319687001
--- a/uploads/doctor/sasf67a56f1704c6984680bb13709c306be.554148301
+++ b/uploads/doctor/sasf67a56f1704c6984680bb13709c306be.554148301
--- a/uploads/doctor/sassas8e03923013e308f7524a9162ba8e9bb2.jpeg
+++ b/uploads/doctor/sassas8e03923013e308f7524a9162ba8e9bb2.jpeg
--- a/uploads/doctor/sassasb46ef8073e21082f41271eb9a414938b.png
+++ b/uploads/doctor/sassasb46ef8073e21082f41271eb9a414938b.png
--- a/views/dev/employeeanalytic/employeeanalytic.templ
+++ b/views/dev/employeeanalytic/employeeanalytic.templ
@@ -0,0 +1,181 @@
+package dev_employeeanalytic
+
+import "cpone/layout"
+import "cpone/component/customtextfield"
+import "cpone/models"
+
+templ EmployeeAnalyticScreen(
+    listID string,
+    paginationID string,
+    breadcrumb templ.Component,
+    filtercomponent templ.Component,
+    listingcomponent templ.Component,
+    paginationcomponent templ.Component,
+) {
+    <div class="container-fluid">
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "listID",
+            Name: "listID",
+            Type: "hidden",
+            Value: listID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+            Name: "paginationID",
+            Type: "hidden",
+            Value: paginationID})
+        <div class="row align-item-center mb-10">
+            <div class="col-md-10 col-sm-12 p-0">
+                @breadcrumb
+            </div>
+        </div>
+        @filtercomponent
+        <div id="loading-parent" class="rounded">
+            @listingcomponent
+            @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 id="loadingcontent"></div>
+    </div>
+}
+
+templ CSSEmployeeAnalytic() {
+    <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;
+        }
+        #div-chart {
+            margin: 40px 10vw 40px 10vw;
+        }
+        .title {
+            font-size: 20px;
+            font-weight: bold;
+        }
+        #title {
+            font-weight: 600;
+        }
+    </style>    
+}
+
+templ JSEmployeeAnalytic() {
+	<script>
+		document.addEventListener('htmx:afterSwap', function(event) {
+			// Reinitialize selectpicker after HTMX content swap
+			$('.selectpicker').selectpicker('refresh');
+		});
+    
+        document.addEventListener('htmx:beforeRequest', function(event) {
+            console.log("Before Request")
+			console.log(event.detail.xhr)
+			console.log(event.detail.target)
+            
+        });
+
+        document.addEventListener('htmx:afterRequest', function(event) {
+            console.log("After Request")
+            console.log(event.detail.xhr)
+			console.log(event.detail.target)
+        });
+        document.addEventListener('htmx:historyCacheError', function(event) {
+            console.log("Error History Cache Error")
+            console.log(event.detail.cause)
+			
+        });
+        document.addEventListener('htmx:historyCacheMissError', function(event) {
+            console.log("Error History Cache Miss Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.path)
+			
+        });
+        document.addEventListener('htmx:oobErrorNoTarget', function(event) {
+            console.log("Error OOB No Target")
+            console.log(event.detail.content)
+        });
+        document.addEventListener('htmx:onLoadError', function(event) {
+            console.log("Error On Load")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.target)
+            console.log(event.detail.exception)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:responseError', function(event) {
+            console.log("Error Response")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:sendError', function(event) {
+            console.log("Error Send Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:sseError', function(event) {
+            console.log("Error Sse ")
+            console.log(event.detail.xhr)
+            console.log(event.detail.error)
+            console.log(event.detail.source)
+        });
+		document.addEventListener('htmx:swapError', function(event) {
+            console.log("Error Swap Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log("Target Swap: "+event.detail.target)
+            console.log(event.detail.requestConfig)
+        });
+		document.addEventListener('htmx:targetError', function(event) {
+            console.log("Error target")
+            console.log(event.detail.elt)
+            console.log("Target ID: "+event.detail.target)
+        });
+    </script>
+}
+
+script BeforeRequestContent() {
+    const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.add("overlay");
+    loadingParent.classList.add("overlay-block");
+    loadingChild.classList.add("overlay-layer");
+    loadingSpinner.classList.remove("d-none");
+}
+
+script AfterRequestContent() {
+    const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.remove("overlay");
+    loadingParent.classList.remove("overlay-block");
+    loadingChild.classList.remove("overlay-layer");
+    loadingSpinner.classList.add("d-none");    
+}
+
+templ ShowEmployeeAnalytic(
+    title string,
+    cmp templ.Component,
+    css templ.Component,
+    js templ.Component,
+    navbaruser templ.Component,
+    userprofile templ.Component,
+) {
+    @layout.EmployeeAnalyticLayout(title, css, js, navbaruser, userprofile) {
+        @cmp
+    }
+}
--- a/views/dev/employeeanalytic/employeeanalytic_templ.go
+++ b/views/dev/employeeanalytic/employeeanalytic_templ.go
@@ -0,0 +1,220 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_employeeanalytic
+
+//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/component/customtextfield"
+import "cpone/models"
+
+func EmployeeAnalyticScreen(
+	listID string,
+	paginationID string,
+	breadcrumb templ.Component,
+	filtercomponent templ.Component,
+	listingcomponent 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: "listID",
+			Name:  "listID",
+			Type:  "hidden",
+			Value: listID}).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-item-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>")
+		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 = listingcomponent.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 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 CSSEmployeeAnalytic() 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)
+		_, 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        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JSEmployeeAnalytic() 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\t\tdocument.addEventListener('htmx:afterSwap', function(event) {\r\n\t\t\t// Reinitialize selectpicker after HTMX content swap\r\n\t\t\t$('.selectpicker').selectpicker('refresh');\r\n\t\t});\r\n    \r\n        document.addEventListener('htmx:beforeRequest', function(event) {\r\n            console.log(\"Before Request\")\r\n\t\t\tconsole.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n            \r\n        });\r\n\r\n        document.addEventListener('htmx:afterRequest', function(event) {\r\n            console.log(\"After Request\")\r\n            console.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n        });\r\n        document.addEventListener('htmx:historyCacheError', function(event) {\r\n            console.log(\"Error History Cache Error\")\r\n            console.log(event.detail.cause)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:historyCacheMissError', function(event) {\r\n            console.log(\"Error History Cache Miss Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.path)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:oobErrorNoTarget', function(event) {\r\n            console.log(\"Error OOB No Target\")\r\n            console.log(event.detail.content)\r\n        });\r\n        document.addEventListener('htmx:onLoadError', function(event) {\r\n            console.log(\"Error On Load\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.target)\r\n            console.log(event.detail.exception)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:responseError', function(event) {\r\n            console.log(\"Error Response\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sendError', function(event) {\r\n            console.log(\"Error Send Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sseError', function(event) {\r\n            console.log(\"Error Sse \")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.error)\r\n            console.log(event.detail.source)\r\n        });\r\n\t\tdocument.addEventListener('htmx:swapError', function(event) {\r\n            console.log(\"Error Swap Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target Swap: \"+event.detail.target)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n\t\tdocument.addEventListener('htmx:targetError', function(event) {\r\n            console.log(\"Error target\")\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target ID: \"+event.detail.target)\r\n        });\r\n    </script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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_848c`,
+		Function: `function __templ_AfterRequestContent_848c(){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_848c`),
+		CallInline: templ.SafeScriptInline(`__templ_AfterRequestContent_848c`),
+	}
+}
+
+func ShowEmployeeAnalytic(
+	title string,
+	cmp templ.Component,
+	css templ.Component,
+	js 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_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Var5 := 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.EmployeeAnalyticLayout(title, css, js, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), 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/employeeanalytic/filteremployeeanalytic.templ
+++ b/views/dev/employeeanalytic/filteremployeeanalytic.templ
@@ -0,0 +1,68 @@
+package dev_employeeanalytic
+
+templ FilterListing(
+    hxGet string,
+    hxTrigger string,
+    hxInclude string,
+    hxSwap string,
+    hxTarget string,
+    hxBeforeRequest templ.ComponentScript,
+    hxAfterRequest templ.ComponentScript,
+) {
+    <div class="row pt-8 align-items-center">
+        <div class="col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2">
+            <label class="text-black font-weight-bolder">Stard Date:</label>
+        </div>
+        <div class="col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2">
+            <input 
+                id="startdateID" 
+                name="startdate"
+                class="form-control form-control-lg bg-field border-0 rounded-lg" 
+                type="date" 
+                autocomplete="off"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                hx-on::before-request={ hxBeforeRequest }
+                hx-on::after-request={ hxAfterRequest }
+            />
+        </div>
+        <div class="col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2">
+            <label class="text-black font-weight-bolder">End Date:</label>
+        </div>
+        <div class="col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2">
+            <input 
+                id="enddateID"
+                name="enddate"
+                class="form-control form-control-lg bg-field border-0 rounded-lg" 
+                type="date" 
+                autocomplete="off"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                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">
+            <input 
+                id="searchID"
+                name="search"
+                class="form-control form-control-lg bg-field border-0 rounded-lg"
+                type="text"
+                placeholder="nama karyawan"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                hx-on::before-request={ hxBeforeRequest }
+                hx-on::after-request={ hxAfterRequest }
+            />
+        </div>
+    </div>
+}
--- a/views/dev/employeeanalytic/filteremployeeanalytic_templ.go
+++ b/views/dev/employeeanalytic/filteremployeeanalytic_templ.go
@@ -0,0 +1,316 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_employeeanalytic
+
+//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"
+
+func FilterListing(
+	hxGet string,
+	hxTrigger string,
+	hxInclude string,
+	hxSwap string,
+	hxTarget 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_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=\"row pt-8 align-items-center\"><div class=\"col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2\"><label class=\"text-black font-weight-bolder\">Stard Date:</label></div><div class=\"col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 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=\"startdateID\" name=\"startdate\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"date\" autocomplete=\"off\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 23, Col: 30}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 24, Col: 38}
+		}
+		_, 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("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 25, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 26, Col: 32}
+		}
+		_, 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-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 27, Col: 36}
+		}
+		_, 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-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div><div class=\"col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2\"><label class=\"text-black font-weight-bolder\">End Date:</label></div><div class=\"col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 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=\"enddateID\" name=\"enddate\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"date\" autocomplete=\"off\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 42, Col: 30}
+		}
+		_, 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-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 43, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 44, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 45, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 46, Col: 36}
+		}
+		_, 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-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var14 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.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_Var15 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></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("<input id=\"searchID\" name=\"search\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"text\" placeholder=\"nama karyawan\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 58, Col: 30}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 59, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 60, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 61, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var20 string
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 62, Col: 36}
+		}
+		_, 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("\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var21 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var22 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/employeeanalytic/listingemployeeanalytic.templ
+++ b/views/dev/employeeanalytic/listingemployeeanalytic.templ
@@ -0,0 +1,41 @@
+package dev_employeeanalytic
+
+import "cpone/models"
+import "strconv"
+
+templ ListingData(
+    data []models.EmployeeAnalytic,
+    listID string,
+) {
+    <div id={listID} class="align-items-center pt-8 flex-column" hx-swap-oob="true">
+        <div class="bg-field rounded">
+            <div class="p-8">
+                for i, d := range data {
+                    if i == (len(data) - 1)  {
+                        <div id={ strconv.Itoa(int(d.Mgm_McuID)) } class="card shadow p-8">
+                            @ItemCard(d)
+                        </div>
+                    } else {
+                        <div id={ strconv.Itoa(int(d.Mgm_McuID)) } class="card shadow p-8 mb-8">
+                            @ItemCard(d)
+                        </div>        
+                    }
+                }
+            </div>
+        </div>
+    </div>
+}
+
+templ ItemCard(data models.EmployeeAnalytic) {
+    <div class="row d-flex align-items-center">
+        <div class="col-7">
+            <h3 class="text-black">{ data.Mgm_McuLabel }</h3>
+        </div>
+        <div class="col-md col-lg text-right">
+            <span class="text-black font-weight-bolder">{ data.Mgm_McuNote }</span>
+        </div>
+        <div class="col-md col-lg text-right">
+            <span class="text-black font-weight-bolder">{ data.Mgm_McuStartDate } - { data.Mgm_McuEndDate }</span>
+        </div>
+    </div>    
+}
--- a/views/dev/employeeanalytic/listingemployeeanalytic_templ.go
+++ b/views/dev/employeeanalytic/listingemployeeanalytic_templ.go
@@ -0,0 +1,189 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_employeeanalytic
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/models"
+import "strconv"
+
+func ListingData(
+	data []models.EmployeeAnalytic,
+	listID string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(listID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 10, Col: 19}
+		}
+		_, 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("\" class=\"align-items-center pt-8 flex-column\" hx-swap-oob=\"true\"><div class=\"bg-field rounded\"><div class=\"p-8\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i, d := range data {
+			if i == (len(data) - 1) {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var3 string
+				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID)))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 15, Col: 64}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = ItemCard(d).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var4 string
+				templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID)))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 19, Col: 64}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8 mb-8\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = ItemCard(d).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</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 ItemCard(data models.EmployeeAnalytic) 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("<div class=\"row d-flex align-items-center\"><div class=\"col-7\"><h3 class=\"text-black\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuLabel)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 32, Col: 54}
+		}
+		_, 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("</h3></div><div class=\"col-md col-lg text-right\"><span class=\"text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuNote)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 35, Col: 74}
+		}
+		_, 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("</span></div><div class=\"col-md col-lg text-right\"><span class=\"text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuStartDate)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 38, Col: 79}
+		}
+		_, 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(" - ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuEndDate)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 38, Col: 105}
+		}
+		_, 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("</span></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/mdbahan/mdbahan.templ
+++ b/views/dev/mdbahan/mdbahan.templ
@@ -0,0 +1,265 @@
+package dev_mdbahanview
+
+import "cpone/layout"
+import "cpone/models"
+import "cpone/component/customtextfield"
+import "cpone/component/customdropdown"
+import "strconv"
+
+templ MdBahanScreen(
+	tableID string,
+	paginationID string,
+	dialogAddID string,
+	dialogAddBodyID string,
+	dialogEditID string,
+	dialogEditBodyID string,
+	dialogDeleteID string,
+	dialogDeleteBodyID string,
+	breadcrumb templ.Component,
+	tablecontent templ.Component,
+	filterComponent templ.Component,
+	pagination templ.Component,
+	dialogAddCmp templ.Component,
+	dialogEditCmp templ.Component,
+	dialogDeleteCmp templ.Component,
+) {
+	<div class="container-fluid">
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddID",
+			Name:  "dialogAddID",
+			Type:  "hidden",
+			Value: dialogAddID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddBodyID",
+			Name:  "dialogAddBodyID",
+			Type:  "hidden",
+			Value: dialogAddBodyID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID",
+			Name:  "dialogEditID",
+			Type:  "hidden",
+			Value: dialogEditID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID",
+			Name:  "dialogEditBodyID",
+			Type:  "hidden",
+			Value: dialogEditBodyID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID",
+			Name:  "dialogDeleteID",
+			Type:  "hidden",
+			Value: dialogDeleteID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteBodyID",
+			Name:  "dialogDeleteBodyID",
+			Type:  "hidden",
+			Value: dialogDeleteBodyID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+			Name:  "tableID",
+			Type:  "hidden",
+			Value: tableID})
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+			Name:  "paginationID",
+			Type:  "hidden",
+			Value: paginationID})
+		<div class="row align-items-center mb-10">
+			<div class="col-md-10 col-sm-12 p-0 ">
+				@breadcrumb
+			</div>
+			<div class="col-md-2 d-none d-lg-block d-xl-block d-md-block d-sm-none">
+				// <div class="d-block align-items-center">
+				<div class="d-flex justify-content-end">
+					<button
+						type="button"
+						class="btn btn-primary"
+						data-toggle="modal"
+						data-target={ "#" + dialogAddID }
+					>Add New</button>
+				</div>
+			</div>
+			<div class="col-md-2 d-block d-lg-none d-xl-none d-md-none d-sm-block justify-content-center px-5">
+				<button
+					type="button"
+					class="btn btn-primary btn-block"
+					data-toggle="modal"
+					data-target={ "#" + dialogAddID }
+				>Add New</button>
+			</div>
+		</div>
+		<div id="loading-parent" class=" rounded">
+			@filterComponent
+			@tablecontent
+			@pagination
+			<div id="loading-child" class=" rounded bg-transparent">
+				// <div class="spinner spinner-lg spinner-primary"></div>
+				<div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
+					<span class="sr-only">Loading...</span>
+				</div>
+			</div>
+		</div>
+		<div id="loadingcontent"></div>
+		@dialogAddCmp
+		@dialogEditCmp
+		@dialogDeleteCmp
+	</div>
+}
+
+templ CssMdUserGroup() {
+}
+
+templ JsMdBahan() {
+	<script>
+		document.addEventListener('htmx:afterSwap', function(event) {
+			// Reinitialize selectpicker after HTMX content swap
+			$('.selectpicker').selectpicker('refresh');
+		});
+    
+        document.addEventListener('htmx:beforeRequest', function(event) {
+            console.log("Before Request")
+			console.log(event.detail.xhr)
+			console.log(event.detail.target)
+            
+        });
+
+        document.addEventListener('htmx:afterRequest', function(event) {
+            console.log("After Request")
+            console.log(event.detail.xhr)
+			console.log(event.detail.target)
+        });
+        document.addEventListener('htmx:historyCacheError', function(event) {
+            console.log("Error History Cache Error")
+            console.log(event.detail.cause)
+			
+        });
+        document.addEventListener('htmx:historyCacheMissError', function(event) {
+            console.log("Error History Cache Miss Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.path)
+			
+        });
+        document.addEventListener('htmx:oobErrorNoTarget', function(event) {
+            console.log("Error OOB No Target")
+            console.log(event.detail.content)
+        });
+        document.addEventListener('htmx:onLoadError', function(event) {
+            console.log("Error On Load")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.target)
+            console.log(event.detail.exception)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:responseError', function(event) {
+            console.log("Error Response")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:sendError', function(event) {
+            console.log("Error Send Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:sseError', function(event) {
+            console.log("Error Sse ")
+            console.log(event.detail.xhr)
+            console.log(event.detail.error)
+            console.log(event.detail.source)
+        });
+		document.addEventListener('htmx:swapError', function(event) {
+            console.log("Error Swap Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log("Target Swap: "+event.detail.target)
+            console.log(event.detail.requestConfig)
+        });
+		document.addEventListener('htmx:targetError', function(event) {
+            console.log("Error target")
+            console.log(event.detail.elt)
+            console.log("Target ID: "+event.detail.target)
+        });
+    </script>
+}
+
+script BeforeRequestContent() {
+			const loadingParent = document.getElementById("loading-parent");
+			const loadingChild = document.getElementById("loading-child");
+			const loadingSpinner = document.getElementById("loading-spinner");
+
+			loadingParent.classList.add("overlay");
+			loadingParent.classList.add("overlay-block");
+			loadingChild.classList.add("overlay-layer");
+			loadingSpinner.classList.remove("d-none");
+}
+
+script AfterRequestContent() {
+			const loadingParent = document.getElementById("loading-parent");
+			const loadingChild = document.getElementById("loading-child");
+			const loadingSpinner = document.getElementById("loading-spinner");
+
+			loadingParent.classList.remove("overlay");
+			loadingParent.classList.remove("overlay-block");
+			loadingChild.classList.remove("overlay-layer");
+			loadingSpinner.classList.add("d-none");
+}
+
+templ MdBahanFilter(
+	hxGet string,
+	hxTrigger string,
+	hxInclude string,
+	hxSwap string,
+	hxTarget string,
+	dataStation []models.TmpSampleStation,
+	selectedIdStation int,
+	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">
+				@customdropdown.CustomDropdownFilter("filter-station",
+					"filterstation",
+					hxInclude,
+					hxGet,
+					hxSwap,
+					hxTarget,
+					"change",
+					hxBeforeRequest,
+					hxAfterRequest, ListItemStation(dataStation, selectedIdStation))
+			</div>
+		</div>
+	</div>
+}
+
+templ ListItemStation(
+	dataStation []models.TmpSampleStation,
+	selectedIdStation int) {
+	for _, v := range dataStation {
+		if v.T_SampleStationID == selectedIdStation {
+			<option value={ strconv.Itoa(v.T_SampleStationID) } selected="selected">{ v.T_SampleStationName }</option>
+		} else {
+			<option value={ strconv.Itoa(v.T_SampleStationID) }>{ v.T_SampleStationName }</option>
+		}
+	}
+}
+
+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
@@ -0,0 +1,531 @@
+// 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"
+import "cpone/component/customdropdown"
+import "strconv"
+
+func MdBahanScreen(
+	tableID string,
+	paginationID string,
+	dialogAddID string,
+	dialogAddBodyID string,
+	dialogEditID string,
+	dialogEditBodyID string,
+	dialogDeleteID string,
+	dialogDeleteBodyID string,
+	breadcrumb templ.Component,
+	tablecontent templ.Component,
+	filterComponent templ.Component,
+	pagination templ.Component,
+	dialogAddCmp templ.Component,
+	dialogEditCmp templ.Component,
+	dialogDeleteCmp templ.Component,
+) 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: "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 = 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\" 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\mdbahan\mdbahan.templ`, Line: 70, Col: 37}
+		}
+		_, 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\mdbahan\mdbahan.templ`, Line: 79, Col: 36}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Add New</button></div></div><div 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>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = dialogAddCmp.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = dialogEditCmp.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = dialogDeleteCmp.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = 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_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\t\tdocument.addEventListener('htmx:afterSwap', function(event) {\r\n\t\t\t// Reinitialize selectpicker after HTMX content swap\r\n\t\t\t$('.selectpicker').selectpicker('refresh');\r\n\t\t});\r\n    \r\n        document.addEventListener('htmx:beforeRequest', function(event) {\r\n            console.log(\"Before Request\")\r\n\t\t\tconsole.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n            \r\n        });\r\n\r\n        document.addEventListener('htmx:afterRequest', function(event) {\r\n            console.log(\"After Request\")\r\n            console.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n        });\r\n        document.addEventListener('htmx:historyCacheError', function(event) {\r\n            console.log(\"Error History Cache Error\")\r\n            console.log(event.detail.cause)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:historyCacheMissError', function(event) {\r\n            console.log(\"Error History Cache Miss Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.path)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:oobErrorNoTarget', function(event) {\r\n            console.log(\"Error OOB No Target\")\r\n            console.log(event.detail.content)\r\n        });\r\n        document.addEventListener('htmx:onLoadError', function(event) {\r\n            console.log(\"Error On Load\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.target)\r\n            console.log(event.detail.exception)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:responseError', function(event) {\r\n            console.log(\"Error Response\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sendError', function(event) {\r\n            console.log(\"Error Send Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sseError', function(event) {\r\n            console.log(\"Error Sse \")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.error)\r\n            console.log(event.detail.source)\r\n        });\r\n\t\tdocument.addEventListener('htmx:swapError', function(event) {\r\n            console.log(\"Error Swap Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target Swap: \"+event.detail.target)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n\t\tdocument.addEventListener('htmx:targetError', function(event) {\r\n            console.log(\"Error target\")\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target ID: \"+event.detail.target)\r\n        });\r\n    </script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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 int,
+	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_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=\"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_Var7 string
+		templ_7745c5c3_Var7, 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: 222, Col: 25}
+		}
+		_, 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-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, 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: 223, Col: 27}
+		}
+		_, 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-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, 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: 224, Col: 27}
+		}
+		_, 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-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, 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: 225, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, 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: 226, Col: 21}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></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 = customdropdown.CustomDropdownFilter("filter-station",
+			"filterstation",
+			hxInclude,
+			hxGet,
+			hxSwap,
+			hxTarget,
+			"change",
+			hxBeforeRequest,
+			hxAfterRequest, ListItemStation(dataStation, selectedIdStation)).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ListItemStation(
+	dataStation []models.TmpSampleStation,
+	selectedIdStation int) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var14 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var14 == nil {
+			templ_7745c5c3_Var14 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		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_Var15 string
+				templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.T_SampleStationID))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 251, Col: 52}
+				}
+				_, 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("\" selected=\"selected\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var16 string
+				templ_7745c5c3_Var16, 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: 251, Col: 98}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</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_Var17 string
+				templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.T_SampleStationID))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahan.templ`, Line: 253, Col: 52}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var18 string
+				templ_7745c5c3_Var18, 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: 253, Col: 78}
+				}
+				_, 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("</option>")
+				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_Var19 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var19 == nil {
+			templ_7745c5c3_Var19 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Var20 := 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_Var20), 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
@@ -0,0 +1,189 @@
+package dev_mdbahanview
+
+import "cpone/models"
+import "cpone/component/modal"
+import "cpone/component/customtextfield"
+import "cpone/component/customdropdown"
+
+templ BahanForm(data models.BahanFormComponent) {
+	<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 BodyFormBahan(inputId string,
+	inputCode models.CustomTextFieldv2Prm,
+	inputName models.CustomTextFieldv2Prm,
+	inputStation models.CustomDropdownV2Prm,
+	componentID string,
+	hxOnLoad templ.ComponentScript) {
+	<div id={ componentID } hx-on::load={ hxOnLoad }>
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{Name: "bahanid", ID: "bahanID", Type: "hidden", Value: inputId})
+		@customtextfield.CustomTextFieldv2(
+			inputCode)
+		@customtextfield.CustomTextFieldv2(
+			inputName)
+		@customdropdown.CustomDropdownForm(inputStation)
+	</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 ActionFormBahan(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 BtnCloseFormBahan(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 string,
+	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(models.CustomTextFieldv2Prm{Name: "bahanid", ID: "bahanID", Type: "hidden", Value: inputId})
+	</div>
+}
+
+templ ActionFormBahanDelete(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/mddoctor/mddoctorformmodal_templ.go
+++ b/views/dev/mddoctor/mddoctorformmodal_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

 // templ: version: v0.2.663
-package dev_mddoctorview
+package dev_mdbahanview

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

@@ -14,10 +14,8 @@ import "cpone/models"
 import "cpone/component/modal"
 import "cpone/component/customtextfield"
 import "cpone/component/customdropdown"
-import "cpone/component/customradiobutton"
-import "cpone/component/customuploadfotodokterv0"

-func DoctorForm(data models.DoctorFormComponent) templ.Component {
+func BahanForm(data models.BahanFormComponent) 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 {
@@ -38,14 +36,14 @@ func DoctorForm(data models.DoctorFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<form hx-encoding=\"multipart/form-data\" id=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<form id=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(data.IDComponent)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 14, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 11, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -58,7 +56,7 @@ func DoctorForm(data models.DoctorFormComponent) templ.Component {
 		var templ_7745c5c3_Var3 string
 		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(data.Link)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 15, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 12, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
@@ -71,7 +69,7 @@ func DoctorForm(data models.DoctorFormComponent) templ.Component {
 		var templ_7745c5c3_Var4 string
 		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxTarget)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 17, Col: 28}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 14, Col: 28}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
@@ -84,7 +82,7 @@ func DoctorForm(data models.DoctorFormComponent) templ.Component {
 		var templ_7745c5c3_Var5 string
 		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxSwap)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 18, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 15, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 		if templ_7745c5c3_Err != nil {
@@ -97,7 +95,7 @@ func DoctorForm(data models.DoctorFormComponent) templ.Component {
 		var templ_7745c5c3_Var6 string
 		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxInclude)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 19, Col: 30}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 16, Col: 30}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
@@ -125,7 +123,7 @@ func DoctorForm(data models.DoctorFormComponent) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = modalcomponent.ModalXL(data.ModalID,
+		templ_7745c5c3_Err = modalcomponent.Modal(data.ModalID,
 			data.ModalTitle,
 			data.DialogBody,
 			data.DialogAction,
@@ -188,43 +186,10 @@ func HandleFormAfterRequest() templ.ComponentScript {
 	}
 }

-func BodyFormDoctor(
-	inputId models.CustomTextFieldv2Prm,
-	inputTglNow models.CustomTextFieldv2Prm,
-	inputTglLahirEdit models.CustomTextFieldv2Prm,
-	dropdownDoctorSapaan models.CustomDropdownv1Prm,
-	listItemSapaan templ.Component,
-	InputImbuhanAwal1 models.CustomTextFieldv2Prm,
-	InputImbuhanAwal2 models.CustomTextFieldv2Prm,
-	dropdownDoctorJenisKelamin models.CustomDropdownv1Prm,
-	listItemJenisKelamin templ.Component,
-	dropdownDoctorGolonganDarah models.CustomDropdownv1Prm,
-	listItemGolonganDarah templ.Component,
-	radiobuttonDoctorKewarganegaraan models.CustomRadioButtonv1Prm,
-	listItemKewarganegaraan templ.Component,
-	InputNomorIdentitas models.CustomTextFieldv2Prm,
-	dropdownDoctorSpesialis models.CustomDropdownv1Prm,
-	listItemSpesialis templ.Component,
-	InputImbuhanAkhir1 models.CustomTextFieldv2Prm,
-	InputImbuhanAkhir2 models.CustomTextFieldv2Prm,
-	InputTahun models.CustomTextFieldv2Prm,
-	InputBulan models.CustomTextFieldv2Prm,
-	InputHari models.CustomTextFieldv2Prm,
-	dropdownDoctorPend models.CustomDropdownv1Prm,
-	listItemPend templ.Component,
-	dropdownDoctorIdentitas models.CustomDropdownv1Prm,
-	listItemIdentitas templ.Component,
-	InputEmail models.CustomTextFieldv2Prm,
-	InputNama models.CustomTextFieldv2Prm,
-	InputTanggalLahir models.CustomTextFieldv2Prm,
-	dropdownDoctorBloodRhesus models.CustomDropdownv1Prm,
-	listItemBloodRhesus templ.Component,
-	dropdownDoctorEtnis models.CustomDropdownv1Prm,
-	listItemEtnis templ.Component,
-	InputNomorHP models.CustomTextFieldv2Prm,
-	dropdownDoctorAgama models.CustomDropdownv1Prm,
-	listItemAgama templ.Component,
-	inputUploadFoto models.CustomUploadFotoPrmV0,
+func BodyFormBahan(inputId string,
+	inputCode models.CustomTextFieldv2Prm,
+	inputName models.CustomTextFieldv2Prm,
+	inputStation models.CustomDropdownV2Prm,
 	componentID string,
 	hxOnLoad templ.ComponentScript) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
@@ -250,7 +215,7 @@ func BodyFormDoctor(
 		var templ_7745c5c3_Var10 string
 		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 104, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 68, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
@@ -265,242 +230,29 @@ func BodyFormDoctor(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><div class=\"wrapperx p-5 h-100\"><!-- person.png start -->")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customuploadfotodokterv0.CustomUploadFotoWithPreviewDokterV0(inputUploadFoto).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- person.png end -->")
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{Name: "bahanid", ID: "bahanID", Type: "hidden", Value: inputId}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			inputId).Render(ctx, templ_7745c5c3_Buffer)
+			inputCode).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			inputTglNow).Render(ctx, templ_7745c5c3_Buffer)
+			inputName).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			inputTglLahirEdit).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = customdropdown.CustomDropdownForm(inputStation).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row mt-5\"><!-- col 1 start --><div class=\"col-4\"><div class=\"form-row\"><!-- sapaan start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorSapaan,
-			listItemSapaan).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- end start --><!-- Imbuhan awal 1 start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputImbuhanAwal1).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Imbuhan awal 1 end --><!-- Imbuhan awal 2 start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputImbuhanAwal2).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Imbuhan awal 2 end --></div><!-- jenis kelamin --><div class=\"form-row mt-0\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorJenisKelamin,
-			listItemJenisKelamin).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- jenis kelamin --><!-- golongan darah --><div class=\"form-row mt-0\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorGolonganDarah,
-			listItemGolonganDarah).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- golongan darah --></div><!-- col 1 end --><!-- col 2 start --><div class=\"col-4\"><div class=\"form-row\"><!-- Nama start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputNama).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Nama end --></div><div class=\"form-row\"><!-- TanggalLahir start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputTanggalLahir).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- TanggalLahir end --></div><div class=\"form-row\"><!-- BloodRhesus start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorBloodRhesus,
-			listItemBloodRhesus).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- BloodRhesus end --></div></div><!-- col 3 start --><div class=\"col-4\"><div class=\"form-row\"><!-- Imbuhan akhir 1 start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputImbuhanAkhir1).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Imbuhan akhir 1 end --><!-- Imbuhan akhir 2 start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputImbuhanAkhir2).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Imbuhan akhir 2 end --></div><div class=\"form-row mt-0\"><!-- Tahun start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputTahun).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Tahun end --><!-- Bulan start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputBulan).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Bulan end --><!-- Hari --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputHari).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Hari --></div><!-- pendidikan --><div class=\"form-row mt-0\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorPend,
-			listItemPend).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- pendidikan --></div><!-- col 3 start --></div><!-- alamat start --><div class=\"row mt-5\"></div><!-- alamat end --><div class=\"row mt-5\"><!-- col 1 start --><div class=\"col-4\"><!-- Kewarganegaraan --><div class=\"form-row mt-0\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customradiobuttoninline.MainCustomRadioButtonInputV0(
-			radiobuttonDoctorKewarganegaraan,
-			listItemKewarganegaraan).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Kewarganegaraan --><!-- Identitas --><div class=\"form-row mt-8\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorIdentitas,
-			listItemIdentitas).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- spesialis --><div class=\"form-row mt-0\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorSpesialis,
-			listItemSpesialis).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- spesialis --></div><!-- col 1 end --><!-- col 2 start --><div class=\"col-4\"><div class=\"form-row\"><!-- Etnis start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorEtnis,
-			listItemEtnis).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Etnis end --></div><div class=\"form-row\"><!-- Nomor Identitas start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputNomorIdentitas).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Nomor Identitas end --></div><div class=\"form-row mt-0\"><!-- Email start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputEmail).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Email end --></div></div><!-- col 2 start --><!-- col 3 start --><div class=\"col-4\"><div class=\"form-row\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInputV0(
-			dropdownDoctorAgama,
-			listItemAgama).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"form-row mt-0\"><!-- Nomor HP start --><div class=\"col\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(
-			InputNomorHP).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Nomor HP end --></div></div><!-- col 3 start --></div></div></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -511,20 +263,20 @@ func BodyFormDoctor(
 	})
 }

-func JsHideModalDoctor(modalID string) templ.ComponentScript {
+func JsHideModal(modalID string) templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_JsHideModalDoctor_da6c`,
-		Function: `function __templ_JsHideModalDoctor_da6c(modalID){$(modalID).modal('hide')
+		Name: `__templ_JsHideModal_da6c`,
+		Function: `function __templ_JsHideModal_da6c(modalID){$(modalID).modal('hide')
 }`,
-		Call:       templ.SafeScript(`__templ_JsHideModalDoctor_da6c`, modalID),
-		CallInline: templ.SafeScriptInline(`__templ_JsHideModalDoctor_da6c`, modalID),
+		Call:       templ.SafeScript(`__templ_JsHideModal_da6c`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_JsHideModal_da6c`, modalID),
 	}
 }

-func JsShowModalDoctor(modalID string) templ.ComponentScript {
+func JsShowModal(modalID string) templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_JsShowModalDoctor_b74d`,
-		Function: `function __templ_JsShowModalDoctor_b74d(modalID){$(modalID).modal('show')
+		Name: `__templ_JsShowModal_b74d`,
+		Function: `function __templ_JsShowModal_b74d(modalID){$(modalID).modal('show')
 	const btnactcancel = document.querySelectorAll('.btnactcancel');
 	const btnactsavedata = document.querySelectorAll('.btnactsavedata');

@@ -538,12 +290,12 @@ func JsShowModalDoctor(modalID string) templ.ComponentScript {
 		
 	}
 }`,
-		Call:       templ.SafeScript(`__templ_JsShowModalDoctor_b74d`, modalID),
-		CallInline: templ.SafeScriptInline(`__templ_JsShowModalDoctor_b74d`, modalID),
+		Call:       templ.SafeScript(`__templ_JsShowModal_b74d`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_JsShowModal_b74d`, modalID),
 	}
 }

-func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
+func ActionFormBahan(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -560,7 +312,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JsHideModalDoctor(modalID))
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JsHideModal(modalID))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -568,7 +320,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var13 templ.ComponentScript = JsHideModalDoctor(modalID)
+		var templ_7745c5c3_Var13 templ.ComponentScript = JsHideModal(modalID)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -580,7 +332,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
 		var templ_7745c5c3_Var14 string
 		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 350, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 102, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 		if templ_7745c5c3_Err != nil {
@@ -593,7 +345,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
 		var templ_7745c5c3_Var15 string
 		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 351, Col: 26}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 103, Col: 26}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
 		if templ_7745c5c3_Err != nil {
@@ -606,7 +358,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
 		var templ_7745c5c3_Var16 string
 		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 352, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 104, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
 		if templ_7745c5c3_Err != nil {
@@ -623,7 +375,7 @@ func ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string,
 	})
 }

-func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
+func BtnCloseFormBahan(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -636,7 +388,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
 			templ_7745c5c3_Var17 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JsHideModalDoctor(modalID))
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JsHideModal(modalID))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -647,7 +399,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
 		var templ_7745c5c3_Var18 string
 		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 373, Col: 21}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 125, Col: 21}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
 		if templ_7745c5c3_Err != nil {
@@ -660,7 +412,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
 		var templ_7745c5c3_Var19 string
 		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 374, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 126, Col: 25}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
 		if templ_7745c5c3_Err != nil {
@@ -673,7 +425,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
 		var templ_7745c5c3_Var20 string
 		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 375, Col: 23}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 127, Col: 23}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
 		if templ_7745c5c3_Err != nil {
@@ -683,7 +435,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var21 templ.ComponentScript = JsHideModalDoctor(modalID)
+		var templ_7745c5c3_Var21 templ.ComponentScript = JsHideModal(modalID)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -699,7 +451,7 @@ func BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string
 	})
 }

-func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
+func DeleteConfirmationBody(inputId string,
 	componentID string,
 	message string,
 	datHeader []string,
@@ -728,7 +480,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
 		var templ_7745c5c3_Var23 string
 		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 392, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 144, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 		if templ_7745c5c3_Err != nil {
@@ -750,7 +502,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
 		var templ_7745c5c3_Var25 string
 		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(message)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 393, Col: 14}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 145, Col: 14}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
 		if templ_7745c5c3_Err != nil {
@@ -768,7 +520,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
 			var templ_7745c5c3_Var26 string
 			templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(v)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 398, Col: 68}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 150, Col: 68}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
 			if templ_7745c5c3_Err != nil {
@@ -791,7 +543,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
 			var templ_7745c5c3_Var27 string
 			templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(v)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 404, Col: 10}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 156, Col: 10}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
 			if templ_7745c5c3_Err != nil {
@@ -806,7 +558,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputId).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{Name: "bahanid", ID: "bahanID", Type: "hidden", Value: inputId}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -821,7 +573,7 @@ func DeleteConfirmationBodyDoctor(inputId models.CustomTextFieldv2Prm,
 	})
 }

-func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
+func ActionFormBahanDelete(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -838,7 +590,7 @@ func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose st
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JsHideModalDoctor(modalID))
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JsHideModal(modalID))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -846,7 +598,7 @@ func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose st
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var29 templ.ComponentScript = JsHideModalDoctor(modalID)
+		var templ_7745c5c3_Var29 templ.ComponentScript = JsHideModal(modalID)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var29.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -858,7 +610,7 @@ func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose st
 		var templ_7745c5c3_Var30 string
 		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 418, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 170, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
 		if templ_7745c5c3_Err != nil {
@@ -871,7 +623,7 @@ func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose st
 		var templ_7745c5c3_Var31 string
 		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 419, Col: 26}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 171, Col: 26}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
 		if templ_7745c5c3_Err != nil {
@@ -884,7 +636,7 @@ func ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose st
 		var templ_7745c5c3_Var32 string
 		templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctorformmodal.templ`, Line: 420, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahanformmodal.templ`, Line: 172, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
 		if templ_7745c5c3_Err != nil {
--- a/views/dev/mddoctor/mddoctortable.templ
+++ b/views/dev/mddoctor/mddoctortable.templ
@@ -1,10 +1,10 @@
-package dev_mddoctorview
+package dev_mdbahanview

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

-templ TableDoctor(data []models.DoctorV1,
+templ TableBahan(data []models.Bahan,
 	tableID string,
 	hxGetEdit string,
 	hxTargetEdit string,
@@ -16,9 +16,9 @@ templ TableDoctor(data []models.DoctorV1,
 	hxIncludeDelete string,
 ) {
 	<div id={ tableID } hx-swap-oob="true">
-		@tablecomponent.TableV3([]string{"DOCTOR CODE", "NAMA", "ALAMAT", "NO HP", "SPESIALIS", "AKSI"},
-			[]string{"15%", "20%", "25%", "5%", "15%", "20%"},
-			RowDoctor(data,
+		@tablecomponent.TableV3([]string{"KODE", "NAMA BAHAN", "SAMPLE STATION", "AKSI"},
+			[]string{"20%", "30%", "30%", "20%"},
+			RowBahan(data,
 				hxGetEdit,
 				hxTargetEdit,
 				hxSwapEdit,
@@ -31,11 +31,7 @@ templ TableDoctor(data []models.DoctorV1,
 	</div>
 }

-templ EmptyDivDoctor() {
-	<div></div>
-}
-
-templ RowDoctor(data []models.DoctorV1,
+templ RowBahan(data []models.Bahan,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -47,18 +43,16 @@ templ RowDoctor(data []models.DoctorV1,
 ) {
 	if len(data) == 0 {
 		<tr>
-			<td colspan="3" class="text-center">Data Tidak Ditemukan</td>
+			<td colspan="4" class="text-center">Data Tidak Ditemukan</td>
 		</tr>
 	}
 	for _, v := range data {
 		<tr>
-			<td>{ v.M_DoctorCode }</td>
-			<td>{ v.M_DoctorName }</td>
-			<td>{ v.M_DoctorAddress }</td>
-			<td>{ v.M_DoctorHp }</td>
-			<td>{ v.M_SpecialistName }</td>
+			<td>{ v.T_BahanCode }</td>
+			<td>{ v.T_BahanName }</td>
+			<td>{ v.T_SampleStationName }</td>
 			<td>
-				@TableAction(v.M_DoctorID,
+				@TableAction(v.T_BahanID,
 					hxGetEdit,
 					hxTargetEdit,
 					hxSwapEdit,
@@ -88,7 +82,7 @@ templ TableAction(
 	<div class="row px-5 d-flex justify-content-around">
 		<a
 			type="button"
-			class="btnactiondc 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"
+			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 }
@@ -102,7 +96,7 @@ templ TableAction(
 		</a>
 		<a
 			type="button"
-			class=" btnactiondc 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"
+			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 }
@@ -118,7 +112,7 @@ templ TableAction(
 }

 script HandleBeforeRequestRow(id string) {
-	var cusid_ele = document.getElementsByClassName('btnactiondc');
+	var cusid_ele = document.getElementsByClassName('btnactbhn');
 	for (var i = 0; i < cusid_ele.length; ++i) {
 		var item = cusid_ele[i];  
 		item.classList.add('disabled');
@@ -127,7 +121,7 @@ script HandleBeforeRequestRow(id string) {
 }

 script HandleAfterRequestRow(id string) {
-	var cusid_ele = document.getElementsByClassName('btnactiondc');
+	var cusid_ele = document.getElementsByClassName('btnactbhn');
 	for (var i = 0; i < cusid_ele.length; ++i) {
 		var item = cusid_ele[i];  
 		item.classList.remove('disabled');
--- a/views/dev/mddoctor/mddoctortable_templ.go
+++ b/views/dev/mddoctor/mddoctortable_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

 // templ: version: v0.2.663
-package dev_mddoctorview
+package dev_mdbahanview

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

@@ -14,7 +14,7 @@ import "cpone/component/table"
 import "cpone/models"
 import "strconv"

-func TableDoctor(data []models.DoctorV1,
+func TableBahan(data []models.Bahan,
 	tableID string,
 	hxGetEdit string,
 	hxTargetEdit string,
@@ -44,7 +44,7 @@ func TableDoctor(data []models.DoctorV1,
 		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\mddoctor\mddoctortable.templ`, Line: 18, Col: 18}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 18, Col: 18}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -54,9 +54,9 @@ func TableDoctor(data []models.DoctorV1,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"DOCTOR CODE", "NAMA", "ALAMAT", "NO HP", "SPESIALIS", "AKSI"},
-			[]string{"15%", "20%", "25%", "5%", "15%", "20%"},
-			RowDoctor(data,
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"KODE", "NAMA BAHAN", "SAMPLE STATION", "AKSI"},
+			[]string{"20%", "30%", "30%", "20%"},
+			RowBahan(data,
 				hxGetEdit,
 				hxTargetEdit,
 				hxSwapEdit,
@@ -80,31 +80,7 @@ func TableDoctor(data []models.DoctorV1,
 	})
 }

-func EmptyDivDoctor() 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("<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 RowDoctor(data []models.DoctorV1,
+func RowBahan(data []models.Bahan,
 	hxGetEdit string,
 	hxTargetEdit string,
 	hxSwapEdit string,
@@ -121,13 +97,13 @@ func RowDoctor(data []models.DoctorV1,
 			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
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		if len(data) == 0 {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"3\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"4\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -137,10 +113,23 @@ func RowDoctor(data []models.DoctorV1,
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var5 string
-			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_DoctorCode)
+			var templ_7745c5c3_Var4 string
+			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_BahanCode)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 55, Col: 23}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 51, Col: 22}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var5 string
+			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_BahanName)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 52, Col: 22}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
 			if templ_7745c5c3_Err != nil {
@@ -151,9 +140,9 @@ func RowDoctor(data []models.DoctorV1,
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var6 string
-			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_DoctorName)
+			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\mddoctor\mddoctortable.templ`, Line: 56, Col: 23}
+				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 {
@@ -163,46 +152,7 @@ func RowDoctor(data []models.DoctorV1,
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var7 string
-			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_DoctorAddress)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 57, Col: 26}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var8 string
-			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_DoctorHp)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 58, Col: 21}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var9 string
-			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_SpecialistName)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 59, Col: 27}
-			}
-			_, 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("</td><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = TableAction(v.M_DoctorID,
+			templ_7745c5c3_Err = TableAction(v.T_BahanID,
 				hxGetEdit,
 				hxTargetEdit,
 				hxSwapEdit,
@@ -246,9 +196,9 @@ func TableAction(
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var10 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var10 == nil {
-			templ_7745c5c3_Var10 = templ.NopComponent
+		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row px-5 d-flex justify-content-around\">")
@@ -259,16 +209,16 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactiondc col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactbhn col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetEdit + "?id=" + strconv.Itoa(id))
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, 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\mddoctor\mddoctortable.templ`, Line: 92, Col: 49}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 86, Col: 49}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -276,12 +226,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(hxTargetEdit)
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 93, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 87, Col: 27}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -289,12 +239,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var13 string
-		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 94, Col: 23}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 88, Col: 23}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -302,12 +252,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 95, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 89, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -315,12 +265,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_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs("#spnredt" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 96, Col: 47}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 90, Col: 47}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -328,8 +278,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var16 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var16.Call)
+		var templ_7745c5c3_Var13 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -337,8 +287,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var17 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var17.Call)
+		var templ_7745c5c3_Var14 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -346,12 +296,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("spnredt" + strconv.Itoa(id))
+		var templ_7745c5c3_Var15 string
+		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs("spnredt" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 100, Col: 42}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 94, Col: 42}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -363,16 +313,16 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\" btnactiondc col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2 btn-sm\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\" btnactbhn col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2 btn-sm\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var19 string
-		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetDelete + "?id=" + strconv.Itoa(id))
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, 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\mddoctor\mddoctortable.templ`, Line: 106, Col: 51}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 100, Col: 51}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -380,12 +330,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(hxTargetDelete)
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 107, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 101, Col: 29}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -393,12 +343,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 108, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 102, Col: 25}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -406,12 +356,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var22 string
-		templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 109, Col: 31}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 103, Col: 31}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -419,12 +369,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_Var20 string
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs("#spnrdel" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 110, Col: 47}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 104, Col: 47}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -432,8 +382,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var24 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var24.Call)
+		var templ_7745c5c3_Var21 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -441,8 +391,8 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var25 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var25.Call)
+		var templ_7745c5c3_Var22 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -450,12 +400,12 @@ func TableAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var26 string
-		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
+		var templ_7745c5c3_Var23 string
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mddoctor\mddoctortable.templ`, Line: 114, Col: 42}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdbahan\mdbahantable.templ`, Line: 108, Col: 42}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -472,30 +422,30 @@ func TableAction(

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

 func HandleAfterRequestRow(id string) templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_HandleAfterRequestRow_9aec`,
-		Function: `function __templ_HandleAfterRequestRow_9aec(id){var cusid_ele = document.getElementsByClassName('btnactiondc');
+		Name: `__templ_HandleAfterRequestRow_ce9e`,
+		Function: `function __templ_HandleAfterRequestRow_ce9e(id){var cusid_ele = document.getElementsByClassName('btnactbhn');
 	for (var i = 0; i < cusid_ele.length; ++i) {
 		var item = cusid_ele[i];  
 		item.classList.remove('disabled');
 	}
 	console.log(id)
 }`,
-		Call:       templ.SafeScript(`__templ_HandleAfterRequestRow_9aec`, id),
-		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_9aec`, id),
+		Call:       templ.SafeScript(`__templ_HandleAfterRequestRow_ce9e`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_ce9e`, id),
 	}
 }
--- a/views/dev/mddoctor/mddoctor.templ
+++ b/views/dev/mddoctor/mddoctor.templ
@@ -1,472 +0,0 @@
-package dev_mddoctorview
-
-import (
-	"cpone/layout"
-	"cpone/component/customtextfield"
-	"cpone/models"
-	"strconv"
-)
-
-templ MdDoctorScreen(
-	tableID string,
-	paginationID string,
-	searchID string,
-	dialogAddID string,
-	dialogAddBodyID string,
-	dialogEditID string,
-	dialogEditBodyID string,
-	dialogDeleteID string,
-	dialogDeleteBodyID string,
-	breadcrumb templ.Component,
-	tablecontent templ.Component,
-	filterComponent templ.Component,
-	paginationComponent templ.Component,
-	modalAddForm templ.Component,
-	modalEditForm templ.Component,
-	modalDeleteForm templ.Component) {
-	<div class="container-fluid">
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
-			Name:  "tableID",
-			Type:  "hidden",
-			Value: tableID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
-			Name:  "paginationID",
-			Type:  "hidden",
-			Value: paginationID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "searchID",
-			Name:  "searchID",
-			Type:  "hidden",
-			Value: searchID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddID",
-			Name:  "dialogAddID",
-			Type:  "hidden",
-			Value: dialogAddID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddBodyID",
-			Name:  "dialogAddBodyID",
-			Type:  "hidden",
-			Value: dialogAddBodyID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID",
-			Name:  "dialogEditID",
-			Type:  "hidden",
-			Value: dialogEditID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID",
-			Name:  "dialogEditBodyID",
-			Type:  "hidden",
-			Value: dialogEditBodyID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID",
-			Name:  "dialogDeleteID",
-			Type:  "hidden",
-			Value: dialogDeleteID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteBodyID",
-			Name:  "dialogDeleteBodyID",
-			Type:  "hidden",
-			Value: dialogDeleteBodyID})
-		<div class="row align-items-center mb-10">
-			<div class="col-md-10 col-sm-12 p-0 ">
-				@breadcrumb
-			</div>
-			<div class="col-md-2 d-none d-lg-block d-xl-block d-md-block d-sm-none">
-				// <div class="d-block align-items-center">
-				<div class="d-flex justify-content-end">
-					<button
-						type="button"
-						class="btn btn-primary"
-						data-toggle="modal"
-						data-target={ "#" + dialogAddID }
-					>Add New</button>
-				</div>
-			</div>
-			<div class="col-md-2 d-block d-lg-none d-xl-none d-md-none d-sm-block justify-content-center px-5">
-				<button
-					type="button"
-					class="btn btn-primary btn-block"
-					data-toggle="modal"
-					data-target={ "#" + dialogAddID }
-				>Add New</button>
-			</div>
-		</div>
-		@filterComponent
-		<div id="loading-parent" class=" rounded">
-			@tablecontent
-			@paginationComponent
-			@modalAddForm
-			@modalEditForm
-			@modalDeleteForm
-			<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>
-}
-
-// for item dropdown sapaan
-templ ItemDropdownSapaan(dataDropdown []models.TitleSapaan, selectedId int) {
-	if len(dataDropdown) == 0 {
-		<option value="0" disabled selected>Tidak Ada Data</option>
-	} else {
-		// <option value="default" selected>{ defaultValueLabel }</option>
-		for _, v := range dataDropdown {
-			if (selectedId == v.M_TitleID) {
-				<option value={ strconv.Itoa(v.M_TitleID) } selected>{ v.M_TitleName }</option>
-			} else {
-				<option value={ strconv.Itoa(v.M_TitleID) }>{ v.M_TitleName }</option>
-			}
-		}
-	}
-}
-
-func ConcatValueTerminology(code string, codeSystem string) string {
-	return code + "$$" + codeSystem
-}
-
-// for item dropdown jenis kelamin
-templ ItemDropdownJenisKelamin(dataDropdown []models.HardCodeDropdownJKV0, selectedId int) {
-	if len(dataDropdown) == 0 {
-		<option value="0" disabled selected>Tidak Ada Data</option>
-	} else {
-		// <option value="default" selected>{ defaultValueLabel }</option>
-		for _, v := range dataDropdown {
-			if (selectedId == v.ID) {
-				<option value={ strconv.Itoa(v.ID) } selected>{ v.Text }</option>
-			} else {
-				<option value={ strconv.Itoa(v.ID) }>{ v.Text }</option>
-			}
-		}
-	}
-}
-
-// for item dropdown terminology
-templ ItemDropdownTerminology(dataDropdown []models.TerminologyV0, selectedItem models.TerminologySelectedV0) {
-	if len(dataDropdown) == 0 {
-		<option value="0" disabled selected>Tidak Ada Data</option>
-	} else {
-		// <option value="default" selected>{ defaultValueLabel }</option>
-		for _, v := range dataDropdown {
-			if (selectedItem.CodeSystem == v.CodeSystem) && (selectedItem.AttributePath == v.AttributePath) && (selectedItem.Code == v.Code) {
-				<option value={ ConcatValueTerminology(v.Code, v.CodeSystem) } selected>{ v.Display }</option>
-			} else {
-				<option value={ ConcatValueTerminology(v.Code, v.CodeSystem) }>{ v.Display }</option>
-			}
-		}
-	}
-}
-
-// for item radiobutton kewarganegaraan
-templ ItemRadioButtonKewarganegaraan(data []models.HardCodeRadioButtonV0, selectedRadioButton int) {
-	<div style="display: flex; gap: 20px" class="mt-6">
-		for _, v := range data {
-			if (selectedRadioButton == v.ID) {
-				<label style="display: flex; align-items: center; gap: 5px">
-					<input type="radio" name={ v.Name } value={ strconv.Itoa(v.ID) } checked/>
-					<p style="margin: 0">{ v.Text }</p>
-				</label>
-			} else {
-				<label style="display: flex; align-items: center; gap: 5px">
-					<input type="radio" name={ v.Name } value={ strconv.Itoa(v.ID) }/>
-					<p style="margin: 0">{ v.Text }</p>
-				</label>
-			}
-		}
-	</div>
-}
-
-// for item dropdown spesialis
-templ ItemDropdownSpesialis(dataDropdown []models.SpecialistV0, selectedId int) {
-	if len(dataDropdown) == 0 {
-		<option value="0" disabled selected>Tidak Ada Data</option>
-	} else {
-		// <option value="default" selected>{ defaultValueLabel }</option>
-		for _, v := range dataDropdown {
-			if (selectedId == v.M_SpecialistID) {
-				<option value={ strconv.Itoa(v.M_SpecialistID) } selected>{ v.M_SpecialistName }</option>
-			} else {
-				<option value={ strconv.Itoa(v.M_SpecialistID) }>{ v.M_SpecialistName }</option>
-			}
-		}
-	}
-}
-
-// for empty div
-templ EmptyDiv1() {
-	<div></div>
-}
-
-templ CssMdDoctor() {
-	<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;
-    }
-    .filter-option-inner-inner {
-		margin-top: 1.2vh;
-		color: var(--text-disabled);
-	}
-	.bootstrap-select > .dropdown-toggle.bs-placeholder.btn {
-		color: var(--text-disabled);
-	}
-
-	.bootstrap-select.btn-group .dropdown-menu {
-		min-width: 100%;
-		-webkit-box-sizing: border-box;
-		-moz-box-sizing: border-box;
-		box-sizing: border-box;
-		position: sticky;
-	}
-
-	.dropdown-menu {
-		transform: translate3d(0px, 0px, 0px) !important;
-	}
-
-	label.text-black {
-		font-size: smaller;
-	}
-
-	.customDP{
-		width: 100%;
-	}
-
-	.form-group{
-		width: 100%;
-	}
-
-
-	/* input::placeholder {
-		font-size: smaller;
-	} */
-    
-</style>
-}
-
-templ JsMdDoctor() {
-	<script>
-        function onLoadingStart() {
-            // 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");
-
-            // Additional logic when loading starts
-        }
-
-        function onLoadingEnd() {
-            console.log('Loading ended');
-            // 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");
-        }
-
-        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();
-            }
-        });
-
-    document.addEventListener('htmx:afterSwap', function(event) {
-        // Reinitialize selectpicker after HTMX content swap
-        $('.selectpicker').selectpicker('refresh');
-    });
-
-	htmx.onLoad(function(content) {
-		const dobElement = document.querySelectorAll("input[name='doctorimbuhantanggallahir']");
-		const dayElement = document.querySelectorAll("input[name='doctorimbuhanhari']");
-		const monthElement = document.querySelectorAll("input[name='doctorimbuhanbulan']");
-		const yearElement = document.querySelectorAll("input[name='doctorimbuhantahun']");
-
-		function setElementsReadonly(elements) {
-            elements.forEach(element => {
-                element.readOnly = true;
-            });
-        }
-
-        setElementsReadonly(dayElement);
-        setElementsReadonly(monthElement);
-        setElementsReadonly(yearElement);
-
-		for(var i = 0; i < dobElement.length; i++) {
-			dobElement[i].addEventListener("change", (event) => {
-				try {
-					todate= new Date();
-					
-
-					var age= [], fromdate= new Date(event.target.value),
-					y= [todate.getFullYear(), fromdate.getFullYear()],
-					ydiff= y[0]-y[1],
-					m= [todate.getMonth(), fromdate.getMonth()],
-					mdiff= m[0]-m[1],
-					d= [todate.getDate(), fromdate.getDate()],
-					ddiff= d[0]-d[1];
-
-					if(mdiff < 0 || (mdiff=== 0 && ddiff<0))--ydiff;
-					if(mdiff<0) mdiff+= 12;
-					if(ddiff<0){
-						fromdate.setMonth(m[1]+1, 0);
-						ddiff= fromdate.getDate()-d[1]+d[0];
-						--mdiff;
-					}
-					if(ydiff> 0) age.push(ydiff+ ' year'+(ydiff> 1? 's ':' '));
-					if(mdiff> 0) age.push(mdiff+ ' month'+(mdiff> 1? 's':''));
-					if(ddiff> 0) age.push(ddiff+ ' day'+(ddiff> 1? 's':''));
-					if(age.length>1) age.splice(age.length-1,0,' and ');    
-					for (var t = 0; t < yearElement.length; ++t) {
-						yearElement[t].value = ydiff;
-					}
-					for (var m = 0; m < monthElement.length; ++m) {
-						monthElement[m].value = mdiff;
-
-					}
-					for (var d = 0; d < dayElement.length; ++d) {
-						dayElement[d].value = ddiff;
-
-					}
-				} catch (error) {
-				console.error(error);
-				
-				}
-			}, false);
-		}
-		function tentukanTanggalLahir(umurTahun, umurBulan, umurHari) {
-			// Memecah tanggal sekarang menjadi tahun, bulan, dan hari
-			var tanggalSekarang = new Date().toISOString().slice(0, 10)
-			console.log("tanggal sekarang");
-			console.log(tanggalSekarang);
-			const [tahunSekarang, bulanSekarang, hariSekarang] = tanggalSekarang.split('-').map(Number);
-
-
-			// Mengurangi umur dari tanggal sekarang
-			let tahunLahir = tahunSekarang - umurTahun;
-			let bulanLahir = bulanSekarang - umurBulan;
-			let hariLahir = hariSekarang - umurHari;
-
-			// Jika hari negatif, kurangi satu bulan dan tambahkan jumlah hari dari bulan sebelumnya
-			if (hariLahir < 0) {
-				bulanLahir--;
-				
-				// Mendapatkan jumlah hari dalam bulan sebelumnya
-				const bulanSebelumnya = bulanSekarang - 1 < 1 ? 12 : bulanSekarang - 1;
-				const tahunSebelumnya = bulanSebelumnya === 12 ? tahunSekarang - 1 : tahunSekarang;
-				hariLahir += new Date(tahunSebelumnya, bulanSebelumnya, 0).getDate();
-			}
-
-			// Jika bulan negatif, kurangi satu tahun dan tambahkan 12 bulan
-			if (bulanLahir < 0) {
-				tahunLahir--;
-				bulanLahir += 12;
-			}
-
-			// Mengembalikan tanggal lahir dalam format YYYY-MM-DD
-			return `${tahunLahir}-${String(bulanLahir).padStart(2, '0')}-${String(hariLahir).padStart(2, '0')}`;
-		}
-
-		dayElement[0].addEventListener("change", (event) => {
-			const tgll = tentukanTanggalLahir(yearElement[0].value, monthElement[0].value, dayElement[0].value);
-			console.log(`Tanggal Lahir: ${tgll}`);
-			dobElement[0].value = tgll + " Hari"
-		});
-		monthElement[0].addEventListener("change", (event) => {
-			const tgll = tentukanTanggalLahir(yearElement[0].value, monthElement[0].value, dayElement[0].value);
-			console.log(`Tanggal Lahir: ${tgll}`);
-			dobElement[0].value = tgll + " Bulan"
-
-		});
-		yearElement[0].addEventListener("change", (event) => {
-			const tgll = tentukanTanggalLahir(yearElement[0].value, monthElement[0].value, dayElement[0].value);
-			console.log(`Tanggal Lahir: ${tgll}`);
-			dobElement[0].value = tgll + " Tahun"
-		});
-		dayElement[1].addEventListener("change", (event) => {
-			const tgll = tentukanTanggalLahir(yearElement[1].value, monthElement[1].value, dayElement[1].value);
-			console.log(`Tanggal Lahir: ${tgll}`);
-			dobElement[1].value = tgll + " Hari"
-		});
-		monthElement[1].addEventListener("change", (event) => {
-			const tgll = tentukanTanggalLahir(yearElement[1].value, monthElement[1].value, dayElement[1].value);
-			console.log(`Tanggal Lahir: ${tgll}`);
-			dobElement[1].value = tgll + " Bulan"
-
-		});
-		yearElement[1].addEventListener("change", (event) => {
-			const tgll = tentukanTanggalLahir(yearElement[1].value, monthElement[1].value, dayElement[1].value);
-			console.log(`Tanggal Lahir: ${tgll}`);
-			dobElement[1].value = tgll + " Tahun"
-		});
-	});
-    </script>
-}
-
-script BeforeRequestContentMdDoctor() {
-			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 AfterRequestContentMdDoctor() {
-			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 ShowMdDoctorScreen(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/mddoctor/mddoctor_templ.go
+++ b/views/dev/mddoctor/mddoctor_templ.go
--- a/views/dev/mddoctor/mddoctorformmodal.templ
+++ b/views/dev/mddoctor/mddoctorformmodal.templ
@@ -1,437 +0,0 @@
-package dev_mddoctorview
-
-import "cpone/models"
-import "cpone/component/modal"
-import "cpone/component/customtextfield"
-import "cpone/component/customdropdown"
-import "cpone/component/customradiobutton"
-import "cpone/component/customuploadfotodokterv0"
-
-templ DoctorForm(data models.DoctorFormComponent) {
-	<div class="">
-		<form
-			hx-encoding="multipart/form-data"
-			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.ModalXL(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 BodyFormDoctor(
-	inputId models.CustomTextFieldv2Prm,
-	inputTglNow models.CustomTextFieldv2Prm,
-	inputTglLahirEdit models.CustomTextFieldv2Prm,
-	dropdownDoctorSapaan models.CustomDropdownv1Prm,
-	listItemSapaan templ.Component,
-	InputImbuhanAwal1 models.CustomTextFieldv2Prm,
-	InputImbuhanAwal2 models.CustomTextFieldv2Prm,
-	dropdownDoctorJenisKelamin models.CustomDropdownv1Prm,
-	listItemJenisKelamin templ.Component,
-	dropdownDoctorGolonganDarah models.CustomDropdownv1Prm,
-	listItemGolonganDarah templ.Component,
-	radiobuttonDoctorKewarganegaraan models.CustomRadioButtonv1Prm,
-	listItemKewarganegaraan templ.Component,
-	InputNomorIdentitas models.CustomTextFieldv2Prm,
-	dropdownDoctorSpesialis models.CustomDropdownv1Prm,
-	listItemSpesialis templ.Component,
-	InputImbuhanAkhir1 models.CustomTextFieldv2Prm,
-	InputImbuhanAkhir2 models.CustomTextFieldv2Prm,
-	InputTahun models.CustomTextFieldv2Prm,
-	InputBulan models.CustomTextFieldv2Prm,
-	InputHari models.CustomTextFieldv2Prm,
-	dropdownDoctorPend models.CustomDropdownv1Prm,
-	listItemPend templ.Component,
-	dropdownDoctorIdentitas models.CustomDropdownv1Prm,
-	listItemIdentitas templ.Component,
-	InputEmail models.CustomTextFieldv2Prm,
-	InputNama models.CustomTextFieldv2Prm,
-	InputTanggalLahir models.CustomTextFieldv2Prm,
-	dropdownDoctorBloodRhesus models.CustomDropdownv1Prm,
-	listItemBloodRhesus templ.Component,
-	dropdownDoctorEtnis models.CustomDropdownv1Prm,
-	listItemEtnis templ.Component,
-	InputNomorHP models.CustomTextFieldv2Prm,
-	dropdownDoctorAgama models.CustomDropdownv1Prm,
-	listItemAgama templ.Component,
-	inputUploadFoto models.CustomUploadFotoPrmV0,
-	componentID string,
-	hxOnLoad templ.ComponentScript) {
-	<div id={ componentID } hx-on::load={ hxOnLoad }>
-		<div class="wrapperx p-5 h-100">
-			<!-- person.png start -->
-			@customuploadfotodokterv0.CustomUploadFotoWithPreviewDokterV0(inputUploadFoto)
-			// <div class="row">
-			// 	<div class="col-4">
-			// 		<img
-			// 			src="asset-corporate-portal/media/person/person.png"
-			// 			style="display: block; width: 13vw"
-			// 		/>
-			// 	</div>
-			// </div>
-			// <div class="row mt-5">
-			// 	<div class="col-4">
-			// 		<button
-			// 			class="btn bg-primary-transparent text-center text-primary"
-			// 			style="width: 13vw; font-weight: 600"
-			// 		>
-			// 			Update Foto
-			// 		</button>
-			// 	</div>
-			// </div>
-			<!-- person.png end -->
-			@customtextfield.CustomTextFieldv2(
-				inputId)
-			@customtextfield.CustomTextFieldv2(
-				inputTglNow)
-			@customtextfield.CustomTextFieldv2(
-				inputTglLahirEdit)
-			<div class="row mt-5">
-				<!-- col 1 start -->
-				<div class="col-4">
-					<div class="form-row">
-						<!-- sapaan start -->
-						<div class="col">
-							@customdropdown.MainCustomDropdownInputV0(
-								dropdownDoctorSapaan,
-								listItemSapaan)
-						</div>
-						<!-- end start -->
-						<!-- Imbuhan awal 1 start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputImbuhanAwal1)
-						</div>
-						<!-- Imbuhan awal 1 end -->
-						<!-- Imbuhan awal 2 start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputImbuhanAwal2)
-						</div>
-						<!-- Imbuhan awal 2 end -->
-					</div>
-					<!-- jenis kelamin -->
-					<div class="form-row mt-0">
-						@customdropdown.MainCustomDropdownInputV0(
-							dropdownDoctorJenisKelamin,
-							listItemJenisKelamin)
-					</div>
-					<!-- jenis kelamin -->
-					<!-- golongan darah -->
-					<div class="form-row mt-0">
-						@customdropdown.MainCustomDropdownInputV0(
-							dropdownDoctorGolonganDarah,
-							listItemGolonganDarah)
-					</div>
-					<!-- golongan darah -->
-				</div>
-				<!-- col 1 end -->
-				<!-- col 2 start -->
-				<div class="col-4">
-					<div class="form-row">
-						<!-- Nama start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputNama)
-						</div>
-						<!-- Nama end -->
-					</div>
-					<div class="form-row">
-						<!-- TanggalLahir start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputTanggalLahir)
-						</div>
-						<!-- TanggalLahir end -->
-					</div>
-					<div class="form-row">
-						<!-- BloodRhesus start -->
-						<div class="col">
-							@customdropdown.MainCustomDropdownInputV0(
-								dropdownDoctorBloodRhesus,
-								listItemBloodRhesus)
-						</div>
-						<!-- BloodRhesus end -->
-					</div>
-				</div>
-				<!-- col 3 start -->
-				<div class="col-4">
-					<div class="form-row">
-						<!-- Imbuhan akhir 1 start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputImbuhanAkhir1)
-						</div>
-						<!-- Imbuhan akhir 1 end -->
-						<!-- Imbuhan akhir 2 start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputImbuhanAkhir2)
-						</div>
-						<!-- Imbuhan akhir 2 end -->
-					</div>
-					<div class="form-row mt-0">
-						<!-- Tahun start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputTahun)
-						</div>
-						<!-- Tahun end -->
-						<!-- Bulan start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputBulan)
-						</div>
-						<!-- Bulan end -->
-						<!-- Hari -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputHari)
-						</div>
-						<!-- Hari -->
-					</div>
-					<!-- pendidikan -->
-					<div class="form-row mt-0">
-						@customdropdown.MainCustomDropdownInputV0(
-							dropdownDoctorPend,
-							listItemPend)
-					</div>
-					<!-- pendidikan -->
-				</div>
-				<!-- col 3 start -->
-			</div>
-			<!-- alamat start -->
-			<div class="row mt-5"></div>
-			<!-- alamat end -->
-			<div class="row mt-5">
-				<!-- col 1 start -->
-				<div class="col-4">
-					<!-- Kewarganegaraan -->
-					<div class="form-row mt-0">
-						@customradiobuttoninline.MainCustomRadioButtonInputV0(
-							radiobuttonDoctorKewarganegaraan,
-							listItemKewarganegaraan)
-					</div>
-					<!-- Kewarganegaraan -->
-					<!-- Identitas -->
-					<div class="form-row mt-8">
-						@customdropdown.MainCustomDropdownInputV0(
-							dropdownDoctorIdentitas,
-							listItemIdentitas)
-					</div>
-					<!-- spesialis -->
-					<div class="form-row mt-0">
-						@customdropdown.MainCustomDropdownInputV0(
-							dropdownDoctorSpesialis,
-							listItemSpesialis)
-					</div>
-					<!-- spesialis -->
-				</div>
-				<!-- col 1 end -->
-				<!-- col 2 start -->
-				<div class="col-4">
-					<div class="form-row">
-						<!-- Etnis start -->
-						<div class="col">
-							@customdropdown.MainCustomDropdownInputV0(
-								dropdownDoctorEtnis,
-								listItemEtnis)
-						</div>
-						<!-- Etnis end -->
-					</div>
-					<div class="form-row">
-						<!-- Nomor Identitas start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputNomorIdentitas)
-						</div>
-						<!-- Nomor Identitas end -->
-					</div>
-					<div class="form-row mt-0">
-						<!-- Email start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputEmail)
-						</div>
-						<!-- Email end -->
-					</div>
-				</div>
-				<!-- col 2 start -->
-				<!-- col 3 start -->
-				<div class="col-4">
-					<div class="form-row">
-						@customdropdown.MainCustomDropdownInputV0(
-							dropdownDoctorAgama,
-							listItemAgama)
-					</div>
-					<div class="form-row mt-0">
-						<!-- Nomor HP start -->
-						<div class="col">
-							@customtextfield.CustomTextFieldv2(
-								InputNomorHP)
-						</div>
-						<!-- Nomor HP end -->
-					</div>
-				</div>
-				<!-- col 3 start -->
-			</div>
-		</div>
-	</div>
-}
-
-script JsHideModalDoctor(modalID string) {
-	$(modalID).modal('hide')
-}
-
-script JsShowModalDoctor(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 ActionFormDoctor(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-	<div>
-		<button
-			hx-on::after-request={ JsHideModalDoctor(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 BtnCloseFormDoctor(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-	<button
-		hx-post={ LinkClose }
-		hx-target={ targetClose }
-		hx-swap={ hxSwapClose }
-		type="button"
-		hx-on::after-request={ JsHideModalDoctor(modalID) }
-		class="close btnactcancel"
-		data-dismiss="modal"
-		aria-label="Close"
-	>
-		<i aria-hidden="true" class="ki ki-close"></i>
-	</button>
-}
-
-templ DeleteConfirmationBodyDoctor(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 ActionFormDoctorDelete(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-	<div>
-		<button
-			hx-on::after-request={ JsHideModalDoctor(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/mdgroupresult/mdgroupresult.templ
+++ b/views/dev/mdgroupresult/mdgroupresult.templ
@@ -153,8 +153,26 @@ templ CssMdGroupResult() {
    #title {
        font-weight: 600;
    }
+	
    .dropdown-menu{
-		transform: translate3d(0px, 35px, 0px)!important;
+		transform: translate3d(0px, 0px, 0px)!important;
+	}
+
+	.filter-option-inner-inner {
+		margin-top: 1.2vh;
+		color: var(--text-disabled);
+	}
+
+	.bootstrap-select > .dropdown-toggle.bs-placeholder.btn {
+		color: var(--text-disabled);
+	}
+
+	.bootstrap-select.btn-group .dropdown-menu {
+	min-width: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	position: sticky;
 	}
    
 </style>
--- a/views/dev/mdgroupresult/mdgroupresult_templ.go
+++ b/views/dev/mdgroupresult/mdgroupresult_templ.go
@@ -321,7 +321,7 @@ func CssMdGroupResult() templ.Component {
 			templ_7745c5c3_Var10 = 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    .dropdown-menu{\r\n\t\ttransform: translate3d(0px, 35px, 0px)!important;\r\n\t}\r\n    \r\n</style>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n    body {\r\n      background-color: white;\r\n      /* padding-right: 100px;\r\n            padding-left: 100px; */\r\n    }\r\n    #div-chart {\r\n        /* overflow-x: scroll; */\r\n        margin: 40px 10vw 40px 10vw;\r\n    }\r\n    .title {\r\n        font-size:20px;\r\n        font-weight: bold;\r\n    }\r\n    #title {\r\n        font-weight: 600;\r\n    }\r\n\t\r\n    .dropdown-menu{\r\n\t\ttransform: translate3d(0px, 0px, 0px)!important;\r\n\t}\r\n\r\n\t.filter-option-inner-inner {\r\n\t\tmargin-top: 1.2vh;\r\n\t\tcolor: var(--text-disabled);\r\n\t}\r\n\r\n\t.bootstrap-select > .dropdown-toggle.bs-placeholder.btn {\r\n\t\tcolor: var(--text-disabled);\r\n\t}\r\n\r\n\t.bootstrap-select.btn-group .dropdown-menu {\r\n\tmin-width: 100%;\r\n\t-webkit-box-sizing: border-box;\r\n\t-moz-box-sizing: border-box;\r\n\tbox-sizing: border-box;\r\n\tposition: sticky;\r\n\t}\r\n    \r\n</style>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/dev/mdgroupresult/mdgroupresultformmodal.templ
+++ b/views/dev/mdgroupresult/mdgroupresultformmodal.templ
@@ -75,8 +75,10 @@ templ BodyFormGroupResult(inputId models.CustomTextFieldv2Prm,
 			inputGrName)
 		@customcheckbox.MainCustomCheckboxInput(
 			checkboxGrFlagPerTest)
+		<div class="mt-5"></div>
 		@customcheckbox.MainCustomCheckboxInput(
 			checkboxGrFlagNonLab)
+		<div class="mt-5"></div>
 		@customdropdown.MainCustomDropdownInput(
 			dropdownGrResumeMcu,
 			listItem)
--- a/views/dev/mdgroupresult/mdgroupresultformmodal_templ.go
+++ b/views/dev/mdgroupresult/mdgroupresultformmodal_templ.go
@@ -252,11 +252,19 @@ func BodyFormGroupResult(inputId models.CustomTextFieldv2Prm,
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"mt-5\"></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(
 			checkboxGrFlagNonLab).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"mt-5\"></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInput(
 			dropdownGrResumeMcu,
 			listItem).Render(ctx, templ_7745c5c3_Buffer)
@@ -343,7 +351,7 @@ func ActionFormGroupResult(LinkClose string, targetClose string, hxSwapClose str
 		var templ_7745c5c3_Var14 string
 		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 116, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 118, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 		if templ_7745c5c3_Err != nil {
@@ -356,7 +364,7 @@ func ActionFormGroupResult(LinkClose string, targetClose string, hxSwapClose str
 		var templ_7745c5c3_Var15 string
 		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 117, Col: 26}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 119, Col: 26}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
 		if templ_7745c5c3_Err != nil {
@@ -369,7 +377,7 @@ func ActionFormGroupResult(LinkClose string, targetClose string, hxSwapClose str
 		var templ_7745c5c3_Var16 string
 		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 118, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 120, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
 		if templ_7745c5c3_Err != nil {
@@ -410,7 +418,7 @@ func BtnCloseFormGroupResult(LinkClose string, targetClose string, hxSwapClose s
 		var templ_7745c5c3_Var18 string
 		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 139, Col: 21}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 141, Col: 21}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
 		if templ_7745c5c3_Err != nil {
@@ -423,7 +431,7 @@ func BtnCloseFormGroupResult(LinkClose string, targetClose string, hxSwapClose s
 		var templ_7745c5c3_Var19 string
 		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 140, Col: 25}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 142, Col: 25}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
 		if templ_7745c5c3_Err != nil {
@@ -436,7 +444,7 @@ func BtnCloseFormGroupResult(LinkClose string, targetClose string, hxSwapClose s
 		var templ_7745c5c3_Var20 string
 		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 141, Col: 23}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 143, Col: 23}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
 		if templ_7745c5c3_Err != nil {
@@ -491,7 +499,7 @@ func DeleteConfirmationBodyGroupResult(inputId models.CustomTextFieldv2Prm,
 		var templ_7745c5c3_Var23 string
 		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 158, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 160, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 		if templ_7745c5c3_Err != nil {
@@ -513,7 +521,7 @@ func DeleteConfirmationBodyGroupResult(inputId models.CustomTextFieldv2Prm,
 		var templ_7745c5c3_Var25 string
 		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(message)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 159, Col: 14}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 161, Col: 14}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
 		if templ_7745c5c3_Err != nil {
@@ -531,7 +539,7 @@ func DeleteConfirmationBodyGroupResult(inputId models.CustomTextFieldv2Prm,
 			var templ_7745c5c3_Var26 string
 			templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(v)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 164, Col: 68}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 166, Col: 68}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
 			if templ_7745c5c3_Err != nil {
@@ -554,7 +562,7 @@ func DeleteConfirmationBodyGroupResult(inputId models.CustomTextFieldv2Prm,
 			var templ_7745c5c3_Var27 string
 			templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(v)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 170, Col: 10}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 172, Col: 10}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
 			if templ_7745c5c3_Err != nil {
@@ -621,7 +629,7 @@ func ActionFormGroupResultDelete(LinkClose string, targetClose string, hxSwapClo
 		var templ_7745c5c3_Var30 string
 		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 184, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 186, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
 		if templ_7745c5c3_Err != nil {
@@ -634,7 +642,7 @@ func ActionFormGroupResultDelete(LinkClose string, targetClose string, hxSwapClo
 		var templ_7745c5c3_Var31 string
 		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 185, Col: 26}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 187, Col: 26}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
 		if templ_7745c5c3_Err != nil {
@@ -647,7 +655,7 @@ func ActionFormGroupResultDelete(LinkClose string, targetClose string, hxSwapClo
 		var templ_7745c5c3_Var32 string
 		templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 186, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdgroupresult\mdgroupresultformmodal.templ`, Line: 188, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
 		if templ_7745c5c3_Err != nil {
--- a/views/dev/mdsamplestation/mdsamplestation.templ
+++ b/views/dev/mdsamplestation/mdsamplestation.templ
@@ -0,0 +1,185 @@
+package dev_mdsamplestationview
+
+import (
+    "cpone/layout"
+	"cpone/component/customtextfield"
+	"cpone/models"
+)
+
+templ ContentMDSampleStation(
+    tableID string,
+    paginationID string,
+    searchID string,
+    dialogAddID string,
+    dialogAddBodyID string,
+    dialogEditID string,
+    dialogEditBodyID string,
+    dialogDeleteID string,
+    dialogDeleteBodyID string,
+    breadcrumb templ.Component,
+    tablecontent templ.Component,
+    filtercomponent templ.Component,
+    paginationtable templ.Component,
+    modalAddForm templ.Component,
+    modalEditForm templ.Component,
+    modalDeleteForm templ.Component,
+) {
+    <div class="container-fluid">
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+            Name: "tableID",
+            Type: "hidden",
+            Value: tableID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+            Name: "paginationID",
+            Type: "hidden",
+            Value: paginationID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "searchID",
+            Name: "searchID",
+            Type: "hidden",
+            Value: searchID})            
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddID",
+            Name: "dialogAddID",
+            Type: "hidden",
+            Value: dialogAddID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddBodyID",
+            Name: "dialogAddBodyID",
+            Type: "hidden",
+            Value: dialogAddBodyID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID",
+            Name: "dialogEditID",
+            Type: "hidden",
+            Value: dialogEditID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID",
+            Name: "dialogEditBodyID",
+            Type: "hidden",
+            Value: dialogEditBodyID})            
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID",
+            Name: "dialogDeleteID",
+            Type: "hidden",
+            Value: dialogDeleteID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteBodyID",
+            Name: "dialogDeleteBodyID",
+            Type: "hidden",
+            Value: dialogDeleteBodyID})                                                
+        <div class="row align-item-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">
+            @tablecontent
+            @paginationtable
+            @modalAddForm
+            @modalEditForm
+            @modalDeleteForm
+            <div id="loading-child" class="rounded bg-transparent">
+                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
+                    <span class="sr-only">Loading...</span>
+                </div>
+            </div>
+        </div>
+        <div id="loadingcontent"></div>
+    </div>
+}
+
+templ CSSMDSampleStation() {
+    <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;
+        }
+        #div-chart {
+            margin: 40px 10vw 40px 10vw;
+        }
+        .title {
+            font-size: 20px;
+            font-weight: bold;
+        }
+        #title {
+            font-weight: 600;
+        }
+    </style>
+}
+
+templ JSMDSampleStation() {
+    <script>
+        document.addEventListener('htmx:beforeRequest', function(event) {
+            var indicator = document.querySelector('#loadingcontent');
+			console.log(event.detail.xhr)
+			console.log(event.detail.elt)
+            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 ShowMDSampleStation(
+    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/mdsamplestation/mdsamplestation_templ.go
+++ b/views/dev/mdsamplestation/mdsamplestation_templ.go
@@ -0,0 +1,319 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_mdsamplestationview
+
+//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"
+	"cpone/layout"
+	"cpone/models"
+)
+
+func ContentMDSampleStation(
+	tableID string,
+	paginationID string,
+	searchID string,
+	dialogAddID string,
+	dialogAddBodyID string,
+	dialogEditID string,
+	dialogEditBodyID string,
+	dialogDeleteID string,
+	dialogDeleteBodyID string,
+	breadcrumb templ.Component,
+	tablecontent templ.Component,
+	filtercomponent templ.Component,
+	paginationtable templ.Component,
+	modalAddForm templ.Component,
+	modalEditForm templ.Component,
+	modalDeleteForm 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-item-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\mdsamplestation\mdsamplestation.templ`, Line: 74, 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\mdsamplestation\mdsamplestation.templ`, Line: 82, 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 = tablecontent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = paginationtable.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalAddForm.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalEditForm.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalDeleteForm.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 CSSMDSampleStation() 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        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JSMDSampleStation() 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\t\t\tconsole.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.elt)\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_848c`,
+		Function: `function __templ_AfterRequestContent_848c(){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_848c`),
+		CallInline: templ.SafeScriptInline(`__templ_AfterRequestContent_848c`),
+	}
+}
+
+func ShowMDSampleStation(
+	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/mdsamplestation/mdsamplestationmodal.templ
+++ b/views/dev/mdsamplestation/mdsamplestationmodal.templ
@@ -0,0 +1,200 @@
+package dev_mdsamplestationview
+
+import "cpone/models"
+import "cpone/component/modal"
+import "cpone/component/customtextfield"
+import "cpone/component/customdropdown"
+import "strconv"
+
+templ MDSampleStationForm(data models.MDSampleStationForm) {
+    <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() {
+    const btnActCancel = document.querySelectorAll('.btnactcancel');
+    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
+
+    for (let i = 0; i < btnActCancel.length; i++) {
+        btnActCancel[i].setAttribute('disabled', 'true');
+    }
+    for (let i = 0; i < btnActSaveData.length; i++) {
+        btnActSaveData[i].setAttribute('disabled', 'true');
+    }
+}
+
+script HandleFormAfterRequest() {
+    const btnActCancel = document.querySelectorAll('.btnactcancel');
+    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
+
+    for (let i = 0; i < btnActCancel.length; i++) {
+        btnActCancel[i].removeAttribute('disabled');
+    }
+    for (let i = 0; i < btnActSaveData.length; i++) {
+        btnActSaveData[i].removeAttribute('disabled');
+    }
+}
+
+templ BodyFormMDSampleStation(
+    componentID string,
+    inputID models.CustomTextFieldv2Prm,
+    inputCode models.CustomTextFieldv2Prm,
+    inputName models.CustomTextFieldv2Prm,
+    inputGroup models.CustomDropdownv1Prm,
+    listGroup templ.Component,
+    hxOnLoad templ.ComponentScript,
+) {
+    <div id={ componentID } hx-on::load={ hxOnLoad }>
+        @customtextfield.CustomTextFieldv2(inputID)
+        @customtextfield.CustomTextFieldv2(inputCode)
+        @customtextfield.CustomTextFieldv2(inputName)
+        @customdropdown.MainCustomDropdownInput(inputGroup, listGroup)
+    </div>
+    <script>
+        document.addEventListener('htmx:afterSwap', function(event) {
+            $('.selectpicker').selectpicker('refresh');
+        })
+    </script>
+}
+
+templ ItemGroupDropdown(itemGroup []models.MDSampleStationGroup, selectedId int) {
+    if len(itemGroup) == 0 {
+        <option value="0" disabled selected>Tidak Ada Data</option>
+    } else {
+        for _, v := range itemGroup {
+            if (selectedId == v.ID) {
+                <option value={ strconv.Itoa(v.ID) } selected>{ v.Group }</option>
+            } else {
+                <option value={ strconv.Itoa(v.ID) }>{ v.Group }</option>
+            }
+        }
+    }
+}
+
+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 ActionFormMDSampleStation(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 BtnCloseFormMDSampleStation(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,
+    dataHeader []string,
+    dataText []string,
+    hxOnLoad templ.ComponentScript,
+) {
+    <div id={ componentID } hx-on::load={ hxOnLoad }>
+        <p>{ message }</p>
+        <div class="card rounded-lg">
+            <div class="card-body d-flex flex-row">
+                <div class="d-flex flex-column">
+                    for _, v := range dataHeader {
+                        <div class="mb-1 mt-1 text-disabled font-weight-bold mr-5">{ v }</div>
+                    }
+                </div>
+                <div class="d-flex flex-column">
+                    for _, v := range dataText {
+                        <div class="mb-1 mt-1 font-weight-bold">{ v }</div>
+                    }
+                </div>
+            </div>
+        </div>
+        @customtextfield.CustomTextFieldv2(inputID)
+    </div>
+}
+
+templ ActionFormMDSampleStationDelete(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/mdsamplestation/mdsamplestationmodal_templ.go
+++ b/views/dev/mdsamplestation/mdsamplestationmodal_templ.go
@@ -0,0 +1,740 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_mdsamplestationview
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/models"
+import "cpone/component/modal"
+import "cpone/component/customtextfield"
+import "cpone/component/customdropdown"
+import "strconv"
+
+func MDSampleStationForm(data models.MDSampleStationForm) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleFormBeforeRequest(), HandleFormAfterRequest())
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<form id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(data.IDComponent)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 12, Col: 33}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(data.Link)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 13, Col: 31}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"form\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 15, Col: 37}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 16, Col: 33}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 17, Col: 39}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\".formloading\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 templ.ComponentScript = HandleFormBeforeRequest()
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 templ.ComponentScript = HandleFormAfterRequest()
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalcomponent.Modal(data.ModalID,
+			data.ModalTitle,
+			data.DialogBody,
+			data.DialogAction,
+			data.ButtonClose,
+		).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</form></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func HandleFormBeforeRequest() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleFormBeforeRequest_7bdf`,
+		Function: `function __templ_HandleFormBeforeRequest_7bdf(){const btnActCancel = document.querySelectorAll('.btnactcancel');
+    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
+
+    for (let i = 0; i < btnActCancel.length; i++) {
+        btnActCancel[i].setAttribute('disabled', 'true');
+    }
+    for (let i = 0; i < btnActSaveData.length; i++) {
+        btnActSaveData[i].setAttribute('disabled', 'true');
+    }
+}`,
+		Call:       templ.SafeScript(`__templ_HandleFormBeforeRequest_7bdf`),
+		CallInline: templ.SafeScriptInline(`__templ_HandleFormBeforeRequest_7bdf`),
+	}
+}
+
+func HandleFormAfterRequest() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleFormAfterRequest_cc6f`,
+		Function: `function __templ_HandleFormAfterRequest_cc6f(){const btnActCancel = document.querySelectorAll('.btnactcancel');
+    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
+
+    for (let i = 0; i < btnActCancel.length; i++) {
+        btnActCancel[i].removeAttribute('disabled');
+    }
+    for (let i = 0; i < btnActSaveData.length; i++) {
+        btnActSaveData[i].removeAttribute('disabled');
+    }
+}`,
+		Call:       templ.SafeScript(`__templ_HandleFormAfterRequest_cc6f`),
+		CallInline: templ.SafeScriptInline(`__templ_HandleFormAfterRequest_cc6f`),
+	}
+}
+
+func BodyFormMDSampleStation(
+	componentID string,
+	inputID models.CustomTextFieldv2Prm,
+	inputCode models.CustomTextFieldv2Prm,
+	inputName models.CustomTextFieldv2Prm,
+	inputGroup models.CustomDropdownv1Prm,
+	listGroup templ.Component,
+	hxOnLoad templ.ComponentScript,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var9 == nil {
+			templ_7745c5c3_Var9 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 65, Col: 25}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::load=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 templ.ComponentScript = hxOnLoad
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputID).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputCode).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputName).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customdropdown.MainCustomDropdownInput(inputGroup, listGroup).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><script>\r\n        document.addEventListener('htmx:afterSwap', function(event) {\r\n            $('.selectpicker').selectpicker('refresh');\r\n        })\r\n    </script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ItemGroupDropdown(itemGroup []models.MDSampleStationGroup, selectedId int) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var12 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var12 == nil {
+			templ_7745c5c3_Var12 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if len(itemGroup) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<option value=\"0\" disabled selected>Tidak Ada Data</option>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			for _, v := range itemGroup {
+				if selectedId == v.ID {
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<option value=\"")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var13 string
+					templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.ID))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 84, Col: 50}
+					}
+					_, 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("\" selected>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var14 string
+					templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(v.Group)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 84, Col: 71}
+					}
+					_, 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("</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_Var15 string
+					templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.ID))
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 86, Col: 50}
+					}
+					_, 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("\">")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var16 string
+					templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(v.Group)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 86, Col: 62}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</option>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				}
+			}
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JSHideModal(modalID string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_JSHideModal_4530`,
+		Function: `function __templ_JSHideModal_4530(modalID){$(modalID).modal('hide')
+}`,
+		Call:       templ.SafeScript(`__templ_JSHideModal_4530`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_JSHideModal_4530`, modalID),
+	}
+}
+
+func JSShowModal(modalID string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_JSShowModal_658d`,
+		Function: `function __templ_JSShowModal_658d(modalID){$(modalID).modal('show')
+    const btnActCancel = document.querySelectorAll('.btnactcancel');
+    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
+
+    for (let i = 0; i < btnActCancel.length; i++) {
+        btnActCancel[i].removeAttribute('disabled');
+    }
+    for (let i = 0; i < btnActSaveData.length; i++) {
+        btnActSaveData[i].removeAttribute('disabled');
+    }
+}`,
+		Call:       templ.SafeScript(`__templ_JSShowModal_658d`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_JSShowModal_658d`, modalID),
+	}
+}
+
+func ActionFormMDSampleStation(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var17 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var17 == nil {
+			templ_7745c5c3_Var17 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal(modalID))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 templ.ComponentScript = JSHideModal(modalID)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var18.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 113, Col: 31}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var20 string
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 114, Col: 35}
+		}
+		_, 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("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var21 string
+		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 115, Col: 33}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\".cancelloading\" type=\"button\" class=\"btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel\" data-dismiss=\"modal\"><span class=\"htmx-indicator spinner-border spinner-border-sm cancelloading\" role=\"status\" aria-hidden=\"true\"></span> Batal\r</button> <button type=\"submit\" class=\"btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata\"><span class=\"htmx-indicator spinner-border spinner-border-sm formloading\" role=\"status\" aria-hidden=\"true\"></span> Simpan\r</button></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func BtnCloseFormMDSampleStation(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var22 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var22 == nil {
+			templ_7745c5c3_Var22 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal(modalID))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-post=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var23 string
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 136, Col: 27}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var24 string
+		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 137, Col: 31}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var25 string
+		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 138, Col: 29}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" type=\"button\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var26 templ.ComponentScript = JSHideModal(modalID)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var26.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"close btnactcancel\" data-dismiss=\"modal\" aria-label=\"Close\"><i aria-hidden=\"true\" class=\"ki ki-close\"></i></button>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func DeleteConfirmationBody(
+	inputID models.CustomTextFieldv2Prm,
+	componentID string,
+	message string,
+	dataHeader []string,
+	dataText []string,
+	hxOnLoad templ.ComponentScript,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var27 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var27 == nil {
+			templ_7745c5c3_Var27 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 157, Col: 25}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::load=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var29 templ.ComponentScript = hxOnLoad
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var29.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><p>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var30 string
+		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(message)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 158, Col: 20}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</p><div class=\"card rounded-lg\"><div class=\"card-body d-flex flex-row\"><div class=\"d-flex flex-column\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, v := range dataHeader {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"mb-1 mt-1 text-disabled font-weight-bold mr-5\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var31 string
+			templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(v)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 163, Col: 86}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"d-flex flex-column\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, v := range dataText {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"mb-1 mt-1 font-weight-bold\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var32 string
+			templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(v)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 168, Col: 67}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputID).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ActionFormMDSampleStationDelete(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var33 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var33 == nil {
+			templ_7745c5c3_Var33 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal(modalID))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var34 templ.ComponentScript = JSHideModal(modalID)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var34.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var35 string
+		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 181, Col: 31}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var36 string
+		templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 182, Col: 35}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
+		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_Var37 string
+		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationmodal.templ`, Line: 183, Col: 33}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\".cancelloading\" type=\"button\" class=\"btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel\" data-dismiss=\"modal\"><span class=\"htmx-indicator spinner-border spinner-border-sm cancelloading\" role=\"status\" aria-hidden=\"true\"></span> Batal\r</button> <button type=\"submit\" class=\"btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata\"><span class=\"htmx-indicator spinner-border spinner-border-sm formloading\" role=\"status\" aria-hidden=\"true\"></span> Yakin\r</button></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/mdsamplestation/mdsamplestationtable.templ
+++ b/views/dev/mdsamplestation/mdsamplestationtable.templ
@@ -0,0 +1,129 @@
+package dev_mdsamplestationview
+
+import "cpone/models"
+import "cpone/component/table"
+import "strconv"
+
+templ TableSampleStation(data []models.MDSampleStation, 
+    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 STATION", "GROUP", "AKSI"},
+            []string{"20%", "30%", "30%", "20%"},
+            ItemRow(data,
+                hxGetEdit,
+                hxTargetEdit,
+                hxSwapEdit,
+                hxIncludeEdit,
+                hxGetDelete,
+                hxTargetDelete,
+                hxSwapDelete,
+                hxIncludeDelete,
+            ))
+    </div>
+}
+
+templ ItemRow(data []models.MDSampleStation,
+    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_SampleStationCode }</td>
+            <td>{ v.T_SampleStationName }</td>
+            <td>{ v.T_SampleStationIsNonLab }</td>
+            <td>
+                @ItemAction(v.T_SampleStationID,
+                    hxGetEdit,
+                    hxTargetEdit,
+                    hxSwapEdit,
+                    hxIncludeEdit,
+                    hxGetDelete,
+                    hxTargetDelete,
+                    hxSwapDelete,
+                    hxIncludeDelete,
+                )
+            </td>
+        </tr>
+    }
+}
+
+templ ItemAction(
+    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="btnactionmdss 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="btnactionmdss 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('btnactionmdss');
+	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('btnactionmdss');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.remove('disabled');
+	}
+	console.log(id)    
+}
--- a/views/dev/mdsamplestation/mdsamplestationtable_templ.go
+++ b/views/dev/mdsamplestation/mdsamplestationtable_templ.go
@@ -0,0 +1,450 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_mdsamplestationview
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/models"
+import "cpone/component/table"
+import "strconv"
+
+func TableSampleStation(data []models.MDSampleStation,
+	tableID string,
+	hxGetEdit string,
+	hxTargetEdit string,
+	hxSwapEdit string,
+	hxIncludeEdit string,
+	hxGetDelete string,
+	hxTargetDelete string,
+	hxSwapDelete string,
+	hxIncludeDelete string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 18, Col: 21}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap-oob=\"true\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"KODE", "NAMA STATION", "GROUP", "AKSI"},
+			[]string{"20%", "30%", "30%", "20%"},
+			ItemRow(data,
+				hxGetEdit,
+				hxTargetEdit,
+				hxSwapEdit,
+				hxIncludeEdit,
+				hxGetDelete,
+				hxTargetDelete,
+				hxSwapDelete,
+				hxIncludeDelete,
+			)).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ItemRow(data []models.MDSampleStation,
+	hxGetEdit string,
+	hxTargetEdit string,
+	hxSwapEdit string,
+	hxIncludeEdit string,
+	hxGetDelete string,
+	hxTargetDelete string,
+	hxSwapDelete string,
+	hxIncludeDelete string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if len(data) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"4\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		for _, v := range data {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var4 string
+			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_SampleStationCode)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 51, Col: 39}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var5 string
+			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_SampleStationName)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 52, Col: 39}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_SampleStationIsNonLab)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 53, Col: 43}
+			}
+			_, 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 = ItemAction(v.T_SampleStationID,
+				hxGetEdit,
+				hxTargetEdit,
+				hxSwapEdit,
+				hxIncludeEdit,
+				hxGetDelete,
+				hxTargetDelete,
+				hxSwapDelete,
+				hxIncludeDelete,
+			).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ItemAction(
+	id int,
+	hxGetEdit string,
+	hxTargetEdit string,
+	hxSwapEdit string,
+	hxIncludeEdit string,
+	hxGetDelete string,
+	hxTargetDelete string,
+	hxSwapDelete string,
+	hxIncludeDelete string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row px-5 d-flex justify-content-around\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleBeforeRequestRow(strconv.Itoa(id)), HandleAfterRequestRow(strconv.Itoa(id)))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactionmdss 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))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 85, Col: 57}
+		}
+		_, 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-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 86, Col: 36}
+		}
+		_, 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-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 87, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 88, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\"")
+		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))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 89, Col: 56}
+		}
+		_, 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-on::before-request=\"")
+		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)
+		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_Var14 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><span id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var15 string
+		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs("spnredt" + strconv.Itoa(id))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 93, Col: 51}
+		}
+		_, 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("\" class=\"htmx-indicator spinner-border spinner-border-sm\" role=\"status\" aria-hidden=\"true\"></span> Edit\r</a> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleBeforeRequestRow(strconv.Itoa(id)), HandleAfterRequestRow(strconv.Itoa(id)))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactionmdss 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))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 99, Col: 59}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 100, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 101, Col: 34}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 102, Col: 40}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\"")
+		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))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 103, Col: 56}
+		}
+		_, 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("\" hx-on::before-request=\"")
+		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)
+		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_Var22 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><span id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var23 string
+		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdsamplestation\mdsamplestationtable.templ`, Line: 107, Col: 51}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"htmx-indicator spinner-border spinner-border-sm\" role=\"status\" aria-hidden=\"true\"></span> Hapus\r</a></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func HandleBeforeRequestRow(id string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleBeforeRequestRow_027b`,
+		Function: `function __templ_HandleBeforeRequestRow_027b(id){var cusid_ele = document.getElementsByClassName('btnactionmdss');
+	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_027b`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleBeforeRequestRow_027b`, id),
+	}
+}
+
+func HandleAfterRequestRow(id string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleAfterRequestRow_792d`,
+		Function: `function __templ_HandleAfterRequestRow_792d(id){var cusid_ele = document.getElementsByClassName('btnactionmdss');
+	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_792d`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_792d`, id),
+	}
+}
--- a/views/public/landingpage/landingpage.templ
+++ b/views/public/landingpage/landingpage.templ
@@ -35,25 +35,25 @@ templ MainLandingPage(medicalServiceComponent templ.Component, listAdvantageComp
 		@medicalServiceComponent
 		<!-- Our Medical Service END -->
 		<!-- Why Westerindo START  belum fix di ukuran < 1400 -->
-		<div class="container p-0 mt-5 ">
-			<div class="row">
+		// <div class="container p-0 mt-5 ">
+			<div class="row mt-5">
 				@HeaderSection("Why Westerindo", "With a dedicated team of professionals we’re committed to providing medical attention tailored to your needs, ensuring a journey to optimal health and vitality.")
 			</div>
 			@listAdvantageComponent
-		</div>
+		// </div>
 		<!-- Why Westerindo END -->
 		<!-- Promotion START -->
-		<div class="container mt-4">
-			<div class="row">
+		// <div class="container mt-4">
+			<div class="row mt-4">
 				@HeaderSection("Promotions", "Seize This Opportunity to Enhance Your Health")
 			</div>
 			@listPromotion
-		</div>
+		// </div>
 		<!-- Promotion END -->
-		<!-- footer START -->
-		@footer
-		<!-- footer END -->
 	</div>
+  <!-- footer START -->
+		@footer
+  <!-- footer END -->
 }

 templ CssLandingPage() {
--- a/views/public/landingpage/landingpage_templ.go
+++ b/views/public/landingpage/landingpage_templ.go
@@ -51,7 +51,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Our Medical Service END --><!-- Why Westerindo START  belum fix di ukuran < 1400 --><div class=\"container p-0 mt-5 \"><div class=\"row\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Our Medical Service END --><!-- Why Westerindo START  belum fix di ukuran < 1400 --><div class=\"row mt-5\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -67,7 +67,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Why Westerindo END --><!-- Promotion START --><div class=\"container mt-4\"><div class=\"row\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Why Westerindo END --><!-- Promotion START --><div class=\"row mt-4\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -83,7 +83,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Promotion END --><!-- footer START -->")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Promotion END --></div><!-- footer START -->")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -91,7 +91,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- footer END --></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- footer END -->")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
Author	SHA1	Message	Date
Stephen	a3b988de8f	feature/hasil-fisik-k3	2024-06-12 18:56:37 +07:00
adibwp	2058220370	fix pagination	2024-06-10 11:55:23 +07:00
adibwp	6045c459da	add styling	2024-06-10 11:40:07 +07:00
adibwp	86264a05e2	add filter listing employee health medic analytic	2024-06-10 10:12:41 +07:00
adibwp	ae807c1615	listing card data	2024-06-08 09:48:39 +07:00
adibwp	88596ac6d9	add routes home + fix container footer	2024-06-07 09:36:57 +07:00
sindhu	c7a66aae8d	add koneksi ke cpone_log	2024-06-05 13:54:26 +07:00
sindhu	a4319bee07	change parameter terminology	2024-05-30 15:30:37 +07:00
sindhu	dbead529fe	modify sql null string terminology model	2024-05-30 15:29:46 +07:00
sindhu	1ed188e3ff	add get terminology list in app services	2024-05-30 11:55:07 +07:00
Sas Andy	1e978188ee	modal xl	2024-05-30 09:37:09 +07:00
adibwp	2c183a43cc	add error log	2024-05-29 15:58:22 +07:00
adibwp	2909b06966	add edit func sample station	2024-05-29 15:58:22 +07:00
adibwp	f2d0db174e	modal with func add data	2024-05-29 15:58:21 +07:00
adibwp	42f24d1c77	modal sample station	2024-05-29 15:58:21 +07:00
adibwp	ada2ae9052	fix rebase conflict	2024-05-29 15:58:21 +07:00
adibwp	ac4feb51c1	refactor sample station + loading	2024-05-29 15:58:21 +07:00
adibwp	44eca754f5	add sample station handler, services, model	2024-05-29 15:58:21 +07:00
sindhu	6e7a84f4aa	step 4 : delete group result	2024-05-29 15:58:21 +07:00
sindhu	f6296003c9	step 3 : edit data group result	2024-05-29 15:58:21 +07:00
sindhu	c6c61c7caf	step 2 : add data group result with form validation	2024-05-29 15:58:20 +07:00
sindhu	1b0522146c	step 1 : listing, search and pagination group result	2024-05-29 15:58:20 +07:00
adibwp	d92cc9727c	listing data minus pagination + bug dislpay group name	2024-05-29 15:58:20 +07:00
adibwp	b947c1c6c4	add sample station handler, services, model	2024-05-29 15:58:20 +07:00
adibwp	59a3f87644	add templ for md-sample-station	2024-05-29 15:58:20 +07:00
kaeltorus	3719cbff71	Merge branch 'mike'	2024-05-29 14:24:00 +07:00
kaeltorus	9b8e3301cc	fixing column	2024-05-29 14:15:31 +07:00
kaeltorus	fb29e251d9	Merge branch 'mike'	2024-05-29 11:33:08 +07:00
kaeltorus	cca96b0203	add slicing patient.html	2024-05-29 11:23:14 +07:00
sindhu	275205f5dd	add model radio button	2024-05-29 11:22:49 +07:00
Sas Andy	add659eb2c	Merge branch 'andy/mdbahan'	2024-05-29 11:17:33 +07:00
Sas Andy	4739ae33c7	Merge branch 'andy/mdbahan' of https://devone.aplikasi.web.id/gitea/andy/corporate_portal_westerindo into andy/mdbahan	2024-05-29 11:14:24 +07:00
Sas Andy	23f8fd513d	md bahan	2024-05-29 11:08:36 +07:00
Sas Andy	e227d59a39	custom dowpdown & revisi customtextfiels	2024-05-29 11:08:35 +07:00
Sas Andy	2e5fc8fd87	md bahan listing search pagination	2024-05-29 11:07:49 +07:00
Sas Andy	1a3251163a	md bahan	2024-05-29 11:04:41 +07:00
Sas Andy	ba6ac081e1	custom dowpdown & revisi customtextfiels	2024-05-29 11:04:31 +07:00
sindhu	1b97c6c788	add slicing doctor.html	2024-05-29 08:17:17 +07:00
sindhu	348c0c1252	add picture person for form doctor	2024-05-28 14:54:40 +07:00
sindhu	8bf75e9ef1	add bootstrap date picker in layout corporate	2024-05-28 14:48:58 +07:00
sindhu	4791aceaa5	fix color bootstrap selectpicker in mdgroupresult	2024-05-28 14:30:58 +07:00
sindhu	b04e3e8e44	custom radio button inline and getTerminology in appservice	2024-05-28 10:14:41 +07:00
sindhu	b14c89dc34	add function GetTerminology	2024-05-28 09:14:01 +07:00
Sas Andy	0053be36f7	Merge branch 'andy/mdbahan' of https://devone.aplikasi.web.id/gitea/andy/corporate_portal_westerindo into andy/mdbahan	2024-05-27 11:21:11 +07:00
Sas Andy	af29e820d9	md bahan listing search pagination	2024-05-27 11:13:02 +07:00
Sas Andy	03d34b80e7	md bahan listing search pagination	2024-05-27 11:11:39 +07:00