add testign script auth guard

change url report minus hasil non lab
add dialog report dafter peserta
2024-06-18 09:54:58 +07:00 · 2024-06-18 08:40:51 +07:00 · 2024-06-18 07:57:59 +07:00 · 2024-06-18 06:46:35 +07:00 · 2024-06-15 15:52:56 +07:00 · 2024-06-14 16:51:16 +07:00
101 changed files with 19295 additions and 4159 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/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/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/isihasilriwayat.html
+++ b/assets/mcu/isihasilriwayat.html
--- a/component/modal/modal.templ
+++ b/component/modal/modal.templ
@@ -57,3 +57,29 @@ templ ModalXL(modalID string, modalTitle string, modalBody templ.Component, moda
 		</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
@@ -157,3 +157,69 @@ func ModalXL(modalID string, modalTitle string, modalBody templ.Component, modal
 		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/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/handlers/corporate/dashboardpic.handlers.go
+++ b/handlers/corporate/dashboardpic.handlers.go
@@ -0,0 +1,193 @@
+package corporate_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"
+	corporate_dashboardpic "cpone/views/corporate/dashboardpic"
+	"net/http"
+	"strconv"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type DashboardPicServices interface {
+	GetEmployeeAnalyticBreadcrumb(title string) (models.BreadCrumbV1, error)
+	DummyDataTest() ([]models.DashboardPic, error)
+	ListingDashboardPic(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()
+	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.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("", "", "", 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 := 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")
+
+	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(search, startdate, enddate, page, 5)
+	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")
+
+	dataList, totalPage, err := ea.DashboardPicServices.ListingDashboardPic(search, startdate, enddate, 1, 5)
+	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,75 @@
+package corporate_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/services"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu"
+	corporate_tabmcudetail "cpone/views/corporate/mcu/mcutab"
+
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type McuDetailServices interface {
+	GetBreadcrumb(title string) (models.BreadCrumbV1, 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()
+	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 corp", zap.Any("error", err))
+		return err
+	}
+
+	dataBreadcrumb, err := mcud.McuDetailServices.GetBreadcrumb(title)
+	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)
+
+	content := corporate_mcudetail.McuDetailScreen(
+		breadcrumb,
+		corporate_mcudetail.TabViewMcuDetail(id),
+	)
+	css := corporate_mcudetail.CSSMcuDetail(
+		corporate_tabmcudetail.CssKesimpulan(),
+	)
+	js := corporate_mcudetail.JSMcuDetail()
+
+	view := corporate_mcudetail.ShowMcuDetail(
+		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,180 @@
+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 TabDaftarPesertaServices interface {
+	GetListMcuDaftarPeserta(id string, currentpage int, rowperpage int) ([]models.ModelMcuDaftarPeserta, int, 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")
+
+	id := c.Param("id")
+	logger.Info("Params", zap.Any("id", id))
+
+	dataTable, totalPage, err := tdp.TabDaftarPesertaServices.GetListMcuDaftarPeserta(id, 1, 5)
+	if err != nil {
+		return err
+	}
+	logger.Info("totalPage", zap.Any("total", totalPage))
+
+	table := corporate_mcudetail.TableDaftarPeserta(
+		dataTable,
+		tableID,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/openreport",
+		"#"+dialogReportBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID",
+		"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",
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	clayout := corporate_mcudetail.ContentLayout(
+		table,
+		pagination,
+	)
+
+	bodymodal := corporate_mcudetail.ModalBody(
+		dialogReportBodyID,
+		corporate_mcudetail.JsShowModal(""),
+	)
+
+	closemodal := corporate_mcudetail.ModalClose(
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/closereport",
+		"#"+dialogReportBodyID,
+		"outerHTML",
+		"#"+dialogReportID,
+	)
+
+	modaldialog := corporate_mcudetail.DialogReport(
+		"",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/dialogreport",
+		"#"+dialogReportBodyID,
+		"outerHTML",
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID"+paginationID,
+		dialogReportID,
+		title,
+		bodymodal,
+		closemodal,
+	)
+
+	content := corporate_mcudetail.TabDaftarPesertaScreen(
+		tableID,
+		paginationID,
+		dialogReportID,
+		dialogReportBodyID,
+		clayout,
+		modaldialog,
+	)
+	// css := corporate_mcudetail.CSSTabDaftarPeserta()
+	// js := corporate_mcudetail.JsTabDaftarPeserta()
+
+	// view := corporate_mcudetail.ShowTabDafterPeserta(
+	// 	title,
+	// 	content,
+	// 	css,
+	// 	js,
+	// )
+
+	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")
+	// dialogReportID := c.QueryParam("dialogReportID")
+	dialogReportBodyID := c.QueryParam("dialogReportBodyID")
+
+	id := c.Param("id")
+
+	// var retval []templ.Component
+	page, err := strconv.Atoi(pageparam)
+	if err != nil {
+		return err
+	}
+
+	tableData, totalPage, err := tdp.TabDaftarPesertaServices.GetListMcuDaftarPeserta(id, page, 5)
+	if err != nil {
+		return err
+	}
+	table := corporate_mcudetail.TableDaftarPeserta(
+		tableData,
+		tableID,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/openreport",
+		"#"+dialogReportBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID",
+		"outerHTML",
+	)
+
+	pagination := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/changepage",
+		paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogReportID, #dialogReportBodyID",
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	// content := corporate_mcudetail.TabDaftarPesertaScreen(tableID, paginationID, table, pagination)
+	// retval = append(retval, table)
+	// retval = append(retval, pagination)
+	// return utils.ViewMulti(c, retval)
+
+	// return utils.View(c, content)
+	clayout := corporate_mcudetail.ContentLayout(table, pagination)
+	return utils.View(c, clayout)
+}
+
+func (tdp *TabDaftarPesertaHandlers) HandleOpenReportDialog(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	idx := c.QueryParam("idx")
+	dialogReportID := c.QueryParam("dialogReportID")
+	dialogReportBodyID := c.QueryParam("dialogReportBodyID")
+	logger.Info("params", zap.Any("idx", idx))
+
+	modalbody := corporate_mcudetail.ModalBody(
+		dialogReportBodyID,
+		corporate_mcudetail.JsShowModal("#"+dialogReportID),
+	)
+
+	return utils.View(c, modalbody)
+}
--- a/handlers/corporate/mcudetail/tabkesimpulan.handlers.go
+++ b/handlers/corporate/mcudetail/tabkesimpulan.handlers.go
@@ -0,0 +1,76 @@
+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)
+}
+
+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.GetListKesimpulanLab(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.GetListKesimpulanNonLab(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.GetListKesimpulanFisik(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/patient.handlers.go
+++ b/handlers/corporate/patient.handlers.go
@@ -1,13 +1,24 @@
 package corporate_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"
 	corporate_patient "cpone/views/corporate/patient"
+	"strconv"

+	"github.com/a-h/templ"
 	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
 )

 type PatientService interface {
+	GetDashboardPatientBreadcrumb(title string) (models.BreadCrumbV1, error)
+	ListingData(search string, date string, patID string, corpId string, currentpage int, rowperpage int) ([]models.DashboardPatient, int, error)
 }

 func NewPatientHandler(us PatientService) *PatientHandler {
@@ -20,7 +31,160 @@ 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) HandleShowPatient(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	title := "Nanda Arisu"
+
+	listID := utils.GenerateRandomID("listid")
+	paginationID := utils.GenerateRandomID("paginationid")
+	dialogID := utils.GenerateRandomID("dialogid")
+	dialogBodyID := utils.GenerateRandomID("dialogbodyid")
+
+	user, err := services.GetUserLogin()
+	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()
+
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+
+	listingdata, totalPage, err := ph.PatientService.ListingData("", "", "108", "40", 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 := corporate_patient.ListingData(listingdata,
+		listID,
+		"/corp/dashboard_pat/open",
+		"#"+dialogBodyID,
+		"#listID, #paginationID, #dialogID, #dialogBodyID",
+		"outerHTML",
+	)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/corp/dashboard_pat/changepage",
+		paginationID,
+		"#listID, #paginationID, #dialogID, #dialogBodyID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		corporate_patient.BeforeRequestContent(),
+		corporate_patient.AfterRequestContent(),
+	)
+
+	bodyModal := corporate_patient.ModalBody(
+		dialogBodyID,
+		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, #dialogBodyID"+paginationID,
+		dialogID,
+		title,
+		bodyModal,
+		bodyClose,
+	)
+
+	content := corporate_patient.DashboardPat(
+		listID,
+		paginationID,
+		dialogID,
+		dialogBodyID,
+		breadcrumb,
+		listingcomponent,
+		paginationcomponent,
+		modalDialog,
+	)
+	css := corporate_patient.CSSDashboardPat()
+	js := corporate_patient.JSDashboardPat()
+
+	view := corporate_patient.ShowDashboardPat(title, 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")
+
+	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.ListingData("", "", "108", "40", page, 5)
+	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, ",
+		"outerHTML",
+	)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pat/changepage",
+		paginationID,
+		"#listID, #paginationID, #dialogID, #dialogBodyID, #currPage"+paginationID,
+		"#"+paginationID,
+		"outerHTML", "", "",
+		corporate_patient.BeforeRequestContent(),
+		corporate_patient.AfterRequestContent(),
+	)
+
+	retval = append(retval, listcomponent)
+	retval = append(retval, paginationcomponent)
+	return utils.ViewMulti(c, retval)
+}
+
+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))
+
+	modalBody := corporate_patient.ModalBody(
+		dialogBodyID,
+		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/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.nonlabtemplate.handlers.go
+++ b/handlers/dev/md.nonlabtemplate.handlers.go
--- 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,19 @@
 package public_handlers

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

 	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
 )

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

 func NewLoginHandler(us LoginService) *LoginHandler {
@@ -20,14 +26,135 @@ 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())

 	return utils.View(c, si)
 }
+
+func (lh *LoginHandler) HandlerSignIn(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	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.Login(username, password)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error", zap.Error(err))
+
+		si := public_login.ShowLogin("Login ", public_login.MainLogin(), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+	}
+	defer logger.Sync()
+
+	var url string
+	switch resp.Data.Type {
+	case "cpone":
+		url = "/one-ui"
+	case "pic":
+		url = "/dashboard_pic"
+	case "patient":
+		url = "/home"
+	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(), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+	}
+
+	userString := string(user)
+
+	storeLocal := `
+	<script>
+		console.log("store token");
+		const token = "` + resp.Data.Token + `";
+		const user = JSON.stringify(` + userString + `);
+		localStorage.setItem("token", token);
+		localStorage.setItem("user", user);
+		
+		setTimeout(() => {
+			window.location.href = "` + url + `";
+		}, 100);
+	</script>
+	`
+
+	c.Response().Header().Set("HX-Trigger", "script")
+
+	return c.String(http.StatusOK, storeLocal)
+}
+
+func (lh *LoginHandler) HandleSignIn(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	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)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error", zap.Error(err))
+
+		si := public_login.ShowLogin("Login ", public_login.MainLogin(), 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(), 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(), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+	}
+	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);
+		
+		setTimeout(() => {
+			window.location.href = "` + url + `";
+		}, 100);
+	</script>	
+	`
+	c.Response().Header().Set("HX-Trigger", "script")
+	return c.String(http.StatusOK, store)
+}
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -3,10 +3,12 @@ package handlers
 import (
 	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 +18,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)

 }

@@ -66,8 +68,15 @@ func SetupRoutesPublic(app *echo.Echo, appStore db.AppStore) {
 	l := public_services.NewServicesLandingPage(public_services.LandingPage{}, appStore)
 	lh := public_handlers.NewLandingPageHandler(l)
 	public.GET("landingpage", lh.ShowLandingPage)
-	loginHdr := public_handlers.NewLoginHandler(l)
-	public.GET("login", loginHdr.HandlerShowLogin)
+	public.GET("home", lh.ShowLandingPage)
+	public.GET("home/login", lh.HandleBtnLogin)
+	// loginHdr := public_handlers.NewLoginHandler(l)
+	// public.GET("login", loginHdr.HandlerShowLogin)
+
+	loginServ := public_services.NewServicesLogin(appStore)
+	loginHadlr := public_handlers.NewLoginHandler(loginServ)
+	public.GET("login", loginHadlr.HandlerShowLogin)
+	public.POST("login/signin", loginHadlr.HandleSignIn)

 	// kartu kontrol
 	publicKartuKontrolServices := public_services.NewServicesKartuKontrol(appStore)
@@ -90,12 +99,39 @@ func SetupRoutesPublic(app *echo.Echo, appStore db.AppStore) {
 	public.GET("redirectsurveymcu", publicKartuKontrolhandlers.HandlerRedirectToSurveyMcu)
 }
 func SetupRoutesCorporate(app *echo.Echo, appStore db.AppStore) {
-	public := app.Group("/corp")
+	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)
+
+	// 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)
+
+	kesimpulanSrv := mcu_corporate_services.NewTabKesimpulanServices(appStore)
+	kesimpulanHdr := mcu_corporate_handlers.NewTabKesimpulanHandler(kesimpulanSrv)
+	corp.GET("/dashboard_pic/detail/:id/tabkesimpulan", kesimpulanHdr.HandleShowTabKesimpulanScreen)
+
+	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)
+
+	patienServices := corporate_services.NewPatientServices(appStore)
+	patientHandler := corporate_handlers.NewPatientHandler(patienServices)
+	corp.GET("/dashboard_pat", patientHandler.HandleShowPatient)
+	corp.GET("/dashboard_pat/changepage", patientHandler.HandleChangePage)
+	corp.GET("/dashboard_pat/open", patientHandler.HandleOpenReport)
 }

 func SetupRoutesClient(app *echo.Echo, appStore db.AppStore) {
@@ -232,6 +268,18 @@ 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)
@@ -278,20 +326,6 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.POST("/md/samplestation/edit", devMDSampleStationHandlers.HandleEditMDSS)
 	dev.POST("/md/samplestation/closeeditform", devMDSampleStationHandlers.HandleCloseEditForm)

-	// md nonlab template
-	devMDNonlabTemplateServices := dev_services.NewMDNonlabTemplateServices(appStore)
-	devMDNonlabTemplateHandlers := dev_handlers.NewMDNonLabTemplateHandler(devMDNonlabTemplateServices)
-	dev.GET("/md/nonlabtemplate", devMDNonlabTemplateHandlers.HandleShowNonlabTemplateScreen)
-	dev.GET("/md/nonlabtemplate/filter", devMDNonlabTemplateHandlers.HandleFilterNonlabTemplate)
-	dev.GET("/md/nonlabtemplate/changepage", devMDNonlabTemplateHandlers.HandleNonlabTempltPagination)
-	dev.GET("/md/nonlabtemplate/opendelete", devMDNonlabTemplateHandlers.HandleOpenFormDelete)
-	dev.POST("/md/nonlabtemplate/closedeleteform", devMDNonlabTemplateHandlers.HandleCloseFormDelete)
-	dev.POST("/md/nonlabtemplate/delete", devMDNonlabTemplateHandlers.HandleDelete)
-	dev.POST("/md/nonlabtemplate/simpanama", devMDNonlabTemplateHandlers.HandleSimpanNama)
-	dev.POST("/md/nonlabtemplate/closeaddform", devMDNonlabTemplateHandlers.HandleCloseFormAdd)
-	dev.POST("/md/nonlabtemplate/adddetail", devMDNonlabTemplateHandlers.HandleAddDetail)
-	dev.POST("/md/nonlabtemplate/deletedetail", devMDNonlabTemplateHandlers.HandleDeleteDetail)
-
 	// masterdata nat unit
 	devMdNatUnitServices := dev_services.NewMdNatUnitServices(appStore)
 	devMdNatUnitHandlers := dev_handlers.NeWMdNatUnitHandler(devMdNatUnitServices)
@@ -335,4 +369,14 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.GET("/md/bahan/opendelete", devMdBahanHandlers.HandleOpenDeleteMdBahan)
 	dev.POST("/md/bahan/closedeleteform", devMdBahanHandlers.HandleCloseDeleteMdBahan)
 	dev.POST("/md/bahan/delete", devMdBahanHandlers.HandleDeleteMdBahan)
+
+	// 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_dashboard.templ
+++ b/layout/layout_dashboard.templ
@@ -0,0 +1,182 @@
+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>
+			<script>
+				document.addEventListener('DOMContentLoaded', (event) => {
+					const storedToken = localStorage.getItem('token');
+					if (!storedToken) {
+						window.location.href = '/home';
+					}
+				});				
+			</script>
+			<!--start::Navbar Mobile-->
+			<div id="kt_header_mobile" class="header-mobile align-items-center  header-mobile-fixed ">
+				<!--begin::Logo-->
+				<a href="index.html">
+					<img alt="Logo" src="asset-corporate-portal/media/logo/logo.png" style="object-fit: contain;height: 4vh;"/>
+				</a>
+				<!--end::Logo-->
+				<!--begin::Toolbar-->
+				<div class="d-flex align-items-center">
+					<!--begin::Topbar Mobile Toggle-->
+					<button class="btn btn-hover-text-primary p-0 ml-2" id="kt_header_mobile_topbar_toggle">
+						<span class="svg-icon svg-icon-xl">
+							<!--begin::Svg Icon | path:/assets/media/svg/icons/General/User.svg-->
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								xmlns:xlink="http://www.w3.org/1999/xlink"
+								width="24px"
+								height="24px"
+								viewBox="0 0 24 24"
+								version="1.1"
+							>
+								<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+									<polygon points="0 0 24 0 24 24 0 24"></polygon>
+									<path
+										d="M12,11 C9.790861,11 8,9.209139 8,7 C8,4.790861 9.790861,3 12,3 C14.209139,3 16,4.790861 16,7 C16,9.209139 14.209139,11 12,11 Z"
+										fill="#000000"
+										fill-rule="nonzero"
+										opacity="0.3"
+									></path>
+									<path
+										d="M3.00065168,20.1992055 C3.38825852,15.4265159 7.26191235,13 11.9833413,13 C16.7712164,13 20.7048837,15.2931929 20.9979143,20.2 C21.0095879,20.3954741 20.9979143,21 20.2466999,21 C16.541124,21 11.0347247,21 3.72750223,21 C3.47671215,21 2.97953825,20.45918 3.00065168,20.1992055 Z"
+										fill="#000000"
+										fill-rule="nonzero"
+									></path>
+								</g>
+							</svg><!--end::Svg Icon-->
+						</span>
+					</button>
+					<!--end::Topbar Mobile Toggle-->
+				</div>
+				<!--end::Toolbar-->
+			</div>
+			<!--start::Navbar Mobile-->
+            <!--start::Navbar Laptop With Sidebar-->			
+            <div class="mb-24 mt-8" style="padding-left: 10vw; padding-right: 10vw;">
+                <div class="align-item-center">
+					@navbaruser
+				</div>
+                <div class="mt-16">
+                    { children... }
+                </div>
+            </div>
+            <!--end::Navbar Laptop With Sidebar-->
+            @sidebaruser
+			<!--begin::Global Config(global config for global JS scripts)-->
+			<script src="asset-corporate-portal/js/ktappsetting.js"></script>
+			<!--end::Global Config-->
+			<!--begin::Global Theme Bundle(used by all pages)-->
+			<script src="assets/plugins/global/plugins.bundle.js"></script>
+			<script src="assets/plugins/custom/prismjs/prismjs.bundle.js"></script>
+			<script src="assets/js/scripts.bundle.js"></script>
+			<!--end::Global Theme Bundle-->
+			<script src="assets/js/iconify/iconify.min.js"></script>
+			// bootstrap datepicker
+			<script src="assets/js/pages/crud/forms/widgets/bootstrap-datepicker.js"></script>
+			@js
+			<!--end::Page Scripts-->
+        </body>
+    </html>
+}
--- a/layout/layout_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><script>\r\n\t\t\t\tdocument.addEventListener('DOMContentLoaded', (event) => {\r\n\t\t\t\t\tconst storedToken = localStorage.getItem('token');\r\n\t\t\t\t\tif (!storedToken) {\r\n\t\t\t\t\t\twindow.location.href = '/home';\r\n\t\t\t\t\t}\r\n\t\t\t\t});\t\t\t\t\r\n\t\t\t</script><!--start::Navbar Mobile--><div id=\"kt_header_mobile\" class=\"header-mobile align-items-center  header-mobile-fixed \"><!--begin::Logo--><a href=\"index.html\"><img alt=\"Logo\" src=\"asset-corporate-portal/media/logo/logo.png\" style=\"object-fit: contain;height: 4vh;\"></a><!--end::Logo--><!--begin::Toolbar--><div class=\"d-flex align-items-center\"><!--begin::Topbar Mobile Toggle--><button class=\"btn btn-hover-text-primary p-0 ml-2\" id=\"kt_header_mobile_topbar_toggle\"><span class=\"svg-icon svg-icon-xl\"><!--begin::Svg Icon | path:/assets/media/svg/icons/General/User.svg--><svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"24px\" height=\"24px\" viewBox=\"0 0 24 24\" version=\"1.1\"><g stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"><polygon points=\"0 0 24 0 24 24 0 24\"></polygon> <path d=\"M12,11 C9.790861,11 8,9.209139 8,7 C8,4.790861 9.790861,3 12,3 C14.209139,3 16,4.790861 16,7 C16,9.209139 14.209139,11 12,11 Z\" fill=\"#000000\" fill-rule=\"nonzero\" opacity=\"0.3\"></path> <path d=\"M3.00065168,20.1992055 C3.38825852,15.4265159 7.26191235,13 11.9833413,13 C16.7712164,13 20.7048837,15.2931929 20.9979143,20.2 C21.0095879,20.3954741 20.9979143,21 20.2466999,21 C16.541124,21 11.0347247,21 3.72750223,21 C3.47671215,21 2.97953825,20.45918 3.00065168,20.1992055 Z\" fill=\"#000000\" fill-rule=\"nonzero\"></path></g></svg><!--end::Svg Icon--></span></button><!--end::Topbar Mobile Toggle--></div><!--end::Toolbar--></div><!--start::Navbar Mobile--><!--start::Navbar Laptop With Sidebar--><div class=\"mb-24 mt-8\" style=\"padding-left: 10vw; padding-right: 10vw;\"><div class=\"align-item-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = navbaruser.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"mt-16\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ_7745c5c3_Var1.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><!--end::Navbar Laptop With Sidebar-->")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = sidebaruser.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--begin::Global Config(global config for global JS scripts)--><script src=\"asset-corporate-portal/js/ktappsetting.js\"></script><!--end::Global Config--><!--begin::Global Theme Bundle(used by all pages)--><script src=\"assets/plugins/global/plugins.bundle.js\"></script><script src=\"assets/plugins/custom/prismjs/prismjs.bundle.js\"></script><script src=\"assets/js/scripts.bundle.js\"></script><!--end::Global Theme Bundle--><script src=\"assets/js/iconify/iconify.min.js\"></script><script src=\"assets/js/pages/crud/forms/widgets/bootstrap-datepicker.js\"></script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = js.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Page Scripts--></body></html>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/layout/playground_layout.templ
+++ b/layout/playground_layout.templ
@@ -3,18 +3,6 @@ package layout
 // LAYOUT PLAYGROUND
 templ PlaygroundLayout(title string, css templ.Component, js templ.Component) {
 	<!DOCTYPE html>
-	<!--
-		Template Name: Metronic - Bootstrap 4 HTML, React, Angular 9 & VueJS Admin Dashboard Theme
-		Author: KeenThemes
-		Website: http://www.keenthemes.com/
-		Contact: support@keenthemes.com
-		Follow: www.twitter.com/keenthemes
-		Dribbble: www.dribbble.com/keenthemes
-		Like: www.facebook.com/keenthemes
-		Purchase: https://1.envato.market/EA4JP
-		Renew Support: https://1.envato.market/EA4JP
-		License: You must have a valid license purchased only from themeforest(the above link) in order to legally use the theme for your project.
-		-->
 	<html lang="en">
 		<!--begin::Head-->
 		<head>
--- a/layout/playground_layout_templ.go
+++ b/layout/playground_layout_templ.go
@@ -24,14 +24,14 @@ func PlaygroundLayout(title string, css templ.Component, js templ.Component) tem
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!doctype html><!--\r\n\t\tTemplate Name: Metronic - Bootstrap 4 HTML, React, Angular 9 & VueJS Admin Dashboard Theme\r\n\t\tAuthor: KeenThemes\r\n\t\tWebsite: http://www.keenthemes.com/\r\n\t\tContact: support@keenthemes.com\r\n\t\tFollow: www.twitter.com/keenthemes\r\n\t\tDribbble: www.dribbble.com/keenthemes\r\n\t\tLike: www.facebook.com/keenthemes\r\n\t\tPurchase: https://1.envato.market/EA4JP\r\n\t\tRenew Support: https://1.envato.market/EA4JP\r\n\t\tLicense: You must have a valid license purchased only from themeforest(the above link) in order to legally use the theme for your project.\r\n\t\t--><html lang=\"en\"><!--begin::Head--><head><base href=\"/\"><meta charset=\"utf-8\"><title>Company Portal | ")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!doctype html><html lang=\"en\"><!--begin::Head--><head><base href=\"/\"><meta charset=\"utf-8\"><title>Company Portal | ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(title)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layout\playground_layout.templ`, Line: 23, Col: 34}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layout\playground_layout.templ`, Line: 11, Col: 34}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
--- a/models/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/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/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,15 @@
+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"`
+}
--- a/models/nonlabtemplate.models.go
+++ b/models/nonlabtemplate.models.go
@@ -1,43 +0,0 @@
-package models
-
-import "github.com/a-h/templ"
-
-type MDNonlabTemplate struct {
-	NonlabTemplateID                int    `db:"NonlabTemplateID"`
-	NonlabTemplateName              string `db:"NonlabTemplateName"`
-	NonlabTemplateFlagFisik         string `db:"NonlabTemplateFlagFisik"`
-	NonlabTemplateIsActive          string `db:"NonlabTemplateIsActive"`
-	NonlabTemplateCreated           string `db:"NonlabTemplateCreated"`
-	NonlabTemplateCreatedUserID     string `db:"NonlabTemplateUserID"`
-	NonlabTemplateLastUpdated       string `db:"NonlabTemplateLastUpdated"`
-	NonlabTemplateLastUpdatedUserID string `db:"NonlabTemplateLastUpdatedUserID"`
-	NonlabTemplateDelete            string `db:"NonlabTemplateDelete"`
-	NonlabTemplateDeleteUserID      string `db:"NonlabTemplateDeleteUserID"`
-}
-
-type NonlabTemplateDetail struct {
-	NonlabTemplateDetailID               int    `db:"NonlabTemplateDetailID"`
-	NonlabTemplateDetailNonlabTemplateID int    `db:"NonlabTemplateDetailNonlabTemplateID"`
-	NonlabTemplateDetailCode             string `db:"NonlabTemplateDetailCode"`
-	NonlabTemplateDetailName             string `db:"NonlabTemplateDetailName"`
-	NonlabTemplateDetaiNat_UnitID        string `db:"NonlabTemplateDetaiNat_UnitID"`
-	NonlabTemplateDetailFlagActive       string `db:"NonlabTemplateDetailFlagActive"`
-	NonlabTemplateDetaiM_LangID          string `db:"NonlabTemplateDetaiM_LangID"`
-	NonlabTemplateDetailIsActive         string `db:"NonlabTemplateDetailIsActive"`
-}
-
-type MDNonlabTemplateForm struct {
-	IDComponent  string
-	Link         string
-	HxTarget     string
-	HxSwap       string
-	HxInclude    string
-	ModalID      string
-	ModalTitle   string
-	InputID      CustomTextFieldv2Prm
-	InputName    CustomTextFieldv2Prm
-	InputFlag    CustomCheckboxv1Prm
-	DialogBody   templ.Component
-	DialogAction templ.Component
-	ButtonClose  templ.Component
-}
--- a/package/database/database.go
+++ b/package/database/database.go
@@ -16,6 +16,10 @@ import (
 var Handle *sql.DB
 var Handlex *sqlx.DB

+// log
+var HandleLog *sql.DB
+var HandlexLog *sqlx.DB
+
 func InitDB() {
 	println(config.Data.Get("DBhost"))
 	if config.Data.Get("DBhost") == "" {
@@ -28,6 +32,15 @@ func InitDB() {
 		}
 		Handle = handle

+		// log handle
+		handlelog, err := sql.Open("sqlite", config.Data.Get("DBnamelog"))
+		if err != nil {
+			// log.Fatalf("🔥 failed to connect to the database: %s", err.Error())
+			log.Panic(err)
+		}
+		HandleLog = handlelog
+		// log handle
+
 		db, err := sqlx.Open("sqlite", config.Data.Get("DBname"))

 		if err != nil {
@@ -35,6 +48,16 @@ func InitDB() {
 		}

 		Handlex = db
+
+		// log
+		dblog, err := sqlx.Open("sqlite", config.Data.Get("DBnamelog"))
+
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		HandlexLog = dblog
+		// log
 	} else {
 		println("mysql")
 		dsn := config.Data.Get("DBuser") + ":" + config.Data.Get("DBpass") + "@tcp(" + config.Data.Get("DBhost") + ":" + config.Data.Get("DBport") + ")/" + config.Data.Get("DBname")
@@ -50,6 +73,21 @@ func InitDB() {
 		}
 		Handle = handle

+		// log
+		dsnlog := config.Data.Get("DBuser") + ":" + config.Data.Get("DBpass") + "@tcp(" + config.Data.Get("DBhost") + ":" + config.Data.Get("DBport") + ")/" + config.Data.Get("DBnamelog")
+		println(dsnlog)
+		handlelog, err := sql.Open("mysql", dsnlog)
+
+		if err != nil {
+			log.Panic(err)
+		}
+
+		if err = handlelog.Ping(); err != nil {
+			log.Panic(err)
+		}
+		HandleLog = handlelog
+		// log
+
 		// sqlx
 		db, err := sqlx.Open("mysql", dsn)

@@ -59,6 +97,16 @@ func InitDB() {

 		Handlex = db

+		// log
+		dblog, err := sqlx.Open("mysql", dsnlog)
+
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		HandlexLog = dblog
+		// log
+
 	}
 	log.Println("🚀 Connected Successfully to the Database")

--- a/services/corporate/dashboardpic.services.go
+++ b/services/corporate/dashboardpic.services.go
@@ -0,0 +1,128 @@
+package corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+
+	"go.uber.org/zap"
+)
+
+type DashboardPicServices struct {
+	DashboardPicStore db.AppStore
+}
+
+func NewDashboardPicServices(uStore db.AppStore) *DashboardPicServices {
+	return &DashboardPicServices{
+		DashboardPicStore: uStore,
+	}
+}
+
+func (ea *DashboardPicServices) GetEmployeeAnalyticBreadcrumb(title string) (models.BreadCrumbV1, error) {
+	breadcrumb := models.BreadCrumbV1{
+		Title: title,
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/dev/dashboard",
+			},
+			{
+				Item: "Employee Health Medical Analytic",
+				Url:  "",
+			},
+		},
+	}
+
+	return breadcrumb, nil
+}
+
+func (ea *DashboardPicServices) DummyDataTest() ([]models.DashboardPic, error) {
+	employees := []models.DashboardPic{
+		{
+			Mgm_McuID:                     1,
+			Mgm_McuLabel:                  "Employee 1",
+			Mgm_McuFlagRelasiBayarSendiri: "Yes",
+			Mgm_McuBisaTambahPemeriksaan:  "No",
+			Mgm_McuCorporateID:            101,
+			Mgm_McuNumber:                 "EMP001",
+			Mgm_McuNumberNational:         "NAT001",
+			Mgm_McuNote:                   "Lorem ipsum dolor sit amet.",
+			Mgm_McuStartDate:              "2024-01-01",
+			Mgm_McuEndDate:                "2024-12-31",
+			Mgm_McuIsActive:               "Y",
+		},
+		{
+			Mgm_McuID:                     2,
+			Mgm_McuLabel:                  "Employee 2",
+			Mgm_McuFlagRelasiBayarSendiri: "No",
+			Mgm_McuBisaTambahPemeriksaan:  "Yes",
+			Mgm_McuCorporateID:            102,
+			Mgm_McuNumber:                 "EMP002",
+			Mgm_McuNumberNational:         "NAT002",
+			Mgm_McuNote:                   "Lorem ipsum dolor sit amet consectetur.",
+			Mgm_McuStartDate:              "2024-02-15",
+			Mgm_McuEndDate:                "2024-11-30",
+			Mgm_McuIsActive:               "Y",
+		},
+	}
+
+	return employees, nil
+}
+
+func (ea *DashboardPicServices) ListingDashboardPic(search string, startdate string, enddate string, currentpage int, rowperpage int) ([]models.DashboardPic, int, error) {
+	logger, _ := zap.NewProduction()
+	var ret []models.DashboardPic
+	var totalData int
+
+	if len(startdate) == 0 {
+		startdate = "1900-01-01"
+	}
+	if len(enddate) == 0 {
+		enddate = "9999-12-12"
+	}
+
+	prmLabel := "%" + search + "%"
+	offset := (currentpage - 1) * rowperpage
+	q := `
+		SELECT COUNT(*)
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuLabel LIKE ?
+		AND Mgm_McuStartDate >= ?
+		AND Mgm_McuEndDate <= ?
+	`
+	if err := dbx.Handlex.Get(&totalData, q, prmLabel, startdate, enddate); err != nil {
+		return nil, 0, fmt.Errorf("error query get total data: %v", err)
+	}
+
+	q = `
+		SELECT
+		Mgm_McuID,
+		Mgm_McuLabel,
+		Mgm_McuFlagRelasiBayarSendiri,
+		Mgm_McuBisaTambahPemeriksaan,
+		Mgm_McuCorporateID,
+		Mgm_McuNumber,
+		Mgm_McuNumberNational,
+		Mgm_McuNote,
+		DATE_FORMAT(Mgm_McuStartDate, '%d-%m-%Y') AS Mgm_McuStartDate,
+		DATE_FORMAT(Mgm_McuEndDate, '%d-%m-%Y') AS Mgm_McuEndDate,
+		Mgm_McuIsActive
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuLabel LIKE ?
+		AND Mgm_McuStartDate >= ?
+		AND Mgm_McuEndDate <= ?
+		ORDER BY Mgm_McuID ASC
+		LIMIT ? OFFSET ?
+	`
+	if err := dbx.Handlex.Select(&ret, q, prmLabel, startdate, enddate, rowperpage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error query get data: %v", err)
+	}
+	logger.Info("Resp", zap.Any("Respsone", ret))
+
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowperpage)))
+	return ret, totalPage, nil
+}
--- a/services/corporate/mcudetail.services.go
+++ b/services/corporate/mcudetail.services.go
@@ -0,0 +1,37 @@
+package corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+)
+
+type McuDetailServices struct {
+	McuDetailStore db.AppStore
+}
+
+func NewMcuDetailServices(uStore db.AppStore) *McuDetailServices {
+	return &McuDetailServices{
+		McuDetailStore: uStore,
+	}
+}
+
+func (mcud *McuDetailServices) GetBreadcrumb(title string) (models.BreadCrumbV1, error) {
+	breadcrumb := models.BreadCrumbV1{
+		Title: title,
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/corp/dashboard_pic",
+			},
+			{
+				Item: "Employee Health Medical Analytic",
+				Url:  "/dev/employeeanalytic/",
+			},
+			{
+				Item: title,
+				Url:  "",
+			},
+		},
+	}
+	return breadcrumb, nil
+}
--- a/services/corporate/mcudetail/tabdaftarpeserta.services.go
+++ b/services/corporate/mcudetail/tabdaftarpeserta.services.go
@@ -0,0 +1,74 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+
+	"go.uber.org/zap"
+)
+
+type TabDaftarPesertaServices struct {
+	TabDaftarPesertaStore db.AppStore
+}
+
+func NewTabDaftarPesertaServices(uStore db.AppStore) *TabDaftarPesertaServices {
+	return &TabDaftarPesertaServices{
+		TabDaftarPesertaStore: uStore,
+	}
+}
+
+func (tdps *TabDaftarPesertaServices) GetListMcuDaftarPeserta(id string, currentpage int, rowperpage int) ([]models.ModelMcuDaftarPeserta, int, error) {
+	logger, _ := zap.NewProduction()
+	var listDaftarPeserta []models.ModelMcuDaftarPeserta
+	var totalData int
+	offset := (currentpage - 1) * rowperpage
+
+	querytotal := `SELECT COUNT(*)
+		FROM t_orderheader
+		JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID
+		AND M_PatientIsActive = 'Y'
+		WHERE T_OrderHeaderIsActive = 'Y' AND T_OrderHeaderMgm_McuID = ?`
+
+	if err := dbx.Handlex.Get(&totalData, querytotal, id); err != nil {
+		return nil, 0, fmt.Errorf("error querying database: %v", err)
+	}
+
+	query := `SELECT T_OrderHeaderID,
+		T_OrderHeaderDate,
+		T_OrderHeaderLabNumber,
+		T_OrderHeaderM_PatientAge,
+		M_PatientID,
+		M_PatientNoReg,
+		M_PatientName,
+		M_PatientGender,
+		CASE 
+		WHEN M_PatientGender = 'male' THEN 'Laki - Laki'
+		WHEN M_PatientGender = 'female' THEN 'Perempuan'
+		ELSE ' '
+		END AS jenisKelamin,
+		M_PatientDOB,
+		FLOOR(DATEDIFF(CURDATE(), M_PatientDOB)/ 365.25) AS age
+		FROM t_orderheader
+		JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID
+		AND M_PatientIsActive = 'Y'
+		WHERE T_OrderHeaderIsActive = 'Y' AND T_OrderHeaderMgm_McuID = ?
+		ORDER BY M_PatientName ASC
+		LIMIT ? OFFSET ?`
+
+	if err := dbx.Handlex.Select(&listDaftarPeserta, query, id, rowperpage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error querying database: %v", err)
+	}
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowperpage)))
+
+	defer logger.Sync()
+	logger.Info("GET DATA PESERTA",
+		zap.Any("id", id),
+		zap.Any("total data", totalData),
+		zap.Any("peserta", listDaftarPeserta),
+	)
+
+	return listDaftarPeserta, totalPage, nil
+}
--- a/services/corporate/mcudetail/tabkesimpulan.services.go
+++ b/services/corporate/mcudetail/tabkesimpulan.services.go
@@ -0,0 +1,232 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+
+	"go.uber.org/zap"
+)
+
+type TabKesimpulanServices struct {
+	TabKesimpulanStore db.AppStore
+}
+
+func NewTabKesimpulanServices(uStore db.AppStore) *TabKesimpulanServices {
+	return &TabKesimpulanServices{
+		TabKesimpulanStore: uStore,
+	}
+}
+
+func (tks *TabKesimpulanServices) GetListKesimpulanLab(id string) ([]models.ModelKesimpulanLab, error) {
+	logger, _ := zap.NewProduction()
+	var listLab []models.ModelKesimpulanLab
+	var dataTot []models.ModelKesimpulanLab
+
+	qryTot := `select '' as nomor,
+	'' as Test, sum(total) as total
+	from(
+	   select count(*) as total
+			   FROM mgm_header
+			   join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+			   join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+			   join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+			   left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+			   where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'L'
+			   and Mgm_HeaderIsNormal = 'N'
+	   group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType ) x`
+
+	err := dbx.Handlex.Select(&dataTot, qryTot, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get total",
+			zap.Any("id", id),
+			zap.Any("total data", dataTot),
+		)
+		// return dataTot, fmt.Errorf("QUERY_FAILED")
+	}
+
+	// Extracting the Total value
+	var totalLab string
+	if len(dataTot) > 0 {
+		totalLab = dataTot[0].Total
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cek total", totalLab),
+	)
+	query := `SELECT ROW_NUMBER() OVER (ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC) AS nomor,
+		ifnull(Nat_TestName ,Mcu_KelainanGroupName) as Test,
+		cast(count(Mgm_HeaderT_OrderHeaderID)/?*100 as decimal(2,0))  as total
+
+		FROM mgm_header
+		join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+		join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+		join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+		left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+		where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'L'
+		and Mgm_HeaderIsNormal = 'N'
+		group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType  ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC
+		LIMIT 3`
+
+	err = dbx.Handlex.Select(&listLab, query, totalLab, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data lab",
+			zap.Any("id", id),
+			zap.Any("list data", listLab),
+		)
+		return listLab, fmt.Errorf("QUERY_FAILED")
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cekkkk", listLab),
+	)
+	return listLab, nil
+}
+
+func (tks *TabKesimpulanServices) GetListKesimpulanNonLab(id string) ([]models.ModelKesimpulanLab, error) {
+	logger, _ := zap.NewProduction()
+	var listNonLab []models.ModelKesimpulanLab
+	var dataTot []models.ModelKesimpulanLab
+
+	qryTot := `select '' as nomor,
+	'' as Test, sum(total) as total
+	from(
+	   select count(*) as total
+			   FROM mgm_header
+			   join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+			   join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+			   join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+			   left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+			   where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'NL'
+			   and Mgm_HeaderIsNormal = 'N'
+	   group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType ) x`
+
+	err := dbx.Handlex.Select(&dataTot, qryTot, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get total",
+			zap.Any("id", id),
+			zap.Any("total data", dataTot),
+		)
+		// return dataTot, fmt.Errorf("QUERY_FAILED")
+	}
+
+	// Extracting the Total value
+	var totalLab string
+	if len(dataTot) > 0 {
+		totalLab = dataTot[0].Total
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cek total", totalLab),
+	)
+	query := `SELECT ROW_NUMBER() OVER (ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC) AS nomor,
+		ifnull(Nat_TestName ,Mcu_KelainanGroupName) as Test,
+		cast(count(Mgm_HeaderT_OrderHeaderID)/?*100 as decimal(2,0))  as total
+
+		FROM mgm_header
+		join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+		join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+		join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+		left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+		where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'NL'
+		and Mgm_HeaderIsNormal = 'N'
+		group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType  ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC
+		LIMIT 3`
+
+	err = dbx.Handlex.Select(&listNonLab, query, totalLab, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data NON lab",
+			zap.Any("id", id),
+			zap.Any("list data", listNonLab),
+		)
+		return listNonLab, fmt.Errorf("QUERY_FAILED")
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cekkkk", listNonLab),
+	)
+	return listNonLab, nil
+}
+
+func (tks *TabKesimpulanServices) GetListKesimpulanFisik(id string) ([]models.ModelKesimpulanLab, error) {
+	logger, _ := zap.NewProduction()
+	var listFisik []models.ModelKesimpulanLab
+	var dataTot []models.ModelKesimpulanLab
+
+	qryTot := `select '' as nomor,
+	'' as Test, sum(total) as total
+	from(
+	   select count(*) as total
+			   FROM mgm_header
+			   join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+			   join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+			   join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+			   left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+			   where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'F'
+			   and Mgm_HeaderIsNormal = 'N'
+	   group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType ) x`
+
+	err := dbx.Handlex.Select(&dataTot, qryTot, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get total",
+			zap.Any("id", id),
+			zap.Any("total data", dataTot),
+		)
+		// return dataTot, fmt.Errorf("QUERY_FAILED")
+	}
+
+	// Extracting the Total value
+	var totalFisik string
+	if len(dataTot) > 0 {
+		totalFisik = dataTot[0].Total
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cek total", totalFisik),
+	)
+	query := `SELECT ROW_NUMBER() OVER (ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC) AS nomor,
+		ifnull(Nat_TestName ,Mcu_KelainanGroupName) as Test,
+		cast(count(Mgm_HeaderT_OrderHeaderID)/?*100 as decimal(2,0))  as total
+
+		FROM mgm_header
+		join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+		join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+		join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+		left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+		where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'F'
+		and Mgm_HeaderIsNormal = 'N'
+		group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType  ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC
+		LIMIT 3`
+
+	err = dbx.Handlex.Select(&listFisik, query, totalFisik, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data fisik",
+			zap.Any("id", id),
+			zap.Any("list data", listFisik),
+		)
+		return listFisik, fmt.Errorf("QUERY_FAILED")
+	}
+
+	return listFisik, nil
+}
--- a/services/corporate/patient.services.go
+++ b/services/corporate/patient.services.go
@@ -1,15 +1,93 @@
 package corporate_services

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

-type ServicesPatient struct {
+	"go.uber.org/zap"
+)
+
+type PatientServices struct {
 	PatientStore db.AppStore
 }

-func NewServicesPatient(uStore db.AppStore) *ServicesPatient {
+func NewPatientServices(uStore db.AppStore) *PatientServices {

-	return &ServicesPatient{
+	return &PatientServices{

 		PatientStore: uStore,
 	}
 }
+
+func (sp *PatientServices) GetDashboardPatientBreadcrumb(title string) (models.BreadCrumbV1, error) {
+	breadcrumb := models.BreadCrumbV1{
+		Title: title,
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/corp/dashboard_pat",
+			},
+			{
+				Item: "PT. ABC",
+				Url:  "",
+			},
+			{
+				Item: title,
+				Url:  "",
+			},
+		},
+	}
+
+	return breadcrumb, nil
+}
+
+func (sp *PatientServices) ListingData(search string, date string, patID string, corpId string, currentpage int, rowperpage int) ([]models.DashboardPatient, int, error) {
+	logger, _ := zap.NewProduction()
+	var ret []models.DashboardPatient
+	var totalData int
+
+	if len(date) == 0 {
+		date = ""
+	}
+
+	prmSearch := "%" + search + "%"
+	offset := (currentpage - 1) * rowperpage
+	q := `
+		SELECT COUNT(*)
+		FROM t_orderheader
+		WHERE T_OrderHeaderIsActive = 'Y'
+		AND T_OrderHeaderLabNumber LIKE ?
+		AND T_OrderHeaderM_PatientID = ?
+		AND T_OrderHeaderCorporateID = ?
+	`
+	if err := dbx.Handlex.Get(&totalData, q, prmSearch, patID, corpId); err != nil {
+		return nil, 0, fmt.Errorf("error query get total data: %v", err)
+	}
+
+	q = `
+		SELECT
+		T_OrderHeaderID,
+		DATE_FORMAT(T_OrderHeaderDate, '%d/%m/%Y') AS T_OrderHeaderDate,
+		T_OrderHeaderLabNumber,
+		T_OrderHeaderM_PatientID,
+		T_OrderHeaderCorporateID,
+		T_OrderHeaderMgm_McuID,
+		T_OrderHeaderIsActive		
+		FROM t_orderheader
+		WHERE T_OrderHeaderIsActive = 'Y'
+		AND T_OrderHeaderLabNumber LIKE ?
+		AND T_OrderHeaderM_PatientID = ?
+		AND T_OrderHeaderCorporateID = ?
+		LIMIT ? OFFSET ?
+	`
+	if err := dbx.Handlex.Select(&ret, q, prmSearch, patID, corpId, rowperpage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error query get data: %v", err)
+	}
+	logger.Info("response", zap.Any("data", ret))
+
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowperpage)))
+	return ret, totalPage, nil
+}
--- a/services/dev/detailmcu.services.go
+++ b/services/dev/detailmcu.services.go
@@ -0,0 +1,37 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+)
+
+type DetailMcuServices struct {
+	DetailMcuStore db.AppStore
+}
+
+func NewDetailMcuServices(uStore db.AppStore) *DetailMcuServices {
+	return &DetailMcuServices{
+		DetailMcuStore: uStore,
+	}
+}
+
+func (dmcu *DetailMcuServices) GetBreadcrumb(title string) (models.BreadCrumbV1, error) {
+	breadcrumb := models.BreadCrumbV1{
+		Title: title,
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/dev/dashboard",
+			},
+			{
+				Item: "Employee Health Medical Analytic",
+				Url:  "/dev/employeeanalytic/",
+			},
+			{
+				Item: title,
+				Url:  "",
+			},
+		},
+	}
+	return breadcrumb, nil
+}
--- a/services/dev/employeeanalytic.services.go
+++ b/services/dev/employeeanalytic.services.go
@@ -0,0 +1,128 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+
+	"go.uber.org/zap"
+)
+
+type EmployeeAnalyticServices struct {
+	EmployeeAnalyticStore db.AppStore
+}
+
+func NewEmployeeAnalyticServices(uStore db.AppStore) *EmployeeAnalyticServices {
+	return &EmployeeAnalyticServices{
+		EmployeeAnalyticStore: uStore,
+	}
+}
+
+func (ea *EmployeeAnalyticServices) GetEmployeeAnalyticBreadcrumb(title string) (models.BreadCrumbV1, error) {
+	breadcrumb := models.BreadCrumbV1{
+		Title: title,
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/dev/dashboard",
+			},
+			{
+				Item: "Employee Health Medical Analytic",
+				Url:  "",
+			},
+		},
+	}
+
+	return breadcrumb, nil
+}
+
+func (ea *EmployeeAnalyticServices) DummyDataTest() ([]models.DashboardPic, error) {
+	employees := []models.DashboardPic{
+		{
+			Mgm_McuID:                     1,
+			Mgm_McuLabel:                  "Employee 1",
+			Mgm_McuFlagRelasiBayarSendiri: "Yes",
+			Mgm_McuBisaTambahPemeriksaan:  "No",
+			Mgm_McuCorporateID:            101,
+			Mgm_McuNumber:                 "EMP001",
+			Mgm_McuNumberNational:         "NAT001",
+			Mgm_McuNote:                   "Lorem ipsum dolor sit amet.",
+			Mgm_McuStartDate:              "2024-01-01",
+			Mgm_McuEndDate:                "2024-12-31",
+			Mgm_McuIsActive:               "Y",
+		},
+		{
+			Mgm_McuID:                     2,
+			Mgm_McuLabel:                  "Employee 2",
+			Mgm_McuFlagRelasiBayarSendiri: "No",
+			Mgm_McuBisaTambahPemeriksaan:  "Yes",
+			Mgm_McuCorporateID:            102,
+			Mgm_McuNumber:                 "EMP002",
+			Mgm_McuNumberNational:         "NAT002",
+			Mgm_McuNote:                   "Lorem ipsum dolor sit amet consectetur.",
+			Mgm_McuStartDate:              "2024-02-15",
+			Mgm_McuEndDate:                "2024-11-30",
+			Mgm_McuIsActive:               "Y",
+		},
+	}
+
+	return employees, nil
+}
+
+func (ea *EmployeeAnalyticServices) ListingEmployeeAnalytic(search string, startdate string, enddate string, currentpage int, rowperpage int) ([]models.DashboardPic, int, error) {
+	logger, _ := zap.NewProduction()
+	var ret []models.DashboardPic
+	var totalData int
+
+	if len(startdate) == 0 {
+		startdate = "1900-01-01"
+	}
+	if len(enddate) == 0 {
+		enddate = "9999-12-12"
+	}
+
+	prmLabel := "%" + search + "%"
+	offset := (currentpage - 1) * rowperpage
+	q := `
+		SELECT COUNT(*)
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuLabel LIKE ?
+		AND Mgm_McuStartDate >= ?
+		AND Mgm_McuEndDate <= ?
+	`
+	if err := dbx.Handlex.Get(&totalData, q, prmLabel, startdate, enddate); err != nil {
+		return nil, 0, fmt.Errorf("error query get total data: %v", err)
+	}
+
+	q = `
+		SELECT
+		Mgm_McuID,
+		Mgm_McuLabel,
+		Mgm_McuFlagRelasiBayarSendiri,
+		Mgm_McuBisaTambahPemeriksaan,
+		Mgm_McuCorporateID,
+		Mgm_McuNumber,
+		Mgm_McuNumberNational,
+		Mgm_McuNote,
+		DATE_FORMAT(Mgm_McuStartDate, '%d-%m-%Y') AS Mgm_McuStartDate,
+		DATE_FORMAT(Mgm_McuEndDate, '%d-%m-%Y') AS Mgm_McuEndDate,
+		Mgm_McuIsActive
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuLabel LIKE ?
+		AND Mgm_McuStartDate >= ?
+		AND Mgm_McuEndDate <= ?
+		ORDER BY Mgm_McuID ASC
+		LIMIT ? OFFSET ?
+	`
+	if err := dbx.Handlex.Select(&ret, q, prmLabel, startdate, enddate, rowperpage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error query get data: %v", err)
+	}
+	logger.Info("Resp", zap.Any("Respsone", ret))
+
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowperpage)))
+	return ret, totalPage, nil
+}
--- a/services/dev/kesimpulan.services.go
+++ b/services/dev/kesimpulan.services.go
@@ -0,0 +1,232 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+
+	"go.uber.org/zap"
+)
+
+func NewServicesKesimpulan(uStore db.AppStore) *KesimpulanServices {
+	return &KesimpulanServices{
+		KesimpulanStore: uStore,
+	}
+}
+
+type KesimpulanServices struct {
+	KesimpulanStore db.AppStore
+}
+
+func (k *KesimpulanServices) GetListKesimpulanLab(id string) ([]models.ModelKesimpulanLab, error) {
+	logger, _ := zap.NewProduction()
+	var listLab []models.ModelKesimpulanLab
+	var dataTot []models.ModelKesimpulanLab
+
+	qryTot := `select '' as nomor,
+	'' as Test, sum(total) as total
+	from(
+	   select count(*) as total
+			   FROM mgm_header
+			   join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+			   join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+			   join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+			   left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+			   where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'L'
+			   and Mgm_HeaderIsNormal = 'N'
+	   group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType ) x`
+
+	err := dbx.Handlex.Select(&dataTot, qryTot, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get total",
+			zap.Any("id", id),
+			zap.Any("total data", dataTot),
+		)
+		// return dataTot, fmt.Errorf("QUERY_FAILED")
+	}
+
+	// Extracting the Total value
+	var totalLab string
+	if len(dataTot) > 0 {
+		totalLab = dataTot[0].Total
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cek total", totalLab),
+	)
+	query := `SELECT ROW_NUMBER() OVER (ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC) AS nomor,
+		ifnull(Nat_TestName ,Mcu_KelainanGroupName) as Test,
+		cast(count(Mgm_HeaderT_OrderHeaderID)/?*100 as decimal(2,0))  as total
+
+		FROM mgm_header
+		join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+		join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+		join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+		left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+		where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'L'
+		and Mgm_HeaderIsNormal = 'N'
+		group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType  ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC
+		LIMIT 3`
+
+	err = dbx.Handlex.Select(&listLab, query, totalLab, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data lab",
+			zap.Any("id", id),
+			zap.Any("list data", listLab),
+		)
+		return listLab, fmt.Errorf("QUERY_FAILED")
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cekkkk", listLab),
+	)
+	return listLab, nil
+}
+
+func (k *KesimpulanServices) GetListKesimpulanNonLab(id string) ([]models.ModelKesimpulanLab, error) {
+	logger, _ := zap.NewProduction()
+	var listNonLab []models.ModelKesimpulanLab
+	var dataTot []models.ModelKesimpulanLab
+
+	qryTot := `select '' as nomor,
+	'' as Test, sum(total) as total
+	from(
+	   select count(*) as total
+			   FROM mgm_header
+			   join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+			   join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+			   join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+			   left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+			   where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'NL'
+			   and Mgm_HeaderIsNormal = 'N'
+	   group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType ) x`
+
+	err := dbx.Handlex.Select(&dataTot, qryTot, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get total",
+			zap.Any("id", id),
+			zap.Any("total data", dataTot),
+		)
+		// return dataTot, fmt.Errorf("QUERY_FAILED")
+	}
+
+	// Extracting the Total value
+	var totalLab string
+	if len(dataTot) > 0 {
+		totalLab = dataTot[0].Total
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cek total", totalLab),
+	)
+	query := `SELECT ROW_NUMBER() OVER (ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC) AS nomor,
+		ifnull(Nat_TestName ,Mcu_KelainanGroupName) as Test,
+		cast(count(Mgm_HeaderT_OrderHeaderID)/?*100 as decimal(2,0))  as total
+
+		FROM mgm_header
+		join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+		join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+		join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+		left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+		where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'NL'
+		and Mgm_HeaderIsNormal = 'N'
+		group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType  ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC
+		LIMIT 3`
+
+	err = dbx.Handlex.Select(&listNonLab, query, totalLab, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data NON lab",
+			zap.Any("id", id),
+			zap.Any("list data", listNonLab),
+		)
+		return listNonLab, fmt.Errorf("QUERY_FAILED")
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cekkkk", listNonLab),
+	)
+	return listNonLab, nil
+}
+
+func (k *KesimpulanServices) GetListKesimpulanFisik(id string) ([]models.ModelKesimpulanLab, error) {
+	logger, _ := zap.NewProduction()
+	var listFisik []models.ModelKesimpulanLab
+	var dataTot []models.ModelKesimpulanLab
+
+	qryTot := `select '' as nomor,
+	'' as Test, sum(total) as total
+	from(
+	   select count(*) as total
+			   FROM mgm_header
+			   join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+			   join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+			   join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+			   left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+			   where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'F'
+			   and Mgm_HeaderIsNormal = 'N'
+	   group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType ) x`
+
+	err := dbx.Handlex.Select(&dataTot, qryTot, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get total",
+			zap.Any("id", id),
+			zap.Any("total data", dataTot),
+		)
+		// return dataTot, fmt.Errorf("QUERY_FAILED")
+	}
+
+	// Extracting the Total value
+	var totalFisik string
+	if len(dataTot) > 0 {
+		totalFisik = dataTot[0].Total
+	}
+
+	logger.Info("data",
+		zap.Any("id", id),
+		zap.Any("cek total", totalFisik),
+	)
+	query := `SELECT ROW_NUMBER() OVER (ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC) AS nomor,
+		ifnull(Nat_TestName ,Mcu_KelainanGroupName) as Test,
+		cast(count(Mgm_HeaderT_OrderHeaderID)/?*100 as decimal(2,0))  as total
+
+		FROM mgm_header
+		join mgm_detail on Mgm_DetailMgm_HeaderID = Mgm_HeaderID  and Mgm_DetailIsActive = 'Y'
+		join mcu_kelainan on Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+		join mcu_kelainangroup on Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+		left join nat_test on Nat_TestCode = Mgm_HeaderNat_TestCode
+
+		where Mgm_HeaderIsActive = 'Y' and Mgm_HeaderMgm_McuID = ? AND Mgm_HeaderType = 'F'
+		and Mgm_HeaderIsNormal = 'N'
+		group by Mgm_DetailMcu_KelainanID, Mgm_HeaderType  ORDER BY  count(Mgm_HeaderT_OrderHeaderID) DESC
+		LIMIT 3`
+
+	err = dbx.Handlex.Select(&listFisik, query, totalFisik, id)
+
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data fisik",
+			zap.Any("id", id),
+			zap.Any("list data", listFisik),
+		)
+		return listFisik, fmt.Errorf("QUERY_FAILED")
+	}
+
+	return listFisik, nil
+}
--- a/services/dev/mcudaftarpeserta.services.go
+++ b/services/dev/mcudaftarpeserta.services.go
@@ -0,0 +1,74 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+
+	"go.uber.org/zap"
+)
+
+type McuDaftarPesertaServices struct {
+	McuDaftarPesertaStore db.AppStore
+}
+
+func NewMcuDaftarPesertaServices(uStore db.AppStore) *McuDaftarPesertaServices {
+	return &McuDaftarPesertaServices{
+		McuDaftarPesertaStore: uStore,
+	}
+}
+
+func (mdp *McuDaftarPesertaServices) GetListMcuDaftarPeserta(id string, currentPage int, rowPerPage int) ([]models.ModelMcuDaftarPeserta, int, error) {
+	logger, _ := zap.NewProduction()
+	var listDaftarPeserta []models.ModelMcuDaftarPeserta
+	var totalData int
+	offset := (currentPage - 1) * rowPerPage
+
+	querytotal := `SELECT COUNT(*)
+		FROM t_orderheader
+		JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID
+		AND M_PatientIsActive = 'Y'
+		WHERE T_OrderHeaderIsActive = 'Y' AND T_OrderHeaderMgm_McuID = ?`
+
+	if err := dbx.Handlex.Get(&totalData, querytotal, id); err != nil {
+		return nil, 0, fmt.Errorf("error querying database: %v", err)
+	}
+
+	query := `SELECT T_OrderHeaderID,
+		T_OrderHeaderDate,
+		T_OrderHeaderLabNumber,
+		T_OrderHeaderM_PatientAge,
+		M_PatientID,
+		M_PatientNoReg,
+		M_PatientName,
+		M_PatientGender,
+		CASE 
+		WHEN M_PatientGender = 'male' THEN 'Laki - Laki'
+		WHEN M_PatientGender = 'female' THEN 'Perempuan'
+		ELSE ' '
+		END AS jenisKelamin,
+		M_PatientDOB,
+		FLOOR(DATEDIFF(CURDATE(), M_PatientDOB)/ 365.25) AS age
+		FROM t_orderheader
+		JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID
+		AND M_PatientIsActive = 'Y'
+		WHERE T_OrderHeaderIsActive = 'Y' AND T_OrderHeaderMgm_McuID = ?
+		ORDER BY M_PatientName ASC
+		LIMIT ? OFFSET ?`
+
+	if err := dbx.Handlex.Select(&listDaftarPeserta, query, id, rowPerPage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error querying database: %v", err)
+	}
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowPerPage)))
+
+	defer logger.Sync()
+	logger.Info("GET DATA PESERTA",
+		zap.Any("id", id),
+		zap.Any("total data", totalData),
+		zap.Any("peserta", listDaftarPeserta),
+	)
+
+	return listDaftarPeserta, totalPage, nil
+}
--- a/services/dev/md.nonlabtemplate.services.go
+++ b/services/dev/md.nonlabtemplate.services.go
@@ -1,430 +0,0 @@
-package dev_services
-
-import (
-	"cpone/db"
-	"cpone/models"
-	dbx "cpone/package/database"
-	"fmt"
-	"math"
-	"strconv"
-	"strings"
-
-	"go.uber.org/zap"
-)
-
-type MDNonlabTemplateServices struct {
-	MDNonlabTemplateStore db.AppStore
-}
-
-func NewMDNonlabTemplateServices(uStore db.AppStore) *MDNonlabTemplateServices {
-	return &MDNonlabTemplateServices{
-		MDNonlabTemplateStore: uStore,
-	}
-}
-
-func (nlt *MDNonlabTemplateServices) GetMDNonLabTemplateBreadcrumb() (models.BreadCrumbV1, error) {
-	var ret models.BreadCrumbV1
-
-	breadcrumb := models.BreadCrumbV1{
-		Title: "Master Non-lab Template",
-		Item: []models.ItemBreadCrumbV1{
-			{
-				Item: "Dashboard",
-				Url:  "/dev/dashboard",
-			},
-			{
-				Item: "Master",
-				Url:  "/dev/master",
-			},
-			{
-				Item: "Non-lab Template",
-				Url:  "",
-			},
-		},
-	}
-
-	ret = breadcrumb
-	return ret, nil
-}
-
-func (nlt *MDNonlabTemplateServices) GetListNonlabTemplate(search string, currPage int, rowPerPage int) ([]models.MDNonlabTemplate, int, error) {
-	var ret []models.MDNonlabTemplate
-	var totalData int
-
-	offset := (currPage - 1) * rowPerPage
-	prm := "%" + strings.TrimSpace(search) + "%"
-	query := `
-		SELECT COUNT(*)
-		FROM nonlab_template
-		WHERE NonlabTemplateIsActive = 'Y'
-		AND (NonlabTemplateName LIKE ?)
-	`
-	if err := dbx.Handlex.Get(&totalData, query, prm); err != nil {
-		return nil, 0, fmt.Errorf("error querying databases: %v", err)
-	}
-
-	query = `
-		SELECT
-		NonlabTemplateID,
-		NonlabTemplateName,
-		NonlabTemplateFlagFisik,
-		NonlabTemplateIsActive,
-		NonlabTemplateCreated,
-		NonlabTemplateLastUpdated
-		FROM nonlab_template
-		WHERE NonlabTemplateIsActive = 'Y'
-		AND (NonlabTemplateName LIKE ?)
-		ORDER BY NonlabTemplateID ASC
-		LIMIT ? OFFSET ?
-	`
-	if err := dbx.Handlex.Select(&ret, query, prm, rowPerPage, offset); err != nil {
-		return nil, 0, fmt.Errorf("error querying database: %v", err)
-	}
-
-	totalPage := int(math.Ceil(float64(totalData) / float64(rowPerPage)))
-
-	return ret, totalPage, nil
-}
-
-func (nlt *MDNonlabTemplateServices) GetMDNonlabTemplateByID(id string) (models.MDNonlabTemplate, error) {
-	logger, _ := zap.NewProduction()
-	var ret models.MDNonlabTemplate
-
-	q := `
-		SELECT
-		NonlabTemplateID,
-		NonlabTemplateName,
-		NonlabTemplateFlagFisik,
-		NonlabTemplateIsActive,
-		NonlabTemplateCreated,
-		NonlabTemplateLastUpdated
-		FROM nonlab_template
-		WHERE NonlabTemplateID = ?
-	`
-	err := dbx.Handlex.Get(&ret, q, id)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error get data non lab template by id vs",
-			zap.String("ID", id),
-			zap.Error(err),
-		)
-		return ret, fmt.Errorf("QUERY FAILED GET DATA BY ID")
-	}
-	return ret, nil
-}
-
-func (nlt *MDNonlabTemplateServices) DeleteDataNonlabTemplate(id string) (models.MDNonlabTemplate, error) {
-	logger, _ := zap.NewProduction()
-	var ret models.MDNonlabTemplate
-
-	q := `
-		UPDATE nonlab_template
-		SET 
-		NonlabTemplateIsActive = 'N',
-		NonlabTemplateLastUpdated = NOW()
-		WHERE NonlabTemplateID = ?
-	`
-	dlt := dbx.Handlex.MustExec(q, id)
-	_, err := dlt.RowsAffected()
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error delete nonlab template", zap.String("id", id))
-		return ret, fmt.Errorf("query failed delete non lab template")
-	}
-
-	return nlt.GetMDNonlabTemplateByID(id)
-}
-
-func (nlt *MDNonlabTemplateServices) AddNonlabTemplate(nama string, fisik string) (models.MDNonlabTemplate, error) {
-	logger, _ := zap.NewProduction()
-	var ret models.MDNonlabTemplate
-
-	var count int
-	var prmName = "%" + nama + "%"
-	q := `
-		SELECT COUNT(*)
-		FROM nonlab_template
-		WHERE NonlabTemplateName LIKE ?
-		AND NonlabTemplateIsActive = 'Y'
-	`
-	err := dbx.Handlex.Get(&count, q, prmName)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("cek duplicate", zap.Any("nama", prmName))
-		return ret, fmt.Errorf("query failed to cek duplicate: %v", err)
-	}
-	if count > 0 {
-		defer logger.Sync()
-		logger.Error("duplicate data", zap.Any("nama", nama))
-		return ret, fmt.Errorf("duplicate nama")
-	}
-
-	q = `
-		INSERT INTO nonlab_template (
-			NonlabTemplateName,
-			NonlabTemplateFlagFisik,
-			NonlabTemplateCreated,
-			NonlabTemplateCreatedUserID
-		) VALUES (?,?,NOW(),1);
-	`
-	rsp := dbx.Handlex.MustExec(q, nama, fisik)
-	insertedID, err := rsp.LastInsertId()
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("error insert data", zap.Any("nama", nama))
-		return ret, fmt.Errorf("failed insert data: %v", err)
-	}
-
-	s := strconv.Itoa(int(insertedID))
-	return nlt.GetMDNonlabTemplateByID(s)
-}
-
-func (nlt *MDNonlabTemplateServices) UpdateNonlabTemplate(id string, nama string, fisik string) (models.MDNonlabTemplate, error) {
-	logger, _ := zap.NewProduction()
-	var ret models.MDNonlabTemplate
-
-	var count int
-	var prmNama = "%" + nama + "%"
-	q := `
-		SELECT COUNT(*)
-		FROM nonlab_template
-		WHERE NonlabTemplateName LIKE ?
-		AND NonlabTemplateIsActive = 'Y'
-		AND NonlabTemplateID <> ? 
-	`
-	err := dbx.Handlex.Get(&count, q, prmNama, id)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("cek duplicate", zap.Any("nama", prmNama))
-		return ret, fmt.Errorf("query failed to cek duplicate: %v", err)
-	}
-	if count > 0 {
-		defer logger.Sync()
-		logger.Error("duplicate data", zap.Any("nama", nama))
-		return ret, fmt.Errorf("duplicate nama")
-	}
-
-	q = `
-		UPDATE nonlab_template SET
-			NonlabTemplateName = ?,
-			NonlabTemplateFlagFisik = ?,
-			NonlabTemplateLastUpdated = NOW(),
-			NonlabTemplateLastUpdatedUserID	= 1
-		WHERE NonlabTemplateID = ?;
-	`
-	respUpdt := dbx.Handlex.MustExec(q, nama, fisik, id)
-	_, err = respUpdt.RowsAffected()
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("error update data", zap.Any("name", nama))
-		return ret, fmt.Errorf("query failed to update data")
-	}
-
-	return nlt.GetMDNonlabTemplateByID(id)
-}
-
-func (nlt *MDNonlabTemplateServices) GetIDNonlabTemplate(name string) (int, error) {
-	logger, _ := zap.NewProduction()
-	var ret int
-
-	prmName := "%" + name + "%"
-	q := `
-		SELECT
-		NonlabTemplateID
-		FROM nonlab_template
-		WHERE NonlabTemplateName LIKE ?
-		AND NonlabTemplateIsActive = 'Y'
-	`
-	err := dbx.Handlex.Get(&ret, q, prmName)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error get data non lab template by id vs",
-			zap.String("name", prmName),
-			zap.Error(err),
-		)
-		return ret, fmt.Errorf("QUERY FAILED GET DATA BY NAME")
-	}
-	return ret, nil
-}
-
-func (nlt *MDNonlabTemplateServices) GetDetailByID(id string) (models.NonlabTemplateDetail, error) {
-	logger, _ := zap.NewProduction()
-	var ret models.NonlabTemplateDetail
-
-	q := `
-		SELECT 
-		NonlabTemplateDetailID,
-		NonlabTemplateDetailNonlabTemplateID,
-		NonlabTemplateDetailCode,
-		NonlabTemplateDetailName,
-		NonlabTemplateDetaiNat_UnitID,
-		NonlabTemplateDetailFlagActive,
-		NonlabTemplateDetaiM_LangID,
-		NonlabTemplateDetailIsActive
-		FROM nonlab_template_detail
-		WHERE NonlabTemplateDetailID = ?
-		AND NonlabTemplateDetailIsActive = 'Y'
-	`
-	err := dbx.Handlex.Get(&ret, q, id)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error get data detail nonlab template", zap.Any("ID", id))
-		return ret, fmt.Errorf("query failed, error get data by id : %v", err)
-	}
-	return ret, nil
-}
-
-func (nlt *MDNonlabTemplateServices) ListDetailByIDNonlabTemplate(id string) ([]models.NonlabTemplateDetail, error) {
-	var ret []models.NonlabTemplateDetail
-	var totalData int
-
-	query := `
-		SELECT COUNT(*)
-		FROM nonlab_template_detail
-		WHERE NonlabTemplateDetailNonlabTemplateID = ?
-		AND NonlabTemplateDetailIsActive = 'Y'
-	`
-	if err := dbx.Handlex.Get(&totalData, query, id); err != nil {
-		return ret, fmt.Errorf("error querying databases: %v", err)
-	}
-
-	query = `
-		SELECT
-		NonlabTemplateDetailID,
-		NonlabTemplateDetailNonlabTemplateID,
-		NonlabTemplateDetailCode,
-		NonlabTemplateDetailName,
-		NonlabTemplateDetaiNat_UnitID,
-		NonlabTemplateDetailFlagActive,
-		NonlabTemplateDetaiM_LangID,
-		NonlabTemplateDetailIsActive
-		FROM nonlab_template_detail
-		WHERE NonlabTemplateDetailNonlabTemplateID = ?
-		AND NonlabTemplateDetailIsActive = 'Y'
-	`
-	if err := dbx.Handlex.Select(&ret, query, id); err != nil {
-		return ret, fmt.Errorf("error querying database: %v", err)
-	}
-
-	return ret, nil
-}
-
-func (nlt *MDNonlabTemplateServices) AddDetailNonlabTemplate(idnonlab string, kode string, name string, flagActive string) ([]models.NonlabTemplateDetail, error) {
-	logger, _ := zap.NewProduction()
-	var ret []models.NonlabTemplateDetail
-
-	var count int
-	prmKode := "%" + kode + "%"
-	prmName := "%" + name + "%"
-	q := `
-		SELECT COUNT(*)
-		FROM nonlab_template_detail
-		WHERE (NonlabTemplateDetailCode LIKE ? OR NonlabTemplateDetailName LIKE ?)
-		AND NonlabTemplateDetailNonlabTemplateID = ?
-		AND NonlabTemplateDetailIsActive = 'Y'
-	`
-	err := dbx.Handlex.Get(&count, q, prmKode, prmName, idnonlab)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("cek duplicate", zap.Any("kode", prmKode), zap.Any("nama", prmName))
-		return ret, fmt.Errorf("query failed to cek duplicate: %v", err)
-	}
-	if count > 0 {
-		defer logger.Sync()
-		logger.Error("data duplicate", zap.Any("kode", prmKode), zap.Any("nama", prmName))
-		return ret, fmt.Errorf("terdapat data duplikat")
-	}
-
-	q = `
-		INSERT INTO nonlab_template_detail (
-			NonlabTemplateDetailNonlabTemplateID,
-			NonlabTemplateDetailCode,
-			NonlabTemplateDetailName,
-			NonlabTemplateDetailFlagActive,
-			NonlabTemplateDetailCreated
-		) VALUES(?,?,?,?,NOW())
-	`
-	rsp := dbx.Handlex.MustExec(q, idnonlab, kode, name, flagActive)
-	insertedID, err := rsp.LastInsertId()
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("error insert data", zap.Any("kode", prmKode), zap.Any("nama", prmName))
-		return ret, fmt.Errorf("query failed to insert data: %v", err)
-	}
-	logger.Info("Success Insert data", zap.Any("id", insertedID))
-
-	return nlt.ListDetailByIDNonlabTemplate(idnonlab)
-}
-
-func (nlt *MDNonlabTemplateServices) DeleteDetailNonlabTemplate(id string) ([]models.NonlabTemplateDetail, error) {
-	logger, _ := zap.NewProduction()
-	var temp models.NonlabTemplateDetail
-	var ret []models.NonlabTemplateDetail
-
-	temp, err := nlt.GetDetailByID(id)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error get current detail nonlab template", zap.Any("id", id))
-		return ret, fmt.Errorf("query failed get current detail nonlab template")
-	}
-
-	q := `
-		UPDATE nonlab_template_detail
-		SET
-		NonlabTemplateDetailIsActive = 'N',
-		NonlabTemplateDetailLastUpdated = NOW()
-		WHERE NonlabTemplateDetailID = ?
-		AND NonlabTemplateDetailNonlabTemplateID = ?
-	`
-	dlt := dbx.Handlex.MustExec(q, id, temp.NonlabTemplateDetailNonlabTemplateID)
-	_, err = dlt.RowsAffected()
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error delete detail nonlab template", zap.Any("id", id))
-		return ret, fmt.Errorf("query failed delete detail nonlab template")
-	}
-
-	s := strconv.Itoa(int(temp.NonlabTemplateDetailNonlabTemplateID))
-
-	return nlt.ListDetailByIDNonlabTemplate(s)
-}
-
-func (nlt *MDNonlabTemplateServices) PilihDetailNonlabTemplate(id string) ([]models.NonlabTemplateDetail, error) {
-	logger, _ := zap.NewProduction()
-	var cek models.NonlabTemplateDetail
-	var ret []models.NonlabTemplateDetail
-	var flag string
-
-	cek, err := nlt.GetDetailByID(id)
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error cek current detail nonlab template", zap.Any("ID", id))
-		return ret, fmt.Errorf("query failed cek current detail nonlab template")
-	}
-
-	if cek.NonlabTemplateDetailFlagActive == "Y" {
-		flag = "N"
-	} else {
-		flag = "Y"
-	}
-
-	q := `
-		UPDATE nonlab_template_detail
-		SET
-		NonlabTemplateDetailFlagActive = ?,
-		NonlabTemplateDetailLastUpdated = NOW()
-		WHERE NonlabTemplateDetailID = ?
-		AND NonlabTemplateDetailNonlabTemplateID = ?
-	`
-	updt := dbx.Handlex.MustExec(q, flag, id, cek.NonlabTemplateDetailNonlabTemplateID)
-	_, err = updt.RowsAffected()
-	if err != nil {
-		defer logger.Sync()
-		logger.Error("Error update detail nonlab template", zap.Any("id", id), zap.Any("flag", flag))
-		return ret, fmt.Errorf("query failed update detail nonlab template")
-	}
-
-	s := strconv.Itoa(int(cek.NonlabTemplateDetailNonlabTemplateID))
-
-	return nlt.ListDetailByIDNonlabTemplate(s)
-}
--- a/services/public/login.services.go
+++ b/services/public/login.services.go
@@ -1,6 +1,17 @@
 package public_services

-import "cpone/db"
+import (
+	"bytes"
+	"cpone/db"
+	"cpone/models"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+
+	"go.uber.org/zap"
+)

 type ServicesLogin struct {
 	CompanyStore db.AppStore
@@ -12,3 +23,80 @@ func NewServicesLogin(uStore db.AppStore) *ServicesLogin {
 		CompanyStore: uStore,
 	}
 }
+
+func (ls *ServicesLogin) Login(username string, password string) (models.ResponseApi, error) {
+	logger, _ := zap.NewProduction()
+	url := "https://devcpone.aplikasi.web.id/one-api/v1/system/auth/login"
+
+	var resp models.ResponseApi
+
+	// Create a JSON payload with the username and password
+	payload := []byte(fmt.Sprintf(`{"username": "%s", "password": "%s"}`, username, password))
+	logger.Info("payload", zap.Any("data", payload))
+
+	// Make the POST request
+	request, err := http.Post(url, "application/json", bytes.NewBuffer(payload))
+	if err != nil {
+		logger.Info("requser", zap.Any("err", err))
+		return resp, err
+	}
+	if request.StatusCode != http.StatusOK {
+		logger.Info("status", zap.Any("err", request.StatusCode))
+		return resp, fmt.Errorf("server returned non-OK status: %d", request.StatusCode)
+	}
+	defer request.Body.Close()
+
+	// Read the response body
+	body, err := io.ReadAll(request.Body)
+	if err != nil {
+		logger.Info("body", zap.Any("data", body))
+		return resp, err
+	}
+
+	if err := json.Unmarshal(body, &resp); err != nil {
+		logger.Info("json", zap.Any("data", err))
+		return resp, err
+	}
+
+	// Check if status is "ERR"
+	if resp.Status == "ERR" {
+		logger.Info("status", zap.Any("data", resp.Message))
+		return resp, fmt.Errorf("login failed: %s", resp.Message)
+	}
+
+	return resp, nil
+}
+
+func (ls *ServicesLogin) MultiSignIn(username string, password string) (models.Response, error) {
+	logger, _ := zap.NewProduction()
+	var ret models.Response
+	uri := "https://devcpone.aplikasi.web.id/one-api/v1/system/auth/multi_login"
+
+	params := url.Values{}
+	params.Add("username", username)
+	params.Add("password", password)
+
+	resp, err := http.PostForm(uri, params)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("error request post", zap.Any("error", err))
+		return ret, err
+	}
+	defer resp.Body.Close()
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("error read body", zap.Any("error", err))
+		return ret, err
+	}
+
+	err = json.Unmarshal(body, &ret)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("error parse body", zap.Any("error", err))
+		return ret, err
+	}
+
+	return ret, nil
+}
--- a/views/corporate/dashboardpic/dashboardpic.templ
+++ b/views/corporate/dashboardpic/dashboardpic.templ
@@ -0,0 +1,110 @@
+package corporate_dashboardpic
+
+import "cpone/layout"
+import "cpone/component/customtextfield"
+import "cpone/models"
+
+templ DashboardPic(
+    listID string,
+    paginationID string,
+    breadcrumb templ.Component,
+    filtercomponent templ.Component,
+    listingcomponent templ.Component,
+    paginationcomponent templ.Component,    
+) {
+    <div class="container-fluid">
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "listID",
+            Name: "listID",
+            Type: "hidden",
+            Value: listID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+            Name: "paginationID",
+            Type: "hidden",
+            Value: paginationID})
+        <div class="row align-item-center mb-10">
+            <div class="col-md-10 col-sm-12 p-0">
+                @breadcrumb
+            </div>
+        </div>
+        @filtercomponent
+        <div id="loading-parent" class="rounded">
+            @listingcomponent
+            @paginationcomponent
+            <div id="loading-child" class="rounded bg-transparent">
+                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
+                    <span class="sr-only">Loading...</span>
+                </div>
+            </div>
+        </div>
+        <div id="loadingcontent"></div>
+    </div>
+}
+
+templ JSDashboardPIC() {
+
+}
+
+templ CSSDashboardPIC() {
+    <link
+        rel="stylesheet"
+        href="assets/css/googlefont/poppins.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/publicsans.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/roboto.css"
+    />
+    <style>
+        body {
+            background-color: white;
+        }
+        #div-chart {
+            margin: 40px 10vw 40px 10vw;
+        }
+        .title {
+            font-size: 20px;
+            font-weight: bold;
+        }
+        #title {
+            font-weight: 600;
+        }
+    </style>
+}
+
+script BeforeRequestContent() {
+    const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.add("overlay");
+    loadingParent.classList.add("overlay-block");
+    loadingChild.classList.add("overlay-layer");
+    loadingSpinner.classList.remove("d-none");
+}
+
+script AfterRequestContent() {
+    const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.remove("overlay");
+    loadingParent.classList.remove("overlay-block");
+    loadingChild.classList.remove("overlay-layer");
+    loadingSpinner.classList.add("d-none");
+}
+
+templ ShowDashboardPic(
+    title string,
+    cmp templ.Component,
+    css templ.Component,
+    js templ.Component,
+    navbaruser templ.Component,
+    userprofile templ.Component,
+) {
+    @layout.DashboardLayout(title, css, js, navbaruser, userprofile) {
+        @cmp
+    }
+}
--- a/views/corporate/dashboardpic/dashboardpic_templ.go
+++ b/views/corporate/dashboardpic/dashboardpic_templ.go
@@ -0,0 +1,216 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_dashboardpic
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/layout"
+import "cpone/component/customtextfield"
+import "cpone/models"
+
+func DashboardPic(
+	listID string,
+	paginationID string,
+	breadcrumb templ.Component,
+	filtercomponent templ.Component,
+	listingcomponent templ.Component,
+	paginationcomponent templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container-fluid\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "listID",
+			Name:  "listID",
+			Type:  "hidden",
+			Value: listID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+			Name:  "paginationID",
+			Type:  "hidden",
+			Value: paginationID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row align-item-center mb-10\"><div class=\"col-md-10 col-sm-12 p-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = breadcrumb.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = filtercomponent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-parent\" class=\"rounded\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = listingcomponent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = paginationcomponent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\"rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem;\" role=\"status\"><span class=\"sr-only\">Loading...</span></div></div></div><div id=\"loadingcontent\"></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JSDashboardPIC() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func CSSDashboardPIC() 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("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n        body {\r\n            background-color: white;\r\n        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func BeforeRequestContent() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_BeforeRequestContent_5717`,
+		Function: `function __templ_BeforeRequestContent_5717(){const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.add("overlay");
+    loadingParent.classList.add("overlay-block");
+    loadingChild.classList.add("overlay-layer");
+    loadingSpinner.classList.remove("d-none");
+}`,
+		Call:       templ.SafeScript(`__templ_BeforeRequestContent_5717`),
+		CallInline: templ.SafeScriptInline(`__templ_BeforeRequestContent_5717`),
+	}
+}
+
+func AfterRequestContent() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_AfterRequestContent_077f`,
+		Function: `function __templ_AfterRequestContent_077f(){const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.remove("overlay");
+    loadingParent.classList.remove("overlay-block");
+    loadingChild.classList.remove("overlay-layer");
+    loadingSpinner.classList.add("d-none");
+}`,
+		Call:       templ.SafeScript(`__templ_AfterRequestContent_077f`),
+		CallInline: templ.SafeScriptInline(`__templ_AfterRequestContent_077f`),
+	}
+}
+
+func ShowDashboardPic(
+	title string,
+	cmp templ.Component,
+	css templ.Component,
+	js templ.Component,
+	navbaruser templ.Component,
+	userprofile templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Var5 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+			if !templ_7745c5c3_IsBuffer {
+				templ_7745c5c3_Buffer = templ.GetBuffer()
+				defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+			}
+			templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if !templ_7745c5c3_IsBuffer {
+				_, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
+			}
+			return templ_7745c5c3_Err
+		})
+		templ_7745c5c3_Err = layout.DashboardLayout(title, css, js, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/dashboardpic/filterdashboardpic.templ
+++ b/views/corporate/dashboardpic/filterdashboardpic.templ
@@ -0,0 +1,68 @@
+package corporate_dashboardpic
+
+templ FilterListing(
+    hxGet string,
+    hxTrigger string,
+    hxInclude string,
+    hxSwap string,
+    hxTarget string,
+    hxBeforeRequest templ.ComponentScript,
+    hxAfterRequest templ.ComponentScript,    
+) {
+    <div class="row pt-8 align-items-center">
+        <div class="col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2">
+            <label class="text-black font-weight-bolder">Stard Date:</label>
+        </div>
+        <div class="col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2">
+            <input 
+                id="startdateID" 
+                name="startdate"
+                class="form-control form-control-lg bg-field border-0 rounded-lg" 
+                type="date" 
+                autocomplete="off"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                hx-on::before-request={ hxBeforeRequest }
+                hx-on::after-request={ hxAfterRequest }
+            />
+        </div>
+        <div class="col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2">
+            <label class="text-black font-weight-bolder">End Date:</label>
+        </div>
+        <div class="col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2">
+            <input 
+                id="enddateID"
+                name="enddate"
+                class="form-control form-control-lg bg-field border-0 rounded-lg" 
+                type="date" 
+                autocomplete="off"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                hx-on::before-request={ hxBeforeRequest }
+                hx-on::after-request={ hxAfterRequest }
+            />
+        </div>
+        <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 mb-2">
+            <input 
+                id="searchID"
+                name="search"
+                class="form-control form-control-lg bg-field border-0 rounded-lg"
+                type="text"
+                placeholder="nama karyawan"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                hx-on::before-request={ hxBeforeRequest }
+                hx-on::after-request={ hxAfterRequest }
+            />
+        </div>
+    </div>
+}
--- a/views/corporate/dashboardpic/filterdashboardpic_templ.go
+++ b/views/corporate/dashboardpic/filterdashboardpic_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

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

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

@@ -10,21 +10,14 @@ import "context"
 import "io"
 import "bytes"

-import "cpone/component/table"
-import "cpone/models"
-import "strconv"
-
-func TableNonlabTmplt(
-	data []models.MDNonlabTemplate,
-	tableID string,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
+func FilterListing(
+	hxGet string,
+	hxTrigger string,
+	hxInclude string,
+	hxSwap string,
+	hxTarget string,
+	hxBeforeRequest templ.ComponentScript,
+	hxAfterRequest templ.ComponentScript,
 ) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
@@ -38,320 +31,167 @@ func TableNonlabTmplt(
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row pt-8 align-items-center\"><div class=\"col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2\"><label class=\"text-black font-weight-bolder\">Stard Date:</label></div><div class=\"col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest, hxAfterRequest)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input id=\"startdateID\" name=\"startdate\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"date\" autocomplete=\"off\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 19, Col: 21}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 23, Col: 30}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap-oob=\"true\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"NAMA", "AKSI"},
-			[]string{"80%", "20%"},
-			RowNonlabTmplt(data,
-				tableID,
-				hxGetEdit,
-				hxTargetEdit,
-				hxSwapEdit,
-				hxIncludeEdit,
-				hxGetDelete,
-				hxTargetDelete,
-				hxSwapDelete,
-				hxIncludeDelete,
-			)).Render(ctx, templ_7745c5c3_Buffer)
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 24, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 25, Col: 38}
 		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func RowNonlabTmplt(
-	data []models.MDNonlabTemplate,
-	tableID string,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var3 == nil {
-			templ_7745c5c3_Var3 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		if len(data) == 0 {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"2\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		for _, v := range data {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var4 string
-			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.NonlabTemplateName)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 55, Col: 38}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = RowAction(v.NonlabTemplateID,
-				hxGetEdit,
-				hxTargetEdit,
-				hxSwapEdit,
-				hxIncludeEdit,
-				hxGetDelete,
-				hxTargetDelete,
-				hxSwapDelete,
-				hxIncludeDelete,
-			).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td></tr>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func RowAction(
-	id int,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var5 == nil {
-			templ_7745c5c3_Var5 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row px-5 d-flex justify-content-around\">")
+		_, 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.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleBeforeRequestRow(strconv.Itoa(id)), HandleAfterRequestRow(strconv.Itoa(id)))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactnlt col-12 col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm\" hx-get=\"")
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 26, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetEdit + "?id=" + strconv.Itoa(id))
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 87, Col: 49}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 27, Col: 36}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 88, Col: 27}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+		var templ_7745c5c3_Var7 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 89, Col: 23}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		var templ_7745c5c3_Var8 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div><div class=\"col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2\"><label class=\"text-black font-weight-bolder\">End Date:</label></div><div class=\"col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest, hxAfterRequest)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input id=\"enddateID\" name=\"enddate\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"date\" autocomplete=\"off\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 90, Col: 29}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 42, Col: 30}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("#spnredt" + strconv.Itoa(id))
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 91, Col: 47}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 43, Col: 38}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var11 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11.Call)
-		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_Var12 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><span id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var13 string
-		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs("spnredt" + strconv.Itoa(id))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 95, Col: 50}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"htmx-indicator spinner-border spinner-border-sm\" role=\"status\" aria-hidden=\"true\"></span> Edit\r</a> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleBeforeRequestRow(strconv.Itoa(id)), HandleAfterRequestRow(strconv.Itoa(id)))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btnactnlt col-12 col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2 btn-sm\" hx-get=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetDelete + "?id=" + strconv.Itoa(id))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 101, Col: 51}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 102, Col: 29}
-		}
-		_, 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-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 103, Col: 25}
-		}
-		_, 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(hxIncludeDelete)
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 104, Col: 31}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 44, Col: 38}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var18 string
-		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs("#spnrdel" + strconv.Itoa(id))
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 105, Col: 47}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 45, Col: 32}
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 46, Col: 36}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -359,8 +199,8 @@ func RowAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var19 templ.ComponentScript = HandleBeforeRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var19.Call)
+		var templ_7745c5c3_Var14 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -368,25 +208,103 @@ func RowAction(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var20 templ.ComponentScript = HandleAfterRequestRow(strconv.Itoa(id))
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var20.Call)
+		var templ_7745c5c3_Var15 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15.Call)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><span id=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div><div class=\"col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 mb-2\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		var templ_7745c5c3_Var21 string
-		templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs("spnrdel" + strconv.Itoa(id))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\nonlabtemplatetable.templ`, Line: 109, Col: 50}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+		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("\" class=\"htmx-indicator spinner-border spinner-border-sm\" role=\"status\" aria-hidden=\"true\"></span> Hapus\r</a></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input id=\"searchID\" name=\"search\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"text\" placeholder=\"nama karyawan\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 58, Col: 30}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 59, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 60, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 61, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var20 string
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\filterdashboardpic.templ`, Line: 62, Col: 36}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var21 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var22 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -396,33 +314,3 @@ func RowAction(
 		return templ_7745c5c3_Err
 	})
 }
-
-func HandleBeforeRequestRow(id string) templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_HandleBeforeRequestRow_9ad2`,
-		Function: `function __templ_HandleBeforeRequestRow_9ad2(id){var cusid_ele = document.getElementsByClassName('btnactnlt');
-	for (var i = 0; i < cusid_ele.length; ++i) {
-		var item = cusid_ele[i];  
-		item.classList.add('disabled');
-	}
-	console.log(id)
-}`,
-		Call:       templ.SafeScript(`__templ_HandleBeforeRequestRow_9ad2`, id),
-		CallInline: templ.SafeScriptInline(`__templ_HandleBeforeRequestRow_9ad2`, id),
-	}
-}
-
-func HandleAfterRequestRow(id string) templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_HandleAfterRequestRow_840a`,
-		Function: `function __templ_HandleAfterRequestRow_840a(id){var cusid_ele = document.getElementsByClassName('btnactnlt');
-	for (var i = 0; i < cusid_ele.length; ++i) {
-		var item = cusid_ele[i];  
-		item.classList.remove('disabled');
-	}
-	console.log(id)
-}`,
-		Call:       templ.SafeScript(`__templ_HandleAfterRequestRow_840a`, id),
-		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_840a`, id),
-	}
-}
--- a/views/corporate/dashboardpic/listingdashboardpic.templ
+++ b/views/corporate/dashboardpic/listingdashboardpic.templ
@@ -0,0 +1,42 @@
+package corporate_dashboardpic
+
+import "cpone/models"
+import "strconv"
+
+templ ListingData(
+    data []models.DashboardPic,
+    listID string,
+) {
+    <div id={listID} class="align-items-center pt-8 flex-column" hx-swap-oob="true">
+        <div class="bg-field rounded">
+            <div class="p-8">
+                for i, d := range data {
+                    if i == (len(data) - 1)  {
+                        <div id={ strconv.Itoa(int(d.Mgm_McuID)) } class="card shadow p-8" hx-get={"/corp/dashboard_pic/click/" + strconv.Itoa(d.Mgm_McuID)}>
+                            @ItemCard(d)
+                        </div>
+                    } else {
+                        <div id={ strconv.Itoa(int(d.Mgm_McuID)) } class="card shadow p-8 mb-8" hx-get={"/corp/dashboard_pic/click/" + strconv.Itoa(d.Mgm_McuID)}>
+                            @ItemCard(d)
+                        </div>        
+                    }
+                }
+            </div>
+        </div>
+    </div>
+}
+
+templ ItemCard(data models.DashboardPic) {
+    <div class="row d-flex align-items-center">
+        <div class="col-7">
+            <h3 class="text-black">{ data.Mgm_McuLabel }</h3>
+        </div>
+        <div class="col-md col-lg text-right">
+            <span class="text-black font-weight-bolder">{ data.Mgm_McuNote }</span>
+        </div>
+        <div class="col-md col-lg text-right">
+            <span class="text-black font-weight-bolder">{ data.Mgm_McuStartDate } - { data.Mgm_McuEndDate }</span>
+        </div>
+    </div>    
+}
+
--- a/views/corporate/dashboardpic/listingdashboardpic_templ.go
+++ b/views/corporate/dashboardpic/listingdashboardpic_templ.go
@@ -0,0 +1,215 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_dashboardpic
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/models"
+import "strconv"
+
+func ListingData(
+	data []models.DashboardPic,
+	listID string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(listID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 10, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"align-items-center pt-8 flex-column\" hx-swap-oob=\"true\"><div class=\"bg-field rounded\"><div class=\"p-8\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i, d := range data {
+			if i == (len(data) - 1) {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var3 string
+				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID)))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 15, Col: 64}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8\" hx-get=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var4 string
+				templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/click/" + strconv.Itoa(d.Mgm_McuID))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 15, Col: 155}
+				}
+				_, 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
+				}
+				templ_7745c5c3_Err = ItemCard(d).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var5 string
+				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID)))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 19, Col: 64}
+				}
+				_, 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=\"card shadow p-8 mb-8\" hx-get=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var6 string
+				templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/click/" + strconv.Itoa(d.Mgm_McuID))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 19, Col: 160}
+				}
+				_, 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 = ItemCard(d).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ItemCard(data models.DashboardPic) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row d-flex align-items-center\"><div class=\"col-7\"><h3 class=\"text-black\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuLabel)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 32, Col: 54}
+		}
+		_, 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("</h3></div><div class=\"col-md col-lg text-right\"><span class=\"text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuNote)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 35, Col: 74}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</span></div><div class=\"col-md col-lg text-right\"><span class=\"text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuStartDate)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 38, Col: 79}
+		}
+		_, 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(data.Mgm_McuEndDate)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\dashboardpic\listingdashboardpic.templ`, Line: 38, Col: 105}
+		}
+		_, 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("</span></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/mcu/mcudetail.templ
+++ b/views/corporate/mcu/mcudetail.templ
@@ -0,0 +1,74 @@
+package corporate_mcudetail
+
+import "cpone/layout"
+
+templ McuDetailScreen(
+    breadcrumb templ.Component,
+    content templ.Component,
+) {
+    <div class="container-fluid">
+        <div class="row align-item-center mb-10">
+            <div class="col-md-10 col-sm-12 p-0">
+                @breadcrumb
+            </div>            
+        </div>
+        <div id="loading-parent" class="rounded">
+            @content
+            <div id="loading-child" class="rounded bg-transparent">
+                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
+                    <span class="sr-only">Loading....</span>
+                </div>
+            </div>
+        </div>
+        <div id="loadingcontent"></div>
+    </div>
+}
+
+templ CSSMcuDetail(
+    CssKesimpulan templ.Component,
+) {
+    <link
+        rel="stylesheet"
+        href="assets/css/googlefont/poppins.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/publicsans.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/roboto.css"
+    />
+    <style>
+        body {
+            background-color: white;
+        }
+        #div-chart {
+            margin: 40px 10vw 40px 10vw;
+        }
+        .title {
+            font-size: 20px;
+            font-weight: bold;
+        }
+        #title {
+            font-weight: 600;
+        }
+    </style>
+    @CssKesimpulan
+}
+
+templ JSMcuDetail() {   
+}
+
+templ ShowMcuDetail(
+    title string,
+    cmp templ.Component,
+    css templ.Component,
+    js templ.Component,
+    navbaruser templ.Component,
+    userprofile templ.Component,
+) {
+    @layout.DashboardLayout(title, css, js, navbaruser, userprofile) {
+        @cmp
+    }
+}
--- a/views/corporate/mcu/mcudetail_templ.go
+++ b/views/corporate/mcu/mcudetail_templ.go
@@ -0,0 +1,152 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_mcudetail
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/layout"
+
+func McuDetailScreen(
+	breadcrumb templ.Component,
+	content templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container-fluid\"><div class=\"row align-item-center mb-10\"><div class=\"col-md-10 col-sm-12 p-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = breadcrumb.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div id=\"loading-parent\" class=\"rounded\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = content.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\"rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem;\" role=\"status\"><span class=\"sr-only\">Loading....</span></div></div></div><div id=\"loadingcontent\"></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func CSSMcuDetail(
+	CssKesimpulan 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_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n        body {\r\n            background-color: white;\r\n        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = CssKesimpulan.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 JSMcuDetail() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ShowMcuDetail(
+	title string,
+	cmp templ.Component,
+	css templ.Component,
+	js templ.Component,
+	navbaruser templ.Component,
+	userprofile templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Var5 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+			if !templ_7745c5c3_IsBuffer {
+				templ_7745c5c3_Buffer = templ.GetBuffer()
+				defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+			}
+			templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if !templ_7745c5c3_IsBuffer {
+				_, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
+			}
+			return templ_7745c5c3_Err
+		})
+		templ_7745c5c3_Err = layout.DashboardLayout(title, css, js, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/mcu/mcutab/modaldaftarpeserta.templ
+++ b/views/corporate/mcu/mcutab/modaldaftarpeserta.templ
@@ -0,0 +1,86 @@
+package corporate_mcudetail
+
+import "cpone/component/modal"
+
+templ DialogReport(
+    IDComponent string,
+    postLink string,
+    hxTarget string,
+    hxSwap string,
+    hxInclude string,
+    modalID string,
+    modalTitle string,
+    modalBody templ.Component,
+    modalClose templ.Component,    
+) {
+    <div class="">
+        <div
+            id={ IDComponent }
+            hx-include={ hxInclude }
+        >
+            @modalcomponent.ModalViewXL(modalID,
+                modalTitle,
+                modalBody,
+                modalClose,
+            )
+        </div>
+    </div>
+}
+
+templ ModalBody(
+    IDComponent string,
+    hxOnLoad templ.ComponentScript,
+) {
+    <div id={ IDComponent } hx-on::load={ hxOnLoad }>
+        <div>
+            <ul class="nav nav-tabs nav-tabs-line">
+                <li class="nav-item">
+                    <a class="nav-link active" data-toggle="tab" href="#kt_tab_pat_1">Hasil Lab</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#kt_tab_pat_2">Hasil Non Lab</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#kt_tab_pat_3">Hasil Fisik</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#kt_tab_pat_4">Resume Individu</a>
+                </li>
+            </ul>
+        </div>
+        <div class="tab-content mt-5" id="patTabContent">
+            <div class="tab-pane fade show active" id="kt_tab_pat_1" role="tabpanel" aria-labelledby="kt_tab_pat_1" style="height: 700px;">
+                <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_history.rptdesign&__format=pdf&PID=5&PPatientID=112&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+            </div>
+            <div class="tab-pane fade" id="kt_tab_pat_2" role="tabpanel" aria-labelledby="kt_tab_pat_2" style="height: 700px;">
+                <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_pajanan.rptdesign&__format=pdf&PID=5&PType=fisik&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+            </div>
+            <div class="tab-pane fade" id="kt_tab_pat_3" role="tabpanel" aria-labelledby="kt_tab_pat_3" style="height: 700px;">
+                <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_fisik.rptdesign&__format=pdf&PID=5&PType=fisik&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+            </div>
+            <div class="tab-pane fade" id="kt_tab_pat_4" role="tabpanel" aria-labelledby="kt_tab_pat_4" style="height: 700px;">
+                <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_resume.rptdesign&__format=pdf&PID=1&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+            </div>
+        </div>
+    </div>
+}
+
+script JsHideModal(modalID string) {
+    $(modalID).modal('hide');
+}
+
+script JsShowModal(modalID string) {
+    $(modalID).modal('show');
+}
+
+templ ModalClose(LinkClose string, hxTarget string, hxSwap string, modalID string) {
+    <button 
+        type="button"
+        hx-on::after-request={ JsHideModal(modalID) }
+        class="close"
+        data-dismiss="modal"
+        aria-label="Close"
+    >
+        <i aria-hidden="true" class="ki ki-close"></i>
+    </button>
+}
--- a/views/corporate/mcu/mcutab/modaldaftarpeserta_templ.go
+++ b/views/corporate/mcu/mcutab/modaldaftarpeserta_templ.go
@@ -0,0 +1,247 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_mcudetail
+
+//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/modal"
+
+func DialogReport(
+	IDComponent string,
+	postLink string,
+	hxTarget string,
+	hxSwap string,
+	hxInclude string,
+	modalID string,
+	modalTitle string,
+	modalBody templ.Component,
+	modalClose 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=\"\"><div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(IDComponent)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 18, Col: 28}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 19, Col: 34}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalcomponent.ModalViewXL(modalID,
+			modalTitle,
+			modalBody,
+			modalClose,
+		).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ModalBody(
+	IDComponent string,
+	hxOnLoad templ.ComponentScript,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(IDComponent)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 34, Col: 25}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-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("\"><div><ul class=\"nav nav-tabs nav-tabs-line\"><li class=\"nav-item\"><a class=\"nav-link active\" data-toggle=\"tab\" href=\"#kt_tab_pat_1\">Hasil Lab</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pat_2\">Hasil Non Lab</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pat_3\">Hasil Fisik</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pat_4\">Resume Individu</a></li></ul></div><div class=\"tab-content mt-5\" id=\"patTabContent\"><div class=\"tab-pane fade show active\" id=\"kt_tab_pat_1\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pat_1\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_history.rptdesign&__format=pdf&PID=5&PPatientID=112&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 53, Col: 188}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pat_2\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pat_2\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_pajanan.rptdesign&__format=pdf&PID=5&PType=fisik&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 56, Col: 181}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pat_3\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pat_3\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_fisik.rptdesign&__format=pdf&PID=5&PType=fisik&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 59, Col: 179}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pat_4\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pat_4\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_resume.rptdesign&__format=pdf&PID=1&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 62, Col: 172}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></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 JsHideModal(modalID string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_JsHideModal_5a6b`,
+		Function: `function __templ_JsHideModal_5a6b(modalID){$(modalID).modal('hide');
+}`,
+		Call:       templ.SafeScript(`__templ_JsHideModal_5a6b`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_JsHideModal_5a6b`, modalID),
+	}
+}
+
+func JsShowModal(modalID string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_JsShowModal_3767`,
+		Function: `function __templ_JsShowModal_3767(modalID){$(modalID).modal('show');
+}`,
+		Call:       templ.SafeScript(`__templ_JsShowModal_3767`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_JsShowModal_3767`, modalID),
+	}
+}
+
+func ModalClose(LinkClose string, hxTarget string, hxSwap string, modalID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var11 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var11 == nil {
+			templ_7745c5c3_Var11 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JsHideModal(modalID))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button type=\"button\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 templ.ComponentScript = JsHideModal(modalID)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"close\" 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
+	})
+}
--- a/views/corporate/mcu/mcutab/tabdaftarpeserta.templ
+++ b/views/corporate/mcu/mcutab/tabdaftarpeserta.templ
@@ -0,0 +1,85 @@
+package corporate_mcudetail
+
+import "cpone/layout"
+import "cpone/models"
+import "cpone/component/customtextfield"
+
+templ TabDaftarPesertaScreen(
+    tableID string,
+    paginationID string,
+    dialogReportID string,
+    dialogReportBodyID string,
+    content templ.Component,
+    dialogReport templ.Component,
+) {
+    <div class="container-fluid">
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+            Name: "tableID",
+            Type: "hidden",
+            Value: tableID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+            Name: "paginationID",
+            Type: "hidden",
+            Value: paginationID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogReportID",
+            Name: "dialogReportID",
+            Type: "hidden",
+            Value: dialogReportID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogReportBodyID",
+            Name: "dialogReportBodyID",
+            Type: "hidden",
+            Value: dialogReportBodyID})
+        <div class="d-flex justify-content-center pt-10 pb-10">
+            <h2 class="title text-black" style="margin-bottom: 0">Daftar Peserta</h2>
+        </div>
+        <div id="loading-parent" class="rounded">
+            @content
+            @dialogReport
+            <div id="loading-child" class="rounded bg-transparent">
+                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
+                    <span class="sr-only">Loading...</span>
+                </div>
+            </div>
+        </div>
+        <div id="loadingcontent"></div>
+    </div>
+}
+
+templ CSSTabDaftarPeserta() {
+}
+
+templ JsTabDaftarPeserta() {
+}
+
+script BeforeRequestContent() {
+    const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.add("overlay");
+    loadingParent.classList.add("overlay-block");
+    loadingChild.classList.add("overlay-layer");
+    loadingSpinner.classList.remove("d-none");
+}
+
+script AfterRequestContent() {
+    const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.remove("overlay");
+    loadingParent.classList.remove("overlay-block");
+    loadingChild.classList.remove("overlay-layer");
+    loadingSpinner.classList.add("d-none");    
+}
+
+templ ShowTabDafterPeserta(
+    title string,
+    cmp templ.Component,
+    css templ.Component,
+    js templ.Component,
+) {
+    @layout.PlaygroundLayout(title, css, js) {
+        @cmp
+    }
+}
--- a/views/corporate/mcu/mcutab/tabdaftarpeserta_templ.go
+++ b/views/corporate/mcu/mcutab/tabdaftarpeserta_templ.go
@@ -0,0 +1,208 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_mcudetail
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/layout"
+import "cpone/models"
+import "cpone/component/customtextfield"
+
+func TabDaftarPesertaScreen(
+	tableID string,
+	paginationID string,
+	dialogReportID string,
+	dialogReportBodyID string,
+	content templ.Component,
+	dialogReport templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container-fluid\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+			Name:  "tableID",
+			Type:  "hidden",
+			Value: tableID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+			Name:  "paginationID",
+			Type:  "hidden",
+			Value: paginationID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogReportID",
+			Name:  "dialogReportID",
+			Type:  "hidden",
+			Value: dialogReportID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogReportBodyID",
+			Name:  "dialogReportBodyID",
+			Type:  "hidden",
+			Value: dialogReportBodyID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"d-flex justify-content-center pt-10 pb-10\"><h2 class=\"title text-black\" style=\"margin-bottom: 0\">Daftar Peserta</h2></div><div id=\"loading-parent\" class=\"rounded\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = content.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = dialogReport.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\"rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem;\" role=\"status\"><span class=\"sr-only\">Loading...</span></div></div></div><div id=\"loadingcontent\"></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func CSSTabDaftarPeserta() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JsTabDaftarPeserta() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func BeforeRequestContent() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_BeforeRequestContent_5717`,
+		Function: `function __templ_BeforeRequestContent_5717(){const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.add("overlay");
+    loadingParent.classList.add("overlay-block");
+    loadingChild.classList.add("overlay-layer");
+    loadingSpinner.classList.remove("d-none");
+}`,
+		Call:       templ.SafeScript(`__templ_BeforeRequestContent_5717`),
+		CallInline: templ.SafeScriptInline(`__templ_BeforeRequestContent_5717`),
+	}
+}
+
+func AfterRequestContent() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_AfterRequestContent_848c`,
+		Function: `function __templ_AfterRequestContent_848c(){const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.remove("overlay");
+    loadingParent.classList.remove("overlay-block");
+    loadingChild.classList.remove("overlay-layer");
+    loadingSpinner.classList.add("d-none");    
+}`,
+		Call:       templ.SafeScript(`__templ_AfterRequestContent_848c`),
+		CallInline: templ.SafeScriptInline(`__templ_AfterRequestContent_848c`),
+	}
+}
+
+func ShowTabDafterPeserta(
+	title string,
+	cmp templ.Component,
+	css templ.Component,
+	js templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Var5 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+			if !templ_7745c5c3_IsBuffer {
+				templ_7745c5c3_Buffer = templ.GetBuffer()
+				defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+			}
+			templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if !templ_7745c5c3_IsBuffer {
+				_, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
+			}
+			return templ_7745c5c3_Err
+		})
+		templ_7745c5c3_Err = layout.PlaygroundLayout(title, css, js).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/mcu/mcutab/tabkesimpulan.templ
+++ b/views/corporate/mcu/mcutab/tabkesimpulan.templ
@@ -0,0 +1,55 @@
+package corporate_mcudetail
+
+import (
+	"cpone/component/customtextfield"
+	"cpone/models"
+)
+
+templ MainKesimpulan(
+	tableID string,
+	tablecontent templ.Component,
+	tablecontentnonlab templ.Component,
+	tablecontentfisik templ.Component,
+) {
+	<div class="container-fluid">
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+			Name:  "tableID",
+			Type:  "hidden",
+			Value: tableID})
+		<div class="d-flex justify-content-center pt-10 pb-10">
+			<h2 class="title text-black" style="margin-bottom: 0">Kesimpulan</h2>
+		</div>
+		@tablecontent
+		@tablecontentnonlab
+		@tablecontentfisik
+	</div>
+}
+
+templ CssKesimpulan() {
+  <style>
+    .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>
+}
+
+templ JsKesimpulan() {
+}
--- a/views/corporate/mcu/mcutab/tabkesimpulan_templ.go
+++ b/views/corporate/mcu/mcutab/tabkesimpulan_templ.go
@@ -0,0 +1,116 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_mcudetail
+
+//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/models"
+)
+
+func MainKesimpulan(
+	tableID string,
+	tablecontent templ.Component,
+	tablecontentnonlab templ.Component,
+	tablecontentfisik templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container-fluid\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+			Name:  "tableID",
+			Type:  "hidden",
+			Value: tableID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"d-flex justify-content-center pt-10 pb-10\"><h2 class=\"title text-black\" style=\"margin-bottom: 0\">Kesimpulan</h2></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tablecontent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tablecontentnonlab.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tablecontentfisik.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func CssKesimpulan() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<style>\r\n    .dot-text {\r\n      position: relative;\r\n      padding-left: 1.5em; /* Menambahkan padding untuk memberi ruang pada titik */\r\n    }\r\n\r\n    .dot-text::before {\r\n      content: \"•\"; /* Menambahkan titik di depan teks */\r\n      position: absolute;\r\n      left: 1em; /* Atur posisi titik */\r\n      top: 0;\r\n      transform: translateX(-100%);\r\n    }\r\n\r\n    .information-title {\r\n      color: #0e1e28;\r\n      font-family: Poppins;\r\n      font-size: 20px;\r\n      font-style: normal;\r\n      font-weight: 600;\r\n      line-height: normal;\r\n    }  \r\n  </style>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JsKesimpulan() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/mcu/mcutab/tabkesimpulantable.templ
+++ b/views/corporate/mcu/mcutab/tabkesimpulantable.templ
@@ -0,0 +1,46 @@
+package corporate_mcudetail
+
+import (
+	"cpone/component/table"
+	"cpone/models"
+)
+
+templ CardTableKesimpulan(title string, data []models.ModelKesimpulanLab, tableID string) {
+	<div class="card card-custom gutter-b" style="border-radius: 20px">
+		<div style="padding-top: 12px">
+			<h3 class="card-label dot-text text-black">
+				{ title }
+			</h3>
+		</div>
+		<div class="card-body">
+			<div>
+				@TableKesimpulan(data, tableID)
+			</div>
+		</div>
+	</div>
+}
+
+templ TableKesimpulan(data []models.ModelKesimpulanLab,
+	tableID string) {
+	<div id={ tableID }>
+		@tablecomponent.TableV3([]string{"NO", "PEMERIKSAAN", "PERSENTASE"},
+			[]string{"5%", "70%", "25%"},
+			RowKesimpulan(data),
+		)
+	</div>
+}
+
+templ RowKesimpulan(data []models.ModelKesimpulanLab) {
+	if len(data) == 0 {
+		<tr>
+			<td colspan="3" class="text-center">Data Tidak Ditemukan</td>
+		</tr>
+	}
+	for _, v := range data {
+		<tr>
+			<td>{ v.Nomor }</td>
+			<td>{ v.Test }</td>
+			<td>{ v.Total }</td>
+		</tr>
+	}
+}
--- a/views/corporate/mcu/mcutab/tabkesimpulantable_templ.go
+++ b/views/corporate/mcu/mcutab/tabkesimpulantable_templ.go
@@ -0,0 +1,181 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_mcudetail
+
+//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/table"
+	"cpone/models"
+)
+
+func CardTableKesimpulan(title string, data []models.ModelKesimpulanLab, tableID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"card card-custom gutter-b\" style=\"border-radius: 20px\"><div style=\"padding-top: 12px\"><h3 class=\"card-label dot-text text-black\">")
+		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: `views\corporate\mcu\mcutab\tabkesimpulantable.templ`, Line: 12, Col: 11}
+		}
+		_, 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("</h3></div><div class=\"card-body\"><div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = TableKesimpulan(data, tableID).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func TableKesimpulan(data []models.ModelKesimpulanLab,
+	tableID 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(tableID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabkesimpulantable.templ`, Line: 25, Col: 18}
+		}
+		_, 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
+		}
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"NO", "PEMERIKSAAN", "PERSENTASE"},
+			[]string{"5%", "70%", "25%"},
+			RowKesimpulan(data),
+		).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func RowKesimpulan(data []models.ModelKesimpulanLab) 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)
+		if len(data) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"3\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		for _, v := range data {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.Nomor)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabkesimpulantable.templ`, Line: 41, Col: 16}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.Test)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabkesimpulantable.templ`, Line: 42, 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("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var8 string
+			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.Total)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabkesimpulantable.templ`, Line: 43, Col: 16}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/mcu/mcutab/tabledaftarpeserta.templ
+++ b/views/corporate/mcu/mcutab/tabledaftarpeserta.templ
@@ -0,0 +1,111 @@
+package corporate_mcudetail
+
+import "cpone/component/table"
+import "cpone/models"
+
+
+templ ContentLayout(
+    tablecomponent templ.Component,
+    paginationtable templ.Component,
+) {
+    <div id="contentlayout" hx-on::load={ AfterRequestContent() }>
+        @tablecomponent
+        @paginationtable
+    </div>
+}
+
+templ TableDaftarPeserta(
+    data []models.ModelMcuDaftarPeserta,
+    tableID string,
+    hxGet string,
+    hxTarget string,
+    hxInclude string,
+    hxSwap string,    
+) {
+    <div id={ tableID }>
+        @tablecomponent.TableV3([]string{"NOLAB", "NAMA", "JENIS KELAMIN", "UMUR", "KESIMPULAN", "AKSI"},
+            []string{"10%","20%","10%","10%","30%","20%"},
+            ItemRow(data,
+                hxGet,
+                hxTarget,
+                hxInclude,
+                hxSwap,
+            ))
+    </div>
+}
+
+templ ItemRow(
+    data []models.ModelMcuDaftarPeserta,
+    hxGet string,
+    hxTarget string,
+    hxInclude string,
+    hxSwap string,
+) {
+    if len(data) == 0 {
+        <tr>
+            <td colspan="6" class="text-center">Data Tidak Ditemukan</td>
+        </tr>
+    }
+    for _, v := range data {
+        <tr>
+            <td>{ v.T_OrderHeaderLabNumber }</td>
+            <td>{ v.M_PatientName }</td>
+            <td>{ v.M_PatientGender }</td>
+            <td>{ v.Age }</td>
+            <td>
+                // <div class="row align-items-center">
+                //     <div class="col-2 col-xl-2 col-lg-2 col-md-12 col-sm-12">
+                //         if v. == "Nanda Arisu" {
+                //             <span class="label label-xl label-rounded label-light-warning" style="width: 50px;">Unfit</span>
+                //         } else {
+                //             <span class="label label-xl label-rounded label-light-success" style="width: 50px;">Fit</span>
+                //         }
+                //     </div>
+                //     <div class="col-10 col-xl-10 col-lg-10 col-md-12 col-sm-12">
+                //         Lorem Ipsum In Dolor Ad Sasum Mara Naka Adhum In Horem
+                //     </div>
+                // </div>
+                -
+            </td>
+            <td>
+                @ItemAction(v.M_PatientID,
+                    hxGet,
+                    hxTarget,
+                    hxInclude,
+                    hxSwap,
+                )
+            </td>
+        </tr>
+    }
+}
+
+templ ItemAction(
+    id string,
+    hxGet string,
+    hxTarget string,
+    hxInclude string,
+    hxSwap string,    
+) {
+    <div class="row px-5 d-flex justify-content-around">
+        <a
+            type="button"
+            class="btn btn-icon"
+            hx-get={ hxGet +"?idx=" + id }
+            hx-target={ hxTarget }
+            hx-swap={ hxSwap }
+            hx-include={ hxInclude }            
+        >
+            <i class="flaticon-doc"></i>
+        </a>
+        <a
+            class="btn btn-icon"
+        >
+            <i class="flaticon2-edit"></i>
+        </a>
+        <a
+            class="btn btn-icon"
+        >
+            <i class="la la-shield icon-xl"></i>
+        </a>
+    </div>
+}
--- a/views/corporate/mcu/mcutab/tabledaftarpeserta_templ.go
+++ b/views/corporate/mcu/mcutab/tabledaftarpeserta_templ.go
@@ -0,0 +1,310 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_mcudetail
+
+//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/table"
+import "cpone/models"
+
+func ContentLayout(
+	tablecomponent templ.Component,
+	paginationtable 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.RenderScriptItems(ctx, templ_7745c5c3_Buffer, AfterRequestContent())
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"contentlayout\" hx-on::load=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 templ.ComponentScript = AfterRequestContent()
+		_, 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("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tablecomponent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = paginationtable.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func TableDaftarPeserta(
+	data []models.ModelMcuDaftarPeserta,
+	tableID string,
+	hxGet string,
+	hxTarget string,
+	hxInclude string,
+	hxSwap 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(tableID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 25, 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("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"NOLAB", "NAMA", "JENIS KELAMIN", "UMUR", "KESIMPULAN", "AKSI"},
+			[]string{"10%", "20%", "10%", "10%", "30%", "20%"},
+			ItemRow(data,
+				hxGet,
+				hxTarget,
+				hxInclude,
+				hxSwap,
+			)).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ItemRow(
+	data []models.ModelMcuDaftarPeserta,
+	hxGet string,
+	hxTarget string,
+	hxInclude string,
+	hxSwap 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)
+		if len(data) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"6\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		for _, v := range data {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_OrderHeaderLabNumber)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 51, Col: 42}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_PatientName)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 52, Col: 33}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var8 string
+			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_PatientGender)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 53, Col: 35}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var9 string
+			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(v.Age)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 54, Col: 23}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>-\r</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ItemAction(v.M_PatientID,
+				hxGet,
+				hxTarget,
+				hxInclude,
+				hxSwap,
+			).Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ItemAction(
+	id string,
+	hxGet string,
+	hxTarget string,
+	hxInclude string,
+	hxSwap 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_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=\"row px-5 d-flex justify-content-around\"><a type=\"button\" class=\"btn btn-icon\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet + "?idx=" + id)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 93, Col: 40}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 94, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-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: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 95, Col: 28}
+		}
+		_, 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-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		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: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 96, Col: 34}
+		}
+		_, 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("\"><i class=\"flaticon-doc\"></i></a> <a class=\"btn btn-icon\"><i class=\"flaticon2-edit\"></i></a> <a class=\"btn btn-icon\"><i class=\"la la-shield icon-xl\"></i></a></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/mcu/mcutabview.templ
+++ b/views/corporate/mcu/mcutabview.templ
@@ -0,0 +1,56 @@
+package corporate_mcudetail
+
+templ TabViewMcuDetail(
+	id string,
+) {
+	<div>
+		<ul class="nav nav-tabs nav-tabs-line">
+			<li class="nav-item">
+				<a class="nav-link active" 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" data-toggle="tab" href="#kt_tab_pane_6" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkesimpulan"} hx-target="#tabkesimpulan">Kesimpulan</a>
+			</li>
+			<li class="nav-item">
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_7" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabdaftarpeserta"} hx-target="#tabdaftarpeserta">Daftar Peserta</a>
+			</li>
+		</ul>
+	</div>
+	<div class="tab-content mt-5" id="myTabContent">
+		<div class="tab-pane fade show active" id="kt_tab_pane_1" role="tabpanel" aria-labelledby="kt_tab_pane_2" style="height: 800px;">
+			<object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_001.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_2" role="tabpanel" aria-labelledby="kt_tab_pane_2" style="height: 800px;">
+			<object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_002.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_3" role="tabpanel" aria-labelledby="kt_tab_pane_3" style="height: 800px;">
+			<object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_003.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_4" role="tabpanel" aria-labelledby="kt_tab_pane_4" style="height: 800px;">
+			<object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_004.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_5" role="tabpanel" aria-labelledby="kt_tab_pane_5" style="height: 800px;">
+			<object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_005.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_6" role="tabpanel" aria-labelledby="kt_tab_pane_6">
+			<div id="tabkesimpulan">
+			</div>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_7" role="tabpanel" aria-labelledby="kt_tab_pane_7">
+			<div id="tabdaftarpeserta">	
+			</div>
+		</div>
+	</div>
+}
--- a/views/corporate/mcu/mcutabview_templ.go
+++ b/views/corporate/mcu/mcutabview_templ.go
@@ -0,0 +1,128 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_mcudetail
+
+//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 TabViewMcuDetail(
+	id string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_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><ul class=\"nav nav-tabs nav-tabs-line\"><li class=\"nav-item\"><a class=\"nav-link active\" 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\" data-toggle=\"tab\" href=\"#kt_tab_pane_6\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + id + "/tabkesimpulan")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 24, Col: 124}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkesimpulan\">Kesimpulan</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_7\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + id + "/tabdaftarpeserta")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 27, Col: 127}
+		}
+		_, 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-target=\"#tabdaftarpeserta\">Daftar Peserta</a></li></ul></div><div class=\"tab-content mt-5\" id=\"myTabContent\"><div class=\"tab-pane fade show active\" id=\"kt_tab_pane_1\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_2\" style=\"height: 800px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_001.rptdesign&__format=pdf&PID=" + id + "&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 33, Col: 167}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_2\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_2\" style=\"height: 800px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_002.rptdesign&__format=pdf&PID=" + id + "&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 36, Col: 167}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_3\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_3\" style=\"height: 800px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_003.rptdesign&__format=pdf&PID=" + id + "&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 39, Col: 167}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_4\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_4\" style=\"height: 800px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_004.rptdesign&__format=pdf&PID=" + id + "&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 42, Col: 167}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_5\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_5\" style=\"height: 800px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_005.rptdesign&__format=pdf&PID=" + id + "&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 45, Col: 167}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_6\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_6\"><div id=\"tabkesimpulan\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_7\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_7\"><div id=\"tabdaftarpeserta\"></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/views/corporate/patient/listingpatient.templ
+++ b/views/corporate/patient/listingpatient.templ
@@ -0,0 +1,88 @@
+package corporate_patient
+
+import "cpone/models"
+import "strconv"
+
+templ ListingData(
+    data []models.DashboardPatient,
+    listID string,
+    hxGet string,
+    hxTarget string,
+    hxInclude string,
+    hxSwap string,
+) {
+    <div id={listID} class="align-items-center pt-8 flex-column" hx-swap-oob="true">
+        <div class="bg-field rounded">
+            <div class="p-8">
+                for i, d := range data {
+                    if i == (len(data) - 1) {
+                        <div id={ strconv.Itoa(d.T_OrderHeaderID) } class="card shadow p-8">
+                            @ItemCard(d,
+                                hxGet,
+                                hxTarget,
+                                hxInclude,
+                                hxSwap,
+                            )
+                        </div>
+                    } else {
+                        <div id={ strconv.Itoa(d.T_OrderHeaderID) } class="card shadow p-8 mb-8">
+                            @ItemCard(d,
+                                hxGet,
+                                hxTarget,
+                                hxInclude,
+                                hxSwap,
+                            )
+                        </div>                    
+                    }
+                }
+            </div>
+        </div>
+    </div>
+}
+
+templ ItemCard(
+    data models.DashboardPatient,
+    hxGet string,
+    hxTarget string,
+    hxInclude string,
+    hxSwap string,
+) {
+    <div class="row d-flex align-items-center">
+        <div class="col-8">
+            <h4 class="text-black">{ data.T_OrderHeaderLabNumber }</h4>
+        </div>
+        <div class="col-3" style="text-align: right;">
+            <h4 class="text-black">{ data.T_OrderHeaderDate }</h4>
+        </div>
+        <div class="col-1">
+            <a 
+                type="button"
+                class="btncetak"
+                hx-get={ hxGet +"?id=" + strconv.Itoa(data.T_OrderHeaderID) }
+                hx-target={ hxTarget }
+                hx-swap={ hxSwap }
+                hx-include={ hxInclude }			    
+            >
+                <i class="flaticon-doc"></i>
+            </a>
+        </div>
+    </div>
+}
+
+script HandleBeforeRequestRow(id string) {
+	var cusid_ele = document.getElementsByClassName('btncetak');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.add('disabled');
+	}
+	console.log(id)
+}
+
+script HandleAfterRequestRow(id string) {
+	var cusid_ele = document.getElementsByClassName('btncetak');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.remove('disabled');
+	}
+	console.log(id)    
+}
--- a/views/corporate/patient/listingpatient_templ.go
+++ b/views/corporate/patient/listingpatient_templ.go
@@ -0,0 +1,265 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_patient
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/models"
+import "strconv"
+
+func ListingData(
+	data []models.DashboardPatient,
+	listID string,
+	hxGet string,
+	hxTarget string,
+	hxInclude string,
+	hxSwap string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(listID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 14, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"align-items-center pt-8 flex-column\" hx-swap-oob=\"true\"><div class=\"bg-field rounded\"><div class=\"p-8\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i, d := range data {
+			if i == (len(data) - 1) {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var3 string
+				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(d.T_OrderHeaderID))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 19, Col: 65}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = ItemCard(d,
+					hxGet,
+					hxTarget,
+					hxInclude,
+					hxSwap,
+				).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var4 string
+				templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(d.T_OrderHeaderID))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 28, Col: 65}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8 mb-8\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				templ_7745c5c3_Err = ItemCard(d,
+					hxGet,
+					hxTarget,
+					hxInclude,
+					hxSwap,
+				).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ItemCard(
+	data models.DashboardPatient,
+	hxGet string,
+	hxTarget string,
+	hxInclude string,
+	hxSwap 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 class=\"row d-flex align-items-center\"><div class=\"col-8\"><h4 class=\"text-black\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(data.T_OrderHeaderLabNumber)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 52, Col: 64}
+		}
+		_, 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("</h4></div><div class=\"col-3\" style=\"text-align: right;\"><h4 class=\"text-black\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(data.T_OrderHeaderDate)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 55, Col: 59}
+		}
+		_, 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("</h4></div><div class=\"col-1\"><a type=\"button\" class=\"btncetak\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet + "?id=" + strconv.Itoa(data.T_OrderHeaderID))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 61, Col: 75}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 62, Col: 36}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 63, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\listingpatient.templ`, Line: 64, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><i class=\"flaticon-doc\"></i></a></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 HandleBeforeRequestRow(id string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleBeforeRequestRow_24b2`,
+		Function: `function __templ_HandleBeforeRequestRow_24b2(id){var cusid_ele = document.getElementsByClassName('btncetak');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.add('disabled');
+	}
+	console.log(id)
+}`,
+		Call:       templ.SafeScript(`__templ_HandleBeforeRequestRow_24b2`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleBeforeRequestRow_24b2`, id),
+	}
+}
+
+func HandleAfterRequestRow(id string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_HandleAfterRequestRow_f077`,
+		Function: `function __templ_HandleAfterRequestRow_f077(id){var cusid_ele = document.getElementsByClassName('btncetak');
+	for (var i = 0; i < cusid_ele.length; ++i) {
+		var item = cusid_ele[i];  
+		item.classList.remove('disabled');
+	}
+	console.log(id)    
+}`,
+		Call:       templ.SafeScript(`__templ_HandleAfterRequestRow_f077`, id),
+		CallInline: templ.SafeScriptInline(`__templ_HandleAfterRequestRow_f077`, id),
+	}
+}
--- a/views/corporate/patient/patient.templ
+++ b/views/corporate/patient/patient.templ
@@ -1,40 +1,122 @@
-package corporate_company
+package corporate_patient

 import (
-	"cpone/component/under_development"
 	"cpone/layout"
+	"cpone/component/customtextfield"
+	"cpone/models"
 )

-templ Content() {
-	<div class="bg-white h-100">
-		@under_development.UnderDevelopment()
-	</div>
+
+templ DashboardPat(
+    listID string,
+    paginationID string,
+    dialogID string,
+    dialogBodyID string,
+    breadcrumb templ.Component,
+    listingcomponent templ.Component,
+    paginationcomponent templ.Component,
+    modaldialog templ.Component,
+) {
+    <div class="container-fluid">
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "listID",
+            Name: "listID",
+            Type: "hidden",
+            Value: listID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+            Name: "paginationID",
+            Type: "hidden",
+            Value: paginationID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogID",
+            Name: "dialogID",
+            Type: "hidden",
+            Value: dialogID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogBodyID",
+            Name: "dialogBodyID",
+            Type: "hidden",
+            Value: dialogBodyID})
+        <div class="row align-item-center mb-10">
+            <div class="col-md-10 col-sm-12 p-0">
+                @breadcrumb
+            </div>
+        </div>
+        <div id="loading-parent" class="rounded">
+            @listingcomponent
+            @paginationcomponent
+            @modaldialog
+            <div id="loading-child" class="rounded bg-transparent">
+                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
+                    <span class="sr-only">Loading...</span>
+                </div>
+            </div>
+        </div>
+        <div id="loadingcontent"></div>
+    </div>
 }

-templ Css() {
-	<style>
-		 .underdev {
-        font-family: "Public Sans";
-        font-size: 64px;
-        font-style: normal;
-        font-weight: 700;
-        line-height: normal;
-      }
-      .underdevsub {
-        font-family: "Public Sans";
-        font-size: 26px;
-        font-style: normal;
-        font-weight: 400;
-        line-height: normal;
-      }
-	</style>
+templ CSSDashboardPat() {
+    <link
+        rel="stylesheet"
+        href="assets/css/googlefont/poppins.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/publicsans.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/roboto.css"
+    />
+    <style>
+        body {
+            background-color: white;
+        }
+        #div-chart {
+            margin: 40px 10vw 40px 10vw;
+        }
+        .title {
+            font-size: 20px;
+            font-weight: bold;
+        }
+        #title {
+            font-weight: 600;
+        }
+    </style>
 }

-templ Js() {
+script BeforeRequestContent() {
+    const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.add("overlay");
+    loadingParent.classList.add("overlay-block");
+    loadingChild.classList.add("overlay-layer");
+    loadingSpinner.classList.remove("d-none");
 }

-templ Show() {
-	@layout.PlaygroundLayout("Corp Patient", Css(), Js()) {
-		@Content()
-	}
+script AfterRequestContent() {
+    const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.remove("overlay");
+    loadingParent.classList.remove("overlay-block");
+    loadingChild.classList.remove("overlay-layer");
+    loadingSpinner.classList.add("d-none");
+}
+
+templ JSDashboardPat() {    
+}
+
+templ ShowDashboardPat(
+    title string,
+    cmp templ.Component,
+    css templ.Component,
+    js templ.Component,
+    navbaruser templ.Component,
+    userprofile templ.Component,
+) {
+    @layout.DashboardLayout(title, css, js, navbaruser, userprofile) {
+        @cmp
+    }
 }
--- a/views/corporate/patient/patient_templ.go
+++ b/views/corporate/patient/patient_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

 // templ: version: v0.2.663
-package corporate_company
+package corporate_patient

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

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

 import (
-	"cpone/component/under_development"
+	"cpone/component/customtextfield"
 	"cpone/layout"
+	"cpone/models"
 )

-func Content() templ.Component {
+func DashboardPat(
+	listID string,
+	paginationID string,
+	dialogID string,
+	dialogBodyID string,
+	breadcrumb templ.Component,
+	listingcomponent templ.Component,
+	paginationcomponent templ.Component,
+	modaldialog 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 {
@@ -28,15 +38,63 @@ func Content() templ.Component {
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"bg-white h-100\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container-fluid\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = under_development.UnderDevelopment().Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "listID",
+			Name:  "listID",
+			Type:  "hidden",
+			Value: listID}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+			Name:  "paginationID",
+			Type:  "hidden",
+			Value: paginationID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogID",
+			Name:  "dialogID",
+			Type:  "hidden",
+			Value: dialogID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogBodyID",
+			Name:  "dialogBodyID",
+			Type:  "hidden",
+			Value: dialogBodyID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row align-item-center mb-10\"><div class=\"col-md-10 col-sm-12 p-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = breadcrumb.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div id=\"loading-parent\" class=\"rounded\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = listingcomponent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = paginationcomponent.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modaldialog.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\"rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem;\" role=\"status\"><span class=\"sr-only\">Loading...</span></div></div></div><div id=\"loadingcontent\"></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -47,7 +105,7 @@ func Content() templ.Component {
 	})
 }

-func Css() templ.Component {
+func CSSDashboardPat() 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 {
@@ -60,7 +118,7 @@ func Css() templ.Component {
 			templ_7745c5c3_Var2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<style>\r\n\t\t .underdev {\r\n        font-family: \"Public Sans\";\r\n        font-size: 64px;\r\n        font-style: normal;\r\n        font-weight: 700;\r\n        line-height: normal;\r\n      }\r\n      .underdevsub {\r\n        font-family: \"Public Sans\";\r\n        font-size: 26px;\r\n        font-style: normal;\r\n        font-weight: 400;\r\n        line-height: normal;\r\n      }\r\n\t</style>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n        body {\r\n            background-color: white;\r\n        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -71,7 +129,41 @@ func Css() templ.Component {
 	})
 }

-func Js() templ.Component {
+func BeforeRequestContent() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_BeforeRequestContent_5717`,
+		Function: `function __templ_BeforeRequestContent_5717(){const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.add("overlay");
+    loadingParent.classList.add("overlay-block");
+    loadingChild.classList.add("overlay-layer");
+    loadingSpinner.classList.remove("d-none");
+}`,
+		Call:       templ.SafeScript(`__templ_BeforeRequestContent_5717`),
+		CallInline: templ.SafeScriptInline(`__templ_BeforeRequestContent_5717`),
+	}
+}
+
+func AfterRequestContent() templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_AfterRequestContent_077f`,
+		Function: `function __templ_AfterRequestContent_077f(){const loadingParent = document.getElementById("loading-parent");
+    const loadingChild = document.getElementById("loading-child");
+    const loadingSpinner = document.getElementById("loading-spinner");
+
+    loadingParent.classList.remove("overlay");
+    loadingParent.classList.remove("overlay-block");
+    loadingChild.classList.remove("overlay-layer");
+    loadingSpinner.classList.add("d-none");
+}`,
+		Call:       templ.SafeScript(`__templ_AfterRequestContent_077f`),
+		CallInline: templ.SafeScriptInline(`__templ_AfterRequestContent_077f`),
+	}
+}
+
+func JSDashboardPat() 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 {
@@ -91,7 +183,14 @@ func Js() templ.Component {
 	})
 }

-func Show() templ.Component {
+func ShowDashboardPat(
+	title string,
+	cmp templ.Component,
+	css templ.Component,
+	js templ.Component,
+	navbaruser templ.Component,
+	userprofile templ.Component,
+) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -110,7 +209,7 @@ func Show() templ.Component {
 				templ_7745c5c3_Buffer = templ.GetBuffer()
 				defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 			}
-			templ_7745c5c3_Err = Content().Render(ctx, templ_7745c5c3_Buffer)
+			templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -119,7 +218,7 @@ func Show() templ.Component {
 			}
 			return templ_7745c5c3_Err
 		})
-		templ_7745c5c3_Err = layout.PlaygroundLayout("Corp Patient", Css(), Js()).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = layout.DashboardLayout(title, css, js, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/corporate/patient/patientmodal.templ
+++ b/views/corporate/patient/patientmodal.templ
@@ -0,0 +1,86 @@
+package corporate_patient
+
+import "cpone/component/modal"
+
+templ DialogReport(
+    IDComponent string,
+    postLink string,
+    hxTarget string,
+    hxSwap string,
+    hxInclude string,
+    modalID string,
+    modalTitle string,
+    modalBody templ.Component,
+    modalClose templ.Component,
+) {
+    <div class="">
+        <div
+            id={ IDComponent }
+            hx-include={ hxInclude }
+        >
+            @modalcomponent.ModalViewXL(modalID,
+                modalTitle,
+                modalBody,
+                modalClose,
+            )
+        </div>        
+    </div>
+}
+
+templ ModalBody(
+    IDComponent string,
+    hxOnLoad templ.ComponentScript,
+) {
+    <div id={ IDComponent } hx-on::load={ hxOnLoad }>
+        <div>
+            <ul class="nav nav-tabs nav-tabs-line">
+                <li class="nav-item">
+                    <a class="nav-link active" data-toggle="tab" href="#kt_tab_pat_1">Hasil Lab</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#kt_tab_pat_2">Hasil Non Lab</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#kt_tab_pat_3">Hasil Fisik</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#kt_tab_pat_4">Resume Individu</a>
+                </li>
+            </ul>
+        </div>
+        <div class="tab-content mt-5" id="patTabContent">
+            <div class="tab-pane fade show active" id="kt_tab_pat_1" role="tabpanel" aria-labelledby="kt_tab_pat_1" style="height: 700px;">
+                <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_history.rptdesign&__format=pdf&PID=5&PPatientID=112&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+            </div>
+            <div class="tab-pane fade" id="kt_tab_pat_2" role="tabpanel" aria-labelledby="kt_tab_pat_2" style="height: 700px;">
+                <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_pajanan.rptdesign&__format=pdf&PID=5&PType=fisik&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+            </div>
+            <div class="tab-pane fade" id="kt_tab_pat_3" role="tabpanel" aria-labelledby="kt_tab_pat_3" style="height: 700px;">
+                <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_fisik.rptdesign&__format=pdf&PID=5&PType=fisik&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+            </div>
+            <div class="tab-pane fade" id="kt_tab_pat_4" role="tabpanel" aria-labelledby="kt_tab_pat_4" style="height: 700px;">
+                <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_resume.rptdesign&__format=pdf&PID=1&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
+            </div>
+        </div>
+    </div>
+}
+
+script JsHideModal(modalID string) {
+    $(modalID).modal('hide');
+}
+
+script JsShowModal(modalID string) {
+    $(modalID).modal('show');
+}
+
+templ ModalClose(LinkClose string, hxTarget string, hxSwap string, modalID string) {
+    <button 
+        type="button"
+        hx-on::after-request={ JsHideModal(modalID) }
+        class="close"
+        data-dismiss="modal"
+        aria-label="Close"
+    >
+        <i aria-hidden="true" class="ki ki-close"></i>
+    </button>
+}
--- a/views/corporate/patient/patientmodal_templ.go
+++ b/views/corporate/patient/patientmodal_templ.go
@@ -0,0 +1,247 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package corporate_patient
+
+//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/modal"
+
+func DialogReport(
+	IDComponent string,
+	postLink string,
+	hxTarget string,
+	hxSwap string,
+	hxInclude string,
+	modalID string,
+	modalTitle string,
+	modalBody templ.Component,
+	modalClose 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=\"\"><div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(IDComponent)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\patientmodal.templ`, Line: 18, Col: 28}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\patientmodal.templ`, Line: 19, Col: 34}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalcomponent.ModalViewXL(modalID,
+			modalTitle,
+			modalBody,
+			modalClose,
+		).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ModalBody(
+	IDComponent string,
+	hxOnLoad templ.ComponentScript,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(IDComponent)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\patientmodal.templ`, Line: 34, Col: 25}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-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("\"><div><ul class=\"nav nav-tabs nav-tabs-line\"><li class=\"nav-item\"><a class=\"nav-link active\" data-toggle=\"tab\" href=\"#kt_tab_pat_1\">Hasil Lab</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pat_2\">Hasil Non Lab</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pat_3\">Hasil Fisik</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pat_4\">Resume Individu</a></li></ul></div><div class=\"tab-content mt-5\" id=\"patTabContent\"><div class=\"tab-pane fade show active\" id=\"kt_tab_pat_1\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pat_1\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 string
+		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_history.rptdesign&__format=pdf&PID=5&PPatientID=112&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\patientmodal.templ`, Line: 53, Col: 188}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pat_2\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pat_2\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_pajanan.rptdesign&__format=pdf&PID=5&PType=fisik&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\patientmodal.templ`, Line: 56, Col: 181}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pat_3\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pat_3\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_fisik.rptdesign&__format=pdf&PID=5&PType=fisik&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\patientmodal.templ`, Line: 59, Col: 179}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pat_4\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pat_4\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_resume.rptdesign&__format=pdf&PID=1&username=adhi&tm=1717726294764")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\patient\patientmodal.templ`, Line: 62, Col: 172}
+		}
+		_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></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 JsHideModal(modalID string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_JsHideModal_5a6b`,
+		Function: `function __templ_JsHideModal_5a6b(modalID){$(modalID).modal('hide');
+}`,
+		Call:       templ.SafeScript(`__templ_JsHideModal_5a6b`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_JsHideModal_5a6b`, modalID),
+	}
+}
+
+func JsShowModal(modalID string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_JsShowModal_3767`,
+		Function: `function __templ_JsShowModal_3767(modalID){$(modalID).modal('show');
+}`,
+		Call:       templ.SafeScript(`__templ_JsShowModal_3767`, modalID),
+		CallInline: templ.SafeScriptInline(`__templ_JsShowModal_3767`, modalID),
+	}
+}
+
+func ModalClose(LinkClose string, hxTarget string, hxSwap string, modalID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var11 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var11 == nil {
+			templ_7745c5c3_Var11 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JsHideModal(modalID))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button type=\"button\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 templ.ComponentScript = JsHideModal(modalID)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var12.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"close\" 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
+	})
+}
--- a/views/dev/employeeanalytic/employeeanalytic.templ
+++ b/views/dev/employeeanalytic/employeeanalytic.templ
@@ -1,157 +1,76 @@
-package dev_mdnonlabtemplateview
+package dev_employeeanalytic

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

-templ MdNonlabTemplateScreen(
-    tableID string,
+templ EmployeeAnalyticScreen(
+    listID string,
    paginationID string,
-    searchID string,
-    dialogAddID string,
-    dialogAddBodyID string,
-    dialogEditID string,
-    dialogEditBodyID string,
-    dialogDeleteID string,
-    dialogDeleteBodyID string,
-    tableDetailID string,
-    detailEditID string,
-    detailDeleteID string,
    breadcrumb templ.Component,
    filtercomponent templ.Component,
-    tablecontent templ.Component,
-    paginationtable templ.Component,
-    modalAddForm templ.Component,
-    // modalEditForm templ.Component,
-    modalDeleteForm templ.Component,
+    listingcomponent templ.Component,
+    paginationcomponent templ.Component,
 ) {
-    <div class="container-fluid">
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
-			Name:  "tableID",
-			Type:  "hidden",
-			Value: tableID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
-			Name:  "paginationID",
-			Type:  "hidden",
-			Value: paginationID})
-        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "searchID",
-            Name: "searchID",
+    <div id="dashboardpicid" class="container-fluid">
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "listID",
+            Name: "listID",
            Type: "hidden",
-            Value: searchID})        
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddID",
-			Name:  "dialogAddID",
-			Type:  "hidden",
-			Value: dialogAddID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddBodyID",
-			Name:  "dialogAddBodyID",
-			Type:  "hidden",
-			Value: dialogAddBodyID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID",
-			Name:  "dialogEditID",
-			Type:  "hidden",
-			Value: dialogEditID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID",
-			Name:  "dialogEditBodyID",
-			Type:  "hidden",
-			Value: dialogEditBodyID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID",
-			Name:  "dialogDeleteID",
-			Type:  "hidden",
-			Value: dialogDeleteID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteBodyID",
-			Name:  "dialogDeleteBodyID",
-			Type:  "hidden",
-			Value: dialogDeleteBodyID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableDetailID",
-			Name:  "tableDetailID",
-			Type:  "hidden",
-			Value: tableDetailID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "detailEditID",
-			Name:  "detailEditID",
-			Type:  "hidden",
-			Value: detailEditID})
-		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "detailDeleteID",
-			Name:  "detailDeleteID",
-			Type:  "hidden",
-			Value: detailDeleteID})
-        <div class="row align-items-center mb-10">
+            Value: listID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "paginationID",
+            Name: "paginationID",
+            Type: "hidden",
+            Value: paginationID})
+        <div class="row align-item-center mb-10">
            <div class="col-md-10 col-sm-12 p-0">
                @breadcrumb
            </div>
-            <div class="col-md-2 d-none d-lg-block d-xl-block d-md-block d-sm-none">
-                <div class="d-flex justify-content-end">
-                    <button 
-                        type="button"
-                        class="btn btn-primary"
-                        data-toggle="modal"
-                        data-target={ "#" + dialogAddID }
-                    >
-                        Add New
-                    </button>
-                </div>
-            </div>
-            <div class="col-md-2 d-block d-lg-none d-xl-none d-md-none d-sm-block justify-content-center px-5">
-                <button 
-                    type="button"
-                    class="btn btn-primary btn-block"
-                    data-toggle="modal"
-                    data-target={ "#" + dialogAddID }
-                >
-                    Add New
-                </button>
-            </div>
        </div>
-        <div id="loading-parent" class=" rounded">
-            @filtercomponent
-            @tablecontent
-            @paginationtable
-            <div id="loading-child" class=" rounded bg-transparent">
-                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem" role="status">
+        @filtercomponent
+        <div id="loading-parent" class="rounded">
+            @listingcomponent
+            @paginationcomponent
+            <div id="loading-child" class="rounded bg-transparent">
+                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
                    <span class="sr-only">Loading...</span>
-                </div>                
+                </div>
            </div>
        </div>
        <div id="loadingcontent"></div>
-        @modalAddForm
-        // @modalEditForm
-        @modalDeleteForm
    </div>
 }

-templ CSSmdnontemplate() {
-	<link
-		rel="stylesheet"
-		href="assets/css/googlefont/poppins.css"
-	/>
-	<link
-		rel="stylesheet"
-		href="assets/css/googlefont/publicsans.css"
-	/>
-	<link
-		rel="stylesheet"
-		href="assets/css/googlefont/roboto.css"
-	/>
-	<style>
+templ CSSEmployeeAnalytic() {
+    <link
+        rel="stylesheet"
+        href="assets/css/googlefont/poppins.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/publicsans.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/roboto.css"
+    />
+    <style>
        body {
-        background-color: white;
-        /* padding-right: 100px;
-                padding-left: 100px; */
+            background-color: white;
        }
        #div-chart {
-            /* overflow-x: scroll; */
            margin: 40px 10vw 40px 10vw;
        }
        .title {
-            font-size:20px;
+            font-size: 20px;
            font-weight: bold;
        }
        #title {
            font-weight: 600;
        }
-    </style>
+    </style>    
 }

-templ JSmdnontemplate() {
+templ JSEmployeeAnalytic() {
 	<script>
 		document.addEventListener('htmx:afterSwap', function(event) {
 			// Reinitialize selectpicker after HTMX content swap
@@ -223,7 +142,7 @@ templ JSmdnontemplate() {
            console.log(event.detail.elt)
            console.log("Target ID: "+event.detail.target)
        });
-    </script>    
+    </script>
 }

 script BeforeRequestContent() {
@@ -245,19 +164,18 @@ script AfterRequestContent() {
    loadingParent.classList.remove("overlay");
    loadingParent.classList.remove("overlay-block");
    loadingChild.classList.remove("overlay-layer");
-    loadingSpinner.classList.add("d-none");
+    loadingSpinner.classList.add("d-none");    
 }

-templ ShowMdNonlabTemplateScreen(
-    title string, 
-    cmp templ.Component, 
+templ ShowEmployeeAnalytic(
+    title string,
+    cmp templ.Component,
    css templ.Component,
    js templ.Component,
-	navbarmenu templ.Component,
-	navbaruser templ.Component,
-	userprofile templ.Component,
+    navbaruser templ.Component,
+    userprofile templ.Component,
 ) {
-    @layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile) {
+    @layout.DashboardLayout(title, css, js, navbaruser, userprofile) {
        @cmp
    }
 }
--- a/views/dev/employeeanalytic/employeeanalytic_templ.go
+++ b/views/dev/employeeanalytic/employeeanalytic_templ.go
@@ -1,7 +1,7 @@
 // Code generated by templ - DO NOT EDIT.

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

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

@@ -11,29 +11,16 @@ import "io"
 import "bytes"

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

-func MdNonlabTemplateScreen(
-	tableID string,
+func EmployeeAnalyticScreen(
+	listID string,
 	paginationID string,
-	searchID string,
-	dialogAddID string,
-	dialogAddBodyID string,
-	dialogEditID string,
-	dialogEditBodyID string,
-	dialogDeleteID string,
-	dialogDeleteBodyID string,
-	tableDetailID string,
-	detailEditID string,
-	detailDeleteID string,
 	breadcrumb templ.Component,
 	filtercomponent templ.Component,
-	tablecontent templ.Component,
-	paginationtable templ.Component,
-	modalAddForm templ.Component,
-	// modalEditForm templ.Component,
-	modalDeleteForm templ.Component,
+	listingcomponent templ.Component,
+	paginationcomponent templ.Component,
 ) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
@@ -47,14 +34,14 @@ func MdNonlabTemplateScreen(
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container-fluid\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"dashboardpicid\" class=\"container-fluid\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
-			Name:  "tableID",
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "listID",
+			Name:  "listID",
 			Type:  "hidden",
-			Value: tableID}).Render(ctx, templ_7745c5c3_Buffer)
+			Value: listID}).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -65,77 +52,7 @@ func MdNonlabTemplateScreen(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "searchID",
-			Name:  "searchID",
-			Type:  "hidden",
-			Value: searchID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddID",
-			Name:  "dialogAddID",
-			Type:  "hidden",
-			Value: dialogAddID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogAddBodyID",
-			Name:  "dialogAddBodyID",
-			Type:  "hidden",
-			Value: dialogAddBodyID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditID",
-			Name:  "dialogEditID",
-			Type:  "hidden",
-			Value: dialogEditID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogEditBodyID",
-			Name:  "dialogEditBodyID",
-			Type:  "hidden",
-			Value: dialogEditBodyID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteID",
-			Name:  "dialogDeleteID",
-			Type:  "hidden",
-			Value: dialogDeleteID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDeleteBodyID",
-			Name:  "dialogDeleteBodyID",
-			Type:  "hidden",
-			Value: dialogDeleteBodyID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableDetailID",
-			Name:  "tableDetailID",
-			Type:  "hidden",
-			Value: tableDetailID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "detailEditID",
-			Name:  "detailEditID",
-			Type:  "hidden",
-			Value: detailEditID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "detailDeleteID",
-			Name:  "detailDeleteID",
-			Type:  "hidden",
-			Value: detailDeleteID}).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row align-items-center mb-10\"><div class=\"col-md-10 col-sm-12 p-0\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row align-item-center mb-10\"><div class=\"col-md-10 col-sm-12 p-0\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -143,33 +60,7 @@ func MdNonlabTemplateScreen(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"col-md-2 d-none d-lg-block d-xl-block d-md-block d-sm-none\"><div class=\"d-flex justify-content-end\"><button type=\"button\" class=\"btn btn-primary\" data-toggle=\"modal\" data-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogAddID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplate.templ`, Line: 87, Col: 55}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Add New\r</button></div></div><div class=\"col-md-2 d-block d-lg-none d-xl-none d-md-none d-sm-block justify-content-center px-5\"><button type=\"button\" class=\"btn btn-primary btn-block\" data-toggle=\"modal\" data-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogAddID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtemplate.templ`, Line: 98, Col: 51}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Add New\r</button></div></div><div id=\"loading-parent\" class=\" rounded\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -177,27 +68,19 @@ func MdNonlabTemplateScreen(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = tablecontent.Render(ctx, templ_7745c5c3_Buffer)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-parent\" class=\"rounded\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = paginationtable.Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = listingcomponent.Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\" rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem\" role=\"status\"><span class=\"sr-only\">Loading...</span></div></div></div><div id=\"loadingcontent\"></div>")
+		templ_7745c5c3_Err = paginationcomponent.Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = modalAddForm.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = modalDeleteForm.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\"rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem;\" role=\"status\"><span class=\"sr-only\">Loading...</span></div></div></div><div id=\"loadingcontent\"></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -208,7 +91,7 @@ func MdNonlabTemplateScreen(
 	})
 }

-func CSSmdnontemplate() templ.Component {
+func CSSEmployeeAnalytic() templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -216,12 +99,12 @@ func CSSmdnontemplate() 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_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n        body {\r\n        background-color: white;\r\n        /* padding-right: 100px;\r\n                padding-left: 100px; */\r\n        }\r\n        #div-chart {\r\n            /* overflow-x: scroll; */\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size:20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n        body {\r\n            background-color: white;\r\n        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -232,7 +115,7 @@ func CSSmdnontemplate() templ.Component {
 	})
 }

-func JSmdnontemplate() templ.Component {
+func JSEmployeeAnalytic() templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -240,9 +123,9 @@ func JSmdnontemplate() templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var5 == nil {
-			templ_7745c5c3_Var5 = templ.NopComponent
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script>\r\n\t\tdocument.addEventListener('htmx:afterSwap', function(event) {\r\n\t\t\t// Reinitialize selectpicker after HTMX content swap\r\n\t\t\t$('.selectpicker').selectpicker('refresh');\r\n\t\t});\r\n    \r\n        document.addEventListener('htmx:beforeRequest', function(event) {\r\n            console.log(\"Before Request\")\r\n\t\t\tconsole.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n            \r\n        });\r\n\r\n        document.addEventListener('htmx:afterRequest', function(event) {\r\n            console.log(\"After Request\")\r\n            console.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n        });\r\n        document.addEventListener('htmx:historyCacheError', function(event) {\r\n            console.log(\"Error History Cache Error\")\r\n            console.log(event.detail.cause)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:historyCacheMissError', function(event) {\r\n            console.log(\"Error History Cache Miss Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.path)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:oobErrorNoTarget', function(event) {\r\n            console.log(\"Error OOB No Target\")\r\n            console.log(event.detail.content)\r\n        });\r\n        document.addEventListener('htmx:onLoadError', function(event) {\r\n            console.log(\"Error On Load\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.target)\r\n            console.log(event.detail.exception)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:responseError', function(event) {\r\n            console.log(\"Error Response\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sendError', function(event) {\r\n            console.log(\"Error Send Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sseError', function(event) {\r\n            console.log(\"Error Sse \")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.error)\r\n            console.log(event.detail.source)\r\n        });\r\n\t\tdocument.addEventListener('htmx:swapError', function(event) {\r\n            console.log(\"Error Swap Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target Swap: \"+event.detail.target)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n\t\tdocument.addEventListener('htmx:targetError', function(event) {\r\n            console.log(\"Error target\")\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target ID: \"+event.detail.target)\r\n        });\r\n    </script>")
@@ -275,27 +158,26 @@ func BeforeRequestContent() templ.ComponentScript {

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

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

-func ShowMdNonlabTemplateScreen(
+func ShowEmployeeAnalytic(
 	title string,
 	cmp templ.Component,
 	css templ.Component,
 	js templ.Component,
-	navbarmenu templ.Component,
 	navbaruser templ.Component,
 	userprofile templ.Component,
 ) templ.Component {
@@ -306,12 +188,12 @@ func ShowMdNonlabTemplateScreen(
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var6 == nil {
-			templ_7745c5c3_Var6 = templ.NopComponent
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Var7 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Var5 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 			if !templ_7745c5c3_IsBuffer {
 				templ_7745c5c3_Buffer = templ.GetBuffer()
@@ -326,7 +208,7 @@ func ShowMdNonlabTemplateScreen(
 			}
 			return templ_7745c5c3_Err
 		})
-		templ_7745c5c3_Err = layout.CorporateLayout(title, css, js, navbarmenu, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var7), templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = layout.DashboardLayout(title, css, js, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/dev/employeeanalytic/filteremployeeanalytic.templ
+++ b/views/dev/employeeanalytic/filteremployeeanalytic.templ
@@ -0,0 +1,68 @@
+package dev_employeeanalytic
+
+templ FilterListing(
+    hxGet string,
+    hxTrigger string,
+    hxInclude string,
+    hxSwap string,
+    hxTarget string,
+    hxBeforeRequest templ.ComponentScript,
+    hxAfterRequest templ.ComponentScript,
+) {
+    <div class="row pt-8 align-items-center">
+        <div class="col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2">
+            <label class="text-black font-weight-bolder">Stard Date:</label>
+        </div>
+        <div class="col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2">
+            <input 
+                id="startdateID" 
+                name="startdate"
+                class="form-control form-control-lg bg-field border-0 rounded-lg" 
+                type="date" 
+                autocomplete="off"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                hx-on::before-request={ hxBeforeRequest }
+                hx-on::after-request={ hxAfterRequest }
+            />
+        </div>
+        <div class="col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2">
+            <label class="text-black font-weight-bolder">End Date:</label>
+        </div>
+        <div class="col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2">
+            <input 
+                id="enddateID"
+                name="enddate"
+                class="form-control form-control-lg bg-field border-0 rounded-lg" 
+                type="date" 
+                autocomplete="off"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                hx-on::before-request={ hxBeforeRequest }
+                hx-on::after-request={ hxAfterRequest }
+            />
+        </div>
+        <div class="col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 mb-2">
+            <input 
+                id="searchID"
+                name="search"
+                class="form-control form-control-lg bg-field border-0 rounded-lg"
+                type="text"
+                placeholder="nama karyawan"
+                hx-get={ hxGet }
+                hx-trigger={ hxTrigger }
+                hx-include={ hxInclude }
+                hx-swap={ hxSwap }
+                hx-target={ hxTarget }
+                hx-on::before-request={ hxBeforeRequest }
+                hx-on::after-request={ hxAfterRequest }
+            />
+        </div>
+    </div>
+}
--- a/views/dev/employeeanalytic/filteremployeeanalytic_templ.go
+++ b/views/dev/employeeanalytic/filteremployeeanalytic_templ.go
@@ -0,0 +1,316 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_employeeanalytic
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+func FilterListing(
+	hxGet string,
+	hxTrigger string,
+	hxInclude string,
+	hxSwap string,
+	hxTarget string,
+	hxBeforeRequest templ.ComponentScript,
+	hxAfterRequest templ.ComponentScript,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row pt-8 align-items-center\"><div class=\"col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2\"><label class=\"text-black font-weight-bolder\">Stard Date:</label></div><div class=\"col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest, hxAfterRequest)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input id=\"startdateID\" name=\"startdate\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"date\" autocomplete=\"off\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 23, Col: 30}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 24, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 25, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 26, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 27, Col: 36}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div><div class=\"col-12 col-sm-3 col-md-1 col-lg-1 col-xl-1 mb-2\"><label class=\"text-black font-weight-bolder\">End Date:</label></div><div class=\"col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest, hxAfterRequest)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input id=\"enddateID\" name=\"enddate\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"date\" autocomplete=\"off\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 42, Col: 30}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 43, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var11 string
+		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 44, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var12 string
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 45, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var13 string
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 46, Col: 36}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var14 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var14.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var15 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var15.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div><div class=\"col-12 col-sm-12 col-md-6 col-lg-6 col-xl-6 mb-2\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxBeforeRequest, hxAfterRequest)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<input id=\"searchID\" name=\"search\" class=\"form-control form-control-lg bg-field border-0 rounded-lg\" type=\"text\" placeholder=\"nama karyawan\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 58, Col: 30}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 59, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 60, Col: 38}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 61, Col: 32}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var20 string
+		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\filteremployeeanalytic.templ`, Line: 62, Col: 36}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::before-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var21 templ.ComponentScript = hxBeforeRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var22 templ.ComponentScript = hxAfterRequest
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var22.Call)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/employeeanalytic/listingemployeeanalytic.templ
+++ b/views/dev/employeeanalytic/listingemployeeanalytic.templ
@@ -0,0 +1,41 @@
+package dev_employeeanalytic
+
+import "cpone/models"
+import "strconv"
+
+templ ListingData(
+    data []models.DashboardPic,
+    listID string,
+) {
+    <div id={listID} class="align-items-center pt-8 flex-column" hx-swap-oob="true">
+        <div class="bg-field rounded">
+            <div class="p-8">
+                for i, d := range data {
+                    if i == (len(data) - 1)  {
+                        <div id={ strconv.Itoa(int(d.Mgm_McuID)) } class="card shadow p-8" hx-get={"/corp/dashboard_pic/click/" + strconv.Itoa(d.Mgm_McuID)}>
+                            @ItemCard(d)
+                        </div>
+                    } else {
+                        <div id={ strconv.Itoa(int(d.Mgm_McuID)) } class="card shadow p-8 mb-8" hx-get={"/corp/dashboard_pic/click/" + strconv.Itoa(d.Mgm_McuID)}>
+                            @ItemCard(d)
+                        </div>
+                    }
+                }
+            </div>
+        </div>
+    </div>
+}
+
+templ ItemCard(data models.DashboardPic) {
+    <div class="row d-flex align-items-center">
+        <div class="col-7">
+            <h3 class="text-black">{ data.Mgm_McuLabel }</h3>
+        </div>
+        <div class="col-md col-lg text-right">
+            <span class="text-black font-weight-bolder">{ data.Mgm_McuNote }</span>
+        </div>
+        <div class="col-md col-lg text-right">
+            <span class="text-black font-weight-bolder">{ data.Mgm_McuStartDate } - { data.Mgm_McuEndDate }</span>
+        </div>
+    </div>    
+}
--- a/views/dev/employeeanalytic/listingemployeeanalytic_templ.go
+++ b/views/dev/employeeanalytic/listingemployeeanalytic_templ.go
@@ -0,0 +1,215 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_employeeanalytic
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/models"
+import "strconv"
+
+func ListingData(
+	data []models.DashboardPic,
+	listID string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(listID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 10, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"align-items-center pt-8 flex-column\" hx-swap-oob=\"true\"><div class=\"bg-field rounded\"><div class=\"p-8\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i, d := range data {
+			if i == (len(data) - 1) {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var3 string
+				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID)))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 15, Col: 64}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8\" hx-get=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var4 string
+				templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/click/" + strconv.Itoa(d.Mgm_McuID))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 15, Col: 155}
+				}
+				_, 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
+				}
+				templ_7745c5c3_Err = ItemCard(d).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var5 string
+				templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(int(d.Mgm_McuID)))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 19, Col: 64}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"card shadow p-8 mb-8\" hx-get=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var6 string
+				templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/click/" + strconv.Itoa(d.Mgm_McuID))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 19, Col: 160}
+				}
+				_, 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 = ItemCard(d).Render(ctx, templ_7745c5c3_Buffer)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ItemCard(data models.DashboardPic) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row d-flex align-items-center\"><div class=\"col-7\"><h3 class=\"text-black\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuLabel)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 32, Col: 54}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</h3></div><div class=\"col-md col-lg text-right\"><span class=\"text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuNote)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 35, Col: 74}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</span></div><div class=\"col-md col-lg text-right\"><span class=\"text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var10 string
+		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(data.Mgm_McuStartDate)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 38, Col: 79}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_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(data.Mgm_McuEndDate)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\employeeanalytic\listingemployeeanalytic.templ`, Line: 38, Col: 105}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</span></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/kesimpulan/kesimpulan.templ
+++ b/views/dev/kesimpulan/kesimpulan.templ
@@ -0,0 +1,282 @@
+package dev_kesimpulan
+
+import (
+	"cpone/layout"
+	"cpone/component/customtextfield"
+	"cpone/models"
+)
+
+templ MainKesimpulan(
+	tableID string,
+	tablecontent templ.Component,
+	tablecontentnonlab templ.Component,
+	tablecontentfisik templ.Component,
+) {
+	<div class="container-fluid">
+		@customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
+			Name:  "tableID",
+			Type:  "hidden",
+			Value: tableID})
+		<div class="d-flex justify-content-center pt-10 pb-10">
+			<h2 class="title text-black" style="margin-bottom: 0">Kesimpulan</h2>
+		</div>
+		@tablecontent
+		@tablecontentnonlab
+		@tablecontentfisik
+	</div>
+}
+
+templ CssKesimpulan() {
+	<link
+		rel="stylesheet"
+		href="assets/css/googlefont/poppins.css"
+	/>
+	<link
+		rel="stylesheet"
+		href="assets/css/googlefont/publicsans.css"
+	/>
+	<link
+		rel="stylesheet"
+		href="assets/css/googlefont/roboto.css"
+	/>
+	<style>
+      #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>
+}
+
+templ JsKesimpulan() {
+}
+
+templ ShowKesimpulan(title string, cmp templ.Component, css templ.Component, js templ.Component) {
+	@layout.PlaygroundLayout(title, css, js) {
+		@cmp
+	}
+}
--- a/views/dev/kesimpulan/kesimpulan_templ.go
+++ b/views/dev/kesimpulan/kesimpulan_templ.go
--- a/views/dev/kesimpulan/tableKesimpulan.templ
+++ b/views/dev/kesimpulan/tableKesimpulan.templ
@@ -0,0 +1,46 @@
+package dev_kesimpulan
+
+import (
+	"cpone/component/table"
+	"cpone/models"
+)
+
+templ CardTableKesimpulan(title string, data []models.ModelKesimpulanLab, tableID string) {
+	<div class="card card-custom gutter-b" style="border-radius: 20px">
+		<div style="padding-top: 12px">
+			<h3 class="card-label dot-text text-black">
+				{ title }
+			</h3>
+		</div>
+		<div class="card-body">
+			<div>
+				@TableKesimpulan(data, tableID)
+			</div>
+		</div>
+	</div>
+}
+
+templ TableKesimpulan(data []models.ModelKesimpulanLab,
+	tableID string) {
+	<div id={ tableID }>
+		@tablecomponent.TableV3([]string{"NO", "PEMERIKSAAN", "PERSENTASE"},
+			[]string{"5%", "70%", "25%"},
+			RowKesimpulan(data),
+		)
+	</div>
+}
+
+templ RowKesimpulan(data []models.ModelKesimpulanLab) {
+	if len(data) == 0 {
+		<tr>
+			<td colspan="3" class="text-center">Data Tidak Ditemukan</td>
+		</tr>
+	}
+	for _, v := range data {
+		<tr>
+			<td>{ v.Nomor }</td>
+			<td>{ v.Test }</td>
+			<td>{ v.Total }</td>
+		</tr>
+	}
+}
--- a/views/dev/kesimpulan/tableKesimpulan_templ.go
+++ b/views/dev/kesimpulan/tableKesimpulan_templ.go
@@ -0,0 +1,181 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_kesimpulan
+
+//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/table"
+	"cpone/models"
+)
+
+func CardTableKesimpulan(title string, data []models.ModelKesimpulanLab, tableID string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"card card-custom gutter-b\" style=\"border-radius: 20px\"><div style=\"padding-top: 12px\"><h3 class=\"card-label dot-text text-black\">")
+		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: `views\dev\kesimpulan\tableKesimpulan.templ`, Line: 12, Col: 11}
+		}
+		_, 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("</h3></div><div class=\"card-body\"><div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = TableKesimpulan(data, tableID).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func TableKesimpulan(data []models.ModelKesimpulanLab,
+	tableID 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(tableID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\kesimpulan\tableKesimpulan.templ`, Line: 25, Col: 18}
+		}
+		_, 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
+		}
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"NO", "PEMERIKSAAN", "PERSENTASE"},
+			[]string{"5%", "70%", "25%"},
+			RowKesimpulan(data),
+		).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func RowKesimpulan(data []models.ModelKesimpulanLab) 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)
+		if len(data) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"3\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		for _, v := range data {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var6 string
+			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.Nomor)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\kesimpulan\tableKesimpulan.templ`, Line: 41, Col: 16}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var7 string
+			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.Test)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\kesimpulan\tableKesimpulan.templ`, Line: 42, 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("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var8 string
+			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.Total)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\kesimpulan\tableKesimpulan.templ`, Line: 43, Col: 16}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/mcu/daftarpeserta/daftarpeserta.templ
+++ b/views/dev/mcu/daftarpeserta/daftarpeserta.templ
@@ -0,0 +1,134 @@
+package dev_mcudaftarpeserta
+
+import "cpone/layout"
+
+templ McuDaftarPesertaScreen() {
+    <div>
+    <table class="table table-hover table-borderless">
+        <thead>
+        <tr>
+            <th scope="col" width="5%">NO LAB</th>
+            <th scope="col" width="25%">NAMA</th>
+            <th scope="col" width="10%">JENIS KELAMIN</th>
+            <th scope="col" width="10%">UMUR</th>
+            <th scope="col" width="35%">KESIMPULAN</th>
+            <th scope="col" width="15%" s>AKSI</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+            <td>21304</td>
+            <td>Abraham Kurniawan</td>
+            <td>Laki - Laki</td>
+            <td>24</td>
+            <td>
+            <div class="row">
+                <div class="col-2">
+                <span class="label-text fit"> Fit </span>
+                <!-- <span class="label label-inline label-text"> FIT </span> -->
+                </div>
+                <div class="col-10 kesimpulan-desc"></div>
+            </div>
+            </td>
+            <td>
+            <div>
+                <a
+                class="btn btn-icon"
+                onclick="ShowModal('Abraham Kurniawan','21304')"
+                >
+                <span
+                    class="iconify iconify-btn"
+                    data-icon="heroicons-solid:document-text"
+                ></span>
+                </a>
+                <a href="mcu/hasil-lab.html" class="btn btn-icon">
+                <span
+                    class="iconify iconify-btn"
+                    data-icon="heroicons-solid:pencil"
+                ></span>
+                </a>
+                <a
+                class="btn btn-icon"
+                onclick="ShowModalAkses('Abraham@gmail.com','Abraham Kurniawan','unchecked')"
+                >
+                <span
+                    class="iconify iconify-btn"
+                    data-icon="heroicons:shield-exclamation-16-solid"
+                ></span>
+                </a>
+            </div>
+            </td>
+        </tr>
+        <tr>
+            <td>21305</td>
+            <td>Anastasia Claudia</td>
+            <td>Perempuan</td>
+            <td>24</td>
+            <td>
+            <div class="row">
+                <div class="col-2 col-xl-2 col-lg-2 col-md-12 col-sm-12">
+                <span class="label-text unfit"> Unfit </span>
+                <!-- <span class="label label-inline label-text"> FIT </span> -->
+                </div>
+                <div
+                class="col-10 col-xl-10 col-lg-10 col-md-12 col-sm-12 kesimpulan-desc"
+                >
+                Anti HBs (Positif : 752), Cholesterol sedikit meningkat
+                (218), LDL Cholesterol Direct meningkat (173)
+                </div>
+            </div>
+            </td>
+            <td>
+            <div>
+                <!-- data-target="#exampleModalSizeLg" -->
+                <a
+                class="btn btn-icon"
+                data-toggle="modal"
+                onclick="ShowModal('Anastasia Claudia', '21305')"
+                >
+                <span
+                    class="iconify iconify-btn"
+                    data-icon="heroicons-solid:document-text"
+                ></span>
+                </a>
+                <a href="mcu/hasil-lab.html" class="btn btn-icon">
+                <span
+                    class="iconify iconify-btn"
+                    data-icon="heroicons-solid:pencil"
+                ></span>
+                </a>
+                <a
+                class="btn btn-icon"
+                onclick="ShowModalAkses('Anastasia@gmail.com','Anastasia Claudia','checked')"
+                >
+                <span
+                    class="iconify iconify-btn"
+                    data-icon="heroicons:shield-exclamation-16-solid"
+                ></span>
+                </a>
+            </div>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+    </div>
+}
+
+templ CSSMcuDaftarPeserta() {
+
+}
+
+templ JsMcuDaftarPeserta() {
+    
+}
+
+templ ShowMcuDafterPeserta(
+    title string,
+    cmp templ.Component,
+    css templ.Component,
+    js templ.Component,
+) {
+    @layout.PlaygroundLayout(title, css, js) {
+        @cmp
+    }
+}
--- a/views/dev/mcu/daftarpeserta/daftarpeserta_templ.go
+++ b/views/dev/mcu/daftarpeserta/daftarpeserta_templ.go
@@ -0,0 +1,121 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_mcudaftarpeserta
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/layout"
+
+func McuDaftarPesertaScreen() 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><table class=\"table table-hover table-borderless\"><thead><tr><th scope=\"col\" width=\"5%\">NO LAB</th><th scope=\"col\" width=\"25%\">NAMA</th><th scope=\"col\" width=\"10%\">JENIS KELAMIN</th><th scope=\"col\" width=\"10%\">UMUR</th><th scope=\"col\" width=\"35%\">KESIMPULAN</th><th scope=\"col\" width=\"15%\" s>AKSI</th></tr></thead> <tbody><tr><td>21304</td><td>Abraham Kurniawan</td><td>Laki - Laki</td><td>24</td><td><div class=\"row\"><div class=\"col-2\"><span class=\"label-text fit\">Fit </span><!-- <span class=\"label label-inline label-text\"> FIT </span> --></div><div class=\"col-10 kesimpulan-desc\"></div></div></td><td><div><a class=\"btn btn-icon\" onclick=\"ShowModal(&#39;Abraham Kurniawan&#39;,&#39;21304&#39;)\"><span class=\"iconify iconify-btn\" data-icon=\"heroicons-solid:document-text\"></span></a> <a href=\"mcu/hasil-lab.html\" class=\"btn btn-icon\"><span class=\"iconify iconify-btn\" data-icon=\"heroicons-solid:pencil\"></span></a> <a class=\"btn btn-icon\" onclick=\"ShowModalAkses(&#39;Abraham@gmail.com&#39;,&#39;Abraham Kurniawan&#39;,&#39;unchecked&#39;)\"><span class=\"iconify iconify-btn\" data-icon=\"heroicons:shield-exclamation-16-solid\"></span></a></div></td></tr><tr><td>21305</td><td>Anastasia Claudia</td><td>Perempuan</td><td>24</td><td><div class=\"row\"><div class=\"col-2 col-xl-2 col-lg-2 col-md-12 col-sm-12\"><span class=\"label-text unfit\">Unfit </span><!-- <span class=\"label label-inline label-text\"> FIT </span> --></div><div class=\"col-10 col-xl-10 col-lg-10 col-md-12 col-sm-12 kesimpulan-desc\">Anti HBs (Positif : 752), Cholesterol sedikit meningkat\r (218), LDL Cholesterol Direct meningkat (173)\r</div></div></td><td><div><!-- data-target=\"#exampleModalSizeLg\" --><a class=\"btn btn-icon\" data-toggle=\"modal\" onclick=\"ShowModal(&#39;Anastasia Claudia&#39;, &#39;21305&#39;)\"><span class=\"iconify iconify-btn\" data-icon=\"heroicons-solid:document-text\"></span></a> <a href=\"mcu/hasil-lab.html\" class=\"btn btn-icon\"><span class=\"iconify iconify-btn\" data-icon=\"heroicons-solid:pencil\"></span></a> <a class=\"btn btn-icon\" onclick=\"ShowModalAkses(&#39;Anastasia@gmail.com&#39;,&#39;Anastasia Claudia&#39;,&#39;checked&#39;)\"><span class=\"iconify iconify-btn\" data-icon=\"heroicons:shield-exclamation-16-solid\"></span></a></div></td></tr></tbody></table></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 CSSMcuDaftarPeserta() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JsMcuDaftarPeserta() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ShowMcuDafterPeserta(
+	title string,
+	cmp templ.Component,
+	css templ.Component,
+	js templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Var5 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+			if !templ_7745c5c3_IsBuffer {
+				templ_7745c5c3_Buffer = templ.GetBuffer()
+				defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+			}
+			templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if !templ_7745c5c3_IsBuffer {
+				_, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
+			}
+			return templ_7745c5c3_Err
+		})
+		templ_7745c5c3_Err = layout.PlaygroundLayout(title, css, js).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/mcu/mcudetail.templ
+++ b/views/dev/mcu/mcudetail.templ
@@ -0,0 +1,143 @@
+package dev_detailmcu
+
+import "cpone/layout"
+
+templ DetailMcuScreen(
+    breadcrumb templ.Component,
+    content templ.Component,
+) {
+    <div class="container-fluid">
+        <div class="row align-item-center mb-10">
+            <div class="col-md-10 col-sm-12 p-0">
+                @breadcrumb
+            </div>            
+        </div>
+        <div id="loading-parent" class="rounded">
+            @content
+            <div id="loading-child" class="rounded bg-transparent">
+                <div id="loading-spinner" class="spinner-border text-primary d-none" style="width: 3rem; height: 3rem;" role="status">
+                    <span class="sr-only">Loading....</span>
+                </div>
+            </div>
+        </div>
+        <div id="loadingcontent"></div>
+    </div>
+}
+
+templ CSSDetailMcu() {
+    <link
+        rel="stylesheet"
+        href="assets/css/googlefont/poppins.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/publicsans.css"
+    />
+    <link 
+        rel="stylesheet"
+        href="assets/css/googlefont/roboto.css"
+    />
+    <style>
+        body {
+            background-color: white;
+        }
+        #div-chart {
+            margin: 40px 10vw 40px 10vw;
+        }
+        .title {
+            font-size: 20px;
+            font-weight: bold;
+        }
+        #title {
+            font-weight: 600;
+        }
+    </style>
+}
+
+templ JSDetailMcu() {
+	<script>
+		document.addEventListener('htmx:afterSwap', function(event) {
+			// Reinitialize selectpicker after HTMX content swap
+			$('.selectpicker').selectpicker('refresh');
+		});
+    
+        document.addEventListener('htmx:beforeRequest', function(event) {
+            console.log("Before Request")
+			console.log(event.detail.xhr)
+			console.log(event.detail.target)
+            
+        });
+
+        document.addEventListener('htmx:afterRequest', function(event) {
+            console.log("After Request")
+            console.log(event.detail.xhr)
+			console.log(event.detail.target)
+        });
+        document.addEventListener('htmx:historyCacheError', function(event) {
+            console.log("Error History Cache Error")
+            console.log(event.detail.cause)
+			
+        });
+        document.addEventListener('htmx:historyCacheMissError', function(event) {
+            console.log("Error History Cache Miss Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.path)
+			
+        });
+        document.addEventListener('htmx:oobErrorNoTarget', function(event) {
+            console.log("Error OOB No Target")
+            console.log(event.detail.content)
+        });
+        document.addEventListener('htmx:onLoadError', function(event) {
+            console.log("Error On Load")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.target)
+            console.log(event.detail.exception)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:responseError', function(event) {
+            console.log("Error Response")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:sendError', function(event) {
+            console.log("Error Send Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log(event.detail.requestConfig)
+        });
+        document.addEventListener('htmx:sseError', function(event) {
+            console.log("Error Sse ")
+            console.log(event.detail.xhr)
+            console.log(event.detail.error)
+            console.log(event.detail.source)
+        });
+		document.addEventListener('htmx:swapError', function(event) {
+            console.log("Error Swap Error")
+            console.log(event.detail.xhr)
+            console.log(event.detail.elt)
+            console.log("Target Swap: "+event.detail.target)
+            console.log(event.detail.requestConfig)
+        });
+		document.addEventListener('htmx:targetError', function(event) {
+            console.log("Error target")
+            console.log(event.detail.elt)
+            console.log("Target ID: "+event.detail.target)
+        });
+    </script>
+}
+
+templ ShowDetailMcu(
+    title string,
+    cmp templ.Component,
+    css templ.Component,
+    js templ.Component,
+    navbaruser templ.Component,
+    userprofile templ.Component,
+) {
+    @layout.DashboardLayout(title, css, js, navbaruser, userprofile) {
+        @cmp
+    }
+}
--- a/views/dev/mcu/mcudetail_templ.go
+++ b/views/dev/mcu/mcudetail_templ.go
@@ -0,0 +1,150 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_detailmcu
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+import "cpone/layout"
+
+func DetailMcuScreen(
+	breadcrumb templ.Component,
+	content templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container-fluid\"><div class=\"row align-item-center mb-10\"><div class=\"col-md-10 col-sm-12 p-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = breadcrumb.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div id=\"loading-parent\" class=\"rounded\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = content.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"loading-child\" class=\"rounded bg-transparent\"><div id=\"loading-spinner\" class=\"spinner-border text-primary d-none\" style=\"width: 3rem; height: 3rem;\" role=\"status\"><span class=\"sr-only\">Loading....</span></div></div></div><div id=\"loadingcontent\"></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func CSSDetailMcu() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var2 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var2 == nil {
+			templ_7745c5c3_Var2 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n        body {\r\n            background-color: white;\r\n        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func JSDetailMcu() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script>\r\n\t\tdocument.addEventListener('htmx:afterSwap', function(event) {\r\n\t\t\t// Reinitialize selectpicker after HTMX content swap\r\n\t\t\t$('.selectpicker').selectpicker('refresh');\r\n\t\t});\r\n    \r\n        document.addEventListener('htmx:beforeRequest', function(event) {\r\n            console.log(\"Before Request\")\r\n\t\t\tconsole.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n            \r\n        });\r\n\r\n        document.addEventListener('htmx:afterRequest', function(event) {\r\n            console.log(\"After Request\")\r\n            console.log(event.detail.xhr)\r\n\t\t\tconsole.log(event.detail.target)\r\n        });\r\n        document.addEventListener('htmx:historyCacheError', function(event) {\r\n            console.log(\"Error History Cache Error\")\r\n            console.log(event.detail.cause)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:historyCacheMissError', function(event) {\r\n            console.log(\"Error History Cache Miss Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.path)\r\n\t\t\t\r\n        });\r\n        document.addEventListener('htmx:oobErrorNoTarget', function(event) {\r\n            console.log(\"Error OOB No Target\")\r\n            console.log(event.detail.content)\r\n        });\r\n        document.addEventListener('htmx:onLoadError', function(event) {\r\n            console.log(\"Error On Load\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.target)\r\n            console.log(event.detail.exception)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:responseError', function(event) {\r\n            console.log(\"Error Response\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sendError', function(event) {\r\n            console.log(\"Error Send Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n        document.addEventListener('htmx:sseError', function(event) {\r\n            console.log(\"Error Sse \")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.error)\r\n            console.log(event.detail.source)\r\n        });\r\n\t\tdocument.addEventListener('htmx:swapError', function(event) {\r\n            console.log(\"Error Swap Error\")\r\n            console.log(event.detail.xhr)\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target Swap: \"+event.detail.target)\r\n            console.log(event.detail.requestConfig)\r\n        });\r\n\t\tdocument.addEventListener('htmx:targetError', function(event) {\r\n            console.log(\"Error target\")\r\n            console.log(event.detail.elt)\r\n            console.log(\"Target ID: \"+event.detail.target)\r\n        });\r\n    </script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ShowDetailMcu(
+	title string,
+	cmp templ.Component,
+	css templ.Component,
+	js templ.Component,
+	navbaruser templ.Component,
+	userprofile templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		templ_7745c5c3_Var5 := templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+			templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+			if !templ_7745c5c3_IsBuffer {
+				templ_7745c5c3_Buffer = templ.GetBuffer()
+				defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+			}
+			templ_7745c5c3_Err = cmp.Render(ctx, templ_7745c5c3_Buffer)
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			if !templ_7745c5c3_IsBuffer {
+				_, templ_7745c5c3_Err = io.Copy(templ_7745c5c3_W, templ_7745c5c3_Buffer)
+			}
+			return templ_7745c5c3_Err
+		})
+		templ_7745c5c3_Err = layout.DashboardLayout(title, css, js, navbaruser, userprofile).Render(templ.WithChildren(ctx, templ_7745c5c3_Var5), templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/dev/mcu/tabviewdetailmcu.templ
+++ b/views/dev/mcu/tabviewdetailmcu.templ
@@ -0,0 +1,67 @@
+package dev_detailmcu
+
+templ TabViewDetailMcu(
+	id string,
+) {
+	<div>
+		<ul class="nav nav-tabs nav-tabs-line">
+			<li class="nav-item">
+				<a class="nav-link active" 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" data-toggle="tab" href="#kt_tab_pane_6" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkesimpulan"} hx-target="#tabkesimpulan">Kesimpulan</a>
+			</li>
+			<li class="nav-item">
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_7" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabdaftarpeserta"} hx-target="#tabdaftarpeserta">Daftar Peserta</a>
+			</li>
+		</ul>
+	</div>
+	<div class="tab-content mt-5" id="myTabContent">
+		<div class="tab-pane fade show active" id="kt_tab_pane_1" role="tabpanel" aria-labelledby="kt_tab_pane_2" style="height: 800px;">
+			<object data="https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_001.rptdesign&__format=pdf&PID=2&username=adhi&tm=1717726294764" type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_2" role="tabpanel" aria-labelledby="kt_tab_pane_2" style="height: 800px;">
+			<object data="https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_002.rptdesign&__format=pdf&PID=2&username=adhi&tm=1717726294764" type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_3" role="tabpanel" aria-labelledby="kt_tab_pane_3" style="height: 800px;">
+			<object data="https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_003.rptdesign&__format=pdf&PID=2&username=adhi&tm=1717726294764" type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_4" role="tabpanel" aria-labelledby="kt_tab_pane_4" style="height: 800px;">
+			<object data="https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_004.rptdesign&__format=pdf&PID=2&username=adhi&tm=1717726294764" type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_5" role="tabpanel" aria-labelledby="kt_tab_pane_5" style="height: 800px;">
+			<object data="https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_005.rptdesign&__format=pdf&PID=2&username=adhi&tm=1717726294764" type="application/pdf" width="100%" height="100%"></object>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_6" role="tabpanel" aria-labelledby="kt_tab_pane_6">
+			<div id="tabkesimpulan">
+			</div>
+		</div>
+		<div class="tab-pane fade" id="kt_tab_pane_7" role="tabpanel" aria-labelledby="kt_tab_pane_7">
+			<div id="tabdaftarpeserta">
+				
+			</div>
+		</div>
+	</div>
+}
+
+// <embed
+//     type="application/x-google-chrome-pdf"
+//     src="chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/c8a5f314-4b1f-4d80-bc24-ea068d6b0763"
+//     original-url="https://devcpone.aplikasi.web.id/birt/run?_report=report/one/mcu/rpt_mcu_graph_001.rptdesign&amp;_format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764"
+//     background-color="4283586137"
+//     javascript="allow" full-frame=""
+// />
+// <iframe src="https://devcpone.aplikasi.web.id/birt/run?_report=report/one/mcu/rpt_mcu_graph_001.rptdesign&amp;_format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764"
+// style="width:600px; height:500px;" frameborder="0"></iframe>
--- a/views/dev/mcu/tabviewdetailmcu_templ.go
+++ b/views/dev/mcu/tabviewdetailmcu_templ.go
@@ -0,0 +1,73 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package dev_detailmcu
+
+//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 TabViewDetailMcu(
+	id string,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_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><ul class=\"nav nav-tabs nav-tabs-line\"><li class=\"nav-item\"><a class=\"nav-link active\" 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\" data-toggle=\"tab\" href=\"#kt_tab_pane_6\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + id + "/tabkesimpulan")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mcu\tabviewdetailmcu.templ`, Line: 24, Col: 124}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkesimpulan\">Kesimpulan</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_7\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var3 string
+		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + id + "/tabdaftarpeserta")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mcu\tabviewdetailmcu.templ`, Line: 27, Col: 127}
+		}
+		_, 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-target=\"#tabdaftarpeserta\">Daftar Peserta</a></li></ul></div><div class=\"tab-content mt-5\" id=\"myTabContent\"><div class=\"tab-pane fade show active\" id=\"kt_tab_pane_1\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_2\" style=\"height: 800px;\"><object data=\"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_001.rptdesign&amp;__format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_2\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_2\" style=\"height: 800px;\"><object data=\"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_002.rptdesign&amp;__format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_3\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_3\" style=\"height: 800px;\"><object data=\"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_003.rptdesign&amp;__format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_4\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_4\" style=\"height: 800px;\"><object data=\"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_004.rptdesign&amp;__format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_5\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_5\" style=\"height: 800px;\"><object data=\"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_005.rptdesign&amp;__format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_6\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_6\"><div id=\"tabkesimpulan\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_7\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_7\"><div id=\"tabdaftarpeserta\"></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
+	})
+}
+
+// <embed
+//     type="application/x-google-chrome-pdf"
+//     src="chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/c8a5f314-4b1f-4d80-bc24-ea068d6b0763"
+//     original-url="https://devcpone.aplikasi.web.id/birt/run?_report=report/one/mcu/rpt_mcu_graph_001.rptdesign&amp;_format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764"
+//     background-color="4283586137"
+//     javascript="allow" full-frame=""
+// />
+// <iframe src="https://devcpone.aplikasi.web.id/birt/run?_report=report/one/mcu/rpt_mcu_graph_001.rptdesign&amp;_format=pdf&amp;PID=2&amp;username=adhi&amp;tm=1717726294764"
+// style="width:600px; height:500px;" frameborder="0"></iframe>
--- a/views/dev/mdnonlabtemplate/mdnonlabtmptmodal.templ
+++ b/views/dev/mdnonlabtemplate/mdnonlabtmptmodal.templ
@@ -1,198 +0,0 @@
-package dev_mdnonlabtemplateview
-
-import "cpone/models"
-import "cpone/component/modal"
-import "cpone/component/customtextfield"
-import "cpone/component/customcheckbox"
-
-templ MDNonlabTmpltForm(data models.MDNonlabTemplateForm) {
-    <div class="">
-        <form
-            id={ data.IDComponent }
-            hx-post={ data.Link }
-            class="form"
-            hx-target={ data.HxTarget }
-            hx-swap={ data.HxSwap }
-            hx-include={ data.HxInclude }
-            hx-indicator=".formloading"
-            hx-on::before-request={ HandleFormBeforeRequest() }
-            hx-on::after-request={ HandleFormAfterRequest() }
-        >
-            if data.ModalTitle == "Delete - Nonlab Template" {
-                @modalcomponent.Modal(data.ModalID,
-                    data.ModalTitle,
-                    data.DialogBody,
-                    data.DialogAction,
-                    data.ButtonClose,
-                )
-            }
-            @modalcomponent.ModalXL(data.ModalID,
-                data.ModalTitle,
-                data.DialogBody,
-                data.DialogAction,
-                data.ButtonClose,
-            )
-        </form>
-    </div>
-}
-
-script HandleFormBeforeRequest() {
-    const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    console.log("here test")
-    for (let i = 0; i < btnActCancel.length; i++) {
-        btnActCancel[i].setAttribute('disabled', 'true');
-    }
-    for (let i = 0; i < btnActSaveData.length; i++) {
-        btnActSaveData[i].setAttribute('disabled', 'true');
-    }
-}
-
-script HandleFormAfterRequest() {
-    const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    console.log("here test#2")
-    for (let i = 0; i < btnActCancel.length; i++) {
-        btnActCancel[i].removeAttribute('disabled');
-    }
-    for (let i = 0; i < btnActSaveData.length; i++) {
-        btnActSaveData[i].removeAttribute('disabled');
-    }
-}
-
-templ BodyFormMDNonlabTemplate(
-    componentID string,
-    inputID models.CustomTextFieldv2Prm,
-    inputName models.CustomTextFieldv2Prm,
-    inputFlag models.CustomCheckboxv1Prm,
-    detailKode models.CustomTextFieldv2Prm,
-    detailNama models.CustomTextFieldv2Prm,
-    btnSimpan templ.Component,
-    btnAddDetail templ.Component,
-    tableDetail templ.Component,
-    hxOnLoad templ.ComponentScript,
-) {
-    <div id={ componentID } hx-on::load={ hxOnLoad }>
-        @customtextfield.CustomTextFieldv2(inputID)
-        <h6 class="font-weight-bold">Nama Template</h6>
-        <div class="row">
-            <div class="col-8">
-                @customtextfield.CustomTextFieldv2(inputName)
-            </div>
-            <div class="col-4">
-                @customcheckbox.MainCustomCheckboxInput(inputFlag)
-            </div>
-        </div>
-        <div class="col-12 d-flex justify-content-end mt-4">
-            @btnSimpan
-        </div>
-        <h6 class="font-weight-bold">Detail Hasil</h6>
-        <div class="row align-items-center">
-            <div class="col-2">
-                @customtextfield.CustomTextFieldv2(detailKode)
-            </div>
-            <div class="col-8">
-                @customtextfield.CustomTextFieldv2(detailNama)
-            </div>
-            <div class="col-2 d-flex justify-content-center">
-                @btnAddDetail
-            </div>
-        </div>
-        @tableDetail
-    </div>
-    <script>
-        document.addEventListener('htmx:afterSwap', function(event) {
-            $('.selectpicker').selectpicker('refresh');
-        })
-    </script>
-}
-
-script JSHideModal(modalID string) {
-    $(modalID).modal('hide')
-}
-
-script JSShowModal(modalID string) {
-    $(modalID).modal('show')
-    const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    for (let i = 0; i < btnActCancel.length; i++) {
-        btnActCancel[i].removeAttribute('disabled');
-    }
-    for (let i = 0; i < btnActSaveData.length; i++) {
-        btnActSaveData[i].removeAttribute('disabled');
-    }
-}
-
-templ ActionFormMDNonlabTmplt(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-    <div>
-        <button 
-            hx-on::after-request={ JSHideModal(modalID) }
-            hx-post={ LinkClose }
-            hx-target={ targetClose }
-            hx-swap={ hxSwapClose }
-            hx-indicator=".cancelloading"
-            type="button" 
-            class="btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel"
-            data-dismiss="modal"
-        >
-            <span class="htmx-indicator spinner-border spinner-border-sm cancelloading" role="status" aria-hidden="true"></span>
-            Batal
-        </button>
-        <button 
-            type="submit"
-            class="btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata"
-        >
-            <span class="htmx-indicator spinner-border spinner-border-sm formloading" role="status" aria-hidden="true"></span>
-            Simpan
-        </button>
-    </div>    
-}
-
-templ BtnCloseFormMDNonlabTmplt(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-    <button 
-        hx-post={ LinkClose }
-        hx-target={ targetClose }
-        hx-swap={ hxSwapClose }
-        type="button" 
-        hx-on::after-request={ JSHideModal(modalID) }
-        class="close btnactcancel"
-        data-dismiss="modal"
-        aria-label="Close"
-    >
-        <i aria-hidden="true" class="ki ki-close"></i>
-    </button>
-}
-
-templ BtnSimpanNama(Link string, target string, hxSwap string, disable bool, hxInclude string) {
-    <button 
-        hx-post={ Link }
-        hx-target={ target }
-        hx-swap={ hxSwap }
-        hx-include={ hxInclude }
-        type="button"
-        class="btn btntmplt btn-outline-secondary font-weight-bolder rounded-lg"
-        aria-label="Simpan Nama"
-        if disable {
-            disabled
-        }
-    >
-        Simpan
-    </button>
-}
-
-templ BtnAddDetail(Link string, target string, hxSwap string, modalID string, hxInclude string) {
-    <button 
-        hx-post={ Link }
-        hx-target={ target }
-        hx-swap={ hxSwap }
-        hx-include={ hxInclude }
-        type="button"
-        class="btn"
-        aria-label="Add Detail Hasil"
-    >
-        <i aria-hidden="true" class="ki ki-solid-plus icon-2x text-primary"></i>
-    </button>
-}
--- a/views/dev/mdnonlabtemplate/mdnonlabtmptmodal_templ.go
+++ b/views/dev/mdnonlabtemplate/mdnonlabtmptmodal_templ.go
@@ -1,665 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.663
-package dev_mdnonlabtemplateview
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import "context"
-import "io"
-import "bytes"
-
-import "cpone/models"
-import "cpone/component/modal"
-import "cpone/component/customtextfield"
-import "cpone/component/customcheckbox"
-
-func MDNonlabTmpltForm(data models.MDNonlabTemplateForm) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, HandleFormBeforeRequest(), HandleFormAfterRequest())
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<form id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(data.IDComponent)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 11, Col: 33}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 string
-		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(data.Link)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 12, Col: 31}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"form\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxTarget)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 14, Col: 37}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var5 string
-		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxSwap)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 15, Col: 33}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var6 string
-		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(data.HxInclude)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 16, Col: 39}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\".formloading\" hx-on::before-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 templ.ComponentScript = HandleFormBeforeRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var7.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 templ.ComponentScript = HandleFormAfterRequest()
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var8.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if data.ModalTitle == "Delete - Nonlab Template" {
-			templ_7745c5c3_Err = modalcomponent.Modal(data.ModalID,
-				data.ModalTitle,
-				data.DialogBody,
-				data.DialogAction,
-				data.ButtonClose,
-			).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		templ_7745c5c3_Err = modalcomponent.ModalXL(data.ModalID,
-			data.ModalTitle,
-			data.DialogBody,
-			data.DialogAction,
-			data.ButtonClose,
-		).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</form></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func HandleFormBeforeRequest() templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_HandleFormBeforeRequest_8f9d`,
-		Function: `function __templ_HandleFormBeforeRequest_8f9d(){const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    console.log("here test")
-    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_8f9d`),
-		CallInline: templ.SafeScriptInline(`__templ_HandleFormBeforeRequest_8f9d`),
-	}
-}
-
-func HandleFormAfterRequest() templ.ComponentScript {
-	return templ.ComponentScript{
-		Name: `__templ_HandleFormAfterRequest_7066`,
-		Function: `function __templ_HandleFormAfterRequest_7066(){const btnActCancel = document.querySelectorAll('.btnactcancel');
-    const btnActSaveData = document.querySelectorAll('.btnactsavedata');
-
-    console.log("here test#2")
-    for (let i = 0; i < btnActCancel.length; i++) {
-        btnActCancel[i].removeAttribute('disabled');
-    }
-    for (let i = 0; i < btnActSaveData.length; i++) {
-        btnActSaveData[i].removeAttribute('disabled');
-    }
-}`,
-		Call:       templ.SafeScript(`__templ_HandleFormAfterRequest_7066`),
-		CallInline: templ.SafeScriptInline(`__templ_HandleFormAfterRequest_7066`),
-	}
-}
-
-func BodyFormMDNonlabTemplate(
-	componentID string,
-	inputID models.CustomTextFieldv2Prm,
-	inputName models.CustomTextFieldv2Prm,
-	inputFlag models.CustomCheckboxv1Prm,
-	detailKode models.CustomTextFieldv2Prm,
-	detailNama models.CustomTextFieldv2Prm,
-	btnSimpan templ.Component,
-	btnAddDetail templ.Component,
-	tableDetail templ.Component,
-	hxOnLoad templ.ComponentScript,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var9 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var9 == nil {
-			templ_7745c5c3_Var9 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, hxOnLoad)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 77, Col: 25}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::load=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var11 templ.ComponentScript = hxOnLoad
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var11.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputID).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<h6 class=\"font-weight-bold\">Nama Template</h6><div class=\"row\"><div class=\"col-8\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputName).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"col-4\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customcheckbox.MainCustomCheckboxInput(inputFlag).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div><div class=\"col-12 d-flex justify-content-end mt-4\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = btnSimpan.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><h6 class=\"font-weight-bold\">Detail Hasil</h6><div class=\"row align-items-center\"><div class=\"col-2\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(detailKode).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"col-8\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(detailNama).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"col-2 d-flex justify-content-center\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = btnAddDetail.Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = tableDetail.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 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 ActionFormMDNonlabTmplt(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var12 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var12 == nil {
-			templ_7745c5c3_Var12 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal(modalID))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var13 templ.ComponentScript = JSHideModal(modalID)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var13.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 133, Col: 31}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 134, Col: 35}
-		}
-		_, 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-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var16 string
-		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 135, Col: 33}
-		}
-		_, 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-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 BtnCloseFormMDNonlabTmplt(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var17 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var17 == nil {
-			templ_7745c5c3_Var17 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		templ_7745c5c3_Err = templ.RenderScriptItems(ctx, templ_7745c5c3_Buffer, JSHideModal(modalID))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var18 string
-		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 156, Col: 27}
-		}
-		_, 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-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var19 string
-		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 157, Col: 31}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var19))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var20 string
-		templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 158, Col: 29}
-		}
-		_, 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("\" type=\"button\" hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var21 templ.ComponentScript = JSHideModal(modalID)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ_7745c5c3_Var21.Call)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"close btnactcancel\" data-dismiss=\"modal\" aria-label=\"Close\"><i aria-hidden=\"true\" class=\"ki ki-close\"></i></button>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func BtnSimpanNama(Link string, target string, hxSwap string, disable bool, hxInclude string) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var22 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var22 == nil {
-			templ_7745c5c3_Var22 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var23 string
-		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(Link)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 171, Col: 22}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var24 string
-		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(target)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 172, Col: 26}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var25 string
-		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 173, 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-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var26 string
-		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 174, Col: 30}
-		}
-		_, 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("\" type=\"button\" class=\"btn btntmplt btn-outline-secondary font-weight-bolder rounded-lg\" aria-label=\"Simpan Nama\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if disable {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" disabled")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(">Simpan\r</button>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func BtnAddDetail(Link string, target string, hxSwap string, modalID string, hxInclude 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_Var27 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var27 == nil {
-			templ_7745c5c3_Var27 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-post=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var28 string
-		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(Link)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 188, 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-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var29 string
-		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(target)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 189, Col: 26}
-		}
-		_, 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-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var30 string
-		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 190, Col: 24}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var31 string
-		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodal.templ`, Line: 191, Col: 30}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" type=\"button\" class=\"btn\" aria-label=\"Add Detail Hasil\"><i aria-hidden=\"true\" class=\"ki ki-solid-plus icon-2x text-primary\"></i></button>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
--- a/views/dev/mdnonlabtemplate/mdnonlabtmptmodaldel.templ
+++ b/views/dev/mdnonlabtemplate/mdnonlabtmptmodaldel.templ
@@ -1,57 +0,0 @@
-package dev_mdnonlabtemplateview
-
-import "cpone/models"
-import "cpone/component/customtextfield"
-
-templ DeleteKonfirmasiBody(
-    inputID models.CustomTextFieldv2Prm,
-    componentID string,
-    message string,
-    dataHeader []string,
-    dataText []string,
-    hxOnLoad templ.ComponentScript,
-) {
-    <div id={ componentID } hx-on::load={ hxOnLoad }>
-        <p>{ message }</p>
-        <div class="card rounded-lg">
-            <div class="card-body d-flex flex-row">
-                <div class="d-flex flex-column">
-                    for _, v := range dataHeader {
-                        <div class="mb-1 mt-1 text-disabled font-weight-bold mr-5">{ v }</div>
-                    }
-                </div>
-                <div class="d-flex flex-column">
-                    for _, v := range dataText {
-                        <div class="mb-1 mt-1 font-weight-bold">{ v }</div>
-                    }
-                </div>
-            </div>
-        </div>
-        @customtextfield.CustomTextFieldv2(inputID)
-    </div>    
-}
-
-templ ActionFormNonlabTemplateDelete(LinkClose string, targetClose string, hxSwapClose string, modalID string) {
-    <div>
-        <button
-            hx-on::after-request={ JSHideModal(modalID) }
-            hx-post={ LinkClose }
-            hx-target={ targetClose }
-            hx-swap={ hxSwapClose }
-            hx-indicator=".cancelloading"
-            type="button" 
-            class="btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel"
-            data-dismiss="modal"
-        >
-            <span class="htmx-indicator spinner-border spinner-border-sm cancelloading" role="status" aria-hidden="true"></span>
-            Batal
-        </button>
-        <button 
-            type="submit" 
-            class="btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata"
-        >
-            <span class="htmx-indicator spinner-border spinner-border-sm formloading" role="status" aria-hidden="true"></span>
-            Yakin
-        </button>
-    </div>
-}
--- a/views/dev/mdnonlabtemplate/mdnonlabtmptmodaldel_templ.go
+++ b/views/dev/mdnonlabtemplate/mdnonlabtmptmodaldel_templ.go
@@ -1,218 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.663
-package dev_mdnonlabtemplateview
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import "context"
-import "io"
-import "bytes"
-
-import "cpone/models"
-import "cpone/component/customtextfield"
-
-func DeleteKonfirmasiBody(
-	inputID models.CustomTextFieldv2Prm,
-	componentID string,
-	message string,
-	dataHeader []string,
-	dataText []string,
-	hxOnLoad templ.ComponentScript,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_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, hxOnLoad)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(componentID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodaldel.templ`, Line: 14, Col: 25}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-on::load=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var3 templ.ComponentScript = hxOnLoad
-		_, 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("\"><p>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var4 string
-		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(message)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodaldel.templ`, Line: 15, Col: 20}
-		}
-		_, 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><div class=\"card rounded-lg\"><div class=\"card-body d-flex flex-row\"><div class=\"d-flex flex-column\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, v := range dataHeader {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"mb-1 mt-1 text-disabled font-weight-bold mr-5\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var5 string
-			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodaldel.templ`, Line: 20, Col: 86}
-			}
-			_, 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>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"d-flex flex-column\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		for _, v := range dataText {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"mb-1 mt-1 font-weight-bold\">")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var6 string
-			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodaldel.templ`, Line: 25, Col: 67}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(inputID).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func ActionFormNonlabTemplateDelete(LinkClose string, targetClose string, hxSwapClose string, modalID string) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_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(modalID))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<button hx-on::after-request=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 templ.ComponentScript = JSHideModal(modalID)
-		_, 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=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(LinkClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodaldel.templ`, Line: 38, Col: 31}
-		}
-		_, 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-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(targetClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodaldel.templ`, Line: 39, Col: 35}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var11 string
-		templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapClose)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\mdnonlabtmptmodaldel.templ`, Line: 40, Col: 33}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-indicator=\".cancelloading\" type=\"button\" class=\"btn btn-outline-secondary font-weight-bolder rounded-lg mr-4 btnactcancel\" data-dismiss=\"modal\"><span class=\"htmx-indicator spinner-border spinner-border-sm cancelloading\" role=\"status\" aria-hidden=\"true\"></span> Batal\r</button> <button type=\"submit\" class=\"btn btn-primary btn-shadow font-weight-bold rounded-lg btnactsavedata\"><span class=\"htmx-indicator spinner-border spinner-border-sm formloading\" role=\"status\" aria-hidden=\"true\"></span> Yakin\r</button></div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
--- a/views/dev/mdnonlabtemplate/nonlabtemplatetable.templ
+++ b/views/dev/mdnonlabtemplate/nonlabtemplatetable.templ
@@ -1,131 +0,0 @@
-package dev_mdnonlabtemplateview
-
-import "cpone/component/table"
-import "cpone/models"
-import "strconv"
-
-templ TableNonlabTmplt(
-    data []models.MDNonlabTemplate,
-	tableID string,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,    
-) {
-    <div id={ tableID } hx-swap-oob="true" >
-        @tablecomponent.TableV3([]string{"NAMA", "AKSI"},
-        []string{"80%","20%"},
-        RowNonlabTmplt(data,
-			tableID,
-            hxGetEdit,
-            hxTargetEdit,
-            hxSwapEdit,
-            hxIncludeEdit,
-            hxGetDelete,
-            hxTargetDelete,
-            hxSwapDelete,
-            hxIncludeDelete,
-        ))
-    </div>
-}
-
-templ RowNonlabTmplt(
-    data []models.MDNonlabTemplate,
-    tableID string,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) {
-    if len(data) == 0 {
-        <tr>
-            <td colspan="2" class="text-center">Data Tidak Ditemukan</td>
-        </tr>
-    }
-    for _, v := range data {
-        <tr>
-            <td>{ v.NonlabTemplateName }</td>
-            <td>
-                @RowAction(v.NonlabTemplateID,
-					hxGetEdit,
-					hxTargetEdit,
-					hxSwapEdit,
-					hxIncludeEdit,
-					hxGetDelete,
-					hxTargetDelete,
-					hxSwapDelete,
-					hxIncludeDelete,
-                )
-            </td>
-        </tr>
-    }
-}
-
-templ RowAction(
-	id int,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,    
-) {
-    <div class="row px-5 d-flex justify-content-around">
-        <a
-            type="button"
-            class="btnactnlt col-12 col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-tosca mb-2 btn-sm"
-			hx-get={ hxGetEdit + "?id=" + strconv.Itoa(id) }
-			hx-target={ hxTargetEdit }
-			hx-swap={ hxSwapEdit }
-			hx-include={ hxIncludeEdit }
-			hx-indicator={ "#spnredt" + strconv.Itoa(id) }
-			hx-on::before-request={ HandleBeforeRequestRow(strconv.Itoa(id)) }
-			hx-on::after-request={ HandleAfterRequestRow(strconv.Itoa(id)) }            
-        >
-           <span id={ "spnredt" + strconv.Itoa(id) } class="htmx-indicator spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-           Edit
-        </a>
-        <a
-            type="button"
-            class="btnactnlt col-12 col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 btn btn-light-danger mb-2 btn-sm"
-			hx-get={ hxGetDelete + "?id=" + strconv.Itoa(id) }
-			hx-target={ hxTargetDelete }
-			hx-swap={ hxSwapDelete }
-			hx-include={ hxIncludeDelete }
-			hx-indicator={ "#spnrdel" + strconv.Itoa(id) }
-			hx-on::before-request={ HandleBeforeRequestRow(strconv.Itoa(id)) }
-			hx-on::after-request={ HandleAfterRequestRow(strconv.Itoa(id)) }            
-        >
-           <span id={ "spnrdel" + strconv.Itoa(id) } class="htmx-indicator spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-           Hapus
-        </a>        
-    </div>
-}
-
-script HandleBeforeRequestRow(id string) {
-	var cusid_ele = document.getElementsByClassName('btnactnlt');
-	for (var i = 0; i < cusid_ele.length; ++i) {
-		var item = cusid_ele[i];  
-		item.classList.add('disabled');
-	}
-	console.log(id)
-}
-
-script HandleAfterRequestRow(id string) {
-	var cusid_ele = document.getElementsByClassName('btnactnlt');
-	for (var i = 0; i < cusid_ele.length; ++i) {
-		var item = cusid_ele[i];  
-		item.classList.remove('disabled');
-	}
-	console.log(id)
-}
--- a/views/dev/mdnonlabtemplate/tabledetail.templ
+++ b/views/dev/mdnonlabtemplate/tabledetail.templ
@@ -1,119 +0,0 @@
-package dev_mdnonlabtemplateview
-
-import "cpone/models"
-import "strconv"
-import "cpone/component/table"
-
-templ TableDetail(data []models.NonlabTemplateDetail,
-    tableDetailID string,
-    hxGetEdit string,
-    hxTargetEdit string,
-    hxSwapEdit string,
-    hxIncludeEdit string,
-    hxGetDelete string,
-    hxTargetDelete string,
-    hxSwapDelete string,
-    hxIncludeDelete string,
-) {
-    <div id={ tableDetailID }>
-        @tablecomponent.TableV3([]string{"KODE", "TEST", "AKSI"},
-        []string{"20%","50%","30%"},
-        RowDetail(data,
-            hxGetEdit,
-            hxTargetEdit,
-            hxSwapEdit,
-            hxIncludeEdit,
-            hxGetDelete,
-            hxTargetDelete,
-            hxSwapDelete,
-            hxIncludeDelete,
-        ))
-    </div>
-}
-
-templ RowDetail(
-    data []models.NonlabTemplateDetail,
-    hxGetEdit string,
-    hxTargetEdit string,
-    hxSwapEdit string,
-    hxIncludeEdit string,
-    hxGetDelete string,
-    hxTargetDelete string,
-    hxSwapDelete string,
-    hxIncludeDelete string,
-) {
-    if len(data) == 0 {
-        <tr>
-            <td colspan="3" class="text-center">Data Tidak Ditemukan</td>
-        </tr>
-    }
-    for _, v := range data {
-        <tr>
-            <td>{  v.NonlabTemplateDetailCode }</td>
-            <td>{  v.NonlabTemplateDetailName }</td>
-            <td>
-                @ActionRow(v.NonlabTemplateDetailID,
-                    v.NonlabTemplateDetailFlagActive,
-                    hxGetEdit,
-                    hxTargetEdit,
-                    hxSwapEdit,
-                    hxIncludeEdit,
-                    hxGetDelete,
-                    hxTargetDelete,
-                    hxSwapDelete,
-                    hxIncludeDelete,
-                )
-            </td>
-        </tr>
-    }
-}
-
-
-templ ActionRow(
-    id int,
-    flagActive string,
-    hxGetEdit string,
-    hxTargetEdit string,
-    hxSwapEdit string,
-    hxIncludeEdit string,
-    hxGetDelete string,
-    hxTargetDelete string,
-    hxSwapDelete string,
-    hxIncludeDelete string,
-) {
-    <div class="row px-5 d-flex justify-content-around">
-        <a
-            type="button"
-            class="btn mb-2 btn-sm col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5"
-            hx-get={ hxGetDelete + "?id=" + strconv.Itoa(id) }
-            hx-target={ hxTargetDelete }
-            hx-swap={ hxSwapDelete }
-            hx-include={ hxIncludeDelete }
-        >
-            <i aria-hidden="true" class="flaticon2-trash text-danger"></i>
-        </a>
-        if flagActive == "Y" {
-            <a 
-                type="button"
-                class="btn btn-light-danger mb-2 btn-sm col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 mb-2 btn-sm"
-                hx-get={ hxGetEdit + "?id=" + strconv.Itoa(id) }
-                hx-target={ hxTargetEdit }
-                hx-swap={ hxSwapEdit }
-                hx-include={ hxIncludeEdit }
-            >
-                Tidak
-            </a>
-        } else {
-            <a 
-                type="button"
-                class="btn btn-light-tosca mb-2 btn-sm col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 mb-2 btn-sm"
-                hx-get={ hxGetEdit + "?id=" + strconv.Itoa(id) }
-                hx-target={ hxTargetEdit }
-                hx-swap={ hxSwapEdit }
-                hx-include={ hxIncludeEdit }
-            >
-                Pilih
-            </a>
-        }
-    </div>
-}
--- a/views/dev/mdnonlabtemplate/tabledetail_templ.go
+++ b/views/dev/mdnonlabtemplate/tabledetail_templ.go
@@ -1,373 +0,0 @@
-// Code generated by templ - DO NOT EDIT.
-
-// templ: version: v0.2.663
-package dev_mdnonlabtemplateview
-
-//lint:file-ignore SA4006 This context is only used if a nested component is present.
-
-import "github.com/a-h/templ"
-import "context"
-import "io"
-import "bytes"
-
-import "cpone/models"
-import "strconv"
-import "cpone/component/table"
-
-func TableDetail(data []models.NonlabTemplateDetail,
-	tableDetailID string,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var1 == nil {
-			templ_7745c5c3_Var1 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var2 string
-		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(tableDetailID)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 18, Col: 27}
-		}
-		_, 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
-		}
-		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"KODE", "TEST", "AKSI"},
-			[]string{"20%", "50%", "30%"},
-			RowDetail(data,
-				hxGetEdit,
-				hxTargetEdit,
-				hxSwapEdit,
-				hxIncludeEdit,
-				hxGetDelete,
-				hxTargetDelete,
-				hxSwapDelete,
-				hxIncludeDelete,
-			)).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func RowDetail(
-	data []models.NonlabTemplateDetail,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var3 == nil {
-			templ_7745c5c3_Var3 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		if len(data) == 0 {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"3\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		for _, v := range data {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var4 string
-			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(v.NonlabTemplateDetailCode)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 52, Col: 45}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var5 string
-			templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(v.NonlabTemplateDetailName)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 53, Col: 45}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			templ_7745c5c3_Err = ActionRow(v.NonlabTemplateDetailID,
-				v.NonlabTemplateDetailFlagActive,
-				hxGetEdit,
-				hxTargetEdit,
-				hxSwapEdit,
-				hxIncludeEdit,
-				hxGetDelete,
-				hxTargetDelete,
-				hxSwapDelete,
-				hxIncludeDelete,
-			).Render(ctx, templ_7745c5c3_Buffer)
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td></tr>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
-
-func ActionRow(
-	id int,
-	flagActive string,
-	hxGetEdit string,
-	hxTargetEdit string,
-	hxSwapEdit string,
-	hxIncludeEdit string,
-	hxGetDelete string,
-	hxTargetDelete string,
-	hxSwapDelete string,
-	hxIncludeDelete string,
-) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
-		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
-		if !templ_7745c5c3_IsBuffer {
-			templ_7745c5c3_Buffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var6 == nil {
-			templ_7745c5c3_Var6 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row px-5 d-flex justify-content-around\"><a type=\"button\" class=\"btn mb-2 btn-sm col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5\" hx-get=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var7 string
-		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetDelete + "?id=" + strconv.Itoa(id))
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 88, Col: 60}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var8 string
-		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDelete)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 89, Col: 38}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var9 string
-		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDelete)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 90, Col: 34}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		var templ_7745c5c3_Var10 string
-		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDelete)
-		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 91, Col: 40}
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><i aria-hidden=\"true\" class=\"flaticon2-trash text-danger\"></i></a> ")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		if flagActive == "Y" {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btn btn-light-danger mb-2 btn-sm col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 mb-2 btn-sm\" hx-get=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var11 string
-			templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetEdit + "?id=" + strconv.Itoa(id))
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 99, Col: 62}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var12 string
-			templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 100, Col: 40}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var13 string
-			templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 101, Col: 36}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var14 string
-			templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 102, Col: 42}
-			}
-			_, 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("\">Tidak\r</a>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btn btn-light-tosca mb-2 btn-sm col-12 col-sm-12 col-md-12 col-lg-5 col-xl-5 col-xxl-5 mb-2 btn-sm\" hx-get=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var15 string
-			templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetEdit + "?id=" + strconv.Itoa(id))
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 110, Col: 62}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var15))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var16 string
-			templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetEdit)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 111, Col: 40}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var17 string
-			templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapEdit)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 112, Col: 36}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var18 string
-			templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeEdit)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\dev\mdnonlabtemplate\tabledetail.templ`, Line: 113, Col: 42}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Pilih\r</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
-		}
-		if !templ_7745c5c3_IsBuffer {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
-		}
-		return templ_7745c5c3_Err
-	})
-}
--- a/views/dev/mdsamplestation/mdsamplestation.templ
+++ b/views/dev/mdsamplestation/mdsamplestation.templ
@@ -100,7 +100,7 @@ templ ContentMDSampleStation(
 }

 templ CSSMDSampleStation() {
-    <linl
+    <link
        rel="stylesheet"
        href="assets/css/googlefont/poppins.css"
    />
--- a/views/dev/mdsamplestation/mdsamplestation_templ.go
+++ b/views/dev/mdsamplestation/mdsamplestation_templ.go
@@ -203,7 +203,7 @@ func CSSMDSampleStation() templ.Component {
 			templ_7745c5c3_Var4 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<linl rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"></linl><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n        body {\r\n            background-color: white;\r\n        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><style>\r\n        body {\r\n            background-color: white;\r\n        }\r\n        #div-chart {\r\n            margin: 40px 10vw 40px 10vw;\r\n        }\r\n        .title {\r\n            font-size: 20px;\r\n            font-weight: bold;\r\n        }\r\n        #title {\r\n            font-weight: 600;\r\n        }\r\n    </style>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/public/landingpage/landingpage.templ
+++ b/views/public/landingpage/landingpage.templ
@@ -19,7 +19,12 @@ templ MainLandingPage(medicalServiceComponent templ.Component, listAdvantageComp
 					alt="Your Brand"
 				/>
 			</a>
-			<button type="button" class="btn btn-lg btn-primary btn-pill">
+			<button 
+        id="btn_login"
+        hx-get="/home/login"
+        type="button" 
+        class="btn btn-lg btn-primary btn-pill"
+      >
 				<span class="title">Login</span>
 			</button>
 		</nav>
@@ -35,25 +40,25 @@ templ MainLandingPage(medicalServiceComponent templ.Component, listAdvantageComp
 		@medicalServiceComponent
 		<!-- Our Medical Service END -->
 		<!-- Why Westerindo START  belum fix di ukuran < 1400 -->
-		<div class="container p-0 mt-5 ">
-			<div class="row">
+		// <div class="container p-0 mt-5 ">
+			<div class="row mt-5">
 				@HeaderSection("Why Westerindo", "With a dedicated team of professionals we’re committed to providing medical attention tailored to your needs, ensuring a journey to optimal health and vitality.")
 			</div>
 			@listAdvantageComponent
-		</div>
+		// </div>
 		<!-- Why Westerindo END -->
 		<!-- Promotion START -->
-		<div class="container mt-4">
-			<div class="row">
+		// <div class="container mt-4">
+			<div class="row mt-4">
 				@HeaderSection("Promotions", "Seize This Opportunity to Enhance Your Health")
 			</div>
 			@listPromotion
-		</div>
+		// </div>
 		<!-- Promotion END -->
-		<!-- footer START -->
-		@footer
-		<!-- footer END -->
 	</div>
+  <!-- footer START -->
+		@footer
+  <!-- footer END -->
 }

 templ CssLandingPage() {
--- a/views/public/landingpage/landingpage_templ.go
+++ b/views/public/landingpage/landingpage_templ.go
@@ -27,7 +27,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 			templ_7745c5c3_Var1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"wrapper-custom mb-25\"><!-- Navbar Start --><nav class=\"navbar navbar-expand-sm navbar-expand-lg navbar-lp justify-content-between\"><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> <button type=\"button\" class=\"btn btn-lg btn-primary btn-pill\"><span class=\"title\">Login</span></button></nav><!-- Navbar End --><!-- jumbotron START --><!-- <div class=\"jumbotron jumbotron-lp d-none d-lg-block\"> -->")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"wrapper-custom mb-25\"><!-- Navbar Start --><nav class=\"navbar navbar-expand-sm navbar-expand-lg navbar-lp justify-content-between\"><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> <button id=\"btn_login\" hx-get=\"/home/login\" type=\"button\" class=\"btn btn-lg btn-primary btn-pill\"><span class=\"title\">Login</span></button></nav><!-- Navbar End --><!-- jumbotron START --><!-- <div class=\"jumbotron jumbotron-lp d-none d-lg-block\"> -->")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -51,7 +51,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Our Medical Service END --><!-- Why Westerindo START  belum fix di ukuran < 1400 --><div class=\"container p-0 mt-5 \"><div class=\"row\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Our Medical Service END --><!-- Why Westerindo START  belum fix di ukuran < 1400 --><div class=\"row mt-5\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -67,7 +67,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Why Westerindo END --><!-- Promotion START --><div class=\"container mt-4\"><div class=\"row\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Why Westerindo END --><!-- Promotion START --><div class=\"row mt-4\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -83,7 +83,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Promotion END --><!-- footer START -->")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Promotion END --></div><!-- footer START -->")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -91,7 +91,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- footer END --></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- footer END -->")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/public/login/logincomponent.templ
+++ b/views/public/login/logincomponent.templ
@@ -113,6 +113,9 @@ templ FormSignin() {
 		<!--begin::Action-->
 		<div class="pb-lg-0 pb-5 pt-5">
 			<button
+				hx-post="/login/signin"
+				hx-swap="outerHTML"
+				hx-target="#kt_login"
 				type="button"
 				id="kt_login_signin_submit"
 				class="btn btn-block font-weight-bolder text-white font-size-h6 px-8 py-4 my-3 mr-3 mt-5 btn-primary"
@@ -271,4 +274,4 @@ templ ForgotPassword() {
 		</div>
 		<!--end::Form group-->
 	</form>
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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