change typo label

edit query and graph component
add split string func
2024-08-22 17:25:43 +07:00 · 2024-08-22 16:08:05 +07:00 · 2024-08-15 16:18:55 +07:00 · 2024-08-15 15:50:59 +07:00 · 2024-08-14 13:59:15 +07:00 · 2024-08-13 13:48:59 +07:00
238 changed files with 56118 additions and 356 deletions
--- a/README.md
+++ b/README.md
@@ -56,4 +56,12 @@ $ templ generate --watch
 ### Happy coding 😀!!

 # LINK ODOO DAN TUTORIAL INIT
-http://odoo.sismedika.com/web#id=6282&cids=1&menu_id=225&action=342&active_id=3&model=project.task&view_type=form
+http://odoo.sismedika.com/web#id=6282&cids=1&menu_id=225&action=342&active_id=3&model=project.task&view_type=form
+
+
+## BUILD WEB LINUX
+Run di Bash command line
+
+```
+GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ./bin/main ./cmd/main.go
+```
--- a/assets/andy/coba.html
+++ b/assets/andy/coba.html
@@ -94,6 +94,48 @@ License: You must have a valid license purchased only from themeforest(the above
  >
    <!--begin::Main-->
    <div class="d-flex flex-column flex-root bg-white">
+      <div
+        id="notification-001"
+        class="toast toast-top-right toas fade show"
+        role="alert"
+        aria-live="assertive"
+        aria-atomic="true"
+        hx-swap-oob="true"
+        style="margin-top: 2vh; margin-right: 2vw;"
+      >
+        <div class="toast-header bg-success text-white">
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            xmlns:xlink="http://www.w3.org/1999/xlink"
+            aria-hidden="true"
+            role="img"
+            class="iconify iconify--ep mr-2 icon-xl"
+            width="1em"
+            height="1em"
+            preserveAspectRatio="xMidYMid meet"
+            viewBox="0 0 1024 1024"
+            data-icon="ep:success-filled"
+          >
+            <path
+              fill="currentColor"
+              d="M512 64a448 448 0 1 1 0 896a448 448 0 0 1 0-896m-55.808 536.384l-99.52-99.584a38.4 38.4 0 1 0-54.336 54.336l126.72 126.72a38.27 38.27 0 0 0 54.336 0l262.4-262.464a38.4 38.4 0 1 0-54.272-54.336z"
+            ></path>
+          </svg>
+          <strong class="mr-auto">Success</strong>
+          <small class="text-muted text-white">just now</small>
+          <button
+            type="button"
+            class="ml-2 mb-1 close"
+            data-dismiss="toast"
+            aria-label="Close"
+          >
+            <span aria-hidden="true">×</span>
+          </button>
+        </div>
+        <div class="toast-body bg-success-transparent">
+          This is a success toast.
+        </div>
+      </div>
      <!-- begin::Navbar -->
      <div
        class="d-flex flex-lg-row justify-content-between py-5"
--- a/assets/asset-corporate-portal/css/sas.bundle.css
+++ b/assets/asset-corporate-portal/css/sas.bundle.css
@@ -59,6 +59,8 @@ SEARCH GROUP CSS KEYWORD "###"
  --dangerbg: #f7c9c9;
  --toscabg: #c9f7f5;
  --fieldbg: #f5f8fa;
+  --labelkartukontrolSudahbg: #e8fff3;
+  --labelkartukontrolBelumbg: #fff8dd;
  /* END BACKGROUND */
  /* TEXT COLOR */
  --text-black: #0e1e28;
@@ -67,6 +69,8 @@ SEARCH GROUP CSS KEYWORD "###"
  --text-header-table: #b5b5c3;
  --header-table-bg: #f3f6f9;
  --active-state: #637381;
+  --textcolorlabelkartukontrolSudah: #50cd89;
+  --textcolorlabelkartukontrolBelum: #f1bc00;
  /* END TEXT COLOR */
  --light: #f3f6f9;
  --dark: #181c32;
@@ -290,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;
@@ -5198,6 +5252,8 @@ a.text-hover-tosca:hover .svg-icon svg:hover g [fill],
  z-index: 99999999999 !important;
  width: 350px;
  height: auto;
+  margin-top: 2vh;
+  margin-right: 2vw;
 }

 /* ### TOAST FONT SIZE */
@@ -5205,6 +5261,27 @@ a.text-hover-tosca:hover .svg-icon svg:hover g [fill],
  font-size: 1.1rem;
 }

+/* ### KARTU KONTROL CSS */
+.kartukontrol-sudah-label {
+  background-color: var(--labelkartukontrolSudahbg); /*figma*/
+  color: var(--textcolorlabelkartukontrolSudah); /*figma*/
+  padding: 0.15rem 0.75rem;
+  border-radius: 0.42rem;
+}
+
+.kartukontrol-pending-label {
+  background-color: var(--labelkartukontrolBelumbg); /*figma*/
+  color: var(--textcolorlabelkartukontrolBelum); /*figma*/
+  padding: 0.15rem 0.75rem;
+  border-radius: 0.42rem;
+}
+
+/* ### CUSTOM CSS SELECTPICKER */
+.btn-custom-selectpicker{
+  height: 8vh;
+  text-align: center;
+}
+
 /* ### OVERLAY */
 .overlay-loading {
  position: relative !important;
@@ -5274,6 +5351,16 @@ a.text-hover-tosca:hover .svg-icon svg:hover g [fill],
 /* ## WARNING */
 /* ## DANGER */

+/* ### HTMX INDICATOR */
+.htmx-indicator {
+  display: none !important;
+}
+.htmx-request .htmx-indicator {
+  display: inline-block !important;
+}
+.htmx-request.htmx-indicator {
+  display: inline-block !important;
+}
 /* ### BUTTON HOVER TEXT */
 /* ###  */
 /* ## PRIMARY */
--- a/assets/asset-corporate-portal/js/login-general.js
+++ b/assets/asset-corporate-portal/js/login-general.js
@@ -54,17 +54,17 @@ var KTLogin = function () {

 			validation.validate().then(function (status) {
 				if (status == 'Valid') {
-					swal.fire({
-						text: "All is cool! Now you submit this form",
-						icon: "success",
-						buttonsStyling: false,
-						confirmButtonText: "Ok, got it!",
-						customClass: {
-							confirmButton: "btn font-weight-bold btn-light-primary"
-						}
-					}).then(function () {
-						KTUtil.scrollTop();
-					});
+					// swal.fire({
+					// 	text: "All is cool! Now you submit this form",
+					// 	icon: "success",
+					// 	buttonsStyling: false,
+					// 	confirmButtonText: "Ok, got it!",
+					// 	customClass: {
+					// 		confirmButton: "btn font-weight-bold btn-light-primary"
+					// 	}
+					// }).then(function () {
+					// 	KTUtil.scrollTop();
+					// });
 				} else {
 					swal.fire({
 						text: "Sorry, looks like there are some errors detected, please try again.",
--- a/assets/asset-corporate-portal/media/person/person.png
+++ b/assets/asset-corporate-portal/media/person/person.png
--- a/assets/hanan/fisik-2.html
+++ b/assets/hanan/fisik-2.html
--- a/assets/hanan/kesimpulan-saran.html
+++ b/assets/hanan/kesimpulan-saran.html
@@ -0,0 +1,784 @@
+<!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>KESIMPULAN & SARAN</title>
+    <meta name="description" content="Login page example" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+
+    <!--begin::Fonts-->
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,600,700"
+    />
+    <!--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="stylesheet"
+      href="https://fonts.googleapis.com/css?family=Public Sans:300,400,500,600,700"
+    />
+    <link rel="shortcut icon" href="assets/media/logos/favicon.ico" />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css?family=Roboto"
+    />
+    <link
+      rel="stylesheet"
+      href="https://fonts.googleapis.com/css2?family=Material+Symbols+Rounded:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200"
+    />
+    <link href="https://fonts.cdnfonts.com/css/open-sans" rel="stylesheet" />
+
+    <style>
+      #canvas {
+        /* overflow-x: scroll; */
+        margin: 40px 10vw 40px 10vw;
+      }
+      #title {
+        font-weight: 600;
+      }
+      .breadcrumb {
+        background-color: white;
+        padding: 0px 0px !important;
+        padding-left: 0 !important;
+      }
+
+      .breadcrumb-item a {
+        color: #3f4254;
+        font-family: Poppins;
+        font-size: 13px;
+        font-style: normal;
+        font-weight: 500;
+        line-height: 21px;
+      }
+
+      .breadcrumb-item.active {
+        color: #b5b5c3;
+        font-family: Poppins;
+        font-size: 13px;
+        font-style: normal;
+        font-weight: 500;
+        line-height: 21px;
+      }
+      .nav-tabs {
+        border-bottom: 0px solid #000000 !important;
+      }
+      .nav-link {
+        color: #637381;
+        font-family: Public Sans;
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 22px;
+        text-align: center;
+      }
+
+      .nav-link.active {
+        color: #212b36 !important; /* Warna teks untuk tab yang aktif */
+        border-bottom: 2px solid #0c518c !important; /* Garis bawah untuk tab yang aktif */
+        font-family: Public Sans;
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: 22px;
+        text-align: center;
+      }
+
+      th {
+        color: #637381;
+        font-family: Roboto;
+        font-weight: 700 !important;
+        font-size: 14px !important;
+        padding-bottom: 5px !important;
+        padding-left: 1px !important;
+        border-bottom: 1pt dashed #e4e6ef !important;
+      }
+      tr {
+        border-bottom: 1pt dashed #e4e6ef !important;
+        font-family: Roboto;
+      }
+      td {
+        color: #0e1e28;
+        font-family: Roboto;
+        font-style: normal;
+        font-weight: 500 !important;
+        font-size: 16px !important;
+        line-height: 30px; /* 187.5% */
+        letter-spacing: -0.32px;
+        padding-left: 1px !important;
+        padding-top: 16px !important;
+        padding-bottom: 16px !important;
+      }
+      thead {
+        border-bottom: 1pt dashed #e4e6ef !important;
+      }
+      .kesimpulan-desc {
+        color: #0e1e28;
+        font-family: Roboto;
+        font-size: 12px;
+        font-style: normal;
+        font-weight: 500;
+        line-height: normal;
+        letter-spacing: -0.24px;
+      }
+      .label-text {
+        background-color: grey;
+        color: black;
+        padding: 5px 20px 5px 20px !important;
+        border-radius: 6px;
+        font-family: Poppins !important;
+        font-size: 11px !important;
+        font-style: normal !important;
+        font-weight: 500 !important;
+        line-height: normal !important;
+      }
+      .label-text.fit {
+        background: #c9f7f5;
+        color: #1bc5bd;
+        padding: 5px 20px 5px 20px !important;
+        border-radius: 6px;
+        font-family: Poppins !important;
+        font-size: 11px !important;
+        font-style: normal !important;
+        font-weight: 500 !important;
+        line-height: normal !important;
+      }
+      .label-text.unfit {
+        background: #fff4de;
+        color: #ffa800;
+        padding: 5px 20px 5px 20px !important;
+        border-radius: 6px;
+        font-family: Poppins !important;
+        font-size: 11px !important;
+        font-style: normal !important;
+        font-weight: 500 !important;
+        line-height: normal !important;
+      }
+
+      .iconify-btn {
+        color: #637381 !important;
+        width: 23px !important;
+        height: 23px !important;
+        margin-right: 1em;
+      }
+      .iconify-btn-blue {
+        color: #0c518c !important;
+        width: 23px !important;
+        height: 23px !important;
+        margin-right: 1em;
+      }
+      .modal-header {
+        border-bottom: none !important;
+      }
+      .modal-title {
+        font-family: "Public Sans" !important;
+        font-size: 18px !important;
+        font-style: normal !important;
+        font-weight: 700 !important;
+        line-height: 28px !important;
+      }
+      .modal-dialog {
+        border-radius: 8px;
+      }
+      .btn-print {
+        border-radius: 6px !important;
+        background-color: #f5f8fa !important;
+        font-family: Roboto;
+        font-size: 14px;
+        margin-bottom: 12px;
+        font-style: normal;
+        font-weight: 500;
+        line-height: normal;
+        display: flex;
+        width: 100%;
+        justify-content: space-between;
+        align-items: center;
+      }
+      .modal-xl {
+        border-radius: 6px !important;
+        max-width: 90vw !important;
+        max-height: 95vh !important;
+        width: 90vw !important;
+        height: 95vh !important;
+      }
+      .header-print {
+        background-color: #d9d9d9;
+      }
+      .modal-print-title {
+        color: #000;
+        font-family: "Open Sans";
+        font-size: 28px;
+        font-style: normal;
+        font-weight: 700;
+        line-height: normal;
+      }
+      .close-print {
+        color: red !important;
+        width: 30px !important;
+        height: 30px !important;
+      }
+      .form-label {
+        font-family: Poppins !important;
+        font-size: 14px !important;
+        font-style: normal !important;
+        font-weight: 600 !important;
+        line-height: 24px !important; /* 171.429% */
+      }
+      .form-input {
+        font-family: Poppins !important;
+        font-size: 16px !important;
+        font-style: normal !important;
+        font-weight: 400 !important;
+        line-height: 24px !important;
+      }
+      .btn-text {
+        font-family: "Public Sans";
+        font-size: 14px;
+        font-style: normal;
+        font-weight: 700;
+        line-height: 24px;
+      }
+      .dot-text {
+        position: relative;
+        padding-left: 1.5em; /* Menambahkan padding untuk memberi ruang pada titik */
+      }
+
+      .dot-text::before {
+        content: "•"; /* Menambahkan titik di depan teks */
+        position: absolute;
+        left: 1em; /* Atur posisi titik */
+        top: 0;
+        transform: translateX(-100%);
+      }
+
+      .information-title {
+        color: #0e1e28;
+        font-family: Poppins;
+        font-size: 20px;
+        font-style: normal;
+        font-weight: 600;
+        line-height: normal;
+      }
+    </style>
+  </head>
+  <!--end::Head-->
+
+  <!--begin::Body-->
+
+  <body
+    id="kt_body"
+    class="header-fixed bg-white header-mobile-fixed subheader-enabled subheader-fixed subheader-mobile-fixed aside-enabled aside-fixed aside-minimize-hoverable page-loading"
+  >
+    <!--begin::Main-->
+    <div class="d-flex flex-column flex-root bg-white" id="canvas">
+      <div>
+        <!-- breadcrumb & icon tanya START -->
+        <div class="row">
+          <div class="col-11">
+            <h1 class="title" style="margin-bottom: 0">
+              PT. Sadhana Abiyasa Sampoerna
+            </h1>
+            <nav aria-label="breadcrumb">
+              <ol class="breadcrumb" style="margin-bottom: 0">
+                <li class="breadcrumb-item"><a href="#">Dashboard</a></li>
+                <li class="breadcrumb-item">
+                  <a href="#">Employee Health Medical Analytic</a>
+                </li>
+                <li class="breadcrumb-item">
+                  <a href="#">PT. Sadhana Abiyasa Sampoerna</a>
+                </li>
+                <li class="breadcrumb-item active" aria-current="page">
+                  Mcu Karyawan
+                </li>
+              </ol>
+            </nav>
+          </div>
+
+          <div class="col-1 align-content-center">
+            <!-- align-content-center -->
+            <div class="d-flex justify-content-end">
+              <a href="#">
+                <i class="fas fa-info-circle text-primary"></i>
+              </a>
+            </div>
+          </div>
+        </div>
+        <!-- breadcrumb & icon tanya END -->
+      </div>
+      <div class="mt-10">
+        <ul class="nav nav-tabs nav-tabs-line">
+          <li class="nav-item">
+            <a class="nav-link" data-toggle="tab" href="#kt_tab_pane_1"
+              >Peserta</a
+            >
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" data-toggle="tab" href="#kt_tab_pane_2"
+              >Kelainan global</a
+            >
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" data-toggle="tab" href="#kt_tab_pane_3"
+              >Kelainan Lab</a
+            >
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" data-toggle="tab" href="#kt_tab_pane_4"
+              >kelainan Non Lab</a
+            >
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" data-toggle="tab" href="#kt_tab_pane_5"
+              >kelainan Fisik</a
+            >
+          </li>
+          <li class="nav-item">
+            <a class="nav-link active" data-toggle="tab" href="#kt_tab_pane_6"
+              >Kesimpulan & Saran</a
+            >
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" data-toggle="tab" href="#kt_tab_pane_7"
+              >Daftar Peserta</a
+            >
+          </li>
+        </ul>
+      </div>
+      <div class="d-flex justify-content-center pt-10 pb-10">
+        <h2 class="title" style="margin-bottom: 0">Kesimpulan</h2>
+      </div>
+
+      <!-- Kelainan pemeriksaan lab -->
+      <div class="card card-custom gutter-b" style="border-radius: 20px">
+        <div style="padding-top: 12px">
+          <h3 class="card-label dot-text text-black">
+            3 Kelainan Pemeriksaan Lab terbesar :
+          </h3>
+        </div>
+        <div class="card-body">
+          <div>
+            <table class="table table-hover table-borderless">
+              <thead>
+                <tr>
+                  <th scope="col" width="5%">NO</th>
+                  <th scope="col" width="70%">PEMERIKSAAN</th>
+                  <th scope="col" width="25%">PRESENTASE</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>1</td>
+                  <td>Hipercholesterolemia</td>
+                  <td>44.5</td>
+                </tr>
+                <tr>
+                  <td>2</td>
+                  <td>Hiperuricemia</td>
+                  <td>22.7</td>
+                </tr>
+                <tr>
+                  <td>3</td>
+                  <td>Peningkatan SGPT</td>
+                  <td>15.8</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+      <!-- End Kelainan pemeriksaan lab -->
+
+      <!-- Kelainan pemeriksaan non lab -->
+      <div class="card card-custom gutter-b" style="border-radius: 20px">
+        <div style="padding-top: 12px">
+          <h3 class="card-label dot-text text-black">
+            3 Kelainan Pemeriksaan Non Lab terbesar :
+          </h3>
+        </div>
+        <div class="card-body">
+          <div>
+            <table class="table table-hover table-borderless">
+              <thead>
+                <tr>
+                  <th scope="col" width="5%">NO</th>
+                  <th scope="col" width="70%">PEMERIKSAAN</th>
+                  <th scope="col" width="25%">PRESENTASE</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>1</td>
+                  <td>Retriksi Ringan</td>
+                  <td>22.0</td>
+                </tr>
+                <tr>
+                  <td>2</td>
+                  <td>Gangguan Konduksi Ringan</td>
+                  <td>15.0</td>
+                </tr>
+                <tr>
+                  <td>3</td>
+                  <td>Obstruksi Sedang</td>
+                  <td>13.0</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+      <!-- End Kelainan pemeriksaan non lab -->
+
+      <!-- Kelainan pemeriksaan Fisik -->
+      <div class="card card-custom gutter-b" style="border-radius: 20px">
+        <div style="padding-top: 12px">
+          <h3 class="card-label dot-text text-black">
+            3 Kelainan Pemeriksaan Fisik terbesar :
+          </h3>
+        </div>
+        <div class="card-body">
+          <div>
+            <table class="table table-hover table-borderless">
+              <thead>
+                <tr>
+                  <th scope="col" width="5%">NO</th>
+                  <th scope="col" width="70%">PEMERIKSAAN</th>
+                  <th scope="col" width="25%">PRESENTASE</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>1</td>
+                  <td>Obesitas Stage 1</td>
+                  <td>41.7</td>
+                </tr>
+                <tr>
+                  <td>2</td>
+                  <td>Pre Hipertensi</td>
+                  <td>39.0</td>
+                </tr>
+                <tr>
+                  <td>3</td>
+                  <td>Kelainan Refraksi</td>
+                  <td>35.2</td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+      </div>
+      <!-- End Kelainan pemeriksaan Fisik -->
+
+      <!-- Saran -->
+      <div class="d-flex justify-content-center pt-10 pb-10">
+        <h2 class="information-title title" style="margin-bottom: 0">Saran</h2>
+      </div>
+
+      <div class="mb-5">
+        <h3 class="information-title mb-3">Tujuan MCU</h3>
+        <div>
+          <div class="dot-text">Olah raga teratur</div>
+          <div class="dot-text">Penurunan berat badan</div>
+        </div>
+      </div>
+
+      <div class="mb-5">
+        <h3 class="information-title mb-3">Kelainan Refraksi</h3>
+        <div>
+          <div class="mb-5">
+            <div>1. Kelainan refraksi dengan kacamata</div>
+            <div class="dot-text">
+              Konsul dokter Scpesialis Mata untuk pemakaian kacamata/ lensa
+              kontak
+            </div>
+          </div>
+          <div>2. Kelainan refraksi tanpa kacamata</div>
+          <div class="dot-text">Pemakaian kacamata/ lensa kontak</div>
+        </div>
+      </div>
+
+      <div class="mb-5">
+        <h3 class="information-title mb-3">Tekanan Darah</h3>
+        <div>
+          <div class="mb-5">
+            <div>1. Pre Hipertensi</div>
+            <div class="dot-text">Olah raga teratur</div>
+            <div class="dot-text">Cukup istirahat</div>
+            <div class="dot-text">Pemeriksaan tekanan darah secara teratur</div>
+          </div>
+          <div class="mb-5">
+            <div>2. Hipertensi stage 1 dan 2</div>
+            <div class="dot-text">Olah raga teratur</div>
+            <div class="dot-text">Cukup istirahat</div>
+            <div class="dot-text">Batasi konsumsi garam</div>
+            <div class="dot-text">Pemeriksaan tekanan darah secara teratur</div>
+            <div class="dot-text">
+              Pengobatan/ minum obat secara teratur (bila ybs sudah minum obat,
+              hipertensi tetapi  kadang-kadang atau tidak rutin)
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="mb-5">
+        <h3 class="information-title mb-3">
+          Peningkatan Profil lemak dan Hiperglikemia
+        </h3>
+        <div>
+          <div class="dot-text">Diet rendah lemak, karbohidrat dan gula,</div>
+          <div class="dot-text">Olahraga secara teraturs</div>
+          <div class="dot-text">
+            Program promosi kesehatan terutama untuk mencegah terjadinya dampak
+            serius peningkatan lemak darah
+          </div>
+        </div>
+      </div>
+
+      <div class="mb-5">
+        <h3 class="information-title mb-3">Hiperuricemia</h3>
+        <div>
+          <div class="dot-text" s>
+            Mengurangi asupan makanan/sayuran yang mengandung purin (melinjo,
+            kangkung, jeroan, emping, dll)
+          </div>
+        </div>
+      </div>
+      <!-- End Saran -->
+    </div>
+    <!--end::Main-->
+    <script>
+      var HOST_URL =
+        "https://preview.keenthemes.com/metronic/theme/html/tools/preview";
+    </script>
+    <!--begin::Global Config(global config for global JS scripts)-->
+    <script>
+      var KTAppSettings = {
+        breakpoints: {
+          sm: 576,
+          md: 768,
+          lg: 992,
+          xl: 1200,
+          xxl: 1400,
+        },
+        colors: {
+          theme: {
+            base: {
+              white: "#ffffff",
+              primary: "#3699FF",
+              secondary: "#E5EAEE",
+              success: "#1BC5BD",
+              info: "#8950FC",
+              warning: "#FFA800",
+              danger: "#F64E60",
+              light: "#E4E6EF",
+              dark: "#181C32",
+            },
+            light: {
+              white: "#ffffff",
+              primary: "#E1F0FF",
+              secondary: "#EBEDF3",
+              success: "#C9F7F5",
+              info: "#EEE5FF",
+              warning: "#FFF4DE",
+              danger: "#FFE2E5",
+              light: "#F3F6F9",
+              dark: "#D6D6E0",
+            },
+            inverse: {
+              white: "#ffffff",
+              primary: "#ffffff",
+              secondary: "#3F4254",
+              success: "#ffffff",
+              info: "#ffffff",
+              warning: "#ffffff",
+              danger: "#ffffff",
+              light: "#464E5F",
+              dark: "#ffffff",
+            },
+          },
+          gray: {
+            "gray-100": "#F3F6F9",
+            "gray-200": "#EBEDF3",
+            "gray-300": "#E4E6EF",
+            "gray-400": "#D1D3E0",
+            "gray-500": "#B5B5C3",
+            "gray-600": "#7E8299",
+            "gray-700": "#5E6278",
+            "gray-800": "#3F4254",
+            "gray-900": "#181C32",
+          },
+        },
+        "font-family": "Poppins",
+      };
+    </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-->
+
+    <!--begin::Page Vendors(used by this page)-->
+    <script src="assets/plugins/custom/fullcalendar/fullcalendar.bundle.js"></script>
+    <!--end::Page Vendors-->
+
+    <!--begin::Page Scripts(used by this page)-->
+    <script src="assets/js/pages/widgets.js"></script>
+    <!--end::Page Scripts-->
+    <!-- echartjs.min.js -->
+    <script src="assets/js/echarts-js/echart.min.js"></script>
+    <!-- SCRIPT -->
+    <script
+      src="https://cdnjs.cloudflare.com/ajax/libs/iconify/2.0.0/iconify.min.js"
+      integrity="sha512-lYMiwcB608+RcqJmP93CMe7b4i9G9QK1RbixsNu4PzMRJMsqr/bUrkXUuFzCNsRUo3IXNUr5hz98lINURv5CNA=="
+      crossorigin="anonymous"
+      referrerpolicy="no-referrer"
+    ></script>
+    <script type="text/javascript">
+      $.fn.redraw = function () {
+        $(this).each(function () {
+          var redraw = this.offsetHeight;
+        });
+      };
+      function ShowModal(name, nolab) {
+        console.log(name + nolab);
+        $("#modal-list-print-title").text(name + "-" + nolab);
+        $(".modal-list-print").modal("show");
+      }
+      function ShowModalPrint(data, title) {
+        console.log(data);
+        let a =
+          "https://devone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_fo_001.rptdesign&__format=pdf&username=ADMIN&PID=132061?t=1713408676799";
+        let b =
+          "https://devone.aplikasi.web.id/birt/run?__report=report/one/external/rpt_mt_pramita_001.rptdesign&__format=pdf&username=adminsas%20&PID=77&tm=1713317444625";
+        $(".modal-print-title").text(title);
+        let tag =
+          '<object id="object-print" width="100%" type="application/pdf" style="height: 80vh" ></object>';
+        if (data === "1") {
+          // $("#object-print").attr("data", a);
+          tag =
+            '<object id="object-print" width="100%" data="' +
+            a +
+            '" type="application/pdf" style="height: 80vh" ></object>';
+        } else {
+          // $("#object-print").attr("data", b);
+          tag =
+            '<object id="object-print" width="100%" data="' +
+            b +
+            '" type="application/pdf" style="height: 80vh" ></object>';
+        }
+        $("#object-print").replaceWith(tag);
+        console.log(tag);
+
+        $(".modal-list-print").modal("hide");
+        $(".modal-print").modal("show");
+      }
+      function CloseModalPrint() {
+        // $("#object-print").removeAttr("data");
+        // $("#object-print").redraw();
+        $(".modal-list-print").modal("show");
+        $(".modal-print").modal("hide");
+      }
+
+      function ShowModalAkses(email, password, checked) {
+        console.log("email" + email);
+        console.log("password" + password);
+        console.log("checked :" + checked);
+        $(".modal-akses").modal("show");
+        $('input[name="email"]').val(email);
+        $('input[name="password"]').val(password);
+        // $("#akses").attr("checked", checked);
+        // $('input[type="checkbox"]').removeAttr("checked");
+        $('input[name="akses"]').removeAttr("checked");
+        let appChecked =
+          '<span class="switch switch-sm switch-akses "><label><input id="akses" type="checkbox" name="akses" checked/><span></span></label></span>';
+        let appNotChecked =
+          '<span class="switch switch-sm switch-akses "><label><input id="akses" type="checkbox" name="akses" /><span></span></label></span>';
+
+        if (checked === "checked") {
+          // $('input[name="akses"]').attr("checked");
+          // $(".form-akses-switch").append(appChecked);
+          $(".switch-akses").replaceWith(appChecked);
+        } else {
+          // $('input[name="akses"]').removeAttr("checked");
+          // $('input[name="akses"]').removeAttr("checked");
+          // $(".form-akses-switch").append(appNotChecked);
+          $(".switch-akses").replaceWith(appNotChecked);
+        }
+        if (checked !== "checked") {
+          $(".switch-akses").replaceWith(appNotChecked);
+        }
+        // $("#akses").load(window.location.href + " #akses");
+      }
+      $("#akses").change(function () {
+        if (this.checked) {
+          $('input[name="akses"]').attr("checked", "checked");
+        } else {
+          $('input[name="akses"]').removeAttr("checked");
+        }
+      });
+    </script>
+  </body>
+  <!--end::Body-->
+</html>
--- a/assets/mcu/doctor.html
+++ b/assets/mcu/doctor.html
@@ -0,0 +1,511 @@
+<!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;
+      }
+    </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"
+  >
+    <!--begin::Main-->
+
+    <div class="wrapperx p-5 h-100">
+      <!-- person.png start -->
+      <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 -->
+
+      <div class="row mt-5">
+        <!-- col 1 start -->
+        <div class="col-4">
+          <div class="form-row">
+            <div class="col">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >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="default">Pilih Sapaan</option>
+                <option value="mr">Tuan</option>
+                <option value="mrs">Nyonya</option>
+                <option value="ms">Nona</option>
+              </select>
+            </div>
+            <div class="col">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Imbuhan Awal 1</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">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Imbuhan Awal 2</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>
+
+          <!-- jenis kelamin -->
+          <div class="form-row mt-5">
+            <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">Tuan</option>
+              <option value="mrs">Nyonya</option>
+              <option value="ms">Nona</option>
+            </select>
+          </div>
+          <!-- jenis kelamin -->
+          <!-- gol darah -->
+          <div class="form-row mt-5">
+            <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="mr">Tuan</option>
+              <option value="mrs">Nyonya</option>
+              <option value="ms">Nona</option>
+            </select>
+          </div>
+          <!-- gol darah -->
+          <!-- kewarganegaraan -->
+          <div class="form-row mt-5">
+            <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 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>
+          <!-- kewarganegaraan -->
+
+          <!-- identitas -->
+          <div class="form-row mt-5">
+            <label for="input1" style="font-family: Poppins; font-weight: 600"
+              >Imbuhan Awal 1</label
+            >
+            <input
+              type="text"
+              class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+              placeholder="Imbuhan Awal 1"
+            />
+          </div>
+          <!-- identitas -->
+        </div>
+        <!-- col 1 end -->
+        <!-- col 2 start -->
+        <div class="col-4">
+          <!-- nama -->
+          <div class="form-row">
+            <label 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="Input 3"
+            />
+          </div>
+          <!-- nama -->
+          <!-- tanggal lahir -->
+          <div class="form-row mt-5">
+            <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>
+          <!-- tanggal lahir -->
+          <!-- rhesus -->
+          <div class="form-row mt-5">
+            <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="mr">Tuan</option>
+              <option value="mrs">Nyonya</option>
+              <option value="ms">Nona</option>
+            </select>
+          </div>
+          <!-- rhesus -->
+          <!-- etnis -->
+          <div class="form-row mt-5">
+            <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="mr">Tuan</option>
+              <option value="mrs">Nyonya</option>
+              <option value="ms">Nona</option>
+            </select>
+          </div>
+          <!-- etnis -->
+
+          <!-- no hp -->
+          <div class="form-row mt-6">
+            <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>
+          <!-- no hp -->
+        </div>
+        <!-- col 2 end -->
+        <!-- col 3 start -->
+        <div class="col-4">
+          <div class="form-row">
+            <div class="col">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Imbuhan Akhir 1</label
+              >
+              <input
+                type="text"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Imbuhan Akhir 1"
+              />
+            </div>
+            <div class="col">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Imbuhan Akhir 2</label
+              >
+              <input
+                type="text"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Imbuhan Akhir 2"
+              />
+            </div>
+          </div>
+
+          <!-- umur -->
+          <div class="form-row mt-5">
+            <div class="col">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Umur</label
+              >
+              <input
+                type="number"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Tahun"
+              />
+            </div>
+            <div class="col mt-8">
+              <input
+                type="number"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Bulan"
+              />
+            </div>
+            <div class="col mt-8">
+              <input
+                type="number"
+                class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+                placeholder="Hari"
+              />
+            </div>
+          </div>
+          <!-- umur -->
+
+          <!-- pendidikan terakhir -->
+          <div class="form-row mt-5">
+            <div class="col">
+              <label for="input1" style="font-family: Poppins; font-weight: 600"
+                >Pendidikan Terakhir</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 Pendidikan</option>
+                <option value="mr">Tuan</option>
+                <option value="mrs">Nyonya</option>
+                <option value="ms">Nona</option>
+              </select>
+            </div>
+          </div>
+          <!-- pendidikan terakhir -->
+
+          <!-- identitas pilihan -->
+          <div class="form-row mt-5">
+            <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="mr">Tuan</option>
+                <option value="mrs">Nyonya</option>
+                <option value="ms">Nona</option>
+              </select>
+            </div>
+          </div>
+          <!-- identitas pilihan -->
+
+          <!-- email -->
+          <div class="form-row mt-6">
+            <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>
+          <!-- email -->
+        </div>
+        <!-- col 3 end -->
+      </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/mcu/formKeuangan.html
+++ b/assets/mcu/formKeuangan.html
@@ -0,0 +1,273 @@
+<!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="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"
+  >
+    <!--begin::Main-->
+
+    <div class="wrapperx p-5 h-100">
+      
+        <!--begin::Row 1-->
+        <div class="form-row">
+              <div class="col-3">
+                <div class="container px-15">
+                  <div
+                    class="d-flex flex-column bg-primary-transparent rounded p-4 m-2 shadow"
+                  >
+                    <h4>Orders</h4>
+                    <h1 class="font-weight-bolder ml-auto">120.000.000</h1>
+                  </div>
+                </div>
+              </div>
+              <div class="col-3">
+                <div class="container px-15">
+                  <div
+                    class="d-flex flex-column bg-warning-transparent rounded p-4 m-2 shadow"
+                  >
+                    <h4>Tagihan</h4>
+                    <h1 class="font-weight-bolder ml-auto">85.000.000</h1>
+                  </div>
+                </div>
+              </div>
+              <div class="col-3">
+                <div class="container px-15">
+                  <div
+                    class="d-flex flex-column bg-success-transparent rounded p-4 m-2 shadow"
+                  >
+                    <h4>Pelunasan</h4>
+                    <h1 class="font-weight-bolder ml-auto">55.000.000</h1>
+                  </div>
+                </div>
+              </div>
+              <div class="col-3">
+                <div class="container px-15">
+                  <div
+                    class="d-flex flex-column bg-danger-transparent rounded p-4 m-2 shadow"
+                  >
+                    <h4>Hutang</h4>
+                    <h1 class="font-weight-bolder ml-auto">55.000.000</h1>
+                  </div>
+                </div>
+              </div>
+              <!--end::Row 1-->
+            </div>
+            <!-- begin::Row 2 -->
+            <div class="form-row mt-15">
+                <div class="col">
+                        <div class="table-responsive">
+                            <table class="table table-bordered">
+                                <thead>
+                                    <tr >
+                                        <th scope="col" class="text-center text-black col-5" colspan="3">Tagihan</th>
+                                        <th scope="col" class="text-center text-black col-4" colspan="2">Pelunasan</th>
+                                        <th scope="col" class="text-center text-black col-3" rowspan="2">
+                                            <div class="d-flex justify-content-center align-items-center h-100">
+                                                <h3>Sisa</h3>
+                                            </div>
+                                        </th>
+                                    </tr>
+                                    <tr>
+                                        <th scope="col" class="text-center text-black">No/Tgl</th>
+                                        <th scope="col" class="text-center text-black">Tgl Jatuh Tempo</th>
+                                        <th scope="col" class="text-center text-black">Jumlah</th>
+                                        <th scope="col" class="text-center text-black">No/Tgl</th>
+                                        <th scope="col" class="text-center text-black">Jumlah</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td class="text-center" rowspan="2">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center" rowspan="2">20 MARET 2024</td>
+                                        <td class="text-center" rowspan="2">20.000.000</td>
+                                        <td class="text-center">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center">10.000.000</td>
+                                        <td class="text-center" rowspan="2">5.000.000</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="text-center">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center">5.000.000</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="text-center" rowspan="2">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center" rowspan="2">20 MARET 2024</td>
+                                        <td class="text-center" rowspan="2">20.000.000</td>
+                                        <td class="text-center">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center">10.000.000</td>
+                                        <td class="text-center" rowspan="2">5.000.000</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="text-center">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center">5.000.000</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                </div>
+            </div>
+            <!-- end::Row 2 -->
+          
+        
+      
+
+    <!--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/mcu/isihasilriwayat.html
+++ b/assets/mcu/isihasilriwayat.html
--- 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/auth/jwt.go
+++ b/auth/jwt.go
@@ -0,0 +1,27 @@
+package auth
+
+import (
+	"net/http"
+
+	echojwt "github.com/labstack/echo-jwt/v4"
+	"github.com/labstack/echo/v4"
+)
+
+var IsLoggedIn = echojwt.WithConfig(
+	echojwt.Config{
+		SigningKey:   []byte("--one_api-secret-2019-04-01"),
+		TokenLookup:  "cookie:token",
+		ErrorHandler: JWTErrorChecker,
+	},
+)
+
+var IsAlreadyLogin = echojwt.WithConfig(
+	echojwt.Config{
+		SigningKey:   []byte("--one_api-secret-2019-04-01"),
+		ErrorHandler: JWTErrorChecker,
+	},
+)
+
+func JWTErrorChecker(c echo.Context, err error) error {
+	return c.Redirect(http.StatusTemporaryRedirect, "/login")
+}
--- a/component/chart/chart.templ
+++ b/component/chart/chart.templ
@@ -11,7 +11,7 @@ script GenerateChart(idDiv string, udata string) {
        var element = document.getElementById(idDiv);
        console.log("element ",element)
        if (element) {
-            element.style.height = "400px";
+            element.style.height = "450px";
            element.style.width = "100%";
        }

@@ -27,4 +27,73 @@ script GenerateChart(idDiv string, udata string) {
        // myChart_001.setOption(option_001);
        myChart[idDiv].setOption(option[idDiv]);
    });
+}
+
+templ ShowChartFixed(idDiv string, udata string, width string, height string) {
+    <div id={ idDiv } class="mx-auto"></div>
+    @GenerateChartFixed(idDiv, udata, width, height)
+}
+
+script GenerateChartFixed(idDiv string, udata string, width string, height string) {
+    htmx.onLoad(function(elt) {
+        // console.log("elt ",elt)
+        var element = document.getElementById(idDiv);
+        // console.log("element ",element)
+        if (element) {
+            element.style.height = height;
+            element.style.width = width;
+        }
+
+        var myChart = {}; 
+        var option = {};
+
+        // var myChart_001 = echarts.init(document.getElementById(idDiv));
+        myChart[idDiv] = echarts.init(element);
+
+        // var option_001 = JSON.parse(udata);
+        option[idDiv] = JSON.parse(udata);
+        // console.log("option ", option)
+        // myChart_001.setOption(option_001);
+        myChart[idDiv].setOption(option[idDiv]);
+    });
+}
+
+templ ShowChartResponsiveWidth(idDiv string, udata string, height string) {
+    <div id={ idDiv } class="mx-auto" style="width: 100%;"></div>
+    @GenerateChartResponsive(idDiv, udata, height)
+}
+
+script GenerateChartResponsive(idDiv string, udata string, height string) {
+    htmx.onLoad(function(elt) {
+        // console.log("elt ",elt)
+        var element = document.getElementById(idDiv);
+        // console.log("element ",element)
+        if (element) {
+            element.style.height = height;
+        }
+
+        var myChart = {}; 
+        var option = {};
+
+        // var myChart_001 = echarts.init(document.getElementById(idDiv));
+        myChart[idDiv] = echarts.init(element);
+
+        // var option_001 = JSON.parse(udata);
+        option[idDiv] = JSON.parse(udata);
+        // console.log("option ", option)
+        // myChart_001.setOption(option_001);
+        if (option[idDiv]['series']['radius']) {
+            option[idDiv]['series']['radius'] = ['30%', '55%'];
+        } else {
+            option[idDiv]['series'][0]['radius'] = ['30%', '55%'];
+        }
+    
+        myChart[idDiv].setOption(option[idDiv]);
+
+        var resizeObserver = new ResizeObserver(function() {
+            myChart[idDiv].resize();
+        });
+
+        resizeObserver.observe(element);
+    });
 }
--- a/component/chart/chart_templ.go
+++ b/component/chart/chart_templ.go
@@ -53,13 +53,13 @@ func ShowChart(idDiv string, udata string) templ.Component {

 func GenerateChart(idDiv string, udata string) templ.ComponentScript {
 	return templ.ComponentScript{
-		Name: `__templ_GenerateChart_4c73`,
-		Function: `function __templ_GenerateChart_4c73(idDiv, udata){htmx.onLoad(function(elt) {
+		Name: `__templ_GenerateChart_906c`,
+		Function: `function __templ_GenerateChart_906c(idDiv, udata){htmx.onLoad(function(elt) {
        console.log("elt ",elt)
        var element = document.getElementById(idDiv);
        console.log("element ",element)
        if (element) {
-            element.style.height = "400px";
+            element.style.height = "450px";
            element.style.width = "100%";
        }

@@ -76,7 +76,160 @@ func GenerateChart(idDiv string, udata string) templ.ComponentScript {
        myChart[idDiv].setOption(option[idDiv]);
    });
 }`,
-		Call:       templ.SafeScript(`__templ_GenerateChart_4c73`, idDiv, udata),
-		CallInline: templ.SafeScriptInline(`__templ_GenerateChart_4c73`, idDiv, udata),
+		Call:       templ.SafeScript(`__templ_GenerateChart_906c`, idDiv, udata),
+		CallInline: templ.SafeScriptInline(`__templ_GenerateChart_906c`, idDiv, udata),
+	}
+}
+
+func ShowChartFixed(idDiv string, udata string, width string, height 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)
+		_, 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(idDiv)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\chart\chart.templ`, Line: 33, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"mx-auto\"></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = GenerateChartFixed(idDiv, udata, width, height).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 GenerateChartFixed(idDiv string, udata string, width string, height string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_GenerateChartFixed_c5bf`,
+		Function: `function __templ_GenerateChartFixed_c5bf(idDiv, udata, width, height){htmx.onLoad(function(elt) {
+        // console.log("elt ",elt)
+        var element = document.getElementById(idDiv);
+        // console.log("element ",element)
+        if (element) {
+            element.style.height = height;
+            element.style.width = width;
+        }
+
+        var myChart = {}; 
+        var option = {};
+
+        // var myChart_001 = echarts.init(document.getElementById(idDiv));
+        myChart[idDiv] = echarts.init(element);
+
+        // var option_001 = JSON.parse(udata);
+        option[idDiv] = JSON.parse(udata);
+        // console.log("option ", option)
+        // myChart_001.setOption(option_001);
+        myChart[idDiv].setOption(option[idDiv]);
+    });
+}`,
+		Call:       templ.SafeScript(`__templ_GenerateChartFixed_c5bf`, idDiv, udata, width, height),
+		CallInline: templ.SafeScriptInline(`__templ_GenerateChartFixed_c5bf`, idDiv, udata, width, height),
+	}
+}
+
+func ShowChartResponsiveWidth(idDiv string, udata string, height 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_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 id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(idDiv)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\chart\chart.templ`, Line: 62, 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("\" class=\"mx-auto\" style=\"width: 100%;\"></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = GenerateChartResponsive(idDiv, udata, height).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 GenerateChartResponsive(idDiv string, udata string, height string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_GenerateChartResponsive_fa78`,
+		Function: `function __templ_GenerateChartResponsive_fa78(idDiv, udata, height){htmx.onLoad(function(elt) {
+        // console.log("elt ",elt)
+        var element = document.getElementById(idDiv);
+        // console.log("element ",element)
+        if (element) {
+            element.style.height = height;
+        }
+
+        var myChart = {}; 
+        var option = {};
+
+        // var myChart_001 = echarts.init(document.getElementById(idDiv));
+        myChart[idDiv] = echarts.init(element);
+
+        // var option_001 = JSON.parse(udata);
+        option[idDiv] = JSON.parse(udata);
+        // console.log("option ", option)
+        // myChart_001.setOption(option_001);
+        if (option[idDiv]['series']['radius']) {
+            option[idDiv]['series']['radius'] = ['30%', '55%'];
+        } else {
+            option[idDiv]['series'][0]['radius'] = ['30%', '55%'];
+        }
+    
+        myChart[idDiv].setOption(option[idDiv]);
+
+        var resizeObserver = new ResizeObserver(function() {
+            myChart[idDiv].resize();
+        });
+
+        resizeObserver.observe(element);
+    });
+}`,
+		Call:       templ.SafeScript(`__templ_GenerateChartResponsive_fa78`, idDiv, udata, height),
+		CallInline: templ.SafeScriptInline(`__templ_GenerateChartResponsive_fa78`, idDiv, udata, height),
 	}
 }
--- a/component/customcheckbox/customcheckboxv1.templ
+++ b/component/customcheckbox/customcheckboxv1.templ
@@ -0,0 +1,25 @@
+package customcheckbox
+
+import "cpone/models"
+
+templ MainCustomCheckboxInput(inp models.CustomCheckboxv1Prm) {
+	<div class="form-control bg-field border-0 h-auto">
+		<div class="form-group">
+			<label>{ inp.Label }</label>
+			<div class="checkbox-list">
+				<label class="checkbox">
+					if (inp.Value == "on") {
+						<input type="checkbox" name={ inp.Name } id={ inp.ID } checked/>
+					} else {
+						<input type="checkbox" name={ inp.Name } id={ inp.ID }/>
+					}
+					<span></span>
+					{ inp.Text }
+				</label>
+			</div>
+		</div>
+		<div class="invalid-feedback text-danger mt-3 ml-2 mt-5">
+			{ inp.ErrorMsg }
+		</div>
+	</div>
+}
--- a/component/customcheckbox/customcheckboxv1_templ.go
+++ b/component/customcheckbox/customcheckboxv1_templ.go
@@ -0,0 +1,143 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package customcheckbox
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/models"
+
+func MainCustomCheckboxInput(inp models.CustomCheckboxv1Prm) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"form-control bg-field border-0 h-auto\"><div class=\"form-group\"><label>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Label)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 8, Col: 21}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</label><div class=\"checkbox-list\"><label class=\"checkbox\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if inp.Value == "on" {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input type=\"checkbox\" name=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var3 string
+			templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 12, Col: 44}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" id=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var4 string
+			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 12, Col: 58}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" checked> ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input type=\"checkbox\" name=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var5 string
+			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 14, Col: 44}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" id=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 14, Col: 58}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"> ")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<span></span> ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Text)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 17, Col: 15}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</label></div></div><div class=\"invalid-feedback text-danger mt-3 ml-2 mt-5\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customcheckbox\customcheckboxv1.templ`, Line: 22, Col: 17}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/component/customdropdown/customdropdown.templ
+++ b/component/customdropdown/customdropdown.templ
@@ -0,0 +1,119 @@
+package customdropdown;
+
+import "cpone/models"
+
+templ MainCustomDropdown(inp models.CustomDropdownv1Prm, listItem templ.Component) {
+	<div class="form-control bg-field border-0 h-auto">
+		<select
+			name={ inp.Name }
+			class="form-control bg-field selectpicker"
+			data-live-search="true"
+			data-size="5"
+			id={ inp.ID }
+			hx-get={ inp.HxGet }
+			hx-target={ inp.HxTarget }
+			hx-indicator={ inp.HxIndicator }
+			hx-trigger={ inp.HxTrigger }
+			hx-include={ inp.HxInclude }
+		>
+			@listItem
+		</select>
+		<div class="invalid-feedback text-danger mt-3 ml-2 mt-5">
+			{ inp.ErrorMsg }
+		</div>
+	</div>
+}
+
+templ MainCustomDropdownInput(inp models.CustomDropdownv1Prm, listItem templ.Component) {
+	<div class="form-control bg-field border-0 h-auto">
+		<select
+			name={ inp.Name }
+			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={ inp.ID }
+		>
+			@listItem
+		</select>
+		<div class="invalid-feedback text-danger mt-3 ml-2 mt-5">
+			{ inp.ErrorMsg }
+		</div>
+	</div>
+}
+
+templ MainCustomDropdownV1(name string, id string, hxTarget string, hxGet string, hxIndicator string, hxTrigger string, hxInclude string, listItem templ.Component) {
+	<div class="form-control bg-field border-0 h-auto">
+		<select
+			name={ name }
+			class="form-control bg-field selectpicker"
+			data-live-search="true"
+			data-size="5"
+			id={ id }
+			hx-get={ hxGet }
+			hx-target={ hxTarget }
+			hx-indicator={ hxIndicator }
+			hx-trigger={ hxTrigger }
+			hx-include={ hxInclude }
+		>
+			@listItem
+		</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
@@ -0,0 +1,611 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package customdropdown
+
+//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 MainCustomDropdown(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_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"form-control bg-field border-0 h-auto\"><select name=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, 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: 8, Col: 18}
+		}
+		_, 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=\"form-control bg-field selectpicker\" data-live-search=\"true\" data-size=\"5\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, 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: 12, Col: 14}
+		}
+		_, 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-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(inp.HxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 13, Col: 21}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(inp.HxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 14, Col: 27}
+		}
+		_, 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-indicator=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(inp.HxIndicator)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 15, Col: 33}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(inp.HxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 16, Col: 29}
+		}
+		_, 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-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(inp.HxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 17, Col: 29}
+		}
+		_, 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
+		}
+		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_Var9 string
+		templ_7745c5c3_Var9, 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: 22, Col: 17}
+		}
+		_, 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("</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 MainCustomDropdownInput(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_Var10 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var10 == nil {
+			templ_7745c5c3_Var10 = 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_Var11 string
+		templ_7745c5c3_Var11, 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: 30, Col: 18}
+		}
+		_, 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("\" 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: 35, Col: 14}
+		}
+		_, 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("\">")
+		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_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: 40, Col: 17}
+		}
+		_, 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("</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)
+		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-control bg-field border-0 h-auto\"><select name=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: 48, Col: 14}
+		}
+		_, 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=\"form-control bg-field selectpicker\" data-live-search=\"true\" data-size=\"5\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: 52, Col: 10}
+		}
+		_, 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-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: 53, Col: 17}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			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_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxIndicator)
+		if templ_7745c5c3_Err != nil {
+			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_Var19))
+		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_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: 56, Col: 25}
+		}
+		_, 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-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: 57, Col: 25}
+		}
+		_, 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("\">")
+		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>")
+		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 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
@@ -0,0 +1,22 @@
+package customradiobuttoninline
+
+import "cpone/models"
+
+templ MainCustomRadioButtonInput(inp models.CustomRadioButtonv1Prm) {
+	<div class="mt-5">
+		<label for="input1" style="font-family: Poppins; font-weight: 600">{ inp.Label }</label>
+		<div class="form-control">
+			<div class="form-group">
+				<div style="display: flex; gap: 20px">
+					<label style="display: flex; align-items: center; gap: 5px">
+						<input type="radio" name="nationality" value={ inp.Value }/>
+						<p style="margin: 0">{ inp.Text }</p>
+					</label>
+				</div>
+			</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
@@ -0,0 +1,89 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package customradiobuttoninline
+
+//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 MainCustomRadioButtonInput(inp models.CustomRadioButtonv1Prm) 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=\"mt-5\"><label for=\"input1\" style=\"font-family: Poppins; font-weight: 600\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Label)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customradiobutton\customradiobuttoninline.templ`, Line: 7, Col: 80}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</label><div class=\"form-control\"><div class=\"form-group\"><div style=\"display: flex; gap: 20px\"><label style=\"display: flex; align-items: center; gap: 5px\"><input type=\"radio\" name=\"nationality\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Value)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customradiobutton\customradiobuttoninline.templ`, Line: 12, Col: 62}
+		}
+		_, 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("\"><p style=\"margin: 0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Text)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customradiobutton\customradiobuttoninline.templ`, Line: 13, 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("</p></label></div></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_Var5 string
+		templ_7745c5c3_Var5, 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: 19, Col: 17}
+		}
+		_, 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("</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/customtextfieldsearch/customtextfieldsearch.templ
+++ b/component/customtextfieldsearch/customtextfieldsearch.templ
@@ -83,3 +83,42 @@ templ MainCustomTextFieldSearchV2(
    });
 </script>
 }
+
+templ MainCustomTextFieldSearchV3(
+	inpId,
+	inpName,
+	inpPlaceHolder,
+	inpType,
+	hxGet,
+	hxTrigger,
+	hxTarget,
+	hxIndicator,
+	value,
+	hxSwap string,
+	hxInclude string,
+	hxBeforeRequest templ.ComponentScript,
+	hxAfterRequest templ.ComponentScript) {
+	<input
+		class="form-control bg-field border-0 h-auto py-6 px-6 rounded-lg"
+		type={ inpType }
+		name={ inpName }
+		id={ inpId }
+		placeholder={ inpPlaceHolder }
+		hx-get={ hxGet }
+		hx-trigger={ hxTrigger }
+		hx-target={ hxTarget }
+		hx-indicator={ hxIndicator }
+		value={ value }
+		hx-include={ hxInclude }
+		hx-swap={ hxSwap }
+		hx-on::before-request={ hxBeforeRequest }
+		hx-on::after-request={ hxAfterRequest }
+		autocomplete="off"
+	/>
+	<script>
+    document.body.addEventListener('htmx:targetError', function(event) {
+        console.error('Error updating target element:', event.detail);
+        alert('There was an error updating the target element.');
+    });
+</script>
+}
--- a/component/customtextfieldsearch/customtextfieldsearch_templ.go
+++ b/component/customtextfieldsearch/customtextfieldsearch_templ.go
@@ -486,3 +486,205 @@ func MainCustomTextFieldSearchV2(
 		return templ_7745c5c3_Err
 	})
 }
+
+func MainCustomTextFieldSearchV3(
+	inpId,
+	inpName,
+	inpPlaceHolder,
+	inpType,
+	hxGet,
+	hxTrigger,
+	hxTarget,
+	hxIndicator,
+	value,
+	hxSwap string,
+	hxInclude 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_Var33 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var33 == nil {
+			templ_7745c5c3_Var33 = 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("<input class=\"form-control bg-field border-0 h-auto py-6 px-6 rounded-lg\" type=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var34 string
+		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(inpType)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 103, Col: 16}
+		}
+		_, 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("\" name=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var35 string
+		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(inpName)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 104, Col: 16}
+		}
+		_, 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(inpId)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 105, Col: 12}
+		}
+		_, 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("\" placeholder=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var37 string
+		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs(inpPlaceHolder)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 106, Col: 30}
+		}
+		_, 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-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var38 string
+		templ_7745c5c3_Var38, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 107, Col: 16}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var38))
+		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_Var39 string
+		templ_7745c5c3_Var39, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 108, Col: 24}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var39))
+		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_Var40 string
+		templ_7745c5c3_Var40, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 109, Col: 22}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var40))
+		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_Var41 string
+		templ_7745c5c3_Var41, templ_7745c5c3_Err = templ.JoinStringErrs(hxIndicator)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 110, Col: 28}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var41))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" value=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var42 string
+		templ_7745c5c3_Var42, templ_7745c5c3_Err = templ.JoinStringErrs(value)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 111, Col: 15}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var42))
+		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_Var43 string
+		templ_7745c5c3_Var43, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 112, Col: 24}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var43))
+		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_Var44 string
+		templ_7745c5c3_Var44, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customtextfieldsearch\customtextfieldsearch.templ`, Line: 113, Col: 18}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var44))
+		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_Var45 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var45.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_Var46 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var46.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" autocomplete=\"off\"><script>\r\n    document.body.addEventListener('htmx:targetError', function(event) {\r\n        console.error('Error updating target element:', event.detail);\r\n        alert('There was an error updating the target element.');\r\n    });\r\n</script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/component/modal/modal.templ
+++ b/component/modal/modal.templ
@@ -28,3 +28,58 @@ templ Modal(modalID string, modalTitle string, modalBody templ.Component, modalA
 		</div>
 	</div>
 }
+
+templ ModalXL(modalID string, modalTitle string, modalBody templ.Component, modalAction templ.Component, btnClose templ.Component) {
+	<div
+		class="modal fade"
+		style="display: none"
+		id={ modalID }
+		tabindex="-1"
+		role="dialog"
+		data-backdrop="static"
+		aria-hidden="true"
+	>
+		<div class="modal-dialog modal-xl modal-dialog-centered" role="document">
+			<div class="modal-content rounded-lg">
+				<div class="modal-header border-bottom-0">
+					<h6 class="modal-title text-black font-weight-bolder">
+						{ modalTitle }
+					</h6>
+					@btnClose
+				</div>
+				<div class="modal-body border-bottom-0">
+					@modalBody
+				</div>
+				<div class="modal-footer border-top-0">
+					@modalAction
+				</div>
+			</div>
+		</div>
+	</div>
+}
+
+templ ModalViewXL(modalID string, modalTitle string, modalBody templ.Component, btnClose templ.Component) {
+	<div
+		class="modal fade"
+		style="display: none"
+		id={ modalID }
+		tabindex="-1"
+		role="dialog"
+		data-backdrop="static"
+		aria-hidden="true"
+	>
+		<div class="modal-dialog modal-xl modal-dialog-centered" role="document">
+			<div class="modal-content rounded-lg">
+				<div class="modal-header border-bottom-0">
+					<h6 class="modal-title text-black font-weight-bolder">
+						{ modalTitle }
+					</h6>
+					@btnClose
+				</div>
+				<div class="modal-body border-bottom-0">
+					@modalBody
+				</div>
+			</div>
+		</div>
+	</div>
+}
--- a/component/modal/modal_templ.go
+++ b/component/modal/modal_templ.go
@@ -83,3 +83,143 @@ func Modal(modalID string, modalTitle string, modalBody templ.Component, modalAc
 		return templ_7745c5c3_Err
 	})
 }
+
+func ModalXL(modalID string, modalTitle string, modalBody templ.Component, modalAction templ.Component, btnClose 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_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"modal fade\" style=\"display: none\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(modalID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\modal\modal.templ`, Line: 36, Col: 14}
+		}
+		_, 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("\" tabindex=\"-1\" role=\"dialog\" data-backdrop=\"static\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl modal-dialog-centered\" role=\"document\"><div class=\"modal-content rounded-lg\"><div class=\"modal-header border-bottom-0\"><h6 class=\"modal-title text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(modalTitle)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\modal\modal.templ`, Line: 46, Col: 18}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</h6>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = btnClose.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"modal-body border-bottom-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalBody.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"modal-footer border-top-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalAction.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ModalViewXL(modalID string, modalTitle string, modalBody templ.Component, btnClose 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_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=\"modal fade\" style=\"display: none\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(modalID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\modal\modal.templ`, Line: 65, Col: 14}
+		}
+		_, 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("\" tabindex=\"-1\" role=\"dialog\" data-backdrop=\"static\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl modal-dialog-centered\" role=\"document\"><div class=\"modal-content rounded-lg\"><div class=\"modal-header border-bottom-0\"><h6 class=\"modal-title text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(modalTitle)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\modal\modal.templ`, Line: 75, Col: 18}
+		}
+		_, 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("</h6>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = btnClose.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"modal-body border-bottom-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalBody.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- 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/component/pagination/paginationv2.templ
+++ b/component/pagination/paginationv2.templ
@@ -27,18 +27,16 @@ templ PaginationV2(length int,
 						hx-trigger="click"
 						hx-target={ hxTarget }
 						hx-include={ hxInclude }
-						hx-disabled-elt=".btneditug, .btndeleteug"
 					>{ strconv.Itoa(i+1) }</a>
 				} else {
 					<a
 						hx-get={ link + "?" + "page=" + strconv.Itoa(i+1) }
-						class="btn btn-icon btn-sm border-0 btn-light mr-2 my-1"
+						class="btn btn-icon btn-sm border-0 btn-light mr-2 my-1 btneditug"
 						hx-swap={ hxSwap }
 						hx-indicator={ hxIndicator }
 						hx-trigger="click"
 						hx-target={ hxTarget }
 						hx-include={ hxInclude }
-						hx-disabled-elt=".btneditug, .btndeleteug"
 					>{ strconv.Itoa(i+1) }</a>
 				}
 			}
--- a/component/pagination/paginationv2_templ.go
+++ b/component/pagination/paginationv2_templ.go
@@ -132,14 +132,14 @@ func PaginationV2(length int,
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-disabled-elt=\".btneditug, .btndeleteug\">")
+				_, 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(strconv.Itoa(i + 1))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 31, Col: 25}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 30, Col: 25}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 				if templ_7745c5c3_Err != nil {
@@ -157,20 +157,20 @@ func PaginationV2(length int,
 				var templ_7745c5c3_Var10 string
 				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(link + "?" + "page=" + strconv.Itoa(i+1))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 34, Col: 55}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 33, Col: 55}
 				}
 				_, 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("\" class=\"btn btn-icon btn-sm border-0 btn-light mr-2 my-1\" hx-swap=\"")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"btn btn-icon btn-sm border-0 btn-light mr-2 my-1 btneditug\" 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: `component\pagination\paginationv2.templ`, Line: 36, Col: 22}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 35, Col: 22}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 				if templ_7745c5c3_Err != nil {
@@ -183,7 +183,7 @@ func PaginationV2(length int,
 				var templ_7745c5c3_Var12 string
 				templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxIndicator)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 37, Col: 32}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 36, Col: 32}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 				if templ_7745c5c3_Err != nil {
@@ -196,7 +196,7 @@ func PaginationV2(length int,
 				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: `component\pagination\paginationv2.templ`, Line: 39, Col: 26}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 38, Col: 26}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
 				if templ_7745c5c3_Err != nil {
@@ -209,20 +209,20 @@ func PaginationV2(length int,
 				var templ_7745c5c3_Var14 string
 				templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 40, Col: 28}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 39, Col: 28}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-disabled-elt=\".btneditug, .btndeleteug\">")
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
 				if templ_7745c5c3_Err != nil {
 					return templ_7745c5c3_Err
 				}
 				var templ_7745c5c3_Var15 string
 				templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(i + 1))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 42, Col: 25}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv2.templ`, Line: 40, Col: 25}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
 				if templ_7745c5c3_Err != nil {
--- a/component/pagination/paginationv3.templ
+++ b/component/pagination/paginationv3.templ
@@ -0,0 +1,60 @@
+package pagination 
+
+import "strconv"
+import "cpone/component/customtextfield"
+import "cpone/models"
+
+templ PaginationV3(length int,
+	currentPage int,
+	link string,
+	paginationID string,
+	hxInclude string,
+	hxTarget string,
+	hxSwap string,
+	hxIndicator string,
+	hxSwapOob string,
+	hxBeforeRequest templ.ComponentScript,
+	hxAfterRequest templ.ComponentScript,
+) {
+	// hx-on::before-request={ HideContent(contentID) }
+	// hx-on::after-request="alert('Done making a request!')"
+	<div
+		class="d-flex justify-content-between align-items-center flex-wrap"
+		hx-on::load={ hxAfterRequest }
+		id={ paginationID }
+		hx-swap-oob={ hxSwapOob }
+	>
+		<div class="d-flex flex-wrap py-2 mr-3">
+			for i:=0; i<length; i++ {
+				if (i+1) == currentPage {
+					<a
+						hx-get={ link + "?" + "page=" + strconv.Itoa(i+1) }
+						class="btn btn-icon btn-sm border-0 btn-light btn-hover-primary active mr-2 my-1"
+						hx-swap={ hxSwap }
+						hx-indicator={ hxIndicator }
+						hx-trigger="click"
+						hx-on::before-request={ hxBeforeRequest }
+						hx-target={ hxTarget }
+						hx-include={ hxInclude }
+					>{ strconv.Itoa(i+1) }</a>
+				} else {
+					<a
+						hx-get={ link + "?" + "page=" + strconv.Itoa(i+1) }
+						class="btn btn-icon btn-sm border-0 btn-light mr-2 my-1 btneditug"
+						hx-swap={ hxSwap }
+						hx-on::before-request={ hxBeforeRequest }
+						hx-indicator={ hxIndicator }
+						hx-trigger="click"
+						hx-target={ hxTarget }
+						hx-include={ hxInclude }
+					>{ strconv.Itoa(i+1) }</a>
+				}
+			}
+		</div>
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{
+			ID:    "currpage" + paginationID,
+			Name:  "currpage" + paginationID,
+			Type:  "hidden",
+			Value: strconv.Itoa(currentPage)})
+	</div>
+}
--- a/component/pagination/paginationv3_templ.go
+++ b/component/pagination/paginationv3_templ.go
@@ -0,0 +1,300 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package pagination
+
+//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 "strconv"
+import "cpone/component/customtextfield"
+import "cpone/models"
+
+func PaginationV3(length int,
+	currentPage int,
+	link string,
+	paginationID string,
+	hxInclude string,
+	hxTarget string,
+	hxSwap string,
+	hxIndicator string,
+	hxSwapOob 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.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxAfterRequest)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"d-flex justify-content-between align-items-center flex-wrap\" hx-on::load=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var2.Call)
+		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_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(paginationID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 24, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap-oob=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapOob)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 25, Col: 25}
+		}
+		_, 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("\"><div class=\"d-flex flex-wrap py-2 mr-3\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i := 0; i < length; i++ {
+			if (i + 1) == currentPage {
+				templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a hx-get=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var5 string
+				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(link + "?" + "page=" + strconv.Itoa(i+1))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 31, Col: 55}
+				}
+				_, 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("\" class=\"btn btn-icon btn-sm border-0 btn-light btn-hover-primary active mr-2 my-1\" hx-swap=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var6 string
+				templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 33, Col: 22}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var7 string
+				templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(hxIndicator)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 34, Col: 32}
+				}
+				_, 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=\"click\" hx-on::before-request=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var8 templ.ComponentScript = hxBeforeRequest
+				_, 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("\" hx-target=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var9 string
+				templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 37, Col: 26}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var10 string
+				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 38, Col: 28}
+				}
+				_, 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("\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var11 string
+				templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(i + 1))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 39, Col: 25}
+				}
+				_, 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("</a>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a hx-get=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var12 string
+				templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(link + "?" + "page=" + strconv.Itoa(i+1))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 42, Col: 55}
+				}
+				_, 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("\" class=\"btn btn-icon btn-sm border-0 btn-light mr-2 my-1 btneditug\" hx-swap=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var13 string
+				templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 44, Col: 22}
+				}
+				_, 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-indicator=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var15 string
+				templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(hxIndicator)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 46, Col: 32}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"click\" hx-target=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var16 string
+				templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 48, Col: 26}
+				}
+				_, 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-include=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var17 string
+				templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 49, Col: 28}
+				}
+				_, 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(strconv.Itoa(i + 1))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\pagination\paginationv3.templ`, Line: 50, Col: 25}
+				}
+				_, 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("</a>")
+				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 = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{
+			ID:    "currpage" + paginationID,
+			Name:  "currpage" + paginationID,
+			Type:  "hidden",
+			Value: strconv.Itoa(currentPage)}).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
+	})
+}
--- a/component/sidebar_user_profile/modal_sidebar_user.templ
+++ b/component/sidebar_user_profile/modal_sidebar_user.templ
@@ -0,0 +1,157 @@
+package sidebaruserprofile
+
+import (
+	"cpone/component/customtextfield"
+	"cpone/models"
+	"cpone/component/modal"
+)
+
+templ SidebarForm() {
+    <div>
+        <form
+            id="form-ganti-password"
+            class="form"
+            hx-post="/corp/dashboard_pic/gantipassword"
+            hx-target="#body-ganti-pass"
+            hx-swap="outerHTML"
+            hx-indicator=".formloading"
+            hx-on::before-request={ HandleFormBeforeRequest() }
+            hx-on::after-request={ HandleFormAfterGantiPass() }
+        >
+            @modalcomponent.Modal("modal-ganti-pass",
+                "Ganti Password",
+                ModalGantiPassword(),
+                ActionFormGantiPassword(),
+                CloseFormGantiPassword(),
+            )
+        </form>
+    </div>
+}
+
+templ ModalGantiPassword() {
+    <div id="body-ganti-pass">
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "oldPassID",
+            Name: "oldpassid",
+            Type: "password",
+            Placeholder: "Masukan password lama",
+            Label: "Password Lama",
+        })
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "newPassID",
+            Name: "newpassid",
+            Type: "password",
+            Placeholder: "Masukan password baru",
+            Label: "Password Baru",
+        })
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "reNewPassID",
+            Name: "renewpassid",
+            Type: "password",
+            Placeholder: "Masukan ulang password baru",
+            Label: "Ulangi Password Baru",
+        })
+    </div>
+    <script>
+        document.addEventListener('htmx:afterSwap', function(event) {
+            $('.selectpicker').selectpicker('refresh');
+        })
+    </script>
+}
+
+
+templ RetModalGantiPassword(
+    oldPass models.CustomTextFieldv2Prm,
+    newPass models.CustomTextFieldv2Prm,
+    renewPass models.CustomTextFieldv2Prm,
+    hxOnLoad templ.ComponentScript,
+) {
+    <div id="body-ganti-pass" hx-on::load={ hxOnLoad }>
+        @customtextfield.CustomTextFieldv2(oldPass)
+        @customtextfield.CustomTextFieldv2(newPass)
+        @customtextfield.CustomTextFieldv2(renewPass)
+    </div>
+    <script>
+        document.addEventListener('htmx:afterSwap', function(event) {
+            $('.selectpicker').selectpicker('refresh');
+        })
+    </script>
+}
+
+templ ActionFormGantiPassword() {
+    <div>
+        <button 
+            hx-on::after-request={ JSHideModal("#modal-ganti-pass") }
+            hx-post="/corp/dashboard_pic/tutupgantipassword"
+            hx-target="#body-ganti-pass"
+            hx-swap="outerHTML"
+            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 CloseFormGantiPassword() {
+    <button 
+        type="button" 
+        hx-on::after-request={ JSHideModal("#modal-ganti-pass") }
+        hx-post="/corp/dashboard_pic/tutupgantipassword"
+        hx-target="#body-ganti-pass"
+        hx-swap="outerHTML"
+        class="close btnactcancel"
+        data-dismiss="modal"
+        aria-label="Close"
+    >
+        <i aria-hidden="true" class="ki ki-close"></i>
+    </button>
+}
+
+script JSHideModal(modalID string) {
+    $(modalID).modal('hide')
+}
+
+script JSShowModal(modalID string) {
+    $(modalID).modal('show')
+    const btnActCancel = document.querySelectorAll('.btnactcancel');
+    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
+
+    for (let i = 0; i < btnActCancel.length; i++) {
+        btnActCancel[i].removeAttribute('disabled');
+    }
+    for (let i = 0; i < btnActSaveData.length; i++) {
+        btnActSaveData[i].removeAttribute('disabled');
+    }
+}
+
+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 HandleFormAfterGantiPass() {
+    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');
+    }
+}
--- a/component/sidebar_user_profile/modal_sidebar_user_templ.go
+++ b/component/sidebar_user_profile/modal_sidebar_user_templ.go
@@ -0,0 +1,336 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package sidebaruserprofile
+
+//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/component/modal"
+	"cpone/models"
+)
+
+func SidebarForm() 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>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleFormBeforeRequest(), HandleFormAfterGantiPass())
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<form id=\"form-ganti-password\" class=\"form\" hx-post=\"/corp/dashboard_pic/gantipassword\" hx-target=\"#body-ganti-pass\" hx-swap=\"outerHTML\" hx-indicator=\".formloading\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 templ.ComponentScript = HandleFormBeforeRequest()
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var2.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_Var3 templ.ComponentScript = HandleFormAfterGantiPass()
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var3.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("modal-ganti-pass",
+			"Ganti Password",
+			ModalGantiPassword(),
+			ActionFormGantiPassword(),
+			CloseFormGantiPassword(),
+		).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 ModalGantiPassword() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"body-ganti-pass\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "oldPassID",
+			Name:        "oldpassid",
+			Type:        "password",
+			Placeholder: "Masukan password lama",
+			Label:       "Password Lama",
+		}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "newPassID",
+			Name:        "newpassid",
+			Type:        "password",
+			Placeholder: "Masukan password baru",
+			Label:       "Password Baru",
+		}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "reNewPassID",
+			Name:        "renewpassid",
+			Type:        "password",
+			Placeholder: "Masukan ulang password baru",
+			Label:       "Ulangi Password Baru",
+		}).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 RetModalGantiPassword(
+	oldPass models.CustomTextFieldv2Prm,
+	newPass models.CustomTextFieldv2Prm,
+	renewPass models.CustomTextFieldv2Prm,
+	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_Var5 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var5 == nil {
+			templ_7745c5c3_Var5 = 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=\"body-ganti-pass\" hx-on::load=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 templ.ComponentScript = hxOnLoad
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var6.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(oldPass).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(newPass).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(renewPass).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 ActionFormGantiPassword() 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>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal("#modal-ganti-pass"))
+		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_Var8 templ.ComponentScript = JSHideModal("#modal-ganti-pass")
+		_, 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("\" hx-post=\"/corp/dashboard_pic/tutupgantipassword\" hx-target=\"#body-ganti-pass\" hx-swap=\"outerHTML\" 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 CloseFormGantiPassword() 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, JSHideModal("#modal-ganti-pass"))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button type=\"button\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 templ.ComponentScript = JSHideModal("#modal-ganti-pass")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var10.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"/corp/dashboard_pic/tutupgantipassword\" hx-target=\"#body-ganti-pass\" hx-swap=\"outerHTML\" 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 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 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 HandleFormAfterGantiPass() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleFormAfterGantiPass_cc6f`,
+		Function: `function __templ_HandleFormAfterGantiPass_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_HandleFormAfterGantiPass_cc6f`),
+		CallInline: templ.SafeScriptInline(`__templ_HandleFormAfterGantiPass_cc6f`),
+	}
+}
--- a/component/sidebar_user_profile/sidebar_user_profile.templ
+++ b/component/sidebar_user_profile/sidebar_user_profile.templ
@@ -22,26 +22,35 @@ templ Navbaruserprofile(dataUser models.User) {
 			<!--end::Header-->
 			<!--begin::Separator-->
 			<div class="separator separator-dashed my-7"></div>
-			<!--end::Separator-->
-			<!--begin::Notifications-->
-			<div>
-				<!--begin:Heading-->
-				<h5 class="mb-5">
-					Recent Notifications
-				</h5>
-				<!--end:Heading-->
-				<!--begin::Item-->
-				@NotificationCard()
-				<!--end::Item-->
+			<div class="navi mt-2">
+				<a 
+					class="btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block"
+					style="width: 100%"
+					data-toggle="modal"
+					data-target="#modal-ganti-pass"
+				>
+					Change Password
+				</a>
+			</div>
+			<div class="navi mt-2">
+				<a 
+					class="btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block"
+					hx-get="/login/signout"
+					hx-indicator=".logoutloading"
+					style="width: 100%"
+				>
+					<span class="htmx-indicator spinner-border spinner-border-sm logoutloading" role="status" aria-hidden="true"></span>
+					Sign Out
+				</a>
 			</div>
-			<!--end::Notifications-->
 		</div>
 		<!--end::Content-->
 	</div>
+	@SidebarForm()
 }

 templ ProfileHeader(dataUser models.User) {
-	<div class="d-flex align-items-center mt-5">
+	<div class="d-flex mt-5">
 		<div class="symbol symbol-100 mr-5 p-2 bg-primary-transparent">
 			// <div class="symbol-label" style="background-image:url('/assets/media/users/300_21.jpg')"></div>
 			// <i class="symbol-badge bg-success"></i>
@@ -54,9 +63,6 @@ templ ProfileHeader(dataUser models.User) {
 			<div class="text-muted mt-1">
 				{ dataUser.UserPosition }
 			</div>
-			<div class="navi mt-2">
-				<a href="#" class="btn btn-sm btn-light-primary font-weight-bolder py-2 px-5">Sign Out</a>
-			</div>
 		</div>
 	</div>
 }
--- a/component/sidebar_user_profile/sidebar_user_profile_templ.go
+++ b/component/sidebar_user_profile/sidebar_user_profile_templ.go
@@ -33,15 +33,11 @@ func Navbaruserprofile(dataUser models.User) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Header--><!--begin::Separator--><div class=\"separator separator-dashed my-7\"></div><!--end::Separator--><!--begin::Notifications--><div><!--begin:Heading--><h5 class=\"mb-5\">Recent Notifications\r</h5><!--end:Heading--><!--begin::Item-->")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Header--><!--begin::Separator--><div class=\"separator separator-dashed my-7\"></div><div class=\"navi mt-2\"><a class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block\" style=\"width: 100%\" data-toggle=\"modal\" data-target=\"#modal-ganti-pass\">Change Password\r</a></div><div class=\"navi mt-2\"><a class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block\" hx-get=\"/login/signout\" hx-indicator=\".logoutloading\" style=\"width: 100%\"><span class=\"htmx-indicator spinner-border spinner-border-sm logoutloading\" role=\"status\" aria-hidden=\"true\"></span> Sign Out\r</a></div></div><!--end::Content--></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = NotificationCard().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Item--></div><!--end::Notifications--></div><!--end::Content--></div>")
+		templ_7745c5c3_Err = SidebarForm().Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -65,14 +61,14 @@ func ProfileHeader(dataUser models.User) templ.Component {
 			templ_7745c5c3_Var2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"d-flex align-items-center mt-5\"><div class=\"symbol symbol-100 mr-5 p-2 bg-primary-transparent\"><span class=\"iconify symbol-label bg-primary-transparent text-primary\" data-icon=\"gravity-ui:person\"></span></div><div class=\"d-flex flex-column\"><a href=\"#\" class=\"font-weight-bold font-size-h5 text-dark-75 text-hover-primary\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"d-flex mt-5\"><div class=\"symbol symbol-100 mr-5 p-2 bg-primary-transparent\"><span class=\"iconify symbol-label bg-primary-transparent text-primary\" data-icon=\"gravity-ui:person\"></span></div><div class=\"d-flex flex-column\"><a href=\"#\" class=\"font-weight-bold font-size-h5 text-dark-75 text-hover-primary\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var3 string
 		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(dataUser.UserFullName)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\sidebar_user_profile\sidebar_user_profile.templ`, Line: 52, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\sidebar_user_profile\sidebar_user_profile.templ`, Line: 61, Col: 27}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
@@ -85,13 +81,13 @@ func ProfileHeader(dataUser models.User) templ.Component {
 		var templ_7745c5c3_Var4 string
 		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(dataUser.UserPosition)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\sidebar_user_profile\sidebar_user_profile.templ`, Line: 55, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\sidebar_user_profile\sidebar_user_profile.templ`, Line: 64, Col: 27}
 		}
 		_, 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("</div><div class=\"navi mt-2\"><a href=\"#\" class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5\">Sign Out</a></div></div></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/component/table/tablev3.templ
+++ b/component/table/tablev3.templ
@@ -10,7 +10,11 @@ templ TableV3(thName []string, thWidth []string, trComponent templ.Component) {
 				<thead>
 					<tr class="rounded-lg bg-header-table">
 						for i, item := range thName {
-							<th scope="col" width={ thWidth[i] }>{ item }</th>
+							if item == "AKSI" {
+								<th scope="col" width={ thWidth[i] } class="text-center">{ item }</th>	
+							} else {
+								<th scope="col" width={ thWidth[i] }>{ item }</th>
+							}
 						}
 					</tr>
 				</thead>
--- a/component/table/tablev3_templ.go
+++ b/component/table/tablev3_templ.go
@@ -38,35 +38,68 @@ func TableV3(thName []string, thWidth []string, trComponent templ.Component) tem
 				return templ_7745c5c3_Err
 			}
 			for i, item := range thName {
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" width=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var2 string
-				templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 13, Col: 41}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var3 string
-				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(item)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 13, Col: 50}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</th>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
+				if item == "AKSI" {
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" width=\"")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var2 string
+					templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 14, Col: 42}
+					}
+					_, 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=\"text-center\">")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var3 string
+					templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(item)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 14, Col: 71}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</th>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				} else {
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" width=\"")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var4 string
+					templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 16, Col: 42}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var5 string
+					templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(item)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 16, Col: 51}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</th>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
 				}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</tr></thead> <tbody>")
@@ -101,9 +134,9 @@ func DivEmptyV3() templ.Component {
 			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_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></div>")
--- a/component/toastbootstrap/customtoastv2.templ
+++ b/component/toastbootstrap/customtoastv2.templ
@@ -13,7 +13,7 @@ func toastBody(typeToastBody string) string {
 }

 func toastIcon(typeToast string) string {
-    var stringx string
+	var stringx string
 	if typeToast == "success" {
 		stringx = "solar:check-circle-broken"
 	} else {
@@ -30,18 +30,18 @@ func toastIcon(typeToast string) string {
 		}
 	}

-    return stringx
+	return stringx
 }

 templ CustomToastV2Show(title string, message string, typeToast string) {
 	<div
-		class="toast fade show"
+		class="toast toast-top-right fade show"
 		role="alert"
 		aria-live="assertive"
 		aria-atomic="true"
 		id="notification-001"
 		hx-swap-oob="true"
-		hx-get="/dev/hidetoast"
+		hx-get="/home/hidetoast"
 		hx-trigger="load delay:3s"
 		hx-target="this"
 		style="border-radius: 8px 8px 8px 8px;"
@@ -63,14 +63,15 @@ templ CustomToastV2Show(title string, message string, typeToast string) {
 }

 templ CustomToastV2Hide() {
-	<div id="notification-001" 
-        class="toast fade hide" 
-        role="alert" 
-        aria-live="assertive" 
-        aria-atomic="true"
-        style="opacity: 0"
-        hx-swap-oob="true"
-    >
+	<div
+		id="notification-001"
+		class="toast fade hide"
+		role="alert"
+		aria-live="assertive"
+		aria-atomic="true"
+		style="opacity: 0"
+		hx-swap-oob="true"
+	>
 		<div class="toast-header bg-success text-white">
 			<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--ep mr-2 icon-xl" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 1024 1024" data-icon="ep:success-filled"><path fill="currentColor" d="M512 64a448 448 0 1 1 0 896a448 448 0 0 1 0-896m-55.808 536.384l-99.52-99.584a38.4 38.4 0 1 0-54.336 54.336l126.72 126.72a38.27 38.27 0 0 0 54.336 0l262.4-262.464a38.4 38.4 0 1 0-54.272-54.336z"></path></svg>
 			<strong class="mr-auto">Success</strong>
--- a/component/toastbootstrap/customtoastv2_templ.go
+++ b/component/toastbootstrap/customtoastv2_templ.go
@@ -56,7 +56,7 @@ func CustomToastV2Show(title string, message string, typeToast string) templ.Com
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"toast fade show\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\" id=\"notification-001\" hx-swap-oob=\"true\" hx-get=\"/dev/hidetoast\" hx-trigger=\"load delay:3s\" hx-target=\"this\" style=\"border-radius: 8px 8px 8px 8px;\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"toast toast-top-right fade show\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\" id=\"notification-001\" hx-swap-oob=\"true\" hx-get=\"/home/hidetoast\" hx-trigger=\"load delay:3s\" hx-target=\"this\" style=\"border-radius: 8px 8px 8px 8px;\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/go.mod
+++ b/go.mod
@@ -4,17 +4,19 @@ 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/golang-jwt/jwt/v5 v5.0.0
+	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 +26,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 +37,8 @@ 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/echo-jwt/v4 v4.2.0
+	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=
@@ -15,6 +18,8 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
+github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
@@ -25,33 +30,38 @@ 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-jwt/v4 v4.2.0 h1:odSISV9JgcSCuhgQSV/6Io3i7nUmfM/QkBeR5GVJj5c=
+github.com/labstack/echo-jwt/v4 v4.2.0/go.mod h1:MA2RqdXdEn4/uEglx0HcUOgQSyBaTh5JcaHIan3biwU=
 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 +79,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 +87,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/corporate/account.handlers.go
+++ b/handlers/corporate/account.handlers.go
@@ -0,0 +1,156 @@
+package corporate_handlers
+
+import (
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	customtoastv2 "cpone/component/toastbootstrap"
+	"cpone/models"
+	"cpone/utils"
+	"net/http"
+	"strings"
+	"time"
+
+	"github.com/a-h/templ"
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/labstack/echo/v4"
+)
+
+type AccountService interface {
+	ChangePasswordPIC(host string, token string, currPassword string, newPassword string) (models.ResponseStatus, error)
+	ChangePasswordPAT(token string, currPassword string, newPassword string) (models.ResponseStatus, error)
+}
+
+func NewAccountHandler(as AccountService) *AccountHandler {
+	return &AccountHandler{
+		AccountService: as,
+	}
+}
+
+type AccountHandler struct {
+	AccountService AccountService
+}
+
+func (as *AccountHandler) HandleChangePassword(c echo.Context) error {
+	var response models.ResponseStatus
+	userToken := c.Get("user").(*jwt.Token)
+	token := userToken.Raw
+	claims := userToken.Claims.(jwt.MapClaims)
+	userGroup := claims["M_UserGroupDashboard"].(string)
+	h := c.Request().Host
+
+	old_pass := c.FormValue("oldpassid")
+	new_pass := c.FormValue("newpassid")
+	re_new_pass := c.FormValue("renewpassid")
+	// logger.Info("params", zap.Any("old", old_pass), zap.Any("new", new_pass), zap.Any("re-new", re_new_pass))
+
+	old_validation := ""
+	new_validation := ""
+	renew_validation := ""
+	errorPop := ""
+
+	if strings.TrimSpace(old_pass) == "" {
+		old_validation = "Tidak boleh kosong"
+		errorPop = "Tidak boleh kosong"
+	}
+	if strings.TrimSpace(new_pass) == "" {
+		new_validation = "Tidak boleh kosong"
+		errorPop = "Tidak boleh kosong"
+	}
+	if strings.TrimSpace(re_new_pass) == "" {
+		renew_validation = "Tidak boleh kosong"
+		errorPop = "Tidak boleh kosong"
+	}
+	if strings.TrimSpace(new_pass) != strings.TrimSpace(re_new_pass) {
+		new_validation = "Password tidak sama"
+		renew_validation = "Password tidak sama"
+		errorPop = "Password tidak sama"
+	}
+
+	if old_validation != "" || new_validation != "" || renew_validation != "" {
+		newBody := sidebaruserprofile.RetModalGantiPassword(
+			models.CustomTextFieldv2Prm{
+				ID:          "oldPassID",
+				Name:        "oldpassid",
+				Type:        "password",
+				Placeholder: "Masukan password lama",
+				Label:       "Password Lama",
+				ErrorMsg:    old_validation,
+			},
+			models.CustomTextFieldv2Prm{
+				ID:          "newPassID",
+				Name:        "newpassid",
+				Type:        "password",
+				Placeholder: "Masukan password baru",
+				Label:       "Password Baru",
+				ErrorMsg:    new_validation,
+			},
+			models.CustomTextFieldv2Prm{
+				ID:          "reNewPassID",
+				Name:        "renewpassid",
+				Type:        "password",
+				Placeholder: "Masukan ulang password baru",
+				Label:       "Ulangi Password Baru",
+				ErrorMsg:    renew_validation,
+			},
+			sidebaruserprofile.JSHideModal(""),
+		)
+		toast := customtoastv2.CustomToastV2Show("Warning", errorPop, "warning")
+		return utils.ViewMulti(c, []templ.Component{toast, newBody})
+	}
+
+	if userGroup == "pic" {
+		resp, err := as.AccountService.ChangePasswordPIC(h, token, old_pass, new_pass)
+		if err != nil {
+			newBody := sidebaruserprofile.ModalGantiPassword()
+			toast := customtoastv2.CustomToastV2Show("Warning", err.Error(), "warning")
+			return utils.ViewMulti(c, []templ.Component{toast, newBody})
+		}
+		response = resp
+	}
+
+	if userGroup == "patient" {
+		resp, err := as.AccountService.ChangePasswordPAT(token, old_pass, new_pass)
+		if err != nil {
+			newBody := sidebaruserprofile.ModalGantiPassword()
+			toast := customtoastv2.CustomToastV2Show("Warning", "Error ganti password pat", "warning")
+			return utils.ViewMulti(c, []templ.Component{toast, newBody})
+		}
+		response = resp
+	}
+
+	if response.Status == "ERR" {
+		newBody := sidebaruserprofile.ModalGantiPassword()
+		toast := customtoastv2.CustomToastV2Show("Warning", response.Message, "warning")
+		return utils.ViewMulti(c, []templ.Component{toast, newBody})
+	}
+
+	expire := time.Now().Add(-7 * 24 * time.Hour)
+	cookie := new(http.Cookie)
+	cookie.Name = "token"
+	cookie.Value = ""
+	cookie.Path = "/"
+	cookie.Expires = expire
+	cookie.HttpOnly = true
+	c.SetCookie(cookie)
+
+	ret := `
+	<script>
+		$("#body-ganti-pass").modal('hide')
+		console.log("signout")
+		localStorage.removeItem("token")
+		localStorage.removeItem("user")
+
+		setTimeout(() => {
+			window.location.replace("/login");
+		}, 200)
+	</script>
+	`
+
+	c.Response().Header().Set("HX-Trigger", "script")
+	return c.String(http.StatusOK, ret)
+}
+
+func (as *AccountHandler) HandleCloseChangePassword(c echo.Context) error {
+	newBody := sidebaruserprofile.ModalGantiPassword()
+
+	return utils.View(c, newBody)
+}
--- a/handlers/corporate/dashboardpic.handlers.go
+++ b/handlers/corporate/dashboardpic.handlers.go
@@ -0,0 +1,217 @@
+package corporate_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	"cpone/component/pagination"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/utils"
+	corporate_dashboardpic "cpone/views/corporate/dashboardpic"
+	"net/http"
+	"strconv"
+
+	"github.com/a-h/templ"
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type DashboardPicServices interface {
+	GetEmployeeAnalyticBreadcrumb(title string) (models.BreadCrumbV1, error)
+	GetCorporateName(userID string) (string, error)
+	DummyDataTest() ([]models.DashboardPic, error)
+	ListingDashboardPic(email string, search string, startdate string, enddate string, currentpage int, rowperpage int) ([]models.DashboardPic, int, error)
+}
+
+type DashboardPicHandler struct {
+	DashboardPicServices DashboardPicServices
+}
+
+func NewDashboardPicHandler(ea DashboardPicServices) *DashboardPicHandler {
+	return &DashboardPicHandler{
+		DashboardPicServices: ea,
+	}
+}
+
+func (ea *DashboardPicHandler) HandleShowEmployeeAnalyticScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	listID := utils.GenerateRandomID("listid")
+	paginationID := utils.GenerateRandomID("paginationid")
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	userID := claims["M_UserID"].(string)
+	name := claims["M_StaffName"].(string)
+	position := claims["M_UserGroupDashboard"].(string)
+	email := claims["M_UserEmail"].(string)
+
+	title, err := ea.DashboardPicServices.GetCorporateName(userID)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get corporate name", zap.Any("error", err))
+		return err
+	}
+
+	convr, _ := strconv.Atoi(userID)
+
+	user := models.User{
+		UserID:       convr,
+		Username:     name,
+		UserFullName: name,
+		UserPosition: position,
+	}
+
+	dataBreadcrumb, err := ea.DashboardPicServices.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.DashboardPicServices.ListingDashboardPic(email, "", "", "", 1, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get listing data", zap.Any("error", err), zap.Any("total", totalPage))
+		return err
+	}
+	listingcomponent := corporate_dashboardpic.ListingData(listingData, listID)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/corp/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		corporate_dashboardpic.BeforeRequestContent(),
+		corporate_dashboardpic.AfterRequestContent(),
+	)
+
+	filtercomponent := corporate_dashboardpic.FilterListing(
+		"/corp/dashboard_pic/filter",
+		"input changed delay:500ms",
+		"#searchID, #startdateID, #enddateID, #listID, #paginationID",
+		"outerHTML",
+		"#"+paginationID,
+		corporate_dashboardpic.BeforeRequestContent(),
+		corporate_dashboardpic.AfterRequestContent(),
+	)
+
+	content := corporate_dashboardpic.DashboardPic(
+		listID,
+		paginationID,
+		breadcrumb,
+		filtercomponent,
+		listingcomponent,
+		paginationcomponent,
+	)
+	css := corporate_dashboardpic.CSSDashboardPIC()
+	js := corporate_dashboardpic.JSDashboardPIC()
+
+	view := corporate_dashboardpic.ShowDashboardPic(title, content, css, js, navbaruser, sidbaruser)
+	return utils.View(c, view)
+}
+
+func (ea *DashboardPicHandler) 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")
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	email := claims["M_UserEmail"].(string)
+
+	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.DashboardPicServices.ListingDashboardPic(email, search, startdate, enddate, page, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error convert page param")
+		return err
+	}
+	listcomponent := corporate_dashboardpic.ListingData(listdata, listID)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		corporate_dashboardpic.BeforeRequestContent(),
+		corporate_dashboardpic.AfterRequestContent(),
+	)
+
+	retVal = append(retVal, listcomponent)
+	retVal = append(retVal, paginationcomponent)
+	return utils.ViewMulti(c, retVal)
+}
+
+func (ea *DashboardPicHandler) 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")
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	email := claims["M_UserEmail"].(string)
+
+	dataList, totalPage, err := ea.DashboardPicServices.ListingDashboardPic(email, search, startdate, enddate, 1, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error Get Listing Data", zap.Any("error", err))
+		return err
+	}
+
+	listcomponent := corporate_dashboardpic.ListingData(dataList, listID)
+	paginationcomponent := pagination.PaginationV3(
+		totalPage, 1,
+		"/corp/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID, "outerHTML", "", "",
+		corporate_dashboardpic.BeforeRequestContent(),
+		corporate_dashboardpic.AfterRequestContent(),
+	)
+
+	var retval []templ.Component
+	retval = append(retval, listcomponent)
+	retval = append(retval, paginationcomponent)
+	return utils.ViewMulti(c, retval)
+}
+
+func (ea *DashboardPicHandler) HandleToDetail(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	id := c.Param("id")
+
+	logger.Info("params", zap.Any("id", id))
+
+	url := "/corp/dashboard_pic/detail/" + id
+	c.Response().Header().Set("HX-Redirect", url)
+
+	return c.String(http.StatusOK, url)
+}
--- a/handlers/corporate/mcudetail.handlers.go
+++ b/handlers/corporate/mcudetail.handlers.go
@@ -0,0 +1,89 @@
+package corporate_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu"
+	corporate_tabmcudetail "cpone/views/corporate/mcu/mcutab"
+
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type McuDetailServices interface {
+	GetBreadcrumb(id string) (models.BreadCrumbV1, error)
+	GetTabNameList(id string) ([]models.McuTabModels, error)
+}
+
+type McuDetailHandler struct {
+	McuDetailServices McuDetailServices
+}
+
+func NewMcuDetailHandler(mcud McuDetailServices) *McuDetailHandler {
+	return &McuDetailHandler{
+		McuDetailServices: mcud,
+	}
+}
+
+func (mcud *McuDetailHandler) HandlerShowMcuDetailScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.Param("id")
+	logger.Info("params", zap.Any("id", id))
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	name := claims["M_StaffName"].(string)
+	position := claims["M_UserGroupDashboard"].(string)
+	// logger.Info("jwt", zap.Any("name", name))
+
+	user := models.User{
+		UserID:       1,
+		Username:     name,
+		UserFullName: name,
+		UserPosition: position,
+	}
+
+	dataBreadcrumb, err := mcud.McuDetailServices.GetBreadcrumb(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb corp", zap.Any("error", err))
+		return err
+	}
+
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+
+	// test := []models.McuTabModels{}
+	tabname, err := mcud.McuDetailServices.GetTabNameList(id)
+	if err != nil {
+		return err
+	}
+	// logger.Info("List tab name", zap.Any("tav", tabname))
+
+	content := corporate_mcudetail.McuDetailScreen(
+		breadcrumb,
+		// corporate_mcudetail.TabViewMcuDetail(id),
+		corporate_mcudetail.McuDetailTabView(id, tabname),
+	)
+	css := corporate_mcudetail.CSSMcuDetail(
+		corporate_tabmcudetail.CssKesimpulan(),
+	)
+	js := corporate_mcudetail.JSMcuDetail()
+
+	view := corporate_mcudetail.ShowMcuDetail(
+		dataBreadcrumb.Title,
+		content,
+		css,
+		js,
+		navbaruser,
+		sidbaruser,
+	)
+
+	return utils.View(c, view)
+}
--- a/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go
+++ b/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go
@@ -0,0 +1,805 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/pagination"
+	customtoastv2 "cpone/component/toastbootstrap"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"strconv"
+	"strings"
+
+	"github.com/a-h/templ"
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabDaftarPesertaServices interface {
+	GetListDaftarPesertaMCU(id string, currentpage int, rowperpage int) ([]models.ModelMcuDaftarPeserta, int, error)
+	GenerataPasswordMCU(mgmMCUID string, host string) (models.GeneratePasswordResponse, error)
+	GetAkunPeserta(patientID string) (models.AuthPatient, error)
+	GetListReportPesertaV4(orderheaderID string, staffname string) ([]models.TabViewReportMcu, error)
+	ResetPasswordPeserta(token string, newPassword string, email string, authuserid string) (models.ResponseStatus, error)
+	DetailTestdanPaket(orderheaderID string) ([]models.TableTestPaket, error)
+}
+
+type TabDaftarPesertaHandlers struct {
+	TabDaftarPesertaServices TabDaftarPesertaServices
+}
+
+func NewTabDaftarPesertaHandlers(tdp TabDaftarPesertaServices) *TabDaftarPesertaHandlers {
+	return &TabDaftarPesertaHandlers{
+		TabDaftarPesertaServices: tdp,
+	}
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleShowTabDaftarPeserta(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	title := "Daftar Report"
+	tableID := utils.GenerateRandomID("tableid")
+	paginationID := utils.GenerateRandomID("paginationID")
+
+	dialogReportID := utils.GenerateRandomID("dialogreportid")
+	dialogReportBodyID := utils.GenerateRandomID("dialogreportbodyid")
+
+	dialogGeneratePassID := utils.GenerateRandomID("generatepasswordID")
+	dialogGeneratePassBodyID := utils.GenerateRandomID("generatepasswordBodyID")
+
+	dialogAkunID := utils.GenerateRandomID("dialogakunID")
+	dialogAkunBodyID := utils.GenerateRandomID("dialogakunbodyID")
+
+	dialogDetailID := utils.GenerateRandomID("dialogdetailID")
+	dialogDetailBodyID := utils.GenerateRandomID("dialogdetailBodyID")
+
+	id := c.Param("id")
+	logger.Info("Params", zap.Any("id", id))
+
+	dataTable, totalPage, err := tdp.TabDaftarPesertaServices.GetListDaftarPesertaMCU(id, 1, 10)
+	if err != nil {
+		return err
+	}
+
+	table := corporate_mcudetail.TableDaftarPeserta(
+		dataTable,
+		tableID,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/openreport",
+		"#"+dialogReportBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
+		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/openviewakun",
+		"#"+dialogAkunBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
+		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/opendetail",
+		"#"+dialogDetailBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogDetailID, #dialogDetailBodyID",
+		"outerHTML",
+	)
+
+	pagination := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/changepage",
+		paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	clayout := corporate_mcudetail.ContentLayout(
+		table,
+		pagination,
+	)
+
+	// modal dialog tab rpt
+	tabData := []models.TabViewReportMcu{}
+	tabview := corporate_mcudetail.TabReportView(tabData)
+
+	bodymodal := corporate_mcudetail.ModalRptBody(
+		dialogReportBodyID,
+		tabview,
+		corporate_mcudetail.JsShowModal(""),
+	)
+
+	closemodal := corporate_mcudetail.ModalClose(
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/closereport",
+		"#"+dialogReportBodyID,
+		"outerHTML",
+		"#"+dialogReportID,
+	)
+
+	modaldialog := corporate_mcudetail.DialogReport(
+		"generatepasswordform",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/dialogreport",
+		"#"+dialogReportBodyID,
+		"outerHTML",
+		"#tableID, #paginationID, #dialogAkunID, #dialogAkunBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogReportID, #dialogReportBodyID"+paginationID,
+		dialogReportID,
+		title,
+		bodymodal,
+		closemodal,
+	)
+
+	// dialog generate password
+	modalGenPassBody := corporate_mcudetail.ModalGenPassBody(
+		dialogGeneratePassBodyID,
+		"Apakah anda yakin untuk men-generate password untuk seluruh karyawan",
+		corporate_mcudetail.JsShowModal(""),
+	)
+
+	closeGenPass := corporate_mcudetail.ModalClose(
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/closegenpass",
+		"#"+dialogGeneratePassBodyID,
+		"outerHTML",
+		"#"+dialogGeneratePassID,
+	)
+
+	actionGenPass := corporate_mcudetail.ModalGenPassAction(
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/closegenpass",
+		"#"+dialogGeneratePassBodyID,
+		"outerHTML",
+		"#"+dialogGeneratePassID,
+	)
+
+	modalGenPass := corporate_mcudetail.DialogGeneratePass(
+		"",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/dialoggenpass",
+		"#"+dialogGeneratePassBodyID,
+		"outerHTML",
+		"#tableID, #paginationID, #contentlayout, #dialogAkunID, #dialogAkunBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogReportID, #dialogReportBodyID, #currpage"+paginationID,
+		dialogGeneratePassID,
+		"Generate Password MCU",
+		modalGenPassBody,
+		closeGenPass,
+		actionGenPass,
+	)
+
+	// dialog view akun
+	dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
+		dialogAkunBodyID,
+		models.CustomTextFieldv2Prm{
+			Label:       "ID Akun Peserta",
+			Name:        "akunpesertaid",
+			Placeholder: "ID Akun Peserta",
+			Type:        "hidden",
+			ID:          "akunpesertaidid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Email",
+			Name:  "akunpesertaemail",
+			Type:  "text",
+			ID:    "akunpesertaemailid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Password baru",
+			Name:  "akunpesertapassnew",
+			Type:  "password",
+			ID:    "akunpesertapassnewid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Ulangi password baru",
+			Name:  "akunpesertapasscek",
+			Type:  "password",
+			ID:    "akunpesertapasscekid",
+		},
+		corporate_mcudetail.JsShowModal(""),
+	)
+
+	dialogAkunClose := corporate_mcudetail.ModalClose(
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/closeviewakun",
+		"#"+dialogAkunBodyID,
+		"outerHTML",
+		"#"+dialogAkunID,
+	)
+
+	dialogAkunAction := corporate_mcudetail.ModalGenPassAction(
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/closeviewakun",
+		"#"+dialogAkunBodyID,
+		"outerHTML",
+		"#"+dialogAkunID,
+	)
+
+	dialogAkunView := corporate_mcudetail.DialogGeneratePass(
+		"viewakunform",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/viewakun",
+		"#"+dialogAkunBodyID,
+		"outerHTML",
+		"#tableID, #paginationID, #dialogAkunID, #contentlayout, #dialogAkunBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogReportID, #dialogReportBodyID, #currpage"+paginationID,
+		dialogAkunID,
+		"Reset Password Akun Peserta",
+		dialogAkunBody,
+		dialogAkunClose,
+		dialogAkunAction,
+	)
+
+	// dialog detali pemeriksaan
+
+	detailData, err := tdp.TabDaftarPesertaServices.DetailTestdanPaket("")
+	if err != nil {
+		return err
+	}
+
+	detailTable := corporate_mcudetail.TableDetailMCU(detailData)
+
+	dialodDetailBody := corporate_mcudetail.ModalRptBody(
+		dialogDetailBodyID,
+		detailTable,
+		corporate_mcudetail.JsShowModal(""),
+	)
+
+	closeDetail := corporate_mcudetail.ModalClose(
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/closedetail",
+		"#"+dialogDetailBodyID,
+		"outerHTML",
+		"#"+dialogDetailID,
+	)
+
+	modalDetail := corporate_mcudetail.DialogReport(
+		"detailmcu",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/dialogdetail",
+		"#"+dialogDetailBodyID,
+		"outerHTML",
+		"#tableID, #paginationID, #dialogAkunID, #dialogAkunBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogReportID, #dialogReportBodyID"+paginationID,
+		dialogDetailID,
+		"Detail Pemeriksaan",
+		dialodDetailBody,
+		closeDetail,
+	)
+
+	content := corporate_mcudetail.TabDaftarPesertaScreen(
+		tableID,
+		paginationID,
+		dialogReportID,
+		dialogReportBodyID,
+		dialogGeneratePassID,
+		dialogGeneratePassBodyID,
+		dialogAkunID,
+		dialogAkunBodyID,
+		dialogDetailID,
+		dialogDetailBodyID,
+		clayout,
+		modaldialog,
+		modalGenPass,
+		dialogAkunView,
+		modalDetail,
+	)
+
+	return utils.View(c, content)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandlePagination(c echo.Context) error {
+	pageparam := c.QueryParam("page")
+	tableID := c.QueryParam("tableID")
+	paginationID := c.QueryParam("paginationID")
+
+	dialogReportBodyID := c.QueryParam("dialogReportBodyID")
+	dialogAkunBodyID := c.QueryParam("dialogAkunBodyID")
+	dialogDetailBodyID := c.QueryParam("dialogDetailBodyID")
+
+	id := c.Param("id")
+
+	// var retval []templ.Component
+	page, err := strconv.Atoi(pageparam)
+	if err != nil {
+		return err
+	}
+
+	tableData, totalPage, err := tdp.TabDaftarPesertaServices.GetListDaftarPesertaMCU(id, page, 10)
+	if err != nil {
+		return err
+	}
+	table := corporate_mcudetail.TableDaftarPeserta(
+		tableData,
+		tableID,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/openreport",
+		"#"+dialogReportBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
+		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/openviewakun",
+		"#"+dialogAkunBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
+		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/opendetail",
+		"#"+dialogDetailBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogDetailID, #dialogDetailBodyID",
+		"outerHTML",
+	)
+
+	pagination := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/changepage",
+		paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogDetailID, #dialogDetailBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogReportID, #dialogReportBodyID, #currPage"+paginationID,
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	clayout := corporate_mcudetail.ContentLayout(table, pagination)
+	return utils.View(c, clayout)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleOpenReportDialog(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	staffname := claims["M_StaffName"].(string)
+
+	idx := c.QueryParam("idx")
+	dialogReportID := c.QueryParam("dialogReportID")
+	dialogReportBodyID := c.QueryParam("dialogReportBodyID")
+	logger.Info("params", zap.Any("idx", idx))
+
+	tabdatav3, err := tdp.TabDaftarPesertaServices.GetListReportPesertaV4(idx, staffname)
+	if err != nil {
+		logger.Info("error", zap.Any("err", err))
+		tab := corporate_mcudetail.TabReportView([]models.TabViewReportMcu{})
+		mod := corporate_mcudetail.ModalRptBody(
+			dialogReportBodyID,
+			tab,
+			corporate_mcudetail.JsShowModal(""),
+		)
+		return utils.View(c, mod)
+	}
+
+	logger.Info("resp new data", zap.Any("data", tabdatav3))
+
+	tabcomponent := corporate_mcudetail.TabReportView(tabdatav3)
+
+	modalbody := corporate_mcudetail.ModalRptBody(
+		dialogReportBodyID,
+		tabcomponent,
+		corporate_mcudetail.JsShowModal("#"+dialogReportID),
+	)
+
+	return utils.View(c, modalbody)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleCloseDialogGenPass(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.Param("id")
+	dialogGenPassID := c.FormValue("dialogGenPassID")
+	dialogGenPassBodyID := c.FormValue("dialogGenPassBodyID")
+	logger.Info("param", zap.Any("id", id))
+
+	modalDialogGenPass := corporate_mcudetail.ModalGenPassBody(
+		dialogGenPassBodyID,
+		"Apakah anda yakin untuk men-generate password untuk seluruh karyawan",
+		corporate_mcudetail.JsHideModal("#"+dialogGenPassID),
+	)
+
+	return utils.View(c, modalDialogGenPass)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleDialogGenPass(c echo.Context) error {
+	// logger, _ := zap.NewProduction()
+	host := c.Request().Host
+	id := c.Param("id")
+
+	dialogGenPassID := c.FormValue("dialogGenPassID")
+	dialogGenPassBodyID := c.FormValue("dialogGenPassBodyID")
+	dialogReportID := c.FormValue("dialogReportID")
+	dialogReportBodyID := c.FormValue("dialogReportBodyID")
+	dialogAkunID := c.FormValue("dialogAkunID")
+	dialogAkunBodyID := c.FormValue("dialogAkunBodyID")
+
+	tableID := c.FormValue("tableID")
+	paginationID := c.FormValue("paginationID")
+	pageparam := c.FormValue("currpage" + paginationID)
+
+	// generate pasword
+	resp, err := tdp.TabDaftarPesertaServices.GenerataPasswordMCU(id, host)
+	if err != nil {
+		modalDialogGenPass := corporate_mcudetail.ModalGenPassBody(
+			dialogGenPassBodyID,
+			"Apakah anda yakin untuk men-generate password untuk seluruh karyawan",
+			corporate_mcudetail.JsShowModal(""),
+		)
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", "Gagal generate password", "warning")
+		retVal := []templ.Component{toastwarning, modalDialogGenPass}
+		return utils.ViewMulti(c, retVal)
+	}
+
+	if resp.Status != "OK" {
+		modalDialogGenPass := corporate_mcudetail.ModalGenPassBody(
+			dialogGenPassBodyID,
+			"Apakah anda yakin untuk men-generate password untuk seluruh karyawan",
+			corporate_mcudetail.JsShowModal(""),
+		)
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", "Gagal generate password MCU", "warning")
+		retVal := []templ.Component{toastwarning, modalDialogGenPass}
+		return utils.ViewMulti(c, retVal)
+	}
+
+	aa := "/corp/dashboard_pic/detail/" + id + "/tabdaftarpeserta/reload?page=" + pageparam
+	bb := "&tableID=" + tableID
+	cc := "&paginationID=" + paginationID
+	dd := "&dialogReportID=" + dialogReportID
+	ee := "&dialogReportBodyID=" + dialogReportBodyID
+	ff := "&dialogGenPassID=" + dialogGenPassID
+	gg := "&dialogGenPassBodyID=" + dialogGenPassBodyID
+	hh := "&dialogAkunID=" + dialogAkunID
+	ii := "&dialogAkunBodyID=" + dialogAkunBodyID
+	jj := "&currpage" + paginationID + "=" + pageparam
+	link := aa + bb + cc + dd + ee + ff + gg + hh + ii + jj
+
+	modalDialogGenPass := corporate_mcudetail.ModalGenPassBody(
+		dialogGenPassBodyID,
+		"Apakah anda yakin untuk men-generate password untuk seluruh karyawan",
+		// corporate_mcudetail.JsHideModal("#"+dialogGenPassID),
+		corporate_mcudetail.JsGenPassReload("#"+dialogGenPassID, link),
+	)
+
+	message := "Success generate password.\n" + "resp.Message" + " password, telah dikirim melalui email peserta"
+	toastSuccess := customtoastv2.CustomToastV2Show("Success", message, "success")
+	retVal := []templ.Component{toastSuccess, modalDialogGenPass}
+	return utils.ViewMulti(c, retVal)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleOpenViewAkun(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	patientID := c.QueryParam("patid")
+	dialogAkunID := c.QueryParam("dialogAkunID")
+	dialogAkunBodyID := c.QueryParam("dialogAkunBodyID")
+	logger.Info("params", zap.Any("patid", patientID))
+
+	akun, err := tdp.TabDaftarPesertaServices.GetAkunPeserta(patientID)
+	if err != nil {
+		dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
+			dialogAkunBodyID,
+			models.CustomTextFieldv2Prm{
+				Label:       "ID Akun Peserta",
+				Name:        "akunpesertaid",
+				Placeholder: "ID Akun Peserta",
+				Type:        "hidden",
+				ID:          "akunpesertaidid",
+				Value:       patientID,
+			},
+			models.CustomTextFieldv2Prm{
+				Label: "Email Akun",
+				Name:  "akunpesertaemail",
+				Type:  "text",
+				ID:    "akunpesertaemailid",
+			},
+			models.CustomTextFieldv2Prm{
+				Label: "Password baru",
+				Name:  "akunpesertapassnew",
+				Type:  "password",
+				ID:    "akunpesertapassnewid",
+			},
+			models.CustomTextFieldv2Prm{
+				Label: "Ulangi password baru",
+				Name:  "akunpesertapasscek",
+				Type:  "password",
+				ID:    "akunpesertapasscekid",
+			},
+			corporate_mcudetail.JsShowModal("#"+dialogAkunID),
+		)
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", "Gagal generate password MCU", "warning")
+		retval := []templ.Component{toastwarning, dialogAkunBody}
+		return utils.ViewMulti(c, retval)
+	}
+
+	dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
+		dialogAkunBodyID,
+		models.CustomTextFieldv2Prm{
+			Label:       "ID Akun Peserta",
+			Name:        "akunpesertaid",
+			Placeholder: "ID Akun Peserta",
+			Type:        "hidden",
+			ID:          "akunpesertaidid",
+			Value:       strconv.Itoa(akun.AuthPatientID),
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Email Akun",
+			Name:  "akunpesertaemail",
+			Type:  "text",
+			ID:    "akunpesertaemailid",
+			Value: akun.AuthPatientEmail,
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Password baru",
+			Name:        "akunpesertapassnew",
+			Type:        "password",
+			ID:          "akunpesertapassnewid",
+			Placeholder: "Masukan password baru",
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Ulangi password baru",
+			Name:        "akunpesertapasscek",
+			Type:        "password",
+			ID:          "akunpesertapasscekid",
+			Placeholder: "Masukan ulang password baru",
+		},
+		corporate_mcudetail.JsShowModal("#"+dialogAkunID),
+	)
+	return utils.View(c, dialogAkunBody)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleCloseViewAkun(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	patientID := c.FormValue("akunpesertaid")
+	dialogAkunID := c.FormValue("dialogAkunID")
+	dialogAkunBodyID := c.FormValue("dialogAkunBodyID")
+	logger.Info("params", zap.Any("patid", patientID))
+
+	dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
+		dialogAkunBodyID,
+		models.CustomTextFieldv2Prm{
+			Label:       "ID Akun Peserta",
+			Name:        "akunpesertaid",
+			Placeholder: "ID Akun Peserta",
+			Type:        "hidden",
+			ID:          "akunpesertaidid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Email Akun",
+			Name:  "akunpesertaemail",
+			Type:  "text",
+			ID:    "akunpesertaemailid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Password baru",
+			Name:  "akunpesertapassnew",
+			Type:  "password",
+			ID:    "akunpesertapassnewid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Ulangi password baru",
+			Name:  "akunpesertapasscek",
+			Type:  "password",
+			ID:    "akunpesertapasscekid",
+		},
+		corporate_mcudetail.JsHideModal("#"+dialogAkunID),
+	)
+	return utils.View(c, dialogAkunBody)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleAkun(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	userToken := c.Get("user").(*jwt.Token)
+	token := userToken.Raw
+
+	patientID := c.FormValue("akunpesertaid")
+	dialogAkunID := c.FormValue("dialogAkunID")
+	dialogAkunBodyID := c.FormValue("dialogAkunBodyID")
+	logger.Info("params", zap.Any("patid", patientID))
+
+	akunID := c.FormValue("akunpesertaid")
+	akunEmail := c.FormValue("akunpesertaemail")
+	oldPass := c.FormValue("akunpesertapassold")
+	newPass := c.FormValue("akunpesertapassnew")
+	newPasscek := c.FormValue("akunpesertapasscek")
+
+	formValidation := ""
+	newValidation := ""
+	cekValidation := ""
+
+	if strings.TrimSpace(newPass) == "" {
+		formValidation = "Password tidak boleh kosong"
+		newValidation = "Password tidak boleh kosong"
+	}
+	if strings.TrimSpace(newPasscek) == "" {
+		formValidation = "Password tidak boleh kosong"
+		cekValidation = "Password tidak boleh kosong"
+	}
+	if strings.TrimSpace(oldPass) == "" && strings.TrimSpace(newPass) == "" && strings.TrimSpace(newPasscek) == "" {
+		formValidation = "Password lama dan baru tidak boleh kosong"
+		newValidation = "Password baru tidak boleh kosong"
+		cekValidation = "Password baru tidak boleh kosong"
+	}
+	if strings.TrimSpace(newPass) != strings.TrimSpace(newPasscek) {
+		formValidation = "Password tidak sama"
+		newValidation = "Password tidak sama"
+		cekValidation = "Password tidak sama"
+	}
+
+	if formValidation != "" || newValidation != "" || cekValidation != "" {
+		dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
+			dialogAkunBodyID,
+			models.CustomTextFieldv2Prm{
+				Label:       "ID Akun Peserta",
+				Name:        "akunpesertaid",
+				Placeholder: "ID Akun Peserta",
+				Type:        "hidden",
+				ID:          "akunpesertaidid",
+				Value:       akunID,
+			},
+			models.CustomTextFieldv2Prm{
+				Label: "Email Akun",
+				Name:  "akunpesertaemail",
+				Type:  "text",
+				ID:    "akunpesertaemailid",
+				Value: akunEmail,
+			},
+			models.CustomTextFieldv2Prm{
+				Label:       "Password baru",
+				Name:        "akunpesertapassnew",
+				Type:        "password",
+				ID:          "akunpesertapassnewid",
+				Placeholder: "Masukan password baru",
+				ErrorMsg:    newValidation,
+			},
+			models.CustomTextFieldv2Prm{
+				Label:       "Ulangi password baru",
+				Name:        "akunpesertapasscek",
+				Type:        "password",
+				ID:          "akunpesertapasscekid",
+				Placeholder: "Masukan ulang password baru",
+				ErrorMsg:    cekValidation,
+			},
+			corporate_mcudetail.JsShowModal(""),
+		)
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", formValidation, "warning")
+		retVal := []templ.Component{toastwarning, dialogAkunBody}
+		return utils.ViewMulti(c, retVal)
+	}
+
+	resp, err := tdp.TabDaftarPesertaServices.ResetPasswordPeserta(token, newPass, akunEmail, akunID)
+	dialogAkunErr := corporate_mcudetail.ModalViewAkunBody(
+		dialogAkunBodyID,
+		models.CustomTextFieldv2Prm{
+			Label:       "ID Akun Peserta",
+			Name:        "akunpesertaid",
+			Placeholder: "ID Akun Peserta",
+			Type:        "hidden",
+			ID:          "akunpesertaidid",
+			Value:       akunID,
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Email Akun",
+			Name:  "akunpesertaemail",
+			Type:  "text",
+			ID:    "akunpesertaemailid",
+			Value: akunEmail,
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Password baru",
+			Name:        "akunpesertapassnew",
+			Type:        "password",
+			ID:          "akunpesertapassnewid",
+			Placeholder: "Masukan password baru",
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Ulangi password baru",
+			Name:        "akunpesertapasscek",
+			Type:        "password",
+			ID:          "akunpesertapasscekid",
+			Placeholder: "Masukan ulang password baru",
+		},
+		corporate_mcudetail.JsHideModal(""),
+	)
+
+	if err != nil {
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", err.Error(), "warning")
+		return utils.ViewMulti(c, []templ.Component{toastwarning, dialogAkunErr})
+	}
+
+	if resp.Status == "ERR" {
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", resp.Message, "warning")
+		return utils.ViewMulti(c, []templ.Component{toastwarning, dialogAkunErr})
+	}
+
+	dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
+		dialogAkunBodyID,
+		models.CustomTextFieldv2Prm{
+			Label:       "ID Akun Peserta",
+			Name:        "akunpesertaid",
+			Placeholder: "ID Akun Peserta",
+			Type:        "hidden",
+			ID:          "akunpesertaidid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Email Akun",
+			Name:  "akunpesertaemail",
+			Type:  "text",
+			ID:    "akunpesertaemailid",
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Password baru",
+			Name:        "akunpesertapassnew",
+			Type:        "password",
+			ID:          "akunpesertapassnewid",
+			Placeholder: "Masukan password baru",
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Ulangi password baru",
+			Name:        "akunpesertapasscek",
+			Type:        "password",
+			ID:          "akunpesertapasscekid",
+			Placeholder: "Masukan ulang password baru",
+		},
+		corporate_mcudetail.JsHideModal("#"+dialogAkunID),
+	)
+	toastwarning := customtoastv2.CustomToastV2Show("Success", "Berhasil reset password peserta: "+akunEmail, "success")
+	retVal := []templ.Component{toastwarning, dialogAkunBody}
+	return utils.ViewMulti(c, retVal)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleContentReload(c echo.Context) error {
+	id := c.Param("id")
+	dialogReportBodyID := c.FormValue("dialogReportBodyID")
+	dialogAkunBodyID := c.FormValue("dialogAkunBodyID")
+	dialogDetailBodyID := c.FormValue("dialogDetailBodyID")
+
+	tableID := c.FormValue("tableID")
+	paginationID := c.FormValue("paginationID")
+	pageparam := c.FormValue("currpage" + paginationID)
+	currpage, err := strconv.Atoi(pageparam)
+	if err != nil {
+		return err
+	}
+
+	tableData, totalPage, err := tdp.TabDaftarPesertaServices.GetListDaftarPesertaMCU(id, currpage, 10)
+	if err != nil {
+		return err
+	}
+
+	table := corporate_mcudetail.TableDaftarPeserta(
+		tableData,
+		tableID,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/openreport",
+		"#"+dialogReportBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
+		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/openviewakun",
+		"#"+dialogAkunBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
+		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/opendetail",
+		"#"+dialogDetailBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogDetailID, #dialogDetailBodyID",
+		"outerHTML",
+	)
+
+	pagination := pagination.PaginationV3(
+		totalPage,
+		currpage,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/changepage",
+		paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogReportID, #dialogReportBodyID, #dialogDetailID, #dialogDetailBodyID, #currPage"+paginationID,
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	clayout := corporate_mcudetail.ContentLayout(table, pagination)
+	return utils.View(c, clayout)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleOpenDetail(c echo.Context) error {
+	idx := c.QueryParam("idx")
+	dialogDetailID := c.QueryParam("dialogDetailID")
+	dialogDetailBodyID := c.QueryParam("dialogDetailBodyID")
+
+	detailData, err := tdp.TabDaftarPesertaServices.DetailTestdanPaket(idx)
+	if err != nil {
+		tab := corporate_mcudetail.TableDetailMCU([]models.TableTestPaket{})
+		mod := corporate_mcudetail.ModalRptBody(
+			dialogDetailBodyID,
+			tab,
+			corporate_mcudetail.JsShowModal("#"+dialogDetailID),
+		)
+		return utils.View(c, mod)
+	}
+
+	tablecomponent := corporate_mcudetail.TableDetailMCU(detailData)
+	detailBody := corporate_mcudetail.ModalRptBody(
+		dialogDetailBodyID,
+		tablecomponent,
+		corporate_mcudetail.JsShowModal("#"+dialogDetailID),
+	)
+
+	return utils.View(c, detailBody)
+}
--- a/handlers/corporate/mcudetail/tabkelainanfisik.hanlders.go
+++ b/handlers/corporate/mcudetail/tabkelainanfisik.hanlders.go
@@ -0,0 +1,76 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"strings"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabKelainanFisikServices interface {
+	GetKelainanFisikBMI(mcuID string) (models.Piechart, error)
+	GetKelainanFisikHipertensi(mcuID string) (models.Piechart, error)
+	GetKelainanFisikRefraksi(mcuID string) (models.Piechart, error)
+	GetKelainanFisikPresentase(mcuID string) (models.Barchart, error)
+	GetKelFisikAlkohol(mcuID string) (models.Piechart, error)
+	GetKelFisikMerokok(mcuID string) (models.Piechart, error)
+	GetKelFisikOlahraga(mcuID string) (models.Piechart, error)
+	GetChartRenderFisik(mcuID string) ([]models.McuTabModels, error)
+}
+
+type TabKelainanFisikHandler struct {
+	TabKelainanFisikServices TabKelainanFisikServices
+}
+
+func NewTabKelainanFisikHandler(tkf TabKelainanFisikServices) *TabKelainanFisikHandler {
+	return &TabKelainanFisikHandler{
+		TabKelainanFisikServices: tkf,
+	}
+}
+
+func (tkf *TabKelainanFisikHandler) HandleShowTabKelainanFisik(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	logger.Info("Tab Kelainan Fisik")
+
+	id := c.Param("id")
+
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}
+
+	tablist, err := tkf.TabKelainanFisikServices.GetChartRenderFisik(id)
+	if err != nil {
+		return err
+	}
+
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+	}
+
+	content := corporate_mcudetail.Tabkelainanfisik(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkelainanglobal.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainanglobal.handlers.go
@@ -0,0 +1,67 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"strings"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+)
+
+type TabKelainanGlobalServices interface {
+	GetKelainanFisik(mcuID string) (models.Barchart, error)
+	GetKelainanGlobalV2(mcuID string) (models.Barchart, error)
+	GetChartRenderGlobal(mcuID string) ([]models.McuTabModels, error)
+}
+
+type TabKelainanGlobalHandler struct {
+	TabKelainanGlobalServices TabKelainanGlobalServices
+}
+
+func NewTabKelainanGlobalHandler(tkg TabKelainanGlobalServices) *TabKelainanGlobalHandler {
+	return &TabKelainanGlobalHandler{
+		TabKelainanGlobalServices: tkg,
+	}
+}
+
+func (tkg *TabKelainanGlobalHandler) HandleShowTabKelainanGlobal(c echo.Context) error {
+	id := c.Param("id")
+
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}
+
+	tablist, err := tkg.TabKelainanGlobalServices.GetChartRenderGlobal(id)
+	if err != nil {
+		return err
+	}
+
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+	}
+
+	content := corporate_mcudetail.TabKelainanGlobal(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkelainanlab.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainanlab.handlers.go
@@ -0,0 +1,71 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"strings"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+)
+
+type TabKelainanLabServices interface {
+	GetDataPresentaseKelainanLab(mcuID string) (models.Barchart, error)
+	GetHematologi(mcuID string) (models.BarchartV2, error)
+	GetUrinalisa(mcuID string) (models.BarchartV2, error)
+	GetGangguanFungsiHati(mcuID string) (models.BarchartV2, error)
+	GetGangguanMetabolismeLemak(mcuID string) (models.BarchartV2, error)
+	GetPeningkatanGlukosa(mcuID string) (models.BarchartV2, error)
+	GetChartRenderLab(mcuID string) ([]models.McuTabModels, error)
+}
+
+type TabKelainanLabHandler struct {
+	TabKelainanLabServices TabKelainanLabServices
+}
+
+func NewTabKelainanLabHandler(tkl TabKelainanLabServices) *TabKelainanLabHandler {
+	return &TabKelainanLabHandler{
+		TabKelainanLabServices: tkl,
+	}
+}
+
+func (tkl *TabKelainanLabHandler) HandleShowTabKelainanLab(c echo.Context) error {
+	id := c.Param("id")
+
+	tablist, err := tkl.TabKelainanLabServices.GetChartRenderLab(id)
+	if err != nil {
+		return err
+	}
+
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}
+
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+	}
+
+	content := corporate_mcudetail.TabKelainanLab(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkelainannonlab.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainannonlab.handlers.go
@@ -0,0 +1,70 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"strings"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+)
+
+type TabKelainanNonLabServices interface {
+	GetDataKelNonLab(mcuID string) (models.Barchart, error)
+	GetThoraxPA(mcuID string) (models.BarchartV2, error)
+	GetGangguanJantung(mcuID string) (models.BarchartV2, error)
+	GetAutospirometri(mcuID string) (models.BarchartV2, error)
+	GetPendengaran(mcuID string) (models.BarchartV2, error)
+	GetChartRenderNonLab(mcuID string) ([]models.McuTabModels, error)
+}
+
+type TabKelainanNonLabHandler struct {
+	TabKelainanNonLabServices TabKelainanNonLabServices
+}
+
+func NewTabKelainanNonLabHandler(tknl TabKelainanNonLabServices) *TabKelainanNonLabHandler {
+	return &TabKelainanNonLabHandler{
+		TabKelainanNonLabServices: tknl,
+	}
+}
+
+func (tknl *TabKelainanNonLabHandler) HandleShowTabKelainanNonLab(c echo.Context) error {
+	id := c.Param("id")
+
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}
+
+	tablist, err := tknl.TabKelainanNonLabServices.GetChartRenderNonLab(id)
+	if err != nil {
+		return err
+	}
+
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+	}
+
+	content := corporate_mcudetail.TabKelainanNonLab(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkepesertaan.handlers.go
+++ b/handlers/corporate/mcudetail/tabkepesertaan.handlers.go
@@ -0,0 +1,73 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"strings"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabKepersertaanServices interface {
+	GetTotalKepesertaanMCU(mcuID string) (models.Piechart, error)
+	GetKepesertaanByGender(mcuID string) (models.Piechart, error)
+	GetKepesertaanByUmur(mcuID string) (models.Piechart, error)
+	GetChartRenderPeserta(mcuID string) ([]models.McuTabModels, error)
+}
+
+type TabKepersertaanHandler struct {
+	TabKepersertaanServices TabKepersertaanServices
+}
+
+func NewTabKepersertaanHandler(tkh TabKepersertaanServices) *TabKepersertaanHandler {
+	return &TabKepersertaanHandler{
+		TabKepersertaanServices: tkh,
+	}
+}
+
+func (tkh *TabKepersertaanHandler) HandleShowTabKepesertaan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	logger.Info("Tab Kepesertaan")
+
+	id := c.Param("id")
+	logger.Info("Params", zap.Any("id", id))
+
+	tablist, err := tkh.TabKepersertaanServices.GetChartRenderPeserta(id)
+	if err != nil {
+		return err
+	}
+
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}
+
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+	}
+
+	content := corporate_mcudetail.TabKepesertaan(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkesimpulan.handlers.go
+++ b/handlers/corporate/mcudetail/tabkesimpulan.handlers.go
@@ -0,0 +1,79 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"fmt"
+
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabKesimpulanServices interface {
+	GetListKesimpulanLab(id string) ([]models.ModelKesimpulanLab, error)
+	GetListKesimpulanNonLab(id string) ([]models.ModelKesimpulanLab, error)
+	GetListKesimpulanFisik(id string) ([]models.ModelKesimpulanLab, error)
+	GetListKesimpulanLabV2(id string) ([]models.ModelKesimpulanLab, error)
+	GetListKesimpulanNonLabV2(id string) ([]models.ModelKesimpulanLab, error)
+	GetListKesimpulanFisikV2(id string) ([]models.ModelKesimpulanLab, error)
+}
+
+type TabKesimpulanHandler struct {
+	TabKesimpulanServices TabKesimpulanServices
+}
+
+func NewTabKesimpulanHandler(us TabKesimpulanServices) *TabKesimpulanHandler {
+	return &TabKesimpulanHandler{
+		TabKesimpulanServices: us,
+	}
+}
+
+func (tkh *TabKesimpulanHandler) HandleShowTabKesimpulanScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	tableID := utils.GenerateRandomID("tablebody")
+	id := c.Param("id")
+
+	dataLab, err := tkh.TabKesimpulanServices.GetListKesimpulanLabV2(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR GET LIST LAB",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataLab)
+		return err
+	}
+	tableComponentLab := corporate_mcudetail.CardTableKesimpulan("3 Kelainan Pemeriksaan Lab terbesar :", dataLab, tableID)
+
+	dataNonLab, err := tkh.TabKesimpulanServices.GetListKesimpulanNonLabV2(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR GET LIST NON LAB",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataNonLab)
+		return err
+	}
+	tableComponentNonLab := corporate_mcudetail.CardTableKesimpulan("3 Kelainan Pemeriksaan Non Lab terbesar :", dataNonLab, tableID)
+
+	dataFisik, err := tkh.TabKesimpulanServices.GetListKesimpulanFisikV2(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR GET LIST FISIK",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataFisik)
+		return err
+	}
+	tableComponentFisik := corporate_mcudetail.CardTableKesimpulan("3 Kelainan Pemeriksaan Fisik terbesar :", dataFisik, tableID)
+
+	content := corporate_mcudetail.MainKesimpulan(
+		tableID,
+		tableComponentLab,
+		tableComponentNonLab,
+		tableComponentFisik,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkeuangan.handlers.go
+++ b/handlers/corporate/mcudetail/tabkeuangan.handlers.go
@@ -0,0 +1,129 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/pagination"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"strconv"
+
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabKeuanganServices interface {
+	GetTotalOrderKeuangan(mcuID string) (int, error)
+	GetTotalCardData(mcuID string) (models.TotalBillCard, error)
+	GetListingDataKeuangan(mcuID string, currentpage int, rowperpage int) ([]models.KeuanganModel, int, error)
+}
+
+type TabKeuanganHandler struct {
+	TabKeuanganServices TabKeuanganServices
+}
+
+func NewTabKeuanganHandler(tk TabKeuanganServices) *TabKeuanganHandler {
+	return &TabKeuanganHandler{
+		TabKeuanganServices: tk,
+	}
+}
+
+func (tk *TabKeuanganHandler) HandleShowTabKeuangan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	logger.Info("handler keuangan")
+	tableID := utils.GenerateRandomID("tableID")
+	paginationID := utils.GenerateRandomID("paginationID")
+
+	id := c.Param("id")
+	logger.Info("Params", zap.Any("id", id))
+
+	dataTable, totalPage, err := tk.TabKeuanganServices.GetListingDataKeuangan(id, 1, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get list data keuangan", zap.Any("error", err))
+		return err
+	}
+
+	tablecompo := corporate_mcudetail.TableKeuangan(dataTable, tableID)
+
+	pagination := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/corp/dashboard_pic/detail/"+id+"/tabkeuangan/changepage",
+		paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent",
+		"#tabdanpagi",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	totalOrder, err := tk.TabKeuanganServices.GetTotalOrderKeuangan(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get total order keuangan", zap.Any("error", err))
+		return err
+	}
+
+	totalBill, err := tk.TabKeuanganServices.GetTotalCardData(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get total bill keuangan", zap.Any("error", err))
+		return err
+	}
+
+	totalOrderF := utils.FormatRibuan(int(totalOrder))
+	totalTagihan := utils.FormatRibuan(int(totalBill.TotalTagihan))
+	totalPelunasan := utils.FormatRibuan(int(totalBill.TotalPelunasan))
+	totalHutang := utils.FormatRibuan(int(totalBill.TotalHutang))
+
+	content := corporate_mcudetail.TabKeuanganScreen(
+		tableID,
+		paginationID,
+		corporate_mcudetail.KeuanganCard(
+			totalOrderF,
+			totalTagihan,
+			totalPelunasan,
+			totalHutang,
+		),
+		corporate_mcudetail.TableAndPagination(
+			tablecompo,
+			pagination,
+		),
+	)
+
+	return utils.View(c, content)
+}
+
+func (tk *TabKeuanganHandler) HandleChangePage(c echo.Context) error {
+	pageparam := c.QueryParam("page")
+	tableID := c.QueryParam("tableID")
+	paginationID := c.QueryParam("paginationID")
+
+	id := c.Param("id")
+
+	page, err := strconv.Atoi(pageparam)
+	if err != nil {
+		return err
+	}
+
+	tableData, totalPage, err := tk.TabKeuanganServices.GetListingDataKeuangan(id, page, 10)
+	if err != nil {
+		return err
+	}
+
+	tablecomp := corporate_mcudetail.TableKeuangan(tableData, tableID)
+	pagination := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pic/detail/"+id+"/tabkeuangan/changepage",
+		paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent",
+		"#tabdanpagi",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	tabdanpagi := corporate_mcudetail.TableAndPagination(tablecomp, pagination)
+	return utils.View(c, tabdanpagi)
+}
--- a/handlers/corporate/patient.handlers.go
+++ b/handlers/corporate/patient.handlers.go
@@ -1,13 +1,25 @@
 package corporate_handlers

 import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	"cpone/component/pagination"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
 	"cpone/utils"
 	corporate_patient "cpone/views/corporate/patient"
+	"strconv"

+	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
 )

 type PatientService interface {
+	GetDashboardPatientBreadcrumb(title string) (models.BreadCrumbV1, error)
+	GetListtingData(email string, currentpage int, rowperpage int) ([]models.DashboardPatient, int, error)
+	GetPatientData(email string) (string, error)
+	GetListReportPesertaV4(orderheaderID string, staffname string) ([]models.TabViewReportMcu, error)
 }

 func NewPatientHandler(us PatientService) *PatientHandler {
@@ -20,7 +32,214 @@ type PatientHandler struct {
 	PatientService PatientService
 }

-func (uh *PatientHandler) ShowPatient(c echo.Context) error {
-	helo := corporate_patient.Show()
-	return utils.View(c, helo)
+func (ph *PatientHandler) LoadLocalData(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+	dialogID := c.QueryParam("dialogID")
+	dialogBodyID := c.QueryParam("dialogBodyID")
+	userEmail := c.QueryParam("userEmail")
+	logger.Info("params", zap.Any("email", userEmail))
+
+	title, err := ph.PatientService.GetPatientData(userEmail)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get user", zap.Any("error", err))
+		return err
+	}
+
+	dataBreadcrumb, err := ph.PatientService.GetDashboardPatientBreadcrumb(title)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb", zap.Any("error", err))
+		return err
+	}
+	defer logger.Sync()
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+
+	listingdata, totalPage, err := ph.PatientService.GetListtingData(userEmail, 1, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get listing data", zap.Any("error", err), zap.Any("total", totalPage))
+		return err
+	}
+	listingcomponent := corporate_patient.ListingData(listingdata,
+		listID,
+		"/corp/dashboard_pat/open",
+		"#"+dialogBodyID,
+		"#listID, #paginationID, #dialogID, #dialogBodyID, #userEmail",
+		"outerHTML",
+	)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/corp/dashboard_pat/changepage",
+		paginationID,
+		"#listID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogID, #dialogBodyID, #userEmail",
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_patient.BeforeRequestContent(),
+		corporate_patient.AfterRequestContent(),
+	)
+
+	tabData := []models.TabViewReportMcu{}
+	tabcomponent := corporate_patient.TabReportView(tabData)
+
+	bodyModal := corporate_patient.ModalBody(
+		dialogBodyID,
+		tabcomponent,
+		corporate_patient.JsShowModal(""),
+	)
+
+	bodyClose := corporate_patient.ModalClose(
+		"/corp/dashboard_pat/closemodal",
+		"#"+dialogBodyID,
+		"outerHTML",
+		"#"+dialogID,
+	)
+
+	modalDialog := corporate_patient.DialogReport(
+		"",
+		"/corp/dashboard_pat/dialog",
+		"#"+dialogBodyID,
+		"outerHTML",
+		"#listID, #paginationID, #dialogID, #userEmail, #dialogBodyID"+paginationID,
+		dialogID,
+		title,
+		bodyModal,
+		bodyClose,
+	)
+
+	content := corporate_patient.ContentP(listingcomponent, paginationcomponent)
+
+	view := corporate_patient.ContentPage(
+		breadcrumb,
+		content,
+		modalDialog,
+	)
+
+	return utils.View(c, view)
+}
+
+func (ph *PatientHandler) HandleShowPatient(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	listID := utils.GenerateRandomID("listid")
+	paginationID := utils.GenerateRandomID("paginationid")
+	dialogID := utils.GenerateRandomID("dialogid")
+	dialogBodyID := utils.GenerateRandomID("dialogbodyid")
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	name := claims["M_StaffName"].(string)
+	position := claims["M_UserGroupDashboard"].(string)
+	logger.Info("jwt", zap.Any("name", name))
+
+	user := models.User{
+		UserID:       1,
+		Username:     name,
+		UserFullName: name,
+		UserPosition: position,
+	}
+
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+
+	content := corporate_patient.DashboardPat(
+		listID,
+		paginationID,
+		dialogID,
+		dialogBodyID,
+	)
+	css := corporate_patient.CSSDashboardPat()
+	js := corporate_patient.JSDashboardPat()
+
+	view := corporate_patient.ShowDashboardPat("Dashboard Pasien", content, css, js, navbaruser, sidbaruser)
+	return utils.View(c, view)
+}
+
+func (ph *PatientHandler) HandleChangePage(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	pageparam := c.QueryParam("page")
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+	dialogBodyID := c.QueryParam("dialogBodyID")
+	userEmail := c.QueryParam("userEmail")
+	logger.Info("params", zap.Any("userEmail", userEmail))
+
+	// var retval []templ.Component
+	page, err := strconv.Atoi(pageparam)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error convert page param")
+		return err
+	}
+
+	listData, totalPage, err := ph.PatientService.GetListtingData(userEmail, page, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get data listing")
+		return err
+	}
+	listcomponent := corporate_patient.ListingData(listData,
+		listID,
+		"/corp/dashboard_pat/open",
+		"#"+dialogBodyID,
+		"#listID, #paginationID, #dialogID, #dialogBodyID, #userEmail",
+		"outerHTML",
+	)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pat/changepage",
+		paginationID,
+		"#listID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogID, #dialogBodyID, #userEmail, #currPage"+paginationID,
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_patient.BeforeRequestContent(),
+		corporate_patient.AfterRequestContent(),
+	)
+
+	// retval = append(retval, listcomponent)
+	// retval = append(retval, paginationcomponent)
+	// return utils.ViewMulti(c, retval)
+
+	content := corporate_patient.ContentP(listcomponent, paginationcomponent)
+	return utils.View(c, content)
+}
+
+func (ph *PatientHandler) HandleOpenReport(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.QueryParam("id")
+	dialogID := c.QueryParam("dialogID")
+	dialogBodyID := c.QueryParam("dialogBodyID")
+	logger.Info("params", zap.Any("id", id))
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	staffname := claims["M_StaffName"].(string)
+
+	newtabdata, err := ph.PatientService.GetListReportPesertaV4(id, staffname)
+	if err != nil {
+		tab := corporate_patient.TabReportView([]models.TabViewReportMcu{})
+		mod := corporate_patient.ModalBody(
+			dialogBodyID,
+			tab,
+			corporate_patient.JsShowModal(""),
+		)
+		return utils.View(c, mod)
+	}
+
+	tabcomponent := corporate_patient.TabReportView(newtabdata)
+	modalBody := corporate_patient.ModalBody(
+		dialogBodyID,
+		tabcomponent,
+		corporate_patient.JsShowModal("#"+dialogID),
+	)
+
+	return utils.View(c, modalBody)
 }
--- a/handlers/dev/detailmcu.handlers.go
+++ b/handlers/dev/detailmcu.handlers.go
@@ -0,0 +1,72 @@
+package dev_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/services"
+	"cpone/utils"
+	dev_detailmcu "cpone/views/dev/mcu"
+
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type DetailMcuServices interface {
+	GetBreadcrumb(title string) (models.BreadCrumbV1, error)
+}
+
+type DetailMcuHandler struct {
+	DetailMcuServices DetailMcuServices
+}
+
+func NewDetailMcuHandler(dmcu DetailMcuServices) *DetailMcuHandler {
+	return &DetailMcuHandler{
+		DetailMcuServices: dmcu,
+	}
+}
+
+func (dmcu *DetailMcuHandler) HandleShowDetailMcuScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	title := "PT. Sadhana Abiyasa Sampoerna"
+
+	id := c.Param("id")
+	logger.Info("params", zap.Any("id", id))
+
+	user, err := services.GetUserLogin()
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get user dev", zap.Any("error", err))
+		return err
+	}
+
+	dataBreadcrumb, err := dmcu.DetailMcuServices.GetBreadcrumb(title)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb dev", zap.Any("error", err))
+		return err
+	}
+
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+
+	content := dev_detailmcu.DetailMcuScreen(
+		breadcrumb,
+		dev_detailmcu.TabViewDetailMcu(id),
+	)
+	css := dev_detailmcu.CSSDetailMcu()
+	js := dev_detailmcu.JSDetailMcu()
+
+	view := dev_detailmcu.ShowDetailMcu(
+		title,
+		content,
+		css,
+		js,
+		navbaruser,
+		sidbaruser,
+	)
+
+	return utils.View(c, view)
+}
--- a/handlers/dev/employeeanalytic.handlers.go
+++ b/handlers/dev/employeeanalytic.handlers.go
@@ -0,0 +1,192 @@
+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.DashboardPic, error)
+	ListingEmployeeAnalytic(search string, startdate string, enddate string, currentpage int, rowperpage int) ([]models.DashboardPic, 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/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	filtercomponent := dev_employeeanalytic.FilterListing(
+		"/dev/dashboard_pic/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/dashboard_pic/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/dashboard_pic/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)
+}
+
+func (ea *EmployeeAnalyticHandler) HandleIntoDetail(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	id := c.Param("id")
+
+	logger.Info("params", zap.Any("id", id))
+
+	url := "/dev/detail/" + id
+	c.Response().Header().Set("HX-Redirect", url)
+
+	return nil
+}
--- a/handlers/dev/groupresult.handlers.go
+++ b/handlers/dev/groupresult.handlers.go
--- a/handlers/dev/kesimpulan.handlers.go
+++ b/handlers/dev/kesimpulan.handlers.go
@@ -0,0 +1,88 @@
+package dev_handlers
+
+import (
+	"cpone/models"
+	"cpone/utils"
+	dev_kesimpulan "cpone/views/dev/kesimpulan"
+	"fmt"
+
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type KesimpulanService interface {
+	GetListKesimpulanLab(id string) ([]models.ModelKesimpulanLab, error)
+	GetListKesimpulanNonLab(id string) ([]models.ModelKesimpulanLab, error)
+	GetListKesimpulanFisik(id string) ([]models.ModelKesimpulanLab, error)
+}
+
+func NewKesimpulanHandler(us KesimpulanService) *KesimpulanHandler {
+	return &KesimpulanHandler{
+		KesimpulanService: us,
+	}
+}
+
+type KesimpulanHandler struct {
+	KesimpulanService KesimpulanService
+}
+
+func (h *KesimpulanHandler) HandleShowKesimpulanScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	tableID := utils.GenerateRandomID("tablebody")
+	id := c.Param("id")
+
+	// table component
+	dataLab, err := h.KesimpulanService.GetListKesimpulanLab(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR GET LIST LAB",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataLab)
+		return err
+	}
+
+	logger.Info("CEK DATA",
+		zap.Any("data lab", dataLab))
+
+	tableComponentLab := dev_kesimpulan.CardTableKesimpulan("3 Kelainan Pemeriksaan Lab terbesar :", dataLab, tableID)
+
+	// table component non lab
+	dataNonLab, err := h.KesimpulanService.GetListKesimpulanNonLab(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR GET LIST NON LAB",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataNonLab)
+		return err
+	}
+
+	logger.Info("CEK DATA",
+		zap.Any("data lab", dataNonLab))
+	tableComponentNonLab := dev_kesimpulan.CardTableKesimpulan("3 Kelainan Pemeriksaan Non Lab terbesar :", dataNonLab, tableID)
+
+	// table component fisik
+	dataFisik, err := h.KesimpulanService.GetListKesimpulanFisik(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR GET LIST FISIK",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataFisik)
+		return err
+	}
+
+	logger.Info("CEK DATA",
+		zap.Any("data lab", dataFisik))
+	tableComponentFisik := dev_kesimpulan.CardTableKesimpulan("3 Kelainan Pemeriksaan Fisik terbesar :", dataFisik, tableID)
+
+	content := dev_kesimpulan.MainKesimpulan(tableID,
+		tableComponentLab,
+		tableComponentNonLab,
+		tableComponentFisik)
+
+	view := dev_kesimpulan.ShowKesimpulan("KESIMPULAN", content, dev_kesimpulan.CssKesimpulan(), dev_kesimpulan.JsKesimpulan())
+	return utils.View(c, view)
+}
--- a/handlers/dev/mcudaftarpeserta.handlers.go
+++ b/handlers/dev/mcudaftarpeserta.handlers.go
@@ -0,0 +1,66 @@
+package dev_handlers
+
+import (
+	"cpone/models"
+	"cpone/utils"
+	dev_mcudaftarpeserta "cpone/views/dev/mcu/daftarpeserta"
+	"fmt"
+
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type McuDaftarPesertaServices interface {
+	GetListMcuDaftarPeserta(id string, currentPage int, rowPerPage int) ([]models.ModelMcuDaftarPeserta, int, error)
+}
+
+type McuDaftarPesertaHandler struct {
+	McuDaftarPesertaServices McuDaftarPesertaServices
+}
+
+func NewMcuDaftarPeserta(mdp McuDaftarPesertaServices) *McuDaftarPesertaHandler {
+	return &McuDaftarPesertaHandler{
+		McuDaftarPesertaServices: mdp,
+	}
+}
+
+func (mdp *McuDaftarPesertaHandler) HandleGetMcuDaftarPeserta(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.Param("id")
+
+	// get listing data
+	dataMcuDaftarPeserta, totalPage, err := mdp.McuDaftarPesertaServices.GetListMcuDaftarPeserta(id, 1, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("ERROR GET LIST LAB",
+			zap.Any("error", err),
+		)
+		fmt.Println(dataMcuDaftarPeserta)
+		return err
+	}
+
+	defer logger.Sync()
+	logger.Info("PESERTA",
+		zap.Any("totalpage", totalPage),
+	)
+
+	return err
+}
+
+func (mdp *McuDaftarPesertaHandler) HandleShowMcuDaftarPeserta(c echo.Context) error {
+	title := "Daftar Peserta"
+
+	content := dev_mcudaftarpeserta.McuDaftarPesertaScreen()
+	css := dev_mcudaftarpeserta.CSSMcuDaftarPeserta()
+	js := dev_mcudaftarpeserta.JsMcuDaftarPeserta()
+
+	view := dev_mcudaftarpeserta.ShowMcuDafterPeserta(
+		title,
+		content,
+		css,
+		js,
+	)
+
+	return utils.View(c, view)
+}
--- 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.groupresult.handlers.go
+++ b/handlers/dev/md.groupresult.handlers.go
--- a/handlers/dev/md.natunit.handlers.go
+++ b/handlers/dev/md.natunit.handlers.go
--- a/handlers/dev/md.samplestation.handlers.go
+++ b/handlers/dev/md.samplestation.handlers.go
--- a/handlers/dev/md.usergroup.handlers.go
+++ b/handlers/dev/md.usergroup.handlers.go
@@ -126,15 +126,17 @@ func (lh *MdUserGroupHandler) HandleShowMdUserGroupScreen(c echo.Context) error
 	)

 	//filter user group component
-	usergroupFilterComponent := customtextfieldsearch.MainCustomTextFieldSearchV2(searchID,
+	usergroupFilterComponent := customtextfieldsearch.MainCustomTextFieldSearchV3(searchID,
 		"search",
 		"Cari Kode/Nama",
 		"text",
 		"/dev/md/usergroupv2/filter",
 		"input changed delay:500ms, search",
-		"#"+paginationID, "", "", "outerHTML", "#tableID, #paginationID, #searchID,#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID")
+		"#"+paginationID, "#loadingcontent", "", "outerHTML", "#tableID, #paginationID, #searchID,#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
+		dev_mdusergroupview.BeforeRequestContent(),
+		dev_mdusergroupview.AfterRequestContent())
 	//Pagination
-	userGroupPaginationComponent := pagination.PaginationV2(
+	userGroupPaginationComponent := pagination.PaginationV3(
 		totalPage,
 		1,
 		"/dev/md/usergroupv2/changepage",
@@ -142,6 +144,8 @@ func (lh *MdUserGroupHandler) HandleShowMdUserGroupScreen(c echo.Context) error
 		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
 		"#"+paginationID,
 		"outerHTML", "", "",
+		dev_mdusergroupview.BeforeRequestContent(),
+		dev_mdusergroupview.AfterRequestContent(),
 	)

 	//modal add form
@@ -178,7 +182,7 @@ func (lh *MdUserGroupHandler) HandleShowMdUserGroupScreen(c echo.Context) error
 			Link:         "/dev/md/usergroupv2/add",
 			HxTarget:     "#" + dialogAddBodyID,
 			HxSwap:       "outerHTML",
-			HxInclude:    "#tableID, #paginationID, #searchID, #dialogAddBodyID, #dialogAddID, #" + searchID + ", #currpage" + paginationID,
+			HxInclude:    "#tableID, #paginationID, #searchID, #dialogAddBodyID, #dialogAddID, #dialogDeleteBodyID, #dialogEditBodyID, #" + searchID + ", #currpage" + paginationID,
 			ModalID:      dialogAddID,
 			ModalTitle:   "New-User Group",
 			DialogBody:   dialogAddBodyCmp,
@@ -221,7 +225,7 @@ func (lh *MdUserGroupHandler) HandleShowMdUserGroupScreen(c echo.Context) error
 			Link:         "/dev/md/usergroupv2/edit",
 			HxTarget:     "#" + dialogEditBodyID,
 			HxSwap:       "outerHTML",
-			HxInclude:    "#tableID, #paginationID, #searchID, #dialogEditBodyID, #dialogEditID, #" + searchID + ", #currpage" + paginationID,
+			HxInclude:    "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogEditBodyID, #dialogEditID, #" + searchID + ", #currpage" + paginationID,
 			ModalID:      dialogEditID,
 			ModalTitle:   "New-User Group",
 			DialogBody:   dialogEditBodyCmp,
@@ -263,7 +267,7 @@ func (lh *MdUserGroupHandler) HandleShowMdUserGroupScreen(c echo.Context) error
 			Link:         "/dev/md/usergroupv2/delete",
 			HxTarget:     "#" + dialogDeleteBodyID,
 			HxSwap:       "outerHTML",
-			HxInclude:    "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID,
+			HxInclude:    "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #dialogEditBodyID, #" + searchID + ", #currpage" + paginationID,
 			ModalID:      dialogDeleteID,
 			ModalTitle:   "New-User Group",
 			DialogBody:   dialogDeleteBodyCmp,
@@ -331,7 +335,7 @@ func (lh *MdUserGroupHandler) HandleFilterMdUserGroup(c echo.Context) error {
 		"#"+dialogDeleteBodyID,
 		"outerHTML",
 		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID")
-	userGroupPaginationComponent := pagination.PaginationV2(
+	userGroupPaginationComponent := pagination.PaginationV3(
 		totalpage,
 		1,
 		"/dev/md/usergroupv2/changepage",
@@ -339,6 +343,8 @@ func (lh *MdUserGroupHandler) HandleFilterMdUserGroup(c echo.Context) error {
 		"#tableID, #searchID, #"+searchID+", #paginationID,  #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
 		"#"+paginationID,
 		"outerHTML", "", "",
+		dev_mdusergroupview.BeforeRequestContent(),
+		dev_mdusergroupview.AfterRequestContent(),
 	)
 	retval = append(retval, tableComponent)
 	retval = append(retval, userGroupPaginationComponent)
@@ -383,7 +389,7 @@ func (lh *MdUserGroupHandler) HandleChangePageMdUserGroup(c echo.Context) error
 		"outerHTML",
 		"#dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
 	)
-	userGroupPaginationComponent := pagination.PaginationV2(
+	userGroupPaginationComponent := pagination.PaginationV3(
 		totalpage,
 		page,
 		"/dev/md/usergroupv2/changepage",
@@ -391,6 +397,8 @@ func (lh *MdUserGroupHandler) HandleChangePageMdUserGroup(c echo.Context) error
 		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
 		"#"+paginationID,
 		"outerHTML", "", "",
+		dev_mdusergroupview.BeforeRequestContent(),
+		dev_mdusergroupview.AfterRequestContent(),
 	)
 	retval = append(retval, tableComponent)
 	retval = append(retval, userGroupPaginationComponent)
@@ -553,7 +561,7 @@ func (lh *MdUserGroupHandler) HandleAddUserGroup(c echo.Context) error {

 	//pagination component
 	//Pagination
-	userGroupPaginationComponent := pagination.PaginationV2(
+	userGroupPaginationComponent := pagination.PaginationV3(
 		totalPage,
 		currPage,
 		"/dev/md/usergroupv2/changepage",
@@ -561,6 +569,8 @@ func (lh *MdUserGroupHandler) HandleAddUserGroup(c echo.Context) error {
 		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
 		"#"+paginationID,
 		"outerHTML", "", "true",
+		dev_mdusergroupview.BeforeRequestContent(),
+		dev_mdusergroupview.AfterRequestContent(),
 	)

 	newForm := dev_mdusergroupview.BodyFormUserGroup(
@@ -797,7 +807,7 @@ func (lh *MdUserGroupHandler) HandleEditUserGroup(c echo.Context) error {

 	//pagination component
 	//Pagination
-	userGroupPaginationComponent := pagination.PaginationV2(
+	userGroupPaginationComponent := pagination.PaginationV3(
 		totalPage,
 		currPage,
 		"/dev/md/usergroupv2/changepage",
@@ -805,6 +815,8 @@ func (lh *MdUserGroupHandler) HandleEditUserGroup(c echo.Context) error {
 		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
 		"#"+paginationID,
 		"outerHTML", "", "true",
+		dev_mdusergroupview.BeforeRequestContent(),
+		dev_mdusergroupview.AfterRequestContent(),
 	)
 	var retVal []templ.Component
 	newForm := dev_mdusergroupview.BodyFormUserGroup(
@@ -954,7 +966,7 @@ func (lh *MdUserGroupHandler) HandleDeleteUserGroup(c echo.Context) error {

 	//pagination component
 	//Pagination
-	userGroupPaginationComponent := pagination.PaginationV2(
+	userGroupPaginationComponent := pagination.PaginationV3(
 		totalPage,
 		currPage,
 		"/dev/md/usergroupv2/changepage",
@@ -962,6 +974,8 @@ func (lh *MdUserGroupHandler) HandleDeleteUserGroup(c echo.Context) error {
 		"#tableID, #searchID, #"+searchID+", #paginationID, #dialogEditBodyID, #dialogEditID, #dialogDeleteBodyID, #dialogDeleteID",
 		"#"+paginationID,
 		"outerHTML", "", "true",
+		dev_mdusergroupview.BeforeRequestContent(),
+		dev_mdusergroupview.AfterRequestContent(),
 	)
 	var retVal []templ.Component
 	newForm := dev_mdusergroupview.DeleteConfirmationBody(
--- a/handlers/public/kartukontrol.handlers.go
+++ b/handlers/public/kartukontrol.handlers.go
@@ -0,0 +1,118 @@
+package public_handlers
+
+import (
+	"cpone/models"
+	"cpone/utils"
+	kartukontrol "cpone/views/public/kartukontrol"
+	public_toast "cpone/views/public/toast"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type KartuKontrolService interface {
+	GetkartuKontrolById(nomorRegistrasi string) ([]models.KartuKontrolModel, error)
+}
+
+func NewKartuKontrolHandler(us KartuKontrolService) *KartuKontrolHandler {
+	return &KartuKontrolHandler{
+		KartuKontrolService: us,
+	}
+}
+
+type KartuKontrolHandler struct {
+	KartuKontrolService KartuKontrolService
+}
+
+func (lh *KartuKontrolHandler) HandlerHideToast(c echo.Context) error {
+	toastComponent := public_toast.PublicToastV1KartuKontrolHide()
+
+	si := toastComponent
+
+	return utils.View(c, si)
+}
+
+func (lh *KartuKontrolHandler) HandlerShowKartuKontrol(c echo.Context) error {
+
+	var flagxError bool = true
+	var msgx string = ""
+
+	nomorRegistrasi := c.Param("nomorRegistrasi")
+
+	urlSurveyMcu := "redirectsurveymcu"
+
+	// urlSurveyMcu := "redirectsurveymcu"
+
+	// nomorRegistrasi := "1"
+	logger, _ := zap.NewProduction()
+	defer logger.Sync()
+
+	dataKartuKontrol, err := lh.KartuKontrolService.GetkartuKontrolById(nomorRegistrasi)
+
+	if err != nil {
+		logger.Info("Error",
+			zap.Any("Error", err),
+			zap.Any("prm", nomorRegistrasi),
+		)
+		// return err
+		if flagxError {
+			msgx = "Error Get Kartu Kontrol"
+			si := public_toast.PublicToastV1KartuKontrolShow("Error", msgx, "danger")
+			return utils.View(c, si)
+		}
+	}
+	logger.Info("SHOW DATA KARTU KONTROL handler",
+		zap.Any("return", dataKartuKontrol),
+		zap.Any("prm", nomorRegistrasi),
+	)
+
+	flagxError = false
+	var si templ.Component
+	var isShowSurveyMcu bool = true
+
+	if isShowSurveyMcu {
+		si = kartukontrol.ShowKartuKontrol("Kartu Kontrol", kartukontrol.MainContentKartuKontrolLayout(dataKartuKontrol, "/modalsurveykartukontrol", "load delay:3s", "modalWordingSurveyMcu", urlSurveyMcu, nomorRegistrasi), kartukontrol.CssKartuKontrol(), kartukontrol.JsKartuKontrol())
+	} else {
+		si = kartukontrol.ShowKartuKontrol("Kartu Kontrol",
+			kartukontrol.MainContentKartuKontrolLayout(dataKartuKontrol, "", "", "modalWordingSurveyMcu", urlSurveyMcu, nomorRegistrasi), kartukontrol.CssKartuKontrol(), kartukontrol.JsKartuKontrol())
+	}
+
+	return utils.View(c, si)
+}
+
+func (lh *KartuKontrolHandler) HandlerShowWordingModalSurveyMcu(c echo.Context) error {
+
+	stringUrlToSurveyMcu := c.QueryParam("urlSurveyMcu")
+
+	// var dataKartuKontrol []models.KartuKontrolModel
+	si := kartukontrol.ShowKartuKontrol(
+		"Kartu Kontrol",
+		kartukontrol.ModalMcuWordingShow("modalWordingSurveyMcu", "Silahkan isi questioner untuk membantu peningkatan layanan kami. Terima kasih.", stringUrlToSurveyMcu), kartukontrol.CssKartuKontrol(), kartukontrol.JsKartuKontrol())
+
+	return utils.View(c, si)
+}
+
+func (lh *KartuKontrolHandler) HandlerRedirectToSurveyMcu(c echo.Context) error {
+
+	nomorRegistrasi := c.QueryParam("nomorRegistrasi")
+	stringUrlToSurveyMcu := "/surveymcu/" + nomorRegistrasi
+
+	logger, _ := zap.NewProduction()
+	defer logger.Sync()
+
+	if len(stringUrlToSurveyMcu) > 0 {
+		// redirect ke kartu kontrol
+		logger.Info("redirect SURVEY MCU",
+			zap.Any("redirect SURVEY MCU", stringUrlToSurveyMcu),
+		)
+		c.Response().Header().Set("HX-Redirect", stringUrlToSurveyMcu)
+		// return c.NoContent(http.StatusOK)
+	}
+
+	si := kartukontrol.ShowKartuKontrol(
+		"Kartu Kontrol",
+		kartukontrol.ModalMcuWordingShow("modalWordingSurveyMcu", "Silahkan isi questioner untuk membantu peningkatan layanan kami. Terima kasih.", ""), kartukontrol.CssKartuKontrol(), kartukontrol.JsKartuKontrol())
+
+	return utils.View(c, si)
+}
--- a/handlers/public/landingpage.handlers.go
+++ b/handlers/public/landingpage.handlers.go
@@ -3,6 +3,7 @@ package public_handlers
 import (
 	public_services "cpone/services/public"
 	public_landingpage "cpone/views/public/landingpage"
+	"net/http"

 	"github.com/a-h/templ"
 	"go.uber.org/zap"
@@ -56,7 +57,7 @@ func (uh *LandingPageHandler) ShowLandingPage(c echo.Context) error {
 	)
 	// fmt.Printf("%+v\n", udata)

-	helo := public_landingpage.ShowLandingPage("Hello World",
+	helo := public_landingpage.ShowLandingPage("HOME",
 		public_landingpage.MainLandingPage(public_landingpage.ListMedicalService(udata),
 			public_landingpage.ListAdvantage(adData), public_landingpage.ListPromotion(lpData),
 			public_landingpage.FooterSection(ftNav)),
@@ -65,6 +66,12 @@ func (uh *LandingPageHandler) ShowLandingPage(c echo.Context) error {
 	return uh.View(c, helo)
 }

+func (uh *LandingPageHandler) HandleBtnLogin(c echo.Context) error {
+	c.Response().Header().Set("HX-Redirect", "/login")
+
+	return c.String(http.StatusOK, "/login")
+}
+
 func (uh *LandingPageHandler) View(c echo.Context, cmp templ.Component) error {
 	c.Response().Header().Set(echo.HeaderContentType, echo.MIMETextHTML)

--- a/handlers/public/login.handlers.go
+++ b/handlers/public/login.handlers.go
@@ -1,13 +1,20 @@
 package public_handlers

 import (
+	"cpone/models"
 	"cpone/utils"
 	public_login "cpone/views/public/login"
+	"encoding/json"
+	"net/http"
+	"time"

+	"github.com/golang-jwt/jwt/v5"
 	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
 )

 type LoginService interface {
+	MultiSignIn(username string, password string, host string) (models.Response, error)
 }

 func NewLoginHandler(us LoginService) *LoginHandler {
@@ -20,14 +27,165 @@ type LoginHandler struct {
 	LoginService LoginService
 }

-// func (uh *LoginHandler) ShowLogin(c echo.Context) error {
-// 	helo := client_Login.Show()
-// 	return utils.View(c, helo)
-// }
-
 func (lh *LoginHandler) HandlerShowLogin(c echo.Context) error {

-	si := public_login.ShowLogin("Login ", public_login.MainLogin(), public_login.CssLogin(), public_login.JsLogin())
+	si := public_login.ShowLogin("Login ", public_login.MainLogin(true), public_login.CssLogin(), public_login.JsLogin())

 	return utils.View(c, si)
 }
+
+func (lh *LoginHandler) HandleSignIn(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	host := c.Request().Host
+	username := c.FormValue("username")
+	password := c.FormValue("password")
+	defer logger.Sync()
+	logger.Info("Params", zap.Any("username", username), zap.Any("pass", password))
+
+	resp, err := lh.LoginService.MultiSignIn(username, password, host)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error", zap.Any("error multi signin", err))
+
+		si := public_login.ShowLogin("Login", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+	}
+	if resp.Status == "ERR" {
+		defer logger.Sync()
+		logger.Info("Error", zap.Any("ERR", resp.Status))
+
+		si := public_login.ShowLogin("Login", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+	}
+
+	defer logger.Sync()
+	logger.Info("valid", zap.Any("value", resp))
+
+	var url string
+	switch resp.Data.Type {
+	case "cpone":
+		url = "/one-ui"
+	case "pic":
+		url = "/corp/dashboard_pic"
+	case "patient":
+		url = "/corp/dashboard_pat"
+	default:
+		url = "/one-ui"
+	}
+
+	user, err := json.Marshal(resp.Data.User)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error", zap.Error(err))
+
+		si := public_login.ShowLogin("Login ", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+	}
+
+	cookie := new(http.Cookie)
+	cookie.Name = "token"
+	cookie.Value = resp.Data.Token
+	cookie.Path = "/"
+	cookie.HttpOnly = true
+
+	c.SetCookie(cookie)
+
+	userString := string(user)
+	store := `
+	<script>
+		console.log("store token");
+		const token = "` + resp.Data.Token + `";
+		const user = JSON.stringify(` + userString + `);
+		localStorage.setItem("token", token);
+		localStorage.setItem("user", user);
+
+		htmx.on("htmx:configRequest", (e)=> {
+			e.detail.headers["Authorization"] = "Bearer ` + resp.Data.Token + `"
+		})		
+
+		setTimeout(() => {
+			htmx.ajax('GET', '/login/redirect?url=` + url + `')
+		}, 200)
+	</script>	
+	`
+	c.Response().Header().Set("HX-Trigger", "script")
+	return c.String(http.StatusOK, store)
+}
+
+func (lh *LoginHandler) HandleRedirect(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	url := c.QueryParam("url")
+	token := c.Request().Header.Get("Authorization")
+	logger.Info("params", zap.Any("url", url), zap.Any("token", token))
+
+	c.Response().Header().Set("HX-Redirect", url)
+	return c.String(http.StatusOK, url)
+}
+
+func (lh *LoginHandler) HandleSignOut(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	logger.Info("Logout")
+	expire := time.Now().Add(-7 * 24 * time.Hour)
+	cookie := new(http.Cookie)
+	cookie.Name = "token"
+	cookie.Value = ""
+	cookie.Path = "/"
+	cookie.Expires = expire
+	cookie.HttpOnly = true
+
+	c.SetCookie(cookie)
+
+	ret := `
+	<script>
+		console.log("signout")
+		localStorage.removeItem("token")
+		localStorage.removeItem("user")
+
+		setTimeout(() => {
+			window.location.replace("/login");
+		}, 200)
+	</script>
+	`
+	c.Response().Header().Set("HX-Trigger", "script")
+	return c.String(http.StatusOK, ret)
+}
+
+func (lh *LoginHandler) HandleAutoLoginPage(c echo.Context) error {
+	userToken := c.Get("user").(*jwt.Token)
+	token := userToken.Raw
+	claims := userToken.Claims.(jwt.MapClaims)
+	userGroup := claims["M_UserGroupDashboard"].(string)
+
+	cookie := new(http.Cookie)
+	cookie.Name = "token"
+	cookie.Value = token
+	cookie.Path = "/"
+	cookie.HttpOnly = true
+	c.SetCookie(cookie)
+
+	var url string
+	switch userGroup {
+	case "cpone":
+		url = "/one-ui"
+	case "pic":
+		url = "/corp/dashboard_pic"
+	case "patient":
+		url = "/corp/dashboard_pat"
+	default:
+		url = "/one-ui"
+	}
+
+	redirect := `
+	<script>
+		setTimeout(() => {
+			htmx.ajax('GET', '/login/redirect?url=` + url + `', {
+				headers: {
+					Authorization: 'Bearer ` + token + `'
+				}
+			})
+		}, 200)
+	</script>	
+	`
+	c.Response().Header().Set("HX-Trigger", "script")
+	return c.String(http.StatusOK, redirect)
+}
--- a/handlers/public/surveymcu.handlers.go
+++ b/handlers/public/surveymcu.handlers.go
@@ -0,0 +1,194 @@
+package public_handlers
+
+import (
+	"cpone/models"
+	"cpone/utils"
+	surveymcu "cpone/views/public/surveymcu"
+	public_toast "cpone/views/public/toast"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type SurveyMcuService interface {
+	GetSurveyMcuByNoreg(nomorRegistrasi string) ([]models.SurveyMcu, error)
+}
+
+func NewSurveyMcuHandler(us SurveyMcuService) *SurveyMcuHandler {
+	return &SurveyMcuHandler{
+		SurveyMcuService: us,
+	}
+}
+
+type SurveyMcuHandler struct {
+	SurveyMcuService SurveyMcuService
+}
+
+func (lh *SurveyMcuHandler) HandlerShowSurveyMcu(c echo.Context) error {
+
+	var flagxError bool = true
+	var msgx string = ""
+
+	nomorRegistrasi := c.Param("nomorRegistrasi")
+	// nomorRegistrasi := "1"
+	logger, _ := zap.NewProduction()
+	defer logger.Sync()
+
+	dataSurveyMcu, err := lh.SurveyMcuService.GetSurveyMcuByNoreg(nomorRegistrasi)
+
+	if err != nil {
+		logger.Info("Error",
+			zap.Any("Error", err),
+			zap.Any("prm", nomorRegistrasi),
+		)
+		// return err
+		if flagxError {
+			msgx = "Error Get Survey MCU By No Reg"
+			si := public_toast.PublicToastV1KartuKontrolShow("Error", msgx, "danger")
+			return utils.View(c, si)
+		}
+	}
+
+	flagxError = false
+	logger.Info("SHOW DATA SURVEY MCU handler",
+		zap.Any("return", dataSurveyMcu),
+		zap.Any("prm", nomorRegistrasi),
+	)
+
+	stringUrl := "surveymcuproses/" + nomorRegistrasi
+	var hxInclude string = ""
+	var idClearMsg []models.IdClearErrorMessage
+
+	if len(dataSurveyMcu) > 0 {
+		hxInclude = utils.ConcatHxIncludeSurveyMcu(dataSurveyMcu)
+	}
+
+	si := surveymcu.ShowSurveyMcu("Survey Mcu",
+		surveymcu.MainContentSurveyMcuLayout(dataSurveyMcu, stringUrl, surveymcu.ErrorMessageSurveyMcu("", "", idClearMsg, "alertSaranMcu", public_toast.PublicToastV1KartuKontrolHide()), hxInclude), surveymcu.CssSurveyMcu(), surveymcu.JsSurveyMcu())
+
+	return utils.View(c, si)
+}
+
+func (lh *SurveyMcuHandler) HandlerProcessSurveyMcu(c echo.Context) error {
+
+	var flagxError bool = true
+	var msgx string = ""
+
+	nomorRegistrasi := c.Param("nomorRegistrasi")
+	stringUrlBackToKartuKontrol := "/kartukontrol/" + nomorRegistrasi
+	// nomorRegistrasi := "1"
+	logger, _ := zap.NewProduction()
+	defer logger.Sync()
+
+	dataSurveyMcu, err := lh.SurveyMcuService.GetSurveyMcuByNoreg(nomorRegistrasi)
+
+	if err != nil {
+		logger.Info("Error",
+			zap.Any("Error", err),
+			zap.Any("prm", nomorRegistrasi),
+		)
+		// return err
+		if flagxError {
+			msgx = "Error Get Survey MCU By No Reg"
+			si := public_toast.PublicToastV1KartuKontrolShow("Error", msgx, "danger")
+			return utils.View(c, si)
+		}
+	}
+
+	logger.Info("SHOW DATA SURVEY MCU handler",
+		zap.Any("return", dataSurveyMcu),
+		zap.Any("prm", nomorRegistrasi),
+	)
+
+	// form := c.Request().PostForm
+
+	// stringUrl := "surveymcuproses/" + nomorRegistrasi
+
+	logger.Info("CEK POST handler",
+		zap.Any("c.FormValue Saran", c.FormValue("saranmcu-11")),
+	)
+
+	// proses validasi
+
+	var si templ.Component
+	var idFormKosong string = ""
+	var stringMessage string = ""
+	var isFormEmpty bool = false
+	var idClearMsg []models.IdClearErrorMessage
+	var idSaranMcuAlert string = ""
+	// var idSaranMcuClear string = ""
+
+	hasError := false
+
+	if len(dataSurveyMcu) > 0 {
+		for _, v := range dataSurveyMcu {
+			// radio button
+			if len(v.DataListItemSurveyMcu) > 0 {
+				for _, x := range v.DataListItemSurveyMcu {
+
+					if len(c.FormValue("radio-"+x.IDItemSurvey)) > 0 {
+						idClearMsg = append(idClearMsg, models.IdClearErrorMessage{IdItem: x.IDItemSurvey})
+					}
+
+					if "default-"+x.NameRadioButton == c.FormValue("default-"+x.NameRadioButton) && len(c.FormValue("radio-"+x.IDItemSurvey)) == 0 {
+						stringMessage = "Pertanyaan ke-" + x.IDItemSurvey + " wajib diisi"
+						idFormKosong = utils.GetIdSurveyMcu(x.IDItemSurvey)
+						isFormEmpty = true
+						hasError = true
+						flagxError = true
+						break
+					}
+				}
+			}
+
+			if hasError {
+				break
+			}
+		}
+	}
+
+	// saran mcu
+	if !hasError && len(dataSurveyMcu) > 0 {
+		for _, v := range dataSurveyMcu {
+			if len(v.DataListItemSurveyMcuSaran) > 0 {
+				for _, x := range v.DataListItemSurveyMcuSaran {
+					if len(c.FormValue("saranmcu-"+x.IDItemSurveyMcuSaran)) > 0 {
+						idClearMsg = append(idClearMsg, models.IdClearErrorMessage{IdItem: x.IDItemSurveyMcuSaran})
+					}
+
+					if "default-"+x.NameSurveyMcuSaran == c.FormValue("default-"+x.NameSurveyMcuSaran) && len(c.FormValue("saranmcu-"+x.IDItemSurveyMcuSaran)) == 0 {
+						stringMessage = "Saran Wajib Diisi"
+						idFormKosong = utils.GetIdSurveyMcu(x.IDItemSurveyMcuSaran)
+						isFormEmpty = true
+						hasError = true
+						break
+					}
+				}
+			}
+			if hasError {
+				break
+			}
+		}
+	}
+
+	if isFormEmpty {
+		// if flagxError {
+		// 	msgx = "Error Get Survey MCU By No Reg"
+		// 	si := public_toast.PublicToastV1KartuKontrolShow("Error", msgx, "danger")
+		// 	return utils.View(c, si)
+		// }
+		si = surveymcu.ErrorMessageSurveyMcu(stringMessage, idFormKosong, idClearMsg, idSaranMcuAlert, public_toast.PublicToastV1KartuKontrolShow("Warning", stringMessage, "warning"))
+	} else {
+		flagxError = false
+		si = surveymcu.ErrorMessageSurveyMcu("", "", idClearMsg, "", public_toast.PublicToastV1KartuKontrolHide())
+		logger.Info("redirect",
+			zap.Any("redirect", stringUrlBackToKartuKontrol),
+		)
+
+		// redirect ke kartu kontrol
+		c.Response().Header().Set("HX-Redirect", stringUrlBackToKartuKontrol)
+	}
+
+	return utils.View(c, si)
+}
--- a/handlers/public/toast.handlers.go
+++ b/handlers/public/toast.handlers.go
@@ -0,0 +1,16 @@
+package public_handlers
+
+import (
+	customtoastv2 "cpone/component/toastbootstrap"
+	"cpone/utils"
+
+	"github.com/labstack/echo/v4"
+)
+
+func HandlerHideToast(c echo.Context) error {
+	toastComponent := customtoastv2.CustomToastV2Hide()
+
+	si := toastComponent
+
+	return utils.View(c, si)
+}
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -1,12 +1,15 @@
 package handlers

 import (
+	"cpone/auth"
 	client_handlers "cpone/handlers/client"
 	corporate_handlers "cpone/handlers/corporate"
+	mcu_corporate_handlers "cpone/handlers/corporate/mcudetail"
 	dev_handlers "cpone/handlers/dev"
 	public_handlers "cpone/handlers/public"
 	client_services "cpone/services/client"
 	corporate_services "cpone/services/corporate"
+	mcu_corporate_services "cpone/services/corporate/mcudetail"
 	dev_services "cpone/services/dev"
 	public_services "cpone/services/public"

@@ -16,10 +19,10 @@ import (
 )

 func SetupRoutes(app *echo.Echo, h *dev_handlers.UserHandler) {
-	group := app.Group("/user")
+	// group := app.Group("/user")

-	group.GET("", h.HandlerShowUsers)
-	group.GET("/details/:id", h.HandlerShowUserById)
+	// group.GET("", h.HandlerShowUsers)
+	// group.GET("/details/:id", h.HandlerShowUserById)

 }

@@ -61,25 +64,132 @@ func SetupRoutesEmployee(app *echo.Echo, e *dev_handlers.EmployeeHandler) {
 func SetupRoutesProject(app *echo.Echo) {

 }
+
 func SetupRoutesPublic(app *echo.Echo, appStore db.AppStore) {
 	public := app.Group("/")
 	l := public_services.NewServicesLandingPage(public_services.LandingPage{}, appStore)
 	lh := public_handlers.NewLandingPageHandler(l)
 	public.GET("landingpage", lh.ShowLandingPage)
-	loginHdr := public_handlers.NewLoginHandler(l)
-	public.GET("login", loginHdr.HandlerShowLogin)
+	public.GET("home", lh.ShowLandingPage)
+	public.GET("home/login", lh.HandleBtnLogin)
+
+	public.GET("home/hidetoast", public_handlers.HandlerHideToast)
+
+	loginServ := public_services.NewServicesLogin(appStore)
+	loginHadlr := public_handlers.NewLoginHandler(loginServ)
+	public.GET("login", loginHadlr.HandlerShowLogin)
+	public.POST("login/signin", loginHadlr.HandleSignIn)
+	public.GET("login/redirect", loginHadlr.HandleRedirect)
+	public.GET("login/signout", loginHadlr.HandleSignOut)
+	public.POST("login/autologin", loginHadlr.HandleAutoLoginPage, auth.IsAlreadyLogin)
+
+	// kartu kontrol
+	publicKartuKontrolServices := public_services.NewServicesKartuKontrol(appStore)
+	publicKartuKontrolhandlers := public_handlers.NewKartuKontrolHandler(publicKartuKontrolServices)
+	public.GET("kartukontrol/:nomorRegistrasi", publicKartuKontrolhandlers.HandlerShowKartuKontrol)
+	public.GET("modalsurveykartukontrol", publicKartuKontrolhandlers.HandlerShowWordingModalSurveyMcu)
+
+	// survey mcu page (pertanyaan dan jawaban)
+	publicSurveyMcuServices := public_services.NewServicesSurveyMcu(appStore)
+	publicSurveyMcuhandlers := public_handlers.NewSurveyMcuHandler(publicSurveyMcuServices)
+	public.GET("surveymcu/:nomorRegistrasi", publicSurveyMcuhandlers.HandlerShowSurveyMcu)
+
+	// hide toast
+	public.GET("hidetoastkartukontrol", publicKartuKontrolhandlers.HandlerHideToast)
+
+	// surveymcuproses
+	public.POST("surveymcuproses/:nomorRegistrasi", publicSurveyMcuhandlers.HandlerProcessSurveyMcu)
+
+	// redirect to survey mcu page
+	public.GET("redirectsurveymcu", publicKartuKontrolhandlers.HandlerRedirectToSurveyMcu)
 }
+
 func SetupRoutesCorporate(app *echo.Echo, appStore db.AppStore) {
-	public := app.Group("/corp")
+	corp := app.Group("/corp", auth.IsLoggedIn)
+	// corp := app.Group("/corp")
 	l := corporate_services.NewServicesCompany(appStore)
 	lh := corporate_handlers.NewCompanyHandler(l)
-	public.GET("/company", lh.ShowCompany)
-	patientHandler := corporate_handlers.NewPatientHandler(l)
-	public.GET("/patient", patientHandler.ShowPatient)
+	corp.GET("/company", lh.ShowCompany)
+
+	// ganti password
+	accountService := corporate_services.NewAccountService(appStore)
+	accountHandler := corporate_handlers.NewAccountHandler(accountService)
+	corp.POST("/dashboard_pic/tutupgantipassword", accountHandler.HandleCloseChangePassword)
+	corp.POST("/dashboard_pic/gantipassword", accountHandler.HandleChangePassword)
+
+	// dashboard_pic
+	dashbrdPicServ := corporate_services.NewDashboardPicServices(appStore)
+	dashbrdPicHandl := corporate_handlers.NewDashboardPicHandler(dashbrdPicServ)
+	corp.GET("/dashboard_pic", dashbrdPicHandl.HandleShowEmployeeAnalyticScreen)
+	corp.GET("/dashboard_pic/changepage", dashbrdPicHandl.HandlePagination)
+	corp.GET("/dashboard_pic/filter", dashbrdPicHandl.HandleFilter)
+	corp.GET("/dashboard_pic/click/:id", dashbrdPicHandl.HandleToDetail)
+
+	// mcu detail
+	mcudServ := corporate_services.NewMcuDetailServices(appStore)
+	mcudHandr := corporate_handlers.NewMcuDetailHandler(mcudServ)
+	corp.GET("/dashboard_pic/detail/:id", mcudHandr.HandlerShowMcuDetailScreen)
+
+	// tab kepesertaan
+	kepesertaanSrvs := mcu_corporate_services.NewTabKepersertaanService(appStore)
+	kepesertaanHdlr := mcu_corporate_handlers.NewTabKepersertaanHandler(kepesertaanSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkepesertaan", kepesertaanHdlr.HandleShowTabKepesertaan)
+
+	// tab kelainan global
+	kelainanglobalSrvs := mcu_corporate_services.NewTabKelainanGlobalServices(appStore)
+	kelainanglobalHdlr := mcu_corporate_handlers.NewTabKelainanGlobalHandler(kelainanglobalSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainanglobal", kelainanglobalHdlr.HandleShowTabKelainanGlobal)
+
+	// tab kelainan lab
+	kelainanlabSrvs := mcu_corporate_services.NewTabKelainanLabServices(appStore)
+	kelainanlabHdlr := mcu_corporate_handlers.NewTabKelainanLabHandler(kelainanlabSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainanlab", kelainanlabHdlr.HandleShowTabKelainanLab)
+
+	// tab kelainan non lab
+	kelnonlabSrvs := mcu_corporate_services.NewTabKelainanNonLabServices(appStore)
+	kelnonlabHdlr := mcu_corporate_handlers.NewTabKelainanNonLabHandler(kelnonlabSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainannonlab", kelnonlabHdlr.HandleShowTabKelainanNonLab)
+
+	// tab kelainan fisik
+	kelainanfisikSrvs := mcu_corporate_services.NewTabKelainanFisikServices(appStore)
+	kelainanfisikHdlr := mcu_corporate_handlers.NewTabKelainanFisikHandler(kelainanfisikSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainanfisik", kelainanfisikHdlr.HandleShowTabKelainanFisik)
+
+	// tab kesimpulan
+	kesimpulanSrv := mcu_corporate_services.NewTabKesimpulanServices(appStore)
+	kesimpulanHdr := mcu_corporate_handlers.NewTabKesimpulanHandler(kesimpulanSrv)
+	corp.GET("/dashboard_pic/detail/:id/tabkesimpulan", kesimpulanHdr.HandleShowTabKesimpulanScreen)
+
+	// tab daftar peserta
+	daftarpesertaServ := mcu_corporate_services.NewTabDaftarPesertaServices(appStore)
+	daftarpesertaHandl := mcu_corporate_handlers.NewTabDaftarPesertaHandlers(daftarpesertaServ)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta", daftarpesertaHandl.HandleShowTabDaftarPeserta)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta/changepage", daftarpesertaHandl.HandlePagination)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta/openreport", daftarpesertaHandl.HandleOpenReportDialog)
+	corp.POST("/dashboard_pic/detail/:id/tabdaftarpeserta/dialoggenpass", daftarpesertaHandl.HandleDialogGenPass)
+	corp.POST("/dashboard_pic/detail/:id/tabdaftarpeserta/closegenpass", daftarpesertaHandl.HandleCloseDialogGenPass)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta/openviewakun", daftarpesertaHandl.HandleOpenViewAkun)
+	corp.POST("/dashboard_pic/detail/:id/tabdaftarpeserta/closeviewakun", daftarpesertaHandl.HandleCloseViewAkun)
+	corp.POST("/dashboard_pic/detail/:id/tabdaftarpeserta/viewakun", daftarpesertaHandl.HandleAkun)
+	corp.POST("/dashboard_pic/detail/:id/tabdaftarpeserta/reload", daftarpesertaHandl.HandleContentReload)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta/opendetail", daftarpesertaHandl.HandleOpenDetail)
+
+	// tab keuangan
+	keuanganService := mcu_corporate_services.NewTabKeuanganServices(appStore)
+	keuanganHandler := mcu_corporate_handlers.NewTabKeuanganHandler(keuanganService)
+	corp.GET("/dashboard_pic/detail/:id/tabkeuangan", keuanganHandler.HandleShowTabKeuangan)
+	corp.GET("/dashboard_pic/detail/:id/tabkeuangan/changepage", keuanganHandler.HandleChangePage)
+
+	patienServices := corporate_services.NewPatientServices(appStore)
+	patientHandler := corporate_handlers.NewPatientHandler(patienServices)
+	corp.GET("/dashboard_pat", patientHandler.HandleShowPatient)
+	corp.GET("/dashboard_pat/content", patientHandler.LoadLocalData)
+	corp.GET("/dashboard_pat/changepage", patientHandler.HandleChangePage)
+	corp.GET("/dashboard_pat/open", patientHandler.HandleOpenReport)
 }

 func SetupRoutesClient(app *echo.Echo, appStore db.AppStore) {
-	public := app.Group("/client")
+	public := app.Group("/client", auth.IsLoggedIn)

 	lpanel := client_services.NewServicesMdPanel(appStore)
 	lhpanel := client_handlers.NewMdPanelHandler(lpanel)
@@ -212,6 +322,34 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	// clientgroup.GET("/usergroup/edit", mastermenuusergroupHandler.ChangeFormEdit)
 	// clientgroup.GET("/usergroup/pagination", mastermenuusergroupHandler.HandleChangePage)

+	// employee analytic
+	devEmplAnaServices := dev_services.NewEmployeeAnalyticServices(appStore)
+	devEmplAnaHandler := dev_handlers.NewEmployeeAnalyticHandler(devEmplAnaServices)
+	dev.GET("/dashboard_pic", devEmplAnaHandler.HandleShowEmployeeAnalyticScreen)
+	dev.GET("/dashboard_pic/changepage", devEmplAnaHandler.HandlePagination)
+	dev.GET("/dashboard_pic/filter", devEmplAnaHandler.HandleFilter)
+	dev.GET("/dashboard_pic/click/:id", devEmplAnaHandler.HandleIntoDetail)
+
+	devDetailMcuService := dev_services.NewDetailMcuServices(appStore)
+	devDetailMcuHandler := dev_handlers.NewDetailMcuHandler(devDetailMcuService)
+	dev.GET("/detail/:id", devDetailMcuHandler.HandleShowDetailMcuScreen)
+
+	// group result
+	devGRServices := dev_services.NewServicesGroupResult(appStore)
+	devGRhandlers := dev_handlers.NewGroupResultHandler(devGRServices)
+	dev.GET("/groupresult", devGRhandlers.HandlerShowGroupResultV1)
+	dev.GET("/searchgroupresultv1", devGRhandlers.HandlerShowGroupResultSearchV1)
+	dev.GET("/groupresultv1pagination", devGRhandlers.HandlerShowGroupResultPaginationV1)
+	dev.POST("/groupresulthandlecloseform", devGRhandlers.HandleCloseForm)
+	dev.POST("/groupresulthandlecloseformedit", devGRhandlers.HandleCloseFormEdit)
+	dev.GET("/groupresultshoweditform", devGRhandlers.HandleEditForm)
+	dev.GET("/groupresultshowdeleteform", devGRhandlers.HandleDeleteForm)
+	// dev.GET("/groupresultshowdeleteform", devGRhandlers.HandleDeleteForm)
+	// form add
+	dev.POST("/groupresult/add", devGRhandlers.AddGroupResult)
+	dev.POST("/groupresult/edit", devGRhandlers.EditGroupResult)
+	dev.POST("/groupresult/delete", devGRhandlers.DeleteGroupResult)
+
 	//New User Group
 	devMdUserGroupServices := dev_services.NewMdUserGroupServices(appStore)
 	devMdUserGroupHandlers := dev_handlers.NewMdUserGroupHandler(devMdUserGroupServices)
@@ -227,4 +365,72 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	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)
+	dev.GET("/md/natunit", devMdNatUnitHandlers.HandleShowMdNatUnitScreen)
+	dev.GET("/md/natunit/filter", devMdNatUnitHandlers.HandleFilterMdNatUnit)
+	dev.GET("/md/natunit/changepage", devMdNatUnitHandlers.HandlerChangePageMdNatUnit)
+	dev.POST("/md/natunit/closeaddform", devMdNatUnitHandlers.HandlerCloseFormAdd)
+	dev.POST("/md/natunit/add", devMdNatUnitHandlers.HandlerAddNatUnit)
+	dev.GET("/md/natunit/openedit", devMdNatUnitHandlers.HandlerOpenEditForm)
+	dev.POST("/md/natunit/closeeditform", devMdNatUnitHandlers.HandlerCloseFormEdit)
+	dev.POST("/md/natunit/edit", devMdNatUnitHandlers.HandlerEditNatUnit)
+	dev.GET("/md/natunit/opendelete", devMdNatUnitHandlers.HandlerOpenDeleteForm)
+	dev.POST("/md/natunit/closedeleteform", devMdNatUnitHandlers.HandlerCloseFormDelete)
+	dev.POST("/md/natunit/delete", devMdNatUnitHandlers.HandlerDeleteNatUnit)
+
+	// group result v2
+	devMdGRServices := dev_services.NewServicesMdGroupResult(appStore)
+	devMdGRhandlers := dev_handlers.NewMdGroupResultHandler(devMdGRServices)
+	dev.GET("/md/groupresultv2", devMdGRhandlers.HandleShowMdGroupResultScreen)
+	dev.GET("/md/groupresultv2/filter", devMdGRhandlers.HandleFilterMdGroupResult)
+	dev.GET("/md/groupresultv2/changepage", devMdGRhandlers.HandleChangePageMdGroupResult)
+	dev.POST("/md/groupresultv2/closeaddform", devMdGRhandlers.HandleCloseFormAdd)
+	dev.POST("/md/groupresultv2/add", devMdGRhandlers.HandleAddGroupResult)
+	dev.GET("/md/groupresultv2/openedit", devMdGRhandlers.HandleOpenEditForm)
+	dev.POST("/md/groupresultv2/closeeditform", devMdGRhandlers.HandleCloseFormEdit)
+	dev.POST("/md/groupresultv2/edit", devMdGRhandlers.HandleEditGroupResult)
+	dev.GET("/md/groupresultv2/opendelete", devMdGRhandlers.HandleOpenDeleteForm)
+	dev.POST("/md/groupresultv2/closedeleteform", devMdGRhandlers.HandleCloseFormDelete)
+	dev.POST("/md/groupresultv2/delete", devMdGRhandlers.HandleDeleteUserGroup)
+	//MD BAHAN
+	devMdBahanServices := dev_services.NewMdBahanServices(appStore)
+	devMdBahanHandlers := dev_handlers.NewMdBahanHandler(devMdBahanServices)
+	dev.GET("/md/bahan", devMdBahanHandlers.HandleShowMdBahanScreen)
+	dev.GET("/md/bahan/filter", devMdBahanHandlers.HandleFilterMdBahan)
+	dev.GET("/md/bahan/pagination", devMdBahanHandlers.HandlePaginationMdBahan)
+	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)
+
+	// Kesimpulan
+	devKesimpulanServices := dev_services.NewServicesKesimpulan(appStore)
+	devKesimpuanHandler := dev_handlers.NewKesimpulanHandler(devKesimpulanServices)
+	dev.GET("/kesimpulan/:id", devKesimpuanHandler.HandleShowKesimpulanScreen)
+
+	// mcu daftar peserta
+	devMcuDaftarPesertaServices := dev_services.NewMcuDaftarPesertaServices(appStore)
+	devMcuDaftarPesertaHandler := dev_handlers.NewMcuDaftarPeserta(devMcuDaftarPesertaServices)
+	dev.GET("/mcudaftarpeserta/:id", devMcuDaftarPesertaHandler.HandleGetMcuDaftarPeserta)
 }
--- a/layout/layout_corporate.templ
+++ b/layout/layout_corporate.templ
@@ -266,6 +266,8 @@ templ CorporateLayout(title string, css templ.Component, js templ.Component, nav
 			<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>
--- a/layout/layout_corporate_templ.go
+++ b/layout/layout_corporate_templ.go
@@ -78,7 +78,7 @@ func CorporateLayout(title string, css templ.Component, js templ.Component, navb
 		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>")
+		_, 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
 		}
--- a/layout/layout_dashboard.templ
+++ b/layout/layout_dashboard.templ
@@ -0,0 +1,197 @@
+package layout
+
+templ DashboardLayout(
+    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">
+					// toast
+					<div class="toast-top-right" id="container-system-notification" style="position: absolute; top: 1vh; right: 0vw; z-index: 999;">
+						<!-- toast success -->
+						<div
+							id="notification-001"
+							class="toast fade hide"
+							role="alert"
+							aria-live="assertive"
+							aria-atomic="true"
+						>
+							<div class="toast-header bg-success text-white">
+								<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--ep mr-2 icon-xl" width="1em" height="1em" preserveAspectRatio="xMidYMid meet" viewBox="0 0 1024 1024" data-icon="ep:success-filled"><path fill="currentColor" d="M512 64a448 448 0 1 1 0 896a448 448 0 0 1 0-896m-55.808 536.384l-99.52-99.584a38.4 38.4 0 1 0-54.336 54.336l126.72 126.72a38.27 38.27 0 0 0 54.336 0l262.4-262.464a38.4 38.4 0 1 0-54.272-54.336z"></path></svg>
+								<strong class="mr-auto">Success</strong>
+								<small class="text-muted text-white">just now</small>
+								<button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close">
+									<span aria-hidden="true">×</span>
+								</button>
+							</div>
+							<div class="toast-body bg-success-transparent">
+								This is a success toast.
+							</div>
+						</div>
+					</div>				
+                    { 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_dashboard_templ.go
+++ b/layout/layout_dashboard_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 DashboardLayout(
+	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_dashboard.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\"><div class=\"toast-top-right\" id=\"container-system-notification\" style=\"position: absolute; top: 1vh; right: 0vw; z-index: 999;\"><!-- toast success --><div id=\"notification-001\" class=\"toast fade hide\" role=\"alert\" aria-live=\"assertive\" aria-atomic=\"true\"><div class=\"toast-header bg-success text-white\"><svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" aria-hidden=\"true\" role=\"img\" class=\"iconify iconify--ep mr-2 icon-xl\" width=\"1em\" height=\"1em\" preserveAspectRatio=\"xMidYMid meet\" viewBox=\"0 0 1024 1024\" data-icon=\"ep:success-filled\"><path fill=\"currentColor\" d=\"M512 64a448 448 0 1 1 0 896a448 448 0 0 1 0-896m-55.808 536.384l-99.52-99.584a38.4 38.4 0 1 0-54.336 54.336l126.72 126.72a38.27 38.27 0 0 0 54.336 0l262.4-262.464a38.4 38.4 0 1 0-54.272-54.336z\"></path></svg> <strong class=\"mr-auto\">Success</strong> <small class=\"text-muted text-white\">just now</small> <button type=\"button\" class=\"ml-2 mb-1 close\" data-dismiss=\"toast\" aria-label=\"Close\"><span aria-hidden=\"true\">×</span></button></div><div class=\"toast-body bg-success-transparent\">This is a success toast.\r</div></div></div>")
+		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/account.models.go
+++ b/models/account.models.go
@@ -0,0 +1,6 @@
+package models
+
+type ResponseStatus struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+}
--- 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/chart.models.go
+++ b/models/chart.models.go
@@ -0,0 +1,177 @@
+package models
+
+type SeriesData struct {
+	Value int    `json:"value"`
+	Name  string `json:"name"`
+}
+
+type Series struct {
+	Label struct {
+		Position  string `json:"position"`
+		Formatter string `json:"formatter"`
+	} `json:"label"`
+	Name      string   `json:"name"`
+	Type      string   `json:"type"`
+	Radius    []string `json:"radius"`
+	ItemStyle struct {
+		BorderRadius int    `json:"borderRadius"`
+		BorderColor  string `json:"borderColor"`
+		BorderWidth  int    `json:"borderWidth"`
+	} `json:"itemStyle"`
+	Data     []SeriesData `json:"data"`
+	Emphasis struct {
+		ItemStyle struct {
+			ShadowBlur    int    `json:"shadowBlur"`
+			ShadowOffsetX int    `json:"shadowOffsetX"`
+			ShadowColor   string `json:"shadowColor"`
+		} `json:"itemStyle"`
+	} `json:"emphasis"`
+}
+
+type Piechart struct {
+	Title struct {
+		Text    string `json:"text"`
+		SubText string `json:"subtext"`
+		Left    string `json:"left"`
+	} `json:"title"`
+	Tooltip struct {
+		Trigger string `json:"trigger"`
+	} `json:"tooltip"`
+	Legend struct {
+		Top    string `json:"top"`
+		Left   string `json:"left"`
+		Orient string `json:"orient"`
+		Height int    `json:"height"`
+	} `json:"legend"`
+	Series []Series `json:"series"`
+}
+
+type Barchart struct {
+	Title struct {
+		Text string `json:"text"`
+		Left string `json:"left"`
+	} `json:"title"`
+	Dataset struct {
+		Source [][]interface{} `json:"source"`
+	} `json:"dataset"`
+	Grid struct {
+		ContainLabel bool `json:"containLabel"`
+	} `json:"grid"`
+	XAxis struct {
+		Name string `json:"name"`
+	} `json:"xAxis"`
+	YAxis struct {
+		Type string `json:"type"`
+	} `json:"yAxis"`
+	VisualMap struct {
+		Orient    string `json:"orient"`
+		Left      string `json:"left"`
+		Min       int    `json:"min"`
+		Max       int    `json:"max"`
+		Show      bool   `json:"show"`
+		Dimension int    `json:"dimension"`
+		InRange   struct {
+			Color []string `json:"color"`
+		} `json:"inRange"`
+	} `json:"visualMap"`
+	Series []struct {
+		Label struct {
+			Position  string `json:"position"`
+			Show      bool   `json:"show"`
+			Formatter string `json:"formatter"`
+		} `json:"label"`
+		Type   string `json:"type"`
+		Encode struct {
+			X string `json:"x"`
+			Y string `json:"y"`
+		} `json:"encode"`
+	} `json:"series"`
+	Tooltip struct {
+		Trigger     string `json:"trigger"`
+		AxisPointer struct {
+			Type string `json:"type"`
+		} `json:"axisPointer"`
+	} `json:"tooltip"`
+	Graphic struct {
+		Type  string `json:"type"`
+		Left  string `json:"left"`
+		Top   string `json:"top"`
+		Style struct {
+			Text       string `json:"text"`
+			FontSize   string `json:"fontSize"`
+			FontWeight string `json:"fontWeight"`
+		} `json:"style"`
+	} `json:"graphic"`
+}
+
+type BarDataset struct {
+	Source [][]interface{} `json:"source"`
+}
+
+type BarchartV2 struct {
+	Title struct {
+		Text string `json:"text"`
+		Left string `json:"left"`
+	} `json:"title"`
+	Dataset struct {
+		Source [][]interface{} `json:"source"`
+	} `json:"dataset"`
+	Grid struct {
+		ContainLabel bool `json:"containLabel"`
+	} `json:"grid"`
+	XAxis struct {
+		Name      string `json:"name"`
+		Type      string `json:"type"`
+		AxisLabel struct {
+			Interval int `json:"interval"`
+			Rotate   int `json:"rotate"`
+		} `json:"axisLabel"`
+	} `json:"xAxis"`
+	YAxis struct {
+		Type          string `json:"type"`
+		Name          string `json:"name"`
+		NameTextStyle struct {
+			Align string `json:"align"`
+		} `json:"nameTextStyle"`
+		NameGap int `json:"nameGap"`
+	} `json:"yAxis"`
+	VisualMap struct {
+		Orient    string `json:"orient"`
+		Left      string `json:"left"`
+		Min       int    `json:"min"`
+		Max       int    `json:"max"`
+		Dimension int    `json:"dimension"`
+		Show      bool   `json:"show"`
+		InRange   struct {
+			Color []string `json:"color"`
+		} `json:"inRange"`
+	} `json:"visualMap"`
+	Series []struct {
+		Label struct {
+			Position  string `json:"position"`
+			Show      bool   `json:"show"`
+			Formatter string `json:"formatter"`
+		} `json:"label"`
+		Type   string `json:"type"`
+		Encode struct {
+			X string `json:"x"`
+			Y string `json:"y"`
+		} `json:"encode"`
+	} `json:"series"`
+	Tooltip struct {
+		Trigger     string `json:"trigger"`
+		AxisPointer struct {
+			Type string `json:"type"`
+		} `json:"axisPointer"`
+	} `json:"tooltip"`
+	Graphic struct {
+		Type  string `json:"type"`
+		Left  string `json:"left"`
+		Top   string `json:"top"`
+		Style struct {
+			Text       string `json:"text"`
+			FontSize   string `json:"fontSize"`
+			FontWeight string `json:"fontWeight"`
+		} `json:"style"`
+	} `json:"graphic"`
+}
--- a/models/customcheckbox.models.go
+++ b/models/customcheckbox.models.go
@@ -0,0 +1,18 @@
+package models
+
+// name string, id string, hxTarget string, hxGet string, hxIndicator string, hxTrigger string, hxInclude string,
+
+type CustomCheckboxv1Prm struct {
+	HxTarget    string `default:"hxTarget"`
+	HxGet       string `default:"hxGet"`
+	HxIndicator string `default:"hxIndicator"`
+	HxInclude   string `default:"hxInclude"`
+	HxTrigger   string `default:"hxTrigger"`
+	Label       string `default:"Label"`
+	Name        string `default:"name"`
+	Text        string `default:"text"`
+	// Type        string `default:"text"`
+	Value    string `default:""`
+	ErrorMsg string `default:""`
+	ID       string
+}
--- a/models/customdropdown.models.go
+++ b/models/customdropdown.models.go
@@ -0,0 +1,36 @@
+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 {
+	HxTarget    string `default:"hxTarget"`
+	HxGet       string `default:"hxGet"`
+	HxIndicator string `default:"hxIndicator"`
+	HxInclude   string `default:"hxInclude"`
+	HxTrigger   string `default:"hxTrigger"`
+	Label       string `default:"Label"`
+	Name        string `default:"name"`
+	// Placeholder string `default:"Placeholder"`
+	// Type        string `default:"text"`
+	// Value       string `default:""`
+	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/customradiobutton.models.go
+++ b/models/customradiobutton.models.go
@@ -0,0 +1,16 @@
+package models
+
+type CustomRadioButtonv1Prm struct {
+	HxTarget    string `default:"hxTarget"`
+	HxGet       string `default:"hxGet"`
+	HxIndicator string `default:"hxIndicator"`
+	HxInclude   string `default:"hxInclude"`
+	HxTrigger   string `default:"hxTrigger"`
+	Label       string `default:"Label"`
+	Name        string `default:"name"`
+	Text        string `default:"text"`
+	// Type        string `default:"text"`
+	Value    string `default:""`
+	ErrorMsg string `default:""`
+	ID       string
+}
--- a/models/dashboardpatient.models.go
+++ b/models/dashboardpatient.models.go
@@ -0,0 +1,11 @@
+package models
+
+type DashboardPatient struct {
+	T_OrderHeaderID          int    `db:"T_OrderHeaderID"`
+	T_OrderHeaderDate        string `db:"T_OrderHeaderDate"`
+	T_OrderHeaderLabNumber   string `db:"T_OrderHeaderLabNumber"`
+	T_OrderHeaderM_PatientID int    `db:"T_OrderHeaderM_PatientID"`
+	T_OrderHeaderCorporateID int    `db:"T_OrderHeaderCorporateID"`
+	T_OrderHeaderMgm_McuID   int    `db:"T_OrderHeaderMgm_McuID"`
+	T_OrderHeaderIsActive    string `db:"T_OrderHeaderIsActive"`
+}
--- a/models/employeeanalytic.models.go
+++ b/models/employeeanalytic.models.go
@@ -0,0 +1,15 @@
+package models
+
+type DashboardPic 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/groupresult.models.go
+++ b/models/groupresult.models.go
@@ -0,0 +1,38 @@
+package models
+
+import "github.com/a-h/templ"
+
+type GroupResultResumeMcu struct {
+	Text string `default:"text"`
+	ID   int    `default:"id"`
+}
+
+type GroupResult struct {
+	Nomor                   string `db:"nomor"`
+	Group_ResultID          int    `db:"Group_ResultID"`
+	Group_ResultName        string `db:"Group_ResultName"`
+	Group_ResultFlagPerTest string `db:"Group_ResultFlagPerTest"`
+	Group_ResultFlagNonLab  string `db:"Group_ResultFlagNonLab"`
+	Group_ResultResumeMcu   string `db:"Group_ResultResumeMcu"`
+	Group_ResultIsActive    string `db:"Group_ResultIsActive"`
+}
+
+// form component
+type GroupResultFormComponent struct {
+	IDComponent                    string
+	Link                           string
+	HxTarget                       string
+	HxSwap                         string
+	HxInclude                      string
+	ModalID                        string
+	ModalTitle                     string
+	InputGroupResultName           CustomTextFieldv2Prm
+	InputGroupResult               CustomTextFieldv2Prm
+	CheckboxGroupResultFlagPerTest CustomCheckboxv1Prm
+	CheckboxGroupResultFlagNonLab  CustomCheckboxv1Prm
+	InputID                        CustomTextFieldv2Prm
+	DropdownGroupResultResumeMcu   CustomDropdownv1Prm
+	DialogBody                     templ.Component
+	DialogAction                   templ.Component
+	ButtonCLose                    templ.Component
+}
--- a/models/kartukontrol.models.go
+++ b/models/kartukontrol.models.go
@@ -0,0 +1,33 @@
+package models
+
+type KartuKontrolModel struct {
+	KartuKontrolDataPasienList                   []DataPasien                       `json:"kartuKontrolDataPasien"`
+	KartuKontrolDataPemeriksaanList              []DataPemeriksaanList              `json:"kartuKontrolDataPemeriksaanList"`
+	KartuKontrolDataPemeriksaanPengambilanSample []DataPemeriksaanPengambilanSample `json:"kartuKontrolDataPemeriksaanPengambilanSample"`
+}
+
+type DataPasien struct {
+	NomorRegistrasi string `json:"nomorRegistrasi"`
+	NomorLab        string `json:"nomorLab"`
+	NamaPasien      string `json:"namaPasien"`
+	TanggalLahir    string `json:"tanggalLahir"`
+	Umur            string `json:"umur"`
+	JenisKelamin    string `json:"jenisKelamin"`
+	NamaDivisi      string `json:"namaDivisi"`
+	NamaCompany     string `json:"namaCompany"`
+}
+
+type DataPemeriksaanList struct {
+	NamaPemeriksaanList string `json:"namaPemeriksaanList"`
+}
+
+type SampleTypeList struct {
+	SampleTypeName     string `json:"sampleTypeName"`
+	SampleTypeDateTime string `json:"sampleTypeDateTime"`
+	SampleTypeStatus   string `json:"sampleTypeStatus"`
+}
+
+type DataPemeriksaanPengambilanSample struct {
+	NamaPemeriksaanPengambilanSample string           `json:"namaPemeriksaanPengambilanSample"`
+	SampleTypeListData               []SampleTypeList `json:"sampleTypeListData"`
+}
--- a/models/kesimpulan.models.go
+++ b/models/kesimpulan.models.go
@@ -0,0 +1,7 @@
+package models
+
+type ModelKesimpulanLab struct {
+	Nomor string `db:"nomor"`
+	Test  string `db:"Test"`
+	Total string `db:"total"`
+}
--- a/models/keuangan.models.go
+++ b/models/keuangan.models.go
@@ -0,0 +1,34 @@
+package models
+
+type KeuanganModel struct {
+	F_BillID          int    `db:"F_BillID"`
+	F_BillNo          string `db:"F_BillNo"`
+	F_BillCorporateID int    `db:"F_BillCorporateID"`
+	F_BillDueDate     string `db:"F_BillDueDate"`
+	F_BillTotal       int    `db:"F_BillTotal"`
+	F_BillUnpaid      int    `db:"F_BillUnpaid"`
+	F_BillCreated     string `db:"F_BillCreated"`
+	BillPayment       []BillPaymentModel
+	TotalBillPayment  int
+}
+
+type BillPaymentModel struct {
+	F_BillPaymentID       int     `db:"F_BillPaymentID"`
+	F_BillPaymentF_BillID int     `db:"F_BillPaymentF_BillID"`
+	F_BillPaymentDate     string  `db:"F_BillPaymentDate"`
+	F_BillPaymentNumber   string  `db:"F_BillPaymentNumber"`
+	F_BillPaymentAmount   float64 `db:"F_BillPaymentAmount"`
+}
+
+type TotalOrderHeader struct {
+	T_OrderHeaderID          int     `db:"T_OrderHeaderID"`
+	T_OrderHeaderCorporateID int     `db:"T_OrderHeaderCorporateID"`
+	T_OrderHeaderTotal       float64 `db:"T_OrderHeaderTotal"`
+	T_OrderHeaderCreated     string  `db:"T_OrderHeaderCreated"`
+}
+
+type TotalBillCard struct {
+	TotalTagihan   int
+	TotalPelunasan int
+	TotalHutang    int
+}
--- a/models/login.models.go
+++ b/models/login.models.go
@@ -0,0 +1,89 @@
+package models
+
+type ResponseApi struct {
+	Status string `json:"status"`
+	Data   struct {
+		User struct {
+			MUserID                      string `json:"M_UserID"`
+			MUserEmail                   string `json:"M_UserEmail"`
+			MUserUsername                string `json:"M_UserUsername"`
+			MUserGroupDashboard          string `json:"M_UserGroupDashboard"`
+			MUserDefaultTSampleStationID string `json:"M_UserDefaultT_SampleStationID"`
+			MStaffName                   string `json:"M_StaffName"`
+			IsCourier                    string `json:"is_courier"`
+			TimeAutologout               string `json:"time_autologout"`
+			IP                           string `json:"ip"`
+			Agent                        string `json:"agent"`
+			Version                      string `json:"version"`
+			LastLogin                    string `json:"last-login"`
+		} `json:"user"`
+		Token string `json:"token"`
+		Type  string `json:"type"`
+	} `json:"data"`
+	Message string `json:"message"`
+	Query   string `json:"query"`
+	DbError struct {
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"db_error"`
+}
+
+type ResponseInvalid struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+	Query   string `json:"query"`
+	DbError struct {
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"db_error"`
+}
+
+type ResponseValid struct {
+	Status string `json:"status"`
+	Data   struct {
+		User struct {
+			MUserID                      string `json:"M_UserID"`
+			MUserEmail                   string `json:"M_UserEmail"`
+			MUserUsername                string `json:"M_UserUsername"`
+			MUserGroupDashboard          string `json:"M_UserGroupDashboard"`
+			MUserDefaultTSampleStationID string `json:"M_UserDefaultT_SampleStationID"`
+			MStaffName                   string `json:"M_StaffName"`
+			IsCourier                    string `json:"is_courier"`
+			TimeAutologout               string `json:"time_autologout"`
+			IP                           string `json:"ip"`
+			Agent                        string `json:"agent"`
+			Version                      string `json:"version"`
+			LastLogin                    string `json:"last-login"`
+		} `json:"user"`
+		Token string `json:"token"`
+		Type  string `json:"type"`
+	} `json:"data"`
+}
+
+type Response struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+	Query   string `json:"query"`
+	DbError struct {
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"db_error"`
+	Data struct {
+		User struct {
+			MUserID                      string `json:"M_UserID"`
+			MUserEmail                   string `json:"M_UserEmail"`
+			MUserUsername                string `json:"M_UserUsername"`
+			MUserGroupDashboard          string `json:"M_UserGroupDashboard"`
+			MUserDefaultTSampleStationID string `json:"M_UserDefaultT_SampleStationID"`
+			MStaffName                   string `json:"M_StaffName"`
+			IsCourier                    string `json:"is_courier"`
+			TimeAutologout               string `json:"time_autologout"`
+			IP                           string `json:"ip"`
+			Agent                        string `json:"agent"`
+			Version                      string `json:"version"`
+			LastLogin                    string `json:"last-login"`
+		} `json:"user"`
+		Token string `json:"token"`
+		Type  string `json:"type"`
+	} `json:"data"`
+}
--- a/models/mcudaftarpeserta.models.go
+++ b/models/mcudaftarpeserta.models.go
@@ -0,0 +1,104 @@
+package models
+
+type ModelMcuDaftarPeserta struct {
+	T_OrderHeaderID           string `db:"T_OrderHeaderID"`
+	T_OrderHeaderDate         string `db:"T_OrderHeaderDate"`
+	T_OrderHeaderLabNumber    string `db:"T_OrderHeaderLabNumber"`
+	T_OrderHeaderM_PatientAge string `db:"T_OrderHeaderM_PatientAge"`
+	M_PatientID               string `db:"M_PatientID"`
+	M_PatientNoReg            string `db:"M_PatientNoReg"`
+	M_PatientName             string `db:"M_PatientName"`
+	M_PatientGender           string `db:"M_PatientGender"`
+	JenisKelamin              string `db:"jenisKelamin"`
+	M_PatientDOB              string `db:"M_PatientDOB"`
+	Age                       string `db:"age"`
+	AuthPatientEmail          string `db:"authPatientEmail"`
+	AuthPatientIsActive       string `db:"authPatientIsActive"`
+	Test_Paket                string `db:"test_paket"`
+	List_Paket                string `db:"list_paket"`
+}
+
+type SoResultEntryReportModel struct {
+	So_ResultEntryID                  int    `db:"So_ResultEntryID"`
+	So_ResultEntryT_OrderHeaderID     int    `db:"So_ResultEntryT_OrderHeaderID"`
+	So_ResultEntryT_OrderDetailID     int    `db:"So_ResultEntryT_OrderDetailID"`
+	So_ResultEntryNonlab_TemplateID   int    `db:"So_ResultEntryNonlab_TemplateID"`
+	So_ResultEntryNonlab_TemplateName string `db:"So_ResultEntryNonlab_TemplateName"`
+	Datetime                          string `db:"Datetime"`
+}
+
+type TabViewReportMcu struct {
+	Name string
+	Link string
+}
+
+type OrderReport struct {
+	M_OrderReportID            int    `db:"M_OrderReportID"`
+	M_OrderReportName          string `db:"M_OrderReportName"`
+	M_OrderReportOrdering      int    `db:"M_OrderReportOrdering"`
+	M_OrderReportUrl           string `db:"M_OrderReportUrl"`
+	M_OrderReportIsOrderHeader string `db:"M_OrderReportIsOrderHeader"`
+	M_OrderReportIsFisikUmum   string `db:"M_OrderReportIsFisikUmum"`
+	M_OrderReportIsActive      string `db:"M_OrderReportIsActive"`
+	Datetime                   string `db:"Datetime"`
+}
+
+type GeneratePasswordResponse struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+}
+
+type AuthPatient struct {
+	AuthPatientID          int    `db:"authPatientID"`
+	AuthPatientM_PatientID int    `db:"authPatientM_PatientID"`
+	AuthPatientEmail       string `db:"authPatientEmail"`
+	AuthPatientPassword    string `db:"authPatientPassword"`
+	AuthPatientIsActive    string `db:"authPatientIsActive"`
+}
+
+type GroupResultOrderModel struct {
+	Group_ResultID            string `db:"Group_ResultID"`
+	Group_ResultName          string `db:"Group_ResultName"`
+	Group_ResultResumeMcu     string `db:"Group_ResultResumeMcu"`
+	Group_ResultOrderOrder    string `db:"Group_ResultOrderOrder"`
+	Group_ResultUrl           string `db:"Group_ResultUrl"`
+	Group_ResultIsOrderHeader string `db:"Group_ResultIsOrderHeader"`
+	Datetime                  string `db:"Datetime"`
+}
+
+type PatientMCU struct {
+	T_OrderHeaderID        string `db:"T_OrderHeaderID"`
+	T_OrderHeaderLabNumber string `db:"T_OrderHeaderLabNumber"`
+	M_PatientID            string `db:"M_PatientID"`
+	M_PatientName          string `db:"M_PatientName"`
+	Datetime               string `db:"Datetime"`
+}
+
+type SoRptData struct {
+	Rpt_name string `db:"rpt_name"`
+	So_id    string `db:"so_id"`
+	Order_id string `db:"order_id"`
+	Datetime string `db:"Datetime"`
+}
+
+type ResumeMCU struct {
+	Mcu_ResumeID string `db:"Mcu_ResumeID"`
+	Datetime     string `db:"Datetime"`
+}
+
+type DetailPaketMCU struct {
+	T_OrderDetailOrderT_PacketID   string `db:"T_OrderDetailOrderT_PacketID"`
+	T_OrderDetailOrderT_PacketName string `db:"T_OrderDetailOrderT_PacketName"`
+	T_TestName                     string `db:"T_TestName"`
+}
+
+type DetailTestMCU struct {
+	T_OrderDetailOrderT_TestID   string `db:"T_OrderDetailOrderT_TestID"`
+	T_OrderDetailOrderT_TestName string `db:"T_OrderDetailOrderT_TestName"`
+}
+
+type TableTestPaket struct {
+	Nomor     int
+	NamaTest  string
+	NamaPaket string
+}
--- a/models/mcutab.models.go
+++ b/models/mcutab.models.go
@@ -0,0 +1,10 @@
+package models
+
+type McuTabModels struct {
+	Mcu_ImageGrafikGroupResult string `db:"Mcu_ImageGrafikGroupResult"`
+	Mcu_ImageGrafikGroupMenu   string `db:"Mcu_ImageGrafikGroupMenu"`
+	Mcu_ImageGrafikName        string `db:"Mcu_ImageGrafikName"`
+	Mcu_ImageGrafikJsonRender  string `db:"Mcu_ImageGrafikJsonRender"`
+	TabID                      string
+	TabName                    string
+}
--- a/models/natunit.models.go
+++ b/models/natunit.models.go
@@ -0,0 +1,29 @@
+package models
+
+import "github.com/a-h/templ"
+
+type NatUnit struct {
+	Nomor               string `db:"nomor"`
+	Nat_UnitID          int    `db:"Nat_UnitID"`
+	Nat_UnitCode        string `db:"Nat_UnitCode"`
+	Nat_UnitName        string `db:"Nat_UnitName"`
+	Nat_UnitCreated     string `db:"Nat_UnitCreated"`
+	Nat_UnitLastUpdated string `db:"Nat_UnitLastUpdated"`
+	Nat_UnitIsActive    string `db:"Nat_UnitIsActive"`
+}
+
+type NatUnitFormComponent struct {
+	IDComponent  string
+	Link         string
+	HxTarget     string
+	HxSwap       string
+	HxInclude    string
+	ModalID      string
+	ModalTitle   string
+	InputName    CustomTextFieldv2Prm
+	InputCode    CustomTextFieldv2Prm
+	InputID      CustomTextFieldv2Prm
+	DialogBody   templ.Component
+	DialogAction templ.Component
+	ButtonCLose  templ.Component
+}
--- 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/models/surveymcu.models.go
+++ b/models/surveymcu.models.go
@@ -0,0 +1,24 @@
+package models
+
+type SurveyMcu struct {
+	DataListItemSurveyMcu      []ItemSurveyMcu      `json:"dataListItemSurveyMcu"`
+	DataListItemSurveyMcuSaran []ItemSurveyMcuSaran `json:"datalistitemsurveymcusaran"`
+}
+
+type ItemSurveyMcu struct {
+	IDItemSurvey    string `json:"iditemsurvey"`
+	Nomor           string `json:"nomor"`
+	Pertanyaan      string `json:"pertanyaan"`
+	NameRadioButton string `json:"nameradiobutton"`
+	ErrorMessage    string `json:"errorMessage"`
+}
+
+type ItemSurveyMcuSaran struct {
+	IDItemSurveyMcuSaran       string `json:"iditemsurveymcusaran"`
+	NameSurveyMcuSaran         string `json:"namesurveymcusaran"`
+	ErrorMessageSurveyMcuSaran string `json:"errormessagesurveymcusaran"`
+}
+
+type IdClearErrorMessage struct {
+	IdItem string `json:"iditem"`
+}
--- a/models/tabkelainanfisik.models.go
+++ b/models/tabkelainanfisik.models.go
@@ -0,0 +1,7 @@
+package models
+
+type KelainanFisikDataModel struct {
+	Test                      string `db:"test"`
+	Total                     int    `db:"total"`
+	Mcu_KelainanClasification string `db:"Mcu_KelainanClasification"`
+}
--- a/models/tabkelainanglobal.models.go
+++ b/models/tabkelainanglobal.models.go
@@ -0,0 +1,17 @@
+package models
+
+type KelainanGlobalMCUModel struct {
+	Test  string `db:"Test"`
+	Total int    `db:"total"`
+}
+
+type KelainanGlobalFisikModel struct {
+	Mcu_KelainanName string `db:"Mcu_KelainanName"`
+	Total            int    `db:"total"`
+}
+
+type KelainanGlobalModel struct {
+	Mcu_KelainanID string `db:"Mcu_KelainanID"`
+	Test           string `db:"Test"`
+	Total          int    `db:"Total"`
+}
--- a/models/tabkelainanlab.models.go
+++ b/models/tabkelainanlab.models.go
@@ -0,0 +1,7 @@
+package models
+
+type KelainanLabModel struct {
+	Mcu_KelainanID   string `db:"Mcu_KelainanID"`
+	Mcu_KelainanName string `db:"Test"`
+	Total            int    `db:"total"`
+}
--- a/models/tabkelainannonlab.models.go
+++ b/models/tabkelainannonlab.models.go
@@ -0,0 +1,7 @@
+package models
+
+type KelNonLabModel struct {
+	Mcu_KelainanID string `db:"Mcu_KelainanID"`
+	Test           string `db:"Test"`
+	Total          int    `db:"total"`
+}
--- a/models/tabkepesertaan.models.go
+++ b/models/tabkepesertaan.models.go
@@ -0,0 +1,16 @@
+package models
+
+type TotalPesertaModel struct {
+	Peserta int `db:"peserta"`
+	Total   int `db:"total"`
+}
+
+type GenderPesertaModel struct {
+	M_PatientGender string `db:"M_PatientGender"`
+	Jumlah          int    `db:"Jumlah"`
+}
+
+type UmurPesertaModel struct {
+	Umur  string `db:"umur"`
+	Total int    `db:"total"`
+}
--- a/models/terminology.models.go
+++ b/models/terminology.models.go
@@ -0,0 +1,29 @@
+package models
+
+import "database/sql"
+
+type TerminologyV0 struct {
+	ResourceType    string         `db:"resource_type"`
+	AttributePath   string         `db:"attribute_path"`
+	Code            string         `db:"code"`
+	ParentCode      string         `db:"parent_code"`
+	Display         string         `db:"display"`
+	DisplayEn       string         `db:"display_en"`
+	CodeSystem      string         `db:"code_system"`
+	OrderNo         uint           `db:"order_no"`
+	FtIndex         sql.NullString `db:"ft_index"`
+	UseInd          bool           `db:"use_ind"`
+	Description     sql.NullString `db:"description"`
+	StatusCd        string         `db:"status_cd"`
+	CreatedDttm     string         `db:"created_dttm"`
+	CreatedUserID   uint           `db:"created_user_id"`
+	UpdatedDttm     string         `db:"updated_dttm"`
+	UpdatedUserID   uint           `db:"updated_user_id"`
+	NullifiedDttm   string         `db:"nullified_dttm"`
+	NullifiedUserID uint           `db:"nullified_user_id"`
+}
+
+type TerminologyParamv0 struct {
+	AttributePath string `json:"AttributePath"`
+	CodeSystem    string `json:"CodeSystem"`
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
adibwp	fc2d9292c2	change typo label	2024-08-22 17:25:43 +07:00
adibwp	74d564e303	edit query and graph component	2024-08-22 16:08:05 +07:00
adibwp	d1b04676a7	add split string func	2024-08-15 16:18:55 +07:00
adibwp	31b2d6c793	edit graphic bar title, order, color	2024-08-15 15:50:59 +07:00
adibwp	72c7e714f5	add detail pemeriksaan	2024-08-14 13:59:15 +07:00
adibwp	35dd1b18fc	add ganti password pic / pat	2024-08-13 13:48:59 +07:00
adibwp	b9930f5662	add change password pic and pat service and handler	2024-08-12 15:43:22 +07:00
adibwp	4d80bf4ca8	v4 list rpt pat & pic	2024-08-09 17:36:04 +07:00
adibwp	fcaa4d7858	change login be, edit query listing mcu	2024-08-09 11:35:30 +07:00
adibwp	19e3269a6a	add nama paket di tabel daftar peserta	2024-08-08 16:20:53 +07:00
adibwp	02d5f2e39e	add label data tidak ditemukan	2024-08-07 16:56:25 +07:00
adibwp	55a2e1bbfd	change query data graph tab	2024-08-07 14:56:07 +07:00
adibwp	a729d6ab67	revice tab ordering service	2024-07-16 13:18:58 +07:00
adibwp	938e6d60f1	add autologon, + generate password btn peserta dashboard pic	2024-07-13 15:37:44 +07:00
adibwp	57d160b62a	edit query	2024-07-10 14:04:46 +07:00
adibwp	e4364f0c4f	add xs layout echarts	2024-07-08 08:47:56 +07:00
adibwp	f2d8207f25	add echart barchart	2024-07-05 10:55:47 +07:00
adibwp	eb7343117b	add echart kelainan lab	2024-07-03 10:47:43 +07:00
adibwp	7a22f5e4d0	add tab kelainan fisik echarts	2024-07-01 15:58:35 +07:00
adibwp	1c7e223195	add chart tab kepesertaan	2024-06-27 15:56:43 +07:00
adibwp	2a25c60cc2	add piechart dummy tab peserta	2024-06-26 18:13:48 +07:00
adibwp	9008cac97d	add tabview kepersetaan	2024-06-26 18:13:48 +07:00
adibwp	91a157b023	add tab view kepesertaan	2024-06-26 18:13:48 +07:00
adibwp	54de2a0ece	add tabchartkepesertaan	2024-06-26 18:13:48 +07:00
adibwp	9af95cfd9f	update url spirometri	2024-06-26 17:16:00 +07:00
adibwp	0e7f438c6a	add corporate name	2024-06-26 14:59:01 +07:00
adibwp	78af5abdf0	add resume individu rpt	2024-06-26 13:20:26 +07:00
adibwp	2179017556	fix ulr rpt audiometri	2024-06-26 11:19:59 +07:00
adibwp	accd8d57d9	add audiometry rpt	2024-06-26 09:56:58 +07:00
adibwp	dbad97d0f2	add formating ribuan keuangan + alert salah login	2024-06-25 16:49:21 +07:00
adibwp	322a70b582	add tab keuangan table	2024-06-24 16:35:03 +07:00
kaeltorus	2cb5ceac47	slicing form-keuangan	2024-06-24 16:35:03 +07:00
adibwp	fdc8c54eed	add blank tab keuangan	2024-06-22 11:15:50 +07:00
adibwp	c771187889	add authgurad	2024-06-21 18:54:06 +07:00
adibwp	5826d72988	change pagination number	2024-06-20 17:49:30 +07:00
adibwp	664c041acf	add executive summary	2024-06-20 16:57:14 +07:00
adibwp	7094dadbdf	dinamis report tab	2024-06-19 19:52:43 +07:00
adibwp	8f818f9e94	add testign script auth guard	2024-06-18 09:54:58 +07:00
adibwp	78487fafd0	change url report minus hasil non lab	2024-06-18 08:40:51 +07:00
adibwp	16a2bd45f5	add dialog report dafter peserta	2024-06-18 07:57:59 +07:00
adibwp	fd4f792d8a	add dialog report	2024-06-18 06:46:35 +07:00
adibwp	e1200fae61	add dialog cetak mcu	2024-06-15 15:52:56 +07:00
adibwp	3bc13d64bc	add pic tab daftar peserta + pagination	2024-06-14 16:51:16 +07:00
adibwp	b279a942dd	split table daftar peserta	2024-06-14 11:17:14 +07:00
adibwp	17e1268cac	add hardcode tab daftar peserta	2024-06-14 11:17:14 +07:00
Hanan Askarim	e6b5435337	add listing daftar peserta	2024-06-14 11:14:36 +07:00
adibwp	2f651cba3d	add tab kesimpulan	2024-06-13 23:06:55 +07:00
Hanan Askarim	16de8d4493	fisik slicing	2024-06-13 21:02:12 +07:00
Hanan Askarim	8dd071a924	fis kesimpulan	2024-06-13 21:02:12 +07:00
Hanan Askarim	1bfeb97a57	add fisik	2024-06-13 21:02:12 +07:00
Hanan Askarim	988cee93c2	add kesimpulan non lab	2024-06-13 21:02:11 +07:00
Hanan Askarim	fe3cb753b5	add listing lab	2024-06-13 21:02:11 +07:00
Hanan Askarim	23382aa755	label keterangan	2024-06-13 21:02:11 +07:00
Hanan Askarim	49a9f76574	fisik	2024-06-13 21:02:11 +07:00
Hanan Askarim	126f623298	add accordion	2024-06-13 21:02:11 +07:00
Hanan Askarim	1c727a5ae7	slicing fisik	2024-06-13 21:02:11 +07:00
Hanan Askarim	18b89453ba	kesimpulan dan saran	2024-06-13 21:02:11 +07:00
adibwp	b508eb68da	tab view mcu bagian daftar peserta	2024-06-13 20:54:28 +07:00
adibwp	7f3e75a8e3	fix routing	2024-06-13 15:49:07 +07:00
adibwp	d1ff7ba2fb	fix routing	2024-06-13 15:16:46 +07:00
adibwp	52a161195e	fix detail mcu	2024-06-13 15:03:40 +07:00
adibwp	6deadec9a3	add redirect ke detail mcu	2024-06-13 15:03:40 +07:00
adibwp	c04b8b1081	multi login	2024-06-13 15:03:39 +07:00
adibwp	e1c8ddd8f0	multi login progress	2024-06-13 15:03:39 +07:00
adibwp	e6a5925588	pindah dashboard_pic ke corp route	2024-06-13 15:03:39 +07:00
adibwp	a2fc463990	add public dashboard_pic	2024-06-13 15:03:39 +07:00
adibwp	246dd34542	add store to localStorage	2024-06-13 15:03:39 +07:00
adibwp	9f822c5514	add login multi api & redirect	2024-06-13 15:03:39 +07:00
adibwp	dd980b4430	add click with id params	2024-06-13 15:03:38 +07:00
Hanan Askarim	f30189816b	add link report	2024-06-13 15:03:38 +07:00
adibwp	8dfdc3fece	object pdf	2024-06-13 15:03:38 +07:00
adibwp	2d67b7b723	add html tab	2024-06-13 15:03:38 +07:00
kaeltorus	f825bc1639	slicing riwayatfisik	2024-06-13 08:37:57 +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
sindhu	219600fc7f	add groupresult into dev folder	2024-05-27 18:07:59 +07:00
Hanan Askarim	3b2086b253	Merge branch 'hanan/masterdata-natunit'	2024-05-27 17:02:11 +07:00
Hanan Askarim	b68a2ed2ec	add feature delete	2024-05-27 16:44:06 +07:00
Hanan Askarim	a3005c3b6a	add feature edit	2024-05-27 14:58:10 +07:00
Hanan Askarim	04460bac00	add feature tambah data	2024-05-27 11:27:07 +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
sindhu	4c3361fe74	Merge branch 'groupresultv1'	2024-05-27 11:07:55 +07:00
Hanan Askarim	5b2c63a4d4	add loading search dan pagination	2024-05-27 09:58:55 +07:00
Hanan Askarim	f6ac4944e8	master unit listing	2024-05-27 09:36:42 +07:00
Sas Andy	4ea514c3f0	Merge branch 'andy/usergroupfix'	2024-05-27 09:10:19 +07:00
Sas Andy	398ee17727	revisi bug	2024-05-27 09:06:00 +07:00
sindhu	6c7986c676	step 7 : add error msg in add and edit	2024-05-27 08:04:39 +07:00
Sas Andy	94fea169d1	loading	2024-05-25 20:10:25 +07:00
Sas Andy	af1c16f8f9	up versi	2024-05-25 20:10:12 +07:00
sindhu	67b9f36d29	step 6 : fix bug after sukses edit then open delete dialog	2024-05-25 19:36:49 +07:00
sindhu	0490d17d2a	step 5 : fix bug after sukses delete then open form edit	2024-05-25 19:08:10 +07:00
sindhu	cd0d3aee08	step 4 : delete group result	2024-05-25 18:32:07 +07:00
sindhu	eaabf29fda	step 3 : edit data group result	2024-05-25 17:49:24 +07:00
sindhu	d13384ab64	step 2 : add data group result with form validation	2024-05-25 13:29:52 +07:00
sindhu	9cc14fd92c	step 1 : listing, search and pagination group result	2024-05-24 22:48:03 +07:00
Sas Andy	10c1d3c5dd	revisi toast top right based screen view	2024-05-24 13:51:36 +07:00
sindhu	d8278b6886	add kartu kontrol and survey mcu into public	2024-05-22 16:39:41 +07:00