add xs layout echarts

add echart barchart
add echart kelainan lab
2024-07-08 08:47:56 +07:00 · 2024-07-05 10:55:47 +07:00 · 2024-07-03 10:47:43 +07:00 · 2024-07-01 15:58:35 +07:00 · 2024-06-27 15:56:43 +07:00 · 2024-06-26 18:13:48 +07:00
148 changed files with 29424 additions and 260 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/formKeuangan.html
+++ b/assets/mcu/formKeuangan.html
@@ -0,0 +1,273 @@
+<!DOCTYPE html>
+<html lang="en">
+  <!--begin::Head-->
+  <head>
+    <base href="../" />
+    <meta charset="utf-8" />
+    <title>Company Portal | { title }</title>
+    <meta name="description" content="Company Portal" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <!--begin::Fonts-->
+    <link rel="stylesheet" href="assets/css/googlefont/poppins.css" />
+    <!--end::Fonts-->
+    <!--begin::Page Custom Styles(used by this page)-->
+    <link
+      href="assets/css/pages/login/login-1.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <!--end::Page Custom Styles-->
+    <!--begin::Global Theme Styles(used by all pages)-->
+    <link
+      href="assets/plugins/global/plugins.bundle.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="assets/plugins/custom/prismjs/prismjs.bundle.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link href="assets/css/style.bundle.css" rel="stylesheet" type="text/css" />
+    <!--end::Global Theme Styles-->
+    <!--begin::Layout Themes(used by all pages)-->
+    <link
+      href="assets/css/themes/layout/header/base/light.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="assets/css/themes/layout/header/menu/light.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="assets/css/themes/layout/brand/dark.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <link
+      href="assets/css/themes/layout/aside/dark.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+    <!--end::Layout Themes-->
+    <link
+      rel="shortcut icon"
+      href="asset-corporate-portal/media/logo/logo-small.jpg"
+    />
+    <!--end::Layout Themes SAS-->
+    <link
+      href="asset-corporate-portal/css/sas.bundle.css"
+      rel="stylesheet"
+      type="text/css"
+    />
+
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.13.18/css/bootstrap-select.min.css"
+    />
+
+    <style>
+      .filter-option-inner-inner {
+        margin-top: 1.2vh;
+        color: var(--text-disabled);
+      }
+      .bootstrap-select > .dropdown-toggle.bs-placeholder.btn {
+        color: var(--text-disabled);
+      }
+
+      .bootstrap-select.btn-group .dropdown-menu {
+        min-width: 100%;
+        -webkit-box-sizing: border-box;
+        -moz-box-sizing: border-box;
+        box-sizing: border-box;
+        position: sticky;
+      }
+
+      .dropdown-menu {
+        transform: translate3d(0px, 0px, 0px) !important;
+      }
+
+      /* mik */
+      .input-container {
+        position: relative;
+      }
+
+      .input-label {
+        position: absolute;
+        right: 20px;
+        transform: translateY(-50%);
+        pointer-events: none;
+        transition: all 0.2s ease;
+      }
+      .input-field:not(:placeholder-shown) + .input-label {
+        top: 50%;
+        font-size: 12px;
+        color: var(--secondary-hover);
+      }
+    </style>
+  </head>
+  <!--end::Head-->
+  <!--begin::Body-->
+  <body
+    id="kt_body"
+    class="bg-white header-fixed header-mobile-fixed subheader-enabled subheader-fixed subheader-mobile-fixed aside-enabled aside-fixed aside-minimize-hoverable page-loading"
+  >
+    <!--begin::Main-->
+
+    <div class="wrapperx p-5 h-100">
+      
+        <!--begin::Row 1-->
+        <div class="form-row">
+              <div class="col-3">
+                <div class="container px-15">
+                  <div
+                    class="d-flex flex-column bg-primary-transparent rounded p-4 m-2 shadow"
+                  >
+                    <h4>Orders</h4>
+                    <h1 class="font-weight-bolder ml-auto">120.000.000</h1>
+                  </div>
+                </div>
+              </div>
+              <div class="col-3">
+                <div class="container px-15">
+                  <div
+                    class="d-flex flex-column bg-warning-transparent rounded p-4 m-2 shadow"
+                  >
+                    <h4>Tagihan</h4>
+                    <h1 class="font-weight-bolder ml-auto">85.000.000</h1>
+                  </div>
+                </div>
+              </div>
+              <div class="col-3">
+                <div class="container px-15">
+                  <div
+                    class="d-flex flex-column bg-success-transparent rounded p-4 m-2 shadow"
+                  >
+                    <h4>Pelunasan</h4>
+                    <h1 class="font-weight-bolder ml-auto">55.000.000</h1>
+                  </div>
+                </div>
+              </div>
+              <div class="col-3">
+                <div class="container px-15">
+                  <div
+                    class="d-flex flex-column bg-danger-transparent rounded p-4 m-2 shadow"
+                  >
+                    <h4>Hutang</h4>
+                    <h1 class="font-weight-bolder ml-auto">55.000.000</h1>
+                  </div>
+                </div>
+              </div>
+              <!--end::Row 1-->
+            </div>
+            <!-- begin::Row 2 -->
+            <div class="form-row mt-15">
+                <div class="col">
+                        <div class="table-responsive">
+                            <table class="table table-bordered">
+                                <thead>
+                                    <tr >
+                                        <th scope="col" class="text-center text-black col-5" colspan="3">Tagihan</th>
+                                        <th scope="col" class="text-center text-black col-4" colspan="2">Pelunasan</th>
+                                        <th scope="col" class="text-center text-black col-3" rowspan="2">
+                                            <div class="d-flex justify-content-center align-items-center h-100">
+                                                <h3>Sisa</h3>
+                                            </div>
+                                        </th>
+                                    </tr>
+                                    <tr>
+                                        <th scope="col" class="text-center text-black">No/Tgl</th>
+                                        <th scope="col" class="text-center text-black">Tgl Jatuh Tempo</th>
+                                        <th scope="col" class="text-center text-black">Jumlah</th>
+                                        <th scope="col" class="text-center text-black">No/Tgl</th>
+                                        <th scope="col" class="text-center text-black">Jumlah</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr>
+                                        <td class="text-center" rowspan="2">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center" rowspan="2">20 MARET 2024</td>
+                                        <td class="text-center" rowspan="2">20.000.000</td>
+                                        <td class="text-center">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center">10.000.000</td>
+                                        <td class="text-center" rowspan="2">5.000.000</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="text-center">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center">5.000.000</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="text-center" rowspan="2">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center" rowspan="2">20 MARET 2024</td>
+                                        <td class="text-center" rowspan="2">20.000.000</td>
+                                        <td class="text-center">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center">10.000.000</td>
+                                        <td class="text-center" rowspan="2">5.000.000</td>
+                                    </tr>
+                                    <tr>
+                                        <td class="text-center">T/103/200/XYZ 20 MARET 2024</td>
+                                        <td class="text-center">5.000.000</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                </div>
+            </div>
+            <!-- end::Row 2 -->
+          
+        
+      
+
+    <!--end::Main-->
+    <script src="asset-corporate-portal/js/ktappsetting.js"></script>
+    <!-- iconify -->
+    <script src="assets/js/iconify/iconify.min.js"></script>
+    <!--end::Global Config-->
+    <!--begin::Global Theme Bundle(used by all pages)-->
+    <script src="assets/plugins/global/plugins.bundle.js"></script>
+    <script src="assets/plugins/custom/prismjs/prismjs.bundle.js"></script>
+    <script src="assets/js/scripts.bundle.js"></script>
+    <script src="assets/js/pages/crud/forms/widgets/bootstrap-datepicker.js"></script>
+
+    <script>
+      function ShowLoading() {
+        document
+          .getElementById("demo")
+          .setAttribute("style", "display:block !important;");
+        document
+          .getElementById("a")
+          .setAttribute("style", "display:none !important;");
+      }
+      function ShowForm() {
+        document
+          .getElementById("demo")
+          .setAttribute("style", "display:none !important;");
+        document
+          .getElementById("a")
+          .setAttribute("style", "display:block !important;;");
+      }
+
+      $(document).ready(function () {
+        // $(".selectpicker").selectpicker();
+        $(".selectpicker").selectpicker({
+          dropupAuto: false,
+        });
+        $("#datepicker").datepicker({
+          format: "dd/mm/yyyy",
+        });
+        $("#calendar-icon").click(function () {
+          $("#datepicker").datepicker("show");
+        });
+      });
+    </script>
+    <!--end::Global Theme Bundle-->
+
+    <!--end::Page Scripts-->
+  </body>
+  <!--end::Body-->
+</html>
--- a/assets/mcu/isihasilriwayat.html
+++ b/assets/mcu/isihasilriwayat.html
--- a/auth/jwt.go
+++ b/auth/jwt.go
@@ -0,0 +1,20 @@
+package auth
+
+import (
+	"net/http"
+
+	echojwt "github.com/labstack/echo-jwt/v4"
+	"github.com/labstack/echo/v4"
+)
+
+var IsLoggedIn = echojwt.WithConfig(
+	echojwt.Config{
+		SigningKey:   []byte("--one_api-secret-2019-04-01"),
+		TokenLookup:  "cookie:token",
+		ErrorHandler: JWTErrorChecker,
+	},
+)
+
+func JWTErrorChecker(c echo.Context, err error) error {
+	return c.Redirect(http.StatusTemporaryRedirect, "/login")
+}
--- a/component/chart/chart.templ
+++ b/component/chart/chart.templ
@@ -11,7 +11,7 @@ script GenerateChart(idDiv string, udata string) {
        var element = document.getElementById(idDiv);
        console.log("element ",element)
        if (element) {
-            element.style.height = "400px";
+            element.style.height = "450px";
            element.style.width = "100%";
        }

@@ -21,6 +21,35 @@ script GenerateChart(idDiv string, udata string) {
        // var myChart_001 = echarts.init(document.getElementById(idDiv));
        myChart[idDiv] = echarts.init(element);

+        // var option_001 = JSON.parse(udata);
+        option[idDiv] = JSON.parse(udata);
+        console.log("option ", option)
+        // myChart_001.setOption(option_001);
+        myChart[idDiv].setOption(option[idDiv]);
+    });
+}
+
+templ ShowChartFixed(idDiv string, udata string, width string, height string) {
+    <div id={ idDiv } class="mx-auto"></div>
+    @GenerateChartFixed(idDiv, udata, width, height)
+}
+
+script GenerateChartFixed(idDiv string, udata string, width string, height string) {
+    htmx.onLoad(function(elt) {
+        console.log("elt ",elt)
+        var element = document.getElementById(idDiv);
+        console.log("element ",element)
+        if (element) {
+            element.style.height = height;
+            element.style.width = width;
+        }
+
+        var myChart = {}; 
+        var option = {};
+
+        // var myChart_001 = echarts.init(document.getElementById(idDiv));
+        myChart[idDiv] = echarts.init(element);
+
        // var option_001 = JSON.parse(udata);
        option[idDiv] = JSON.parse(udata);
        console.log("option ", option)
--- a/component/chart/chart_templ.go
+++ b/component/chart/chart_templ.go
@@ -53,13 +53,13 @@ func ShowChart(idDiv string, udata string) templ.Component {

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

@@ -76,7 +76,78 @@ func GenerateChart(idDiv string, udata string) templ.ComponentScript {
        myChart[idDiv].setOption(option[idDiv]);
    });
 }`,
-		Call:       templ.SafeScript(`__templ_GenerateChart_4c73`, idDiv, udata),
-		CallInline: templ.SafeScriptInline(`__templ_GenerateChart_4c73`, idDiv, udata),
+		Call:       templ.SafeScript(`__templ_GenerateChart_906c`, idDiv, udata),
+		CallInline: templ.SafeScriptInline(`__templ_GenerateChart_906c`, idDiv, udata),
+	}
+}
+
+func ShowChartFixed(idDiv string, udata string, width string, height string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var3 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var3 == nil {
+			templ_7745c5c3_Var3 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(idDiv)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\chart\chart.templ`, Line: 33, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"mx-auto\"></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = GenerateChartFixed(idDiv, udata, width, height).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func GenerateChartFixed(idDiv string, udata string, width string, height string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_GenerateChartFixed_a276`,
+		Function: `function __templ_GenerateChartFixed_a276(idDiv, udata, width, height){htmx.onLoad(function(elt) {
+        console.log("elt ",elt)
+        var element = document.getElementById(idDiv);
+        console.log("element ",element)
+        if (element) {
+            element.style.height = height;
+            element.style.width = width;
+        }
+
+        var myChart = {}; 
+        var option = {};
+
+        // var myChart_001 = echarts.init(document.getElementById(idDiv));
+        myChart[idDiv] = echarts.init(element);
+
+        // var option_001 = JSON.parse(udata);
+        option[idDiv] = JSON.parse(udata);
+        console.log("option ", option)
+        // myChart_001.setOption(option_001);
+        myChart[idDiv].setOption(option[idDiv]);
+    });
+}`,
+		Call:       templ.SafeScript(`__templ_GenerateChartFixed_a276`, idDiv, udata, width, height),
+		CallInline: templ.SafeScriptInline(`__templ_GenerateChartFixed_a276`, idDiv, udata, width, height),
 	}
 }
--- a/component/customdropdown/customdropdown_templ.go
+++ b/component/customdropdown/customdropdown_templ.go
@@ -376,7 +376,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var23 string
 		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(idCmp)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 80, Col: 12}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 81, Col: 12}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 		if templ_7745c5c3_Err != nil {
@@ -389,7 +389,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var24 string
 		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(hxName)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 81, Col: 15}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 82, Col: 15}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
 		if templ_7745c5c3_Err != nil {
@@ -402,7 +402,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var25 string
 		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 82, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 83, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
 		if templ_7745c5c3_Err != nil {
@@ -415,7 +415,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var26 string
 		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 83, Col: 16}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 84, Col: 16}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
 		if templ_7745c5c3_Err != nil {
@@ -428,7 +428,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var27 string
 		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 84, Col: 18}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 85, Col: 18}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
 		if templ_7745c5c3_Err != nil {
@@ -441,7 +441,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var28 string
 		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 85, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 86, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
 		if templ_7745c5c3_Err != nil {
@@ -454,7 +454,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var29 string
 		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 86, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 87, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
 		if templ_7745c5c3_Err != nil {
@@ -518,7 +518,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var33 string
 		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Label)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 97, Col: 87}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 98, Col: 87}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
 		if templ_7745c5c3_Err != nil {
@@ -546,7 +546,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var34 string
 		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Placeholder)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 106, Col: 26}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 107, Col: 26}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
 		if templ_7745c5c3_Err != nil {
@@ -559,7 +559,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var35 string
 		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 109, Col: 18}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 110, Col: 18}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
 		if templ_7745c5c3_Err != nil {
@@ -572,7 +572,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var36 string
 		templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 110, Col: 14}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 111, Col: 14}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
 		if templ_7745c5c3_Err != nil {
@@ -593,7 +593,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var37 string
 		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 115, Col: 17}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 116, Col: 17}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37))
 		if templ_7745c5c3_Err != nil {
--- a/component/modal/modal.templ
+++ b/component/modal/modal.templ
@@ -28,3 +28,58 @@ templ Modal(modalID string, modalTitle string, modalBody templ.Component, modalA
 		</div>
 	</div>
 }
+
+templ ModalXL(modalID string, modalTitle string, modalBody templ.Component, modalAction templ.Component, btnClose templ.Component) {
+	<div
+		class="modal fade"
+		style="display: none"
+		id={ modalID }
+		tabindex="-1"
+		role="dialog"
+		data-backdrop="static"
+		aria-hidden="true"
+	>
+		<div class="modal-dialog modal-xl modal-dialog-centered" role="document">
+			<div class="modal-content rounded-lg">
+				<div class="modal-header border-bottom-0">
+					<h6 class="modal-title text-black font-weight-bolder">
+						{ modalTitle }
+					</h6>
+					@btnClose
+				</div>
+				<div class="modal-body border-bottom-0">
+					@modalBody
+				</div>
+				<div class="modal-footer border-top-0">
+					@modalAction
+				</div>
+			</div>
+		</div>
+	</div>
+}
+
+templ ModalViewXL(modalID string, modalTitle string, modalBody templ.Component, btnClose templ.Component) {
+	<div
+		class="modal fade"
+		style="display: none"
+		id={ modalID }
+		tabindex="-1"
+		role="dialog"
+		data-backdrop="static"
+		aria-hidden="true"
+	>
+		<div class="modal-dialog modal-xl modal-dialog-centered" role="document">
+			<div class="modal-content rounded-lg">
+				<div class="modal-header border-bottom-0">
+					<h6 class="modal-title text-black font-weight-bolder">
+						{ modalTitle }
+					</h6>
+					@btnClose
+				</div>
+				<div class="modal-body border-bottom-0">
+					@modalBody
+				</div>
+			</div>
+		</div>
+	</div>
+}
--- a/component/modal/modal_templ.go
+++ b/component/modal/modal_templ.go
@@ -83,3 +83,143 @@ func Modal(modalID string, modalTitle string, modalBody templ.Component, modalAc
 		return templ_7745c5c3_Err
 	})
 }
+
+func ModalXL(modalID string, modalTitle string, modalBody templ.Component, modalAction templ.Component, btnClose templ.Component) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var4 == nil {
+			templ_7745c5c3_Var4 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"modal fade\" style=\"display: none\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var5 string
+		templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(modalID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\modal\modal.templ`, Line: 36, Col: 14}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" tabindex=\"-1\" role=\"dialog\" data-backdrop=\"static\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl modal-dialog-centered\" role=\"document\"><div class=\"modal-content rounded-lg\"><div class=\"modal-header border-bottom-0\"><h6 class=\"modal-title text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(modalTitle)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\modal\modal.templ`, Line: 46, Col: 18}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</h6>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = btnClose.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"modal-body border-bottom-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalBody.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"modal-footer border-top-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalAction.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func ModalViewXL(modalID string, modalTitle string, modalBody templ.Component, btnClose templ.Component) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"modal fade\" style=\"display: none\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 string
+		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(modalID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\modal\modal.templ`, Line: 65, Col: 14}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" tabindex=\"-1\" role=\"dialog\" data-backdrop=\"static\" aria-hidden=\"true\"><div class=\"modal-dialog modal-xl modal-dialog-centered\" role=\"document\"><div class=\"modal-content rounded-lg\"><div class=\"modal-header border-bottom-0\"><h6 class=\"modal-title text-black font-weight-bolder\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 string
+		templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(modalTitle)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\modal\modal.templ`, Line: 75, Col: 18}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</h6>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = btnClose.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"modal-body border-bottom-0\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = modalBody.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></div></div></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/component/navbar/navbar.templ
+++ b/component/navbar/navbar.templ
@@ -40,6 +40,50 @@ templ Navbar(dataUser models.User) {
 	</div>
 }

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

-func NavbarMenu(datamenu []models.Menu) templ.Component {
+func NavbarWithLogo(dataUser models.User) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
 		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
 		if !templ_7745c5c3_IsBuffer {
@@ -66,6 +66,43 @@ func NavbarMenu(datamenu []models.Menu) templ.Component {
 			templ_7745c5c3_Var3 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"kt_header\" class=\"header\"><!--begin::Container--><div class=\"container-fluid  d-flex align-items-stretch justify-content-between\"><!--begin::Header Menu Wrapper--><div class=\"header-menu-wrapper header-menu-wrapper-left\" id=\"kt_header_menu_wrapper\"><a class=\"navbar-brand\" href=\"#\"><img src=\"/asset-corporate-portal/media/landingpage/logo.png\" width=\"126\" height=\"40\" class=\"d-inline-block align-top\" alt=\"Your Brand\"></a></div><!--end::Header Menu Wrapper--><!--begin::Topbar--><div class=\"topbar\"><!--begin::User--><div class=\"topbar-item\"><div class=\"btn btn-icon btn-icon-mobile w-auto btn-clean d-flex align-items-center btn-lg px-2\" id=\"kt_quick_user_toggle\"><span class=\"text-muted font-weight-bold font-size-base d-none d-md-inline mr-1\">Hi,</span> <span class=\"text-dark-50 font-weight-bolder font-size-base d-none d-md-inline mr-3\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var4 string
+		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(dataUser.Username)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\navbar\navbar.templ`, Line: 73, Col: 26}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</span> <span class=\"bg-primary-transparent p-3\" style=\"border-radius: 50%; width: 40px; height: 40px;\"><span class=\"iconify text-primary\" data-icon=\"gravity-ui:person\"></span></span></div></div><!--end::User--></div><!--end::Topbar--></div><!--end::Container--></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func NavbarMenu(datamenu []models.Menu) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var5 == nil {
+			templ_7745c5c3_Var5 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"aside-menu-wrapper flex-column-fluid\" id=\"kt_aside_menu_wrapper\"><!--begin::Menu Container--><div id=\"kt_aside_menu\" class=\"aside-menu my-4 \" data-menu-vertical=\"1\" data-menu-scroll=\"1\" data-menu-dropdown-timeout=\"500\"><!--begin::Menu Nav--><ul class=\"menu-nav \">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
--- a/component/sidebar_user_profile/sidebar_user_profile.templ
+++ b/component/sidebar_user_profile/sidebar_user_profile.templ
@@ -24,16 +24,16 @@ templ Navbaruserprofile(dataUser models.User) {
 			<div class="separator separator-dashed my-7"></div>
 			<!--end::Separator-->
 			<!--begin::Notifications-->
-			<div>
-				<!--begin:Heading-->
-				<h5 class="mb-5">
-					Recent Notifications
-				</h5>
-				<!--end:Heading-->
-				<!--begin::Item-->
-				@NotificationCard()
-				<!--end::Item-->
-			</div>
+			// <div>
+			// 	<!--begin:Heading-->
+			// 	<h5 class="mb-5">
+			// 		Recent Notifications
+			// 	</h5>
+			// 	<!--end:Heading-->
+			// 	<!--begin::Item-->
+			// 	@NotificationCard()
+			// 	<!--end::Item-->
+			// </div>
 			<!--end::Notifications-->
 		</div>
 		<!--end::Content-->
@@ -55,7 +55,12 @@ templ ProfileHeader(dataUser models.User) {
 				{ dataUser.UserPosition }
 			</div>
 			<div class="navi mt-2">
-				<a href="#" class="btn btn-sm btn-light-primary font-weight-bolder py-2 px-5">Sign Out</a>
+				<a 
+					class="btn btn-sm btn-light-primary font-weight-bolder py-2 px-5"
+					hx-get="/login/signout"
+				>
+					Sign Out
+				</a>
 			</div>
 		</div>
 	</div>
--- a/component/sidebar_user_profile/sidebar_user_profile_templ.go
+++ b/component/sidebar_user_profile/sidebar_user_profile_templ.go
@@ -33,15 +33,7 @@ func Navbaruserprofile(dataUser models.User) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Header--><!--begin::Separator--><div class=\"separator separator-dashed my-7\"></div><!--end::Separator--><!--begin::Notifications--><div><!--begin:Heading--><h5 class=\"mb-5\">Recent Notifications\r</h5><!--end:Heading--><!--begin::Item-->")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = NotificationCard().Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Item--></div><!--end::Notifications--></div><!--end::Content--></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Header--><!--begin::Separator--><div class=\"separator separator-dashed my-7\"></div><!--end::Separator--><!--begin::Notifications--><!--end::Notifications--></div><!--end::Content--></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -91,7 +83,7 @@ func ProfileHeader(dataUser models.User) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"navi mt-2\"><a href=\"#\" class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5\">Sign Out</a></div></div></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"navi mt-2\"><a class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5\" hx-get=\"/login/signout\">Sign Out\r</a></div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/component/table/tablev3.templ
+++ b/component/table/tablev3.templ
@@ -10,7 +10,11 @@ templ TableV3(thName []string, thWidth []string, trComponent templ.Component) {
 				<thead>
 					<tr class="rounded-lg bg-header-table">
 						for i, item := range thName {
-							<th scope="col" width={ thWidth[i] }>{ item }</th>
+							if item == "AKSI" {
+								<th scope="col" width={ thWidth[i] } class="text-center">{ item }</th>	
+							} else {
+								<th scope="col" width={ thWidth[i] }>{ item }</th>
+							}
 						}
 					</tr>
 				</thead>
--- a/component/table/tablev3_templ.go
+++ b/component/table/tablev3_templ.go
@@ -38,35 +38,68 @@ func TableV3(thName []string, thWidth []string, trComponent templ.Component) tem
 				return templ_7745c5c3_Err
 			}
 			for i, item := range thName {
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" width=\"")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var2 string
-				templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 13, Col: 41}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				var templ_7745c5c3_Var3 string
-				templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(item)
-				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 13, Col: 50}
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
-				}
-				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</th>")
-				if templ_7745c5c3_Err != nil {
-					return templ_7745c5c3_Err
+				if item == "AKSI" {
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" width=\"")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var2 string
+					templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 14, Col: 42}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"text-center\">")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var3 string
+					templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(item)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 14, Col: 71}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</th>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+				} else {
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<th scope=\"col\" width=\"")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var4 string
+					templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(thWidth[i])
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 16, Col: 42}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					var templ_7745c5c3_Var5 string
+					templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(item)
+					if templ_7745c5c3_Err != nil {
+						return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\table\tablev3.templ`, Line: 16, Col: 51}
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5))
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
+					_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</th>")
+					if templ_7745c5c3_Err != nil {
+						return templ_7745c5c3_Err
+					}
 				}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</tr></thead> <tbody>")
@@ -101,9 +134,9 @@ func DivEmptyV3() templ.Component {
 			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		templ_7745c5c3_Var4 := templ.GetChildren(ctx)
-		if templ_7745c5c3_Var4 == nil {
-			templ_7745c5c3_Var4 = templ.NopComponent
+		templ_7745c5c3_Var6 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var6 == nil {
+			templ_7745c5c3_Var6 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div></div>")
--- a/go.mod
+++ b/go.mod
@@ -4,17 +4,19 @@ go 1.21.0

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

 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/jmoiron/sqlx v1.4.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
@@ -24,7 +26,6 @@ require (
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.18.2 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
@@ -36,7 +37,8 @@ require (
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
 	github.com/google/uuid v1.5.0 // indirect
-	github.com/labstack/gommon v0.4.2 // indirect
+	github.com/labstack/echo-jwt/v4 v4.2.0
+	github.com/labstack/gommon v0.4.2
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
--- a/go.sum
+++ b/go.sum
@@ -3,10 +3,13 @@ filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4
 github.com/a-h/templ v0.2.663 h1:aa0WMm27InkYHGjimcM7us6hJ6BLhg98ZbfaiDPyjHE=
 github.com/a-h/templ v0.2.663/go.mod h1:SA7mtYwVEajbIXFRh3vKdYm/4FYyLQAtPH1+KxzGPA8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
 github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
@@ -15,6 +18,8 @@ github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpv
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
 github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
 github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
+github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
@@ -25,33 +30,38 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o=
 github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY=
-github.com/labstack/echo/v4 v4.11.3 h1:Upyu3olaqSHkCjs1EJJwQ3WId8b8b1hxbogyommKktM=
-github.com/labstack/echo/v4 v4.11.3/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/labstack/echo-jwt/v4 v4.2.0 h1:odSISV9JgcSCuhgQSV/6Io3i7nUmfM/QkBeR5GVJj5c=
+github.com/labstack/echo-jwt/v4 v4.2.0/go.mod h1:MA2RqdXdEn4/uEglx0HcUOgQSyBaTh5JcaHIan3biwU=
 github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0=
 github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM=
-github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
-github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
 github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
 github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
+github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
 github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
 github.com/sagikazarmark/locafero v0.4.0 h1:HApY1R9zGo4DBgr7dqsTH/JJxLTTsOt7u6keLGt6kNQ=
 github.com/sagikazarmark/locafero v0.4.0/go.mod h1:Pe1W6UlPYUk/+wc/6KFhbORCfqzgYEpgQ3O5fPuL3H4=
 github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
@@ -69,7 +79,6 @@ github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMV
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
@@ -78,43 +87,34 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8
 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
 go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
 golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
 golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
 golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 modernc.org/libc v1.37.6 h1:orZH3c5wmhIQFTXF+Nt+eeauyd+ZIt2BX6ARe+kD+aw=
--- a/handlers/corporate/dashboardpic.handlers.go
+++ b/handlers/corporate/dashboardpic.handlers.go
@@ -0,0 +1,209 @@
+package corporate_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	"cpone/component/pagination"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/utils"
+	corporate_dashboardpic "cpone/views/corporate/dashboardpic"
+	"net/http"
+	"strconv"
+
+	"github.com/a-h/templ"
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type DashboardPicServices interface {
+	GetEmployeeAnalyticBreadcrumb(title string) (models.BreadCrumbV1, error)
+	GetCorporateName(userID string) (string, error)
+	DummyDataTest() ([]models.DashboardPic, error)
+	ListingDashboardPic(search string, startdate string, enddate string, currentpage int, rowperpage int) ([]models.DashboardPic, int, error)
+}
+
+type DashboardPicHandler struct {
+	DashboardPicServices DashboardPicServices
+}
+
+func NewDashboardPicHandler(ea DashboardPicServices) *DashboardPicHandler {
+	return &DashboardPicHandler{
+		DashboardPicServices: ea,
+	}
+}
+
+func (ea *DashboardPicHandler) HandleShowEmployeeAnalyticScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	listID := utils.GenerateRandomID("listid")
+	paginationID := utils.GenerateRandomID("paginationid")
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	userID := claims["M_UserID"].(string)
+	name := claims["M_StaffName"].(string)
+	position := claims["M_UserGroupDashboard"].(string)
+	logger.Info("jwt", zap.Any("name", name))
+
+	title, err := ea.DashboardPicServices.GetCorporateName(userID)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get corporate name", zap.Any("error", err))
+		return err
+	}
+
+	convr, _ := strconv.Atoi(userID)
+
+	user := models.User{
+		UserID:       convr,
+		Username:     name,
+		UserFullName: name,
+		UserPosition: position,
+	}
+
+	dataBreadcrumb, err := ea.DashboardPicServices.GetEmployeeAnalyticBreadcrumb(title)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb dev", zap.Any("error", err))
+		return err
+	}
+	defer logger.Sync()
+
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+
+	listingData, totalPage, err := ea.DashboardPicServices.ListingDashboardPic("", "", "", 1, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get listing data", zap.Any("error", err), zap.Any("total", totalPage))
+		return err
+	}
+	listingcomponent := corporate_dashboardpic.ListingData(listingData, listID)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/corp/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		corporate_dashboardpic.BeforeRequestContent(),
+		corporate_dashboardpic.AfterRequestContent(),
+	)
+
+	filtercomponent := corporate_dashboardpic.FilterListing(
+		"/corp/dashboard_pic/filter",
+		"input changed delay:500ms",
+		"#searchID, #startdateID, #enddateID, #listID, #paginationID",
+		"outerHTML",
+		"#"+paginationID,
+		corporate_dashboardpic.BeforeRequestContent(),
+		corporate_dashboardpic.AfterRequestContent(),
+	)
+
+	content := corporate_dashboardpic.DashboardPic(
+		listID,
+		paginationID,
+		breadcrumb,
+		filtercomponent,
+		listingcomponent,
+		paginationcomponent,
+	)
+	css := corporate_dashboardpic.CSSDashboardPIC()
+	js := corporate_dashboardpic.JSDashboardPIC()
+
+	view := corporate_dashboardpic.ShowDashboardPic(title, content, css, js, navbaruser, sidbaruser)
+	return utils.View(c, view)
+}
+
+func (ea *DashboardPicHandler) HandlePagination(c echo.Context) error {
+
+	pageparam := c.QueryParam("page")
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+	search := c.QueryParam("search")
+	startdate := c.QueryParam("startdate")
+	enddate := c.QueryParam("enddate")
+
+	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, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error convert page param")
+		return err
+	}
+	listcomponent := corporate_dashboardpic.ListingData(listdata, listID)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		corporate_dashboardpic.BeforeRequestContent(),
+		corporate_dashboardpic.AfterRequestContent(),
+	)
+
+	retVal = append(retVal, listcomponent)
+	retVal = append(retVal, paginationcomponent)
+	return utils.ViewMulti(c, retVal)
+}
+
+func (ea *DashboardPicHandler) HandleFilter(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	search := c.QueryParam("search")
+	startdate := c.QueryParam("startdate")
+	enddate := c.QueryParam("enddate")
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+
+	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,80 @@
+package corporate_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu"
+	corporate_tabmcudetail "cpone/views/corporate/mcu/mcutab"
+
+	"github.com/golang-jwt/jwt/v5"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type McuDetailServices interface {
+	GetBreadcrumb(id string) (models.BreadCrumbV1, error)
+}
+
+type McuDetailHandler struct {
+	McuDetailServices McuDetailServices
+}
+
+func NewMcuDetailHandler(mcud McuDetailServices) *McuDetailHandler {
+	return &McuDetailHandler{
+		McuDetailServices: mcud,
+	}
+}
+
+func (mcud *McuDetailHandler) HandlerShowMcuDetailScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.Param("id")
+	logger.Info("params", zap.Any("id", id))
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	name := claims["M_StaffName"].(string)
+	position := claims["M_UserGroupDashboard"].(string)
+	logger.Info("jwt", zap.Any("name", name))
+
+	user := models.User{
+		UserID:       1,
+		Username:     name,
+		UserFullName: name,
+		UserPosition: position,
+	}
+
+	dataBreadcrumb, err := mcud.McuDetailServices.GetBreadcrumb(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb corp", zap.Any("error", err))
+		return err
+	}
+
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+
+	content := corporate_mcudetail.McuDetailScreen(
+		breadcrumb,
+		corporate_mcudetail.TabViewMcuDetail(id),
+	)
+	css := corporate_mcudetail.CSSMcuDetail(
+		corporate_tabmcudetail.CssKesimpulan(),
+	)
+	js := corporate_mcudetail.JSMcuDetail()
+
+	view := corporate_mcudetail.ShowMcuDetail(
+		dataBreadcrumb.Title,
+		content,
+		css,
+		js,
+		navbaruser,
+		sidbaruser,
+	)
+
+	return utils.View(c, view)
+}
--- a/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go
+++ b/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go
@@ -0,0 +1,199 @@
+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)
+	GetReportMcu(orderheaderID string) ([]models.TabViewReportMcu, 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, 10)
+	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,
+	)
+
+	tabData := []models.TabViewReportMcu{}
+	tabview := corporate_mcudetail.TabReportView(tabData)
+
+	bodymodal := corporate_mcudetail.ModalBody(
+		dialogReportBodyID,
+		tabview,
+		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, 10)
+	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, #currPage"+paginationID,
+		"#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))
+
+	tabData, err := tdp.TabDaftarPesertaServices.GetReportMcu(idx)
+	if err != nil {
+		tab := corporate_mcudetail.TabReportView([]models.TabViewReportMcu{})
+		mod := corporate_mcudetail.ModalBody(
+			dialogReportBodyID,
+			tab,
+			corporate_mcudetail.JsShowModal(""),
+		)
+		return utils.View(c, mod)
+	}
+
+	tabcomponent := corporate_mcudetail.TabReportView(tabData)
+
+	modalbody := corporate_mcudetail.ModalBody(
+		dialogReportBodyID,
+		tabcomponent,
+		corporate_mcudetail.JsShowModal("#"+dialogReportID),
+	)
+
+	return utils.View(c, modalbody)
+}
--- a/handlers/corporate/mcudetail/tabkelainanfisik.hanlders.go
+++ b/handlers/corporate/mcudetail/tabkelainanfisik.hanlders.go
@@ -0,0 +1,79 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"encoding/json"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabKelainanFisikServices interface {
+	GetKelainanFisikBMI(mcuID string) (models.Piechart, error)
+	GetKelainanFisikHipertensi(mcuID string) (models.Piechart, error)
+}
+
+type TabKelainanFisikHandler struct {
+	TabKelainanFisikServices TabKelainanFisikServices
+}
+
+func NewTabKelainanFisikHandler(tkf TabKelainanFisikServices) *TabKelainanFisikHandler {
+	return &TabKelainanFisikHandler{
+		TabKelainanFisikServices: tkf,
+	}
+}
+
+func (tkf *TabKelainanFisikHandler) HandleShowTabKelainanFisik(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	logger.Info("Tab Kelainan Fisik")
+
+	id := c.Param("id")
+	logger.Info("Params", zap.Any("id", id))
+
+	bmi, err := tkf.TabKelainanFisikServices.GetKelainanFisikBMI(id)
+	if err != nil {
+		return err
+	}
+
+	hiper, err := tkf.TabKelainanFisikServices.GetKelainanFisikHipertensi(id)
+	if err != nil {
+		return err
+	}
+
+	bmijson, err := json.MarshalIndent(bmi, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	hiperjson, err := json.MarshalIndent(hiper, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	chartsxs := []templ.Component{
+		chart.ShowChartFixed("bmixs", string(bmijson), "400px", "450px"),
+		chart.ShowChartFixed("hprxs", string(hiperjson), "400px", "450px"),
+	}
+
+	chartsmd := []templ.Component{
+		chart.ShowChartFixed("bmimd", string(bmijson), "450px", "450px"),
+		chart.ShowChartFixed("hprmd", string(hiperjson), "450px", "450px"),
+	}
+
+	chartslg := []templ.Component{
+		chart.ShowChartFixed("bmilg", string(bmijson), "600px", "450px"),
+		chart.ShowChartFixed("hprlg", string(hiperjson), "600px", "450px"),
+	}
+
+	content := corporate_mcudetail.Tabkelainanfisik(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkelainanglobal.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainanglobal.handlers.go
@@ -0,0 +1,78 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"encoding/json"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabKelainanGlobalServices interface {
+	GetKelainanGlobalMCU(mcuID string) (models.Barchart, error)
+	GetKelainanFisik(mcuID string) (models.Barchart, error)
+}
+
+type TabKelainanGlobalHandler struct {
+	TabKelainanGlobalServices TabKelainanGlobalServices
+}
+
+func NewTabKelainanGlobalHandler(tkg TabKelainanGlobalServices) *TabKelainanGlobalHandler {
+	return &TabKelainanGlobalHandler{
+		TabKelainanGlobalServices: tkg,
+	}
+}
+
+func (tkg *TabKelainanGlobalHandler) HandleShowTabKelainanGlobal(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	id := c.Param("id")
+
+	logger.Info("params", zap.Any("id", id))
+
+	kelmcu, err := tkg.TabKelainanGlobalServices.GetKelainanGlobalMCU(id)
+	if err != nil {
+		return err
+	}
+
+	kelfisik, err := tkg.TabKelainanGlobalServices.GetKelainanFisik(id)
+	if err != nil {
+		return err
+	}
+
+	klmcujson, err := json.MarshalIndent(kelmcu, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	klfisjson, err := json.MarshalIndent(kelfisik, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	chartsxs := []templ.Component{
+		chart.ShowChartFixed("chartmcuxs", string(klmcujson), "400px", "450px"),
+		chart.ShowChartFixed("chartfisikxs", string(klfisjson), "400px", "450px"),
+	}
+
+	chartsmd := []templ.Component{
+		chart.ShowChartFixed("chartmcumd", string(klmcujson), "500px", "450px"),
+		chart.ShowChartFixed("chartfisikmd", string(klfisjson), "500px", "450px"),
+	}
+
+	chartslg := []templ.Component{
+		chart.ShowChartFixed("chartmculg", string(klmcujson), "1000px", "450px"),
+		chart.ShowChartFixed("chartfisiklg", string(klfisjson), "1000px", "450px"),
+	}
+
+	content := corporate_mcudetail.TabKelainanGlobal(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkelainanlab.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainanlab.handlers.go
@@ -0,0 +1,130 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"encoding/json"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+)
+
+type TabKelainanLabServices interface {
+	GetDataPresentaseKelainanLab(mcuID string) (models.Barchart, error)
+	GetHematologi(mcuID string) (models.BarchartV2, error)
+	GetUrinalisa(mcuID string) (models.BarchartV2, error)
+	GetGangguanFungsiHati(mcuID string) (models.BarchartV2, error)
+	GetGangguanMetabolismeLemak(mcuID string) (models.BarchartV2, error)
+	GetPeningkatanGlukosa(mcuID string) (models.BarchartV2, error)
+}
+
+type TabKelainanLabHandler struct {
+	TabKelainanLabServices TabKelainanLabServices
+}
+
+func NewTabKelainanLabHandler(tkl TabKelainanLabServices) *TabKelainanLabHandler {
+	return &TabKelainanLabHandler{
+		TabKelainanLabServices: tkl,
+	}
+}
+
+func (tkl *TabKelainanLabHandler) HandleShowTabKelainanLab(c echo.Context) error {
+	id := c.Param("id")
+
+	datapre, err := tkl.TabKelainanLabServices.GetDataPresentaseKelainanLab(id)
+	if err != nil {
+		return err
+	}
+
+	hematologi, err := tkl.TabKelainanLabServices.GetHematologi(id)
+	if err != nil {
+		return err
+	}
+
+	urinalisa, err := tkl.TabKelainanLabServices.GetUrinalisa(id)
+	if err != nil {
+		return err
+	}
+
+	hati, err := tkl.TabKelainanLabServices.GetGangguanFungsiHati(id)
+	if err != nil {
+		return err
+	}
+
+	lemak, err := tkl.TabKelainanLabServices.GetGangguanMetabolismeLemak(id)
+	if err != nil {
+		return err
+	}
+
+	glukosa, err := tkl.TabKelainanLabServices.GetPeningkatanGlukosa(id)
+	if err != nil {
+		return err
+	}
+
+	dataprejson, err := json.MarshalIndent(datapre, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	hemajson, err := json.MarshalIndent(hematologi, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	urinjson, err := json.MarshalIndent(urinalisa, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	hatijson, err := json.MarshalIndent(hati, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	lemakjson, err := json.MarshalIndent(lemak, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	glukosjson, err := json.MarshalIndent(glukosa, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	chartsxs := []templ.Component{
+		chart.ShowChartFixed("dataprexs", string(dataprejson), "400px", "450px"),
+		chart.ShowChartFixed("hemaxs", string(hemajson), "400px", "450px"),
+		chart.ShowChartFixed("urinxs", string(urinjson), "400px", "450px"),
+		chart.ShowChartFixed("hatixs", string(hatijson), "400px", "450px"),
+		chart.ShowChartFixed("lemakxs", string(lemakjson), "400px", "450px"),
+		chart.ShowChartFixed("glukosxs", string(glukosjson), "400px", "450px"),
+	}
+
+	chartsmd := []templ.Component{
+		chart.ShowChartFixed("datapremd", string(dataprejson), "500px", "450px"),
+		chart.ShowChartFixed("hemamd", string(hemajson), "500px", "450px"),
+		chart.ShowChartFixed("urinmd", string(urinjson), "500px", "450px"),
+		chart.ShowChartFixed("hatimd", string(hatijson), "500px", "450px"),
+		chart.ShowChartFixed("lemakmd", string(lemakjson), "500px", "450px"),
+		chart.ShowChartFixed("glukosmd", string(glukosjson), "500px", "450px"),
+	}
+
+	chartslg := []templ.Component{
+		chart.ShowChartFixed("hemalg", string(hemajson), "600px", "450px"),
+		chart.ShowChartFixed("urinlg", string(urinjson), "600px", "450px"),
+		chart.ShowChartFixed("hatilg", string(hatijson), "600px", "450px"),
+		chart.ShowChartFixed("lemaklg", string(lemakjson), "600px", "450px"),
+		chart.ShowChartFixed("glukoslg", string(glukosjson), "600px", "450px"),
+	}
+
+	content := corporate_mcudetail.TabKelainanLab(
+		chart.ShowChartFixed("dataprelg", string(dataprejson), "1000px", "450px"),
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkelainannonlab.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainannonlab.handlers.go
@@ -0,0 +1,74 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"encoding/json"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+)
+
+type TabKelainanNonLabServices interface {
+	GetDataKelNonLab(mcuID string) (models.Barchart, error)
+	GetThoraxPA(mcuID string) (models.BarchartV2, error)
+}
+
+type TabKelainanNonLabHandler struct {
+	TabKelainanNonLabServices TabKelainanNonLabServices
+}
+
+func NewTabKelainanNonLabHandler(tknl TabKelainanNonLabServices) *TabKelainanNonLabHandler {
+	return &TabKelainanNonLabHandler{
+		TabKelainanNonLabServices: tknl,
+	}
+}
+
+func (tknl *TabKelainanNonLabHandler) HandleShowTabKelainanNonLab(c echo.Context) error {
+	id := c.Param("id")
+
+	datapre, err := tknl.TabKelainanNonLabServices.GetDataKelNonLab(id)
+	if err != nil {
+		return err
+	}
+
+	thorax, err := tknl.TabKelainanNonLabServices.GetThoraxPA(id)
+	if err != nil {
+		return err
+	}
+
+	dataprejson, err := json.MarshalIndent(datapre, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	thrxjson, err := json.MarshalIndent(thorax, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	chartsxs := []templ.Component{
+		chart.ShowChartFixed("datanonxs", string(dataprejson), "400px", "450px"),
+		chart.ShowChartFixed("thoraxxs", string(thrxjson), "400px", "450px"),
+	}
+
+	chartsmd := []templ.Component{
+		chart.ShowChartFixed("datanonmd", string(dataprejson), "500px", "450px"),
+		chart.ShowChartFixed("thoraxmd", string(thrxjson), "500px", "450px"),
+	}
+
+	chartslg := []templ.Component{
+		chart.ShowChartFixed("datanonlg", string(dataprejson), "1000px", "450px"),
+		chart.ShowChartFixed("thoraxlg", string(thrxjson), "600px", "450px"),
+	}
+
+	content := corporate_mcudetail.TabKelainanNonLab(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkepesertaan.handlers.go
+++ b/handlers/corporate/mcudetail/tabkepesertaan.handlers.go
@@ -0,0 +1,93 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"encoding/json"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabKepersertaanServices interface {
+	GetTotalKepesertaanMCU(mcuID string) (models.Piechart, error)
+	GetKepesertaanByGender(mcuID string) (models.Piechart, error)
+	GetKepesertaanByUmur(mcuID string) (models.Piechart, error)
+}
+
+type TabKepersertaanHandler struct {
+	TabKepersertaanServices TabKepersertaanServices
+}
+
+func NewTabKepersertaanHandler(tkh TabKepersertaanServices) *TabKepersertaanHandler {
+	return &TabKepersertaanHandler{
+		TabKepersertaanServices: tkh,
+	}
+}
+
+func (tkh *TabKepersertaanHandler) HandleShowTabKepesertaan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	logger.Info("Tab Kepesertaan")
+
+	id := c.Param("id")
+	logger.Info("Params", zap.Any("id", id))
+
+	peserta, err := tkh.TabKepersertaanServices.GetTotalKepesertaanMCU(id)
+	if err != nil {
+		return err
+	}
+
+	gender, err := tkh.TabKepersertaanServices.GetKepesertaanByGender(id)
+	if err != nil {
+		return err
+	}
+
+	umur, err := tkh.TabKepersertaanServices.GetKepesertaanByUmur(id)
+	if err != nil {
+		return err
+	}
+
+	totaljson, err := json.MarshalIndent(peserta, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	genderjson, err := json.MarshalIndent(gender, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	umurjson, err := json.MarshalIndent(umur, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	chartsxs := []templ.Component{
+		chart.ShowChartFixed("charttotalxs", string(totaljson), "400px", "450px"),
+		chart.ShowChartFixed("chartgenderxs", string(genderjson), "400px", "450px"),
+		chart.ShowChartFixed("chartumurxs", string(umurjson), "400px", "450px"),
+	}
+
+	chartsmd := []templ.Component{
+		chart.ShowChartFixed("charttotalmd", string(totaljson), "450px", "450px"),
+		chart.ShowChartFixed("chartgendermd", string(genderjson), "450px", "450px"),
+		chart.ShowChartFixed("chartumurmd", string(umurjson), "450px", "450px"),
+	}
+
+	chartslg := []templ.Component{
+		chart.ShowChartFixed("charttotal", string(totaljson), "600px", "450px"),
+		chart.ShowChartFixed("chartgender", string(genderjson), "600px", "450px"),
+		chart.ShowChartFixed("chartumur", string(umurjson), "600px", "450px"),
+	}
+
+	content := corporate_mcudetail.TabKepesertaan(
+		chartsxs,
+		chartsmd,
+		chartslg,
+	)
+
+	return utils.View(c, content)
+}
--- a/handlers/corporate/mcudetail/tabkesimpulan.handlers.go
+++ b/handlers/corporate/mcudetail/tabkesimpulan.handlers.go
@@ -0,0 +1,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/mcudetail/tabkeuangan.handlers.go
+++ b/handlers/corporate/mcudetail/tabkeuangan.handlers.go
@@ -0,0 +1,129 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/pagination"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"strconv"
+
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type TabKeuanganServices interface {
+	GetTotalOrderKeuangan(mcuID string) (int, error)
+	GetTotalCardData(mcuID string) (models.TotalBillCard, error)
+	GetListingDataKeuangan(mcuID string, currentpage int, rowperpage int) ([]models.KeuanganModel, int, error)
+}
+
+type TabKeuanganHandler struct {
+	TabKeuanganServices TabKeuanganServices
+}
+
+func NewTabKeuanganHandler(tk TabKeuanganServices) *TabKeuanganHandler {
+	return &TabKeuanganHandler{
+		TabKeuanganServices: tk,
+	}
+}
+
+func (tk *TabKeuanganHandler) HandleShowTabKeuangan(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	logger.Info("handler keuangan")
+	tableID := utils.GenerateRandomID("tableID")
+	paginationID := utils.GenerateRandomID("paginationID")
+
+	id := c.Param("id")
+	logger.Info("Params", zap.Any("id", id))
+
+	dataTable, totalPage, err := tk.TabKeuanganServices.GetListingDataKeuangan(id, 1, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get list data keuangan", zap.Any("error", err))
+		return err
+	}
+
+	tablecompo := corporate_mcudetail.TableKeuangan(dataTable, tableID)
+
+	pagination := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/corp/dashboard_pic/detail/"+id+"/tabkeuangan/changepage",
+		paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent",
+		"#tabdanpagi",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	totalOrder, err := tk.TabKeuanganServices.GetTotalOrderKeuangan(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get total order keuangan", zap.Any("error", err))
+		return err
+	}
+
+	totalBill, err := tk.TabKeuanganServices.GetTotalCardData(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get total bill keuangan", zap.Any("error", err))
+		return err
+	}
+
+	totalOrderF := utils.FormatRibuan(int(totalOrder))
+	totalTagihan := utils.FormatRibuan(int(totalBill.TotalTagihan))
+	totalPelunasan := utils.FormatRibuan(int(totalBill.TotalPelunasan))
+	totalHutang := utils.FormatRibuan(int(totalBill.TotalHutang))
+
+	content := corporate_mcudetail.TabKeuanganScreen(
+		tableID,
+		paginationID,
+		corporate_mcudetail.KeuanganCard(
+			totalOrderF,
+			totalTagihan,
+			totalPelunasan,
+			totalHutang,
+		),
+		corporate_mcudetail.TableAndPagination(
+			tablecompo,
+			pagination,
+		),
+	)
+
+	return utils.View(c, content)
+}
+
+func (tk *TabKeuanganHandler) HandleChangePage(c echo.Context) error {
+	pageparam := c.QueryParam("page")
+	tableID := c.QueryParam("tableID")
+	paginationID := c.QueryParam("paginationID")
+
+	id := c.Param("id")
+
+	page, err := strconv.Atoi(pageparam)
+	if err != nil {
+		return err
+	}
+
+	tableData, totalPage, err := tk.TabKeuanganServices.GetListingDataKeuangan(id, page, 10)
+	if err != nil {
+		return err
+	}
+
+	tablecomp := corporate_mcudetail.TableKeuangan(tableData, tableID)
+	pagination := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pic/detail/"+id+"/tabkeuangan/changepage",
+		paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent",
+		"#tabdanpagi",
+		"outerHTML", "", "",
+		corporate_mcudetail.BeforeRequestContent(),
+		corporate_mcudetail.AfterRequestContent(),
+	)
+
+	tabdanpagi := corporate_mcudetail.TableAndPagination(tablecomp, pagination)
+	return utils.View(c, tabdanpagi)
+}
--- a/handlers/corporate/patient.handlers.go
+++ b/handlers/corporate/patient.handlers.go
@@ -1,13 +1,26 @@
 package corporate_handlers

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

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

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

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

-func (uh *PatientHandler) ShowPatient(c echo.Context) error {
-	helo := corporate_patient.Show()
-	return utils.View(c, helo)
+func (ph *PatientHandler) LoadLocalData(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+	dialogID := c.QueryParam("dialogID")
+	dialogBodyID := c.QueryParam("dialogBodyID")
+	userEmail := c.QueryParam("userEmail")
+	logger.Info("params", zap.Any("email", userEmail))
+
+	title, err := ph.PatientService.GetPatientData(userEmail)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get user", zap.Any("error", err))
+		return err
+	}
+
+	dataBreadcrumb, err := ph.PatientService.GetDashboardPatientBreadcrumb(title)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb", zap.Any("error", err))
+		return err
+	}
+	defer logger.Sync()
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+
+	listingdata, totalPage, err := ph.PatientService.GetListtingData(userEmail, 1, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get listing data", zap.Any("error", err), zap.Any("total", totalPage))
+		return err
+	}
+	listingcomponent := corporate_patient.ListingData(listingdata,
+		listID,
+		"/corp/dashboard_pat/open",
+		"#"+dialogBodyID,
+		"#listID, #paginationID, #dialogID, #dialogBodyID, #userEmail",
+		"outerHTML",
+	)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/corp/dashboard_pat/changepage",
+		paginationID,
+		"#listID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogID, #dialogBodyID, #userEmail",
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_patient.BeforeRequestContent(),
+		corporate_patient.AfterRequestContent(),
+	)
+
+	tabData := []models.TabViewReportMcu{}
+	tabcomponent := corporate_patient.TabReportView(tabData)
+
+	bodyModal := corporate_patient.ModalBody(
+		dialogBodyID,
+		tabcomponent,
+		corporate_patient.JsShowModal(""),
+	)
+
+	bodyClose := corporate_patient.ModalClose(
+		"/corp/dashboard_pat/closemodal",
+		"#"+dialogBodyID,
+		"outerHTML",
+		"#"+dialogID,
+	)
+
+	modalDialog := corporate_patient.DialogReport(
+		"",
+		"/corp/dashboard_pat/dialog",
+		"#"+dialogBodyID,
+		"outerHTML",
+		"#listID, #paginationID, #dialogID, #userEmail, #dialogBodyID"+paginationID,
+		dialogID,
+		title,
+		bodyModal,
+		bodyClose,
+	)
+
+	content := corporate_patient.ContentP(listingcomponent, paginationcomponent)
+
+	view := corporate_patient.ContentPage(
+		breadcrumb,
+		content,
+		modalDialog,
+	)
+
+	return utils.View(c, view)
+}
+
+func (ph *PatientHandler) HandleShowPatient(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	listID := utils.GenerateRandomID("listid")
+	paginationID := utils.GenerateRandomID("paginationid")
+	dialogID := utils.GenerateRandomID("dialogid")
+	dialogBodyID := utils.GenerateRandomID("dialogbodyid")
+
+	userCok := c.Get("user").(*jwt.Token)
+	claims := userCok.Claims.(jwt.MapClaims)
+	name := claims["M_StaffName"].(string)
+	position := claims["M_UserGroupDashboard"].(string)
+	logger.Info("jwt", zap.Any("name", name))
+
+	user := models.User{
+		UserID:       1,
+		Username:     name,
+		UserFullName: name,
+		UserPosition: position,
+	}
+
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+
+	content := corporate_patient.DashboardPat(
+		listID,
+		paginationID,
+		dialogID,
+		dialogBodyID,
+	)
+	css := corporate_patient.CSSDashboardPat()
+	js := corporate_patient.JSDashboardPat()
+
+	view := corporate_patient.ShowDashboardPat("Dashboard Pasien", content, css, js, navbaruser, sidbaruser)
+	return utils.View(c, view)
+}
+
+func (ph *PatientHandler) HandleChangePage(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	pageparam := c.QueryParam("page")
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+	dialogBodyID := c.QueryParam("dialogBodyID")
+	userEmail := c.QueryParam("userEmail")
+	logger.Info("params", zap.Any("userEmail", userEmail))
+
+	// var retval []templ.Component
+	page, err := strconv.Atoi(pageparam)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error convert page param")
+		return err
+	}
+
+	listData, totalPage, err := ph.PatientService.GetListtingData(userEmail, page, 10)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("error get data listing")
+		return err
+	}
+	listcomponent := corporate_patient.ListingData(listData,
+		listID,
+		"/corp/dashboard_pat/open",
+		"#"+dialogBodyID,
+		"#listID, #paginationID, #dialogID, #dialogBodyID, #userEmail",
+		"outerHTML",
+	)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/corp/dashboard_pat/changepage",
+		paginationID,
+		"#listID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogID, #dialogBodyID, #userEmail, #currPage"+paginationID,
+		"#contentlayout",
+		"outerHTML", "", "",
+		corporate_patient.BeforeRequestContent(),
+		corporate_patient.AfterRequestContent(),
+	)
+
+	// retval = append(retval, listcomponent)
+	// retval = append(retval, paginationcomponent)
+	// return utils.ViewMulti(c, retval)
+
+	content := corporate_patient.ContentP(listcomponent, paginationcomponent)
+	return utils.View(c, content)
+}
+
+func (ph *PatientHandler) HandleOpenReport(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	id := c.QueryParam("id")
+	dialogID := c.QueryParam("dialogID")
+	dialogBodyID := c.QueryParam("dialogBodyID")
+	logger.Info("params", zap.Any("id", id))
+
+	tabData, err := ph.PatientService.GetReportMcu(id)
+	if err != nil {
+		tab := corporate_patient.TabReportView([]models.TabViewReportMcu{})
+		mod := corporate_patient.ModalBody(
+			dialogBodyID,
+			tab,
+			corporate_patient.JsShowModal(""),
+		)
+		return utils.View(c, mod)
+	}
+
+	tabcomponent := corporate_patient.TabReportView(tabData)
+	modalBody := corporate_patient.ModalBody(
+		dialogBodyID,
+		tabcomponent,
+		corporate_patient.JsShowModal("#"+dialogID),
+	)
+
+	return utils.View(c, modalBody)
 }
--- a/handlers/dev/detailmcu.handlers.go
+++ b/handlers/dev/detailmcu.handlers.go
@@ -0,0 +1,72 @@
+package dev_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/services"
+	"cpone/utils"
+	dev_detailmcu "cpone/views/dev/mcu"
+
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type DetailMcuServices interface {
+	GetBreadcrumb(title string) (models.BreadCrumbV1, error)
+}
+
+type DetailMcuHandler struct {
+	DetailMcuServices DetailMcuServices
+}
+
+func NewDetailMcuHandler(dmcu DetailMcuServices) *DetailMcuHandler {
+	return &DetailMcuHandler{
+		DetailMcuServices: dmcu,
+	}
+}
+
+func (dmcu *DetailMcuHandler) HandleShowDetailMcuScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	title := "PT. Sadhana Abiyasa Sampoerna"
+
+	id := c.Param("id")
+	logger.Info("params", zap.Any("id", id))
+
+	user, err := services.GetUserLogin()
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get user dev", zap.Any("error", err))
+		return err
+	}
+
+	dataBreadcrumb, err := dmcu.DetailMcuServices.GetBreadcrumb(title)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb dev", zap.Any("error", err))
+		return err
+	}
+
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+
+	content := dev_detailmcu.DetailMcuScreen(
+		breadcrumb,
+		dev_detailmcu.TabViewDetailMcu(id),
+	)
+	css := dev_detailmcu.CSSDetailMcu()
+	js := dev_detailmcu.JSDetailMcu()
+
+	view := dev_detailmcu.ShowDetailMcu(
+		title,
+		content,
+		css,
+		js,
+		navbaruser,
+		sidbaruser,
+	)
+
+	return utils.View(c, view)
+}
--- a/handlers/dev/employeeanalytic.handlers.go
+++ b/handlers/dev/employeeanalytic.handlers.go
@@ -0,0 +1,192 @@
+package dev_handlers
+
+import (
+	breadcrumadmin "cpone/component/breadcrumbadmin"
+	navbarmenu "cpone/component/navbar"
+	"cpone/component/pagination"
+	sidebaruserprofile "cpone/component/sidebar_user_profile"
+	"cpone/models"
+	"cpone/services"
+	"cpone/utils"
+	dev_employeeanalytic "cpone/views/dev/employeeanalytic"
+	"strconv"
+
+	"github.com/a-h/templ"
+	"github.com/labstack/echo/v4"
+	"go.uber.org/zap"
+)
+
+type EmployeeAnalyticServices interface {
+	GetEmployeeAnalyticBreadcrumb(title string) (models.BreadCrumbV1, error)
+	DummyDataTest() ([]models.DashboardPic, error)
+	ListingEmployeeAnalytic(search string, startdate string, enddate string, currentpage int, rowperpage int) ([]models.DashboardPic, int, error)
+}
+
+type EmployeeAnalyticHandler struct {
+	EmployeeAnalyticServices EmployeeAnalyticServices
+}
+
+func NewEmployeeAnalyticHandler(ea EmployeeAnalyticServices) *EmployeeAnalyticHandler {
+	return &EmployeeAnalyticHandler{
+		EmployeeAnalyticServices: ea,
+	}
+}
+
+func (ea *EmployeeAnalyticHandler) HandleShowEmployeeAnalyticScreen(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	title := "PT. Sadhana Abiyasa Sampoerna"
+
+	listID := utils.GenerateRandomID("listid")
+	paginationID := utils.GenerateRandomID("paginationid")
+
+	user, err := services.GetUserLogin()
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get user dev", zap.Any("error", err))
+		return err
+	}
+
+	dataBreadcrumb, err := ea.EmployeeAnalyticServices.GetEmployeeAnalyticBreadcrumb(title)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error breadcrumb dev", zap.Any("error", err))
+		return err
+	}
+	defer logger.Sync()
+
+	navbaruser := navbarmenu.NavbarWithLogo(user)
+	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)
+	breadcrumb := breadcrumadmin.MainBreadcrumbAdminV1(dataBreadcrumb)
+
+	listingData, totalPage, err := ea.EmployeeAnalyticServices.ListingEmployeeAnalytic("", "", "", 1, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error get listing data", zap.Any("error", err), zap.Any("total", totalPage))
+		return err
+	}
+	listingcomponent := dev_employeeanalytic.ListingData(listingData, listID)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		1,
+		"/dev/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	filtercomponent := dev_employeeanalytic.FilterListing(
+		"/dev/dashboard_pic/filter",
+		"input changed delay:500ms",
+		"#searchID, #startdateID, #enddateID, #listID, #paginationID",
+		"outerHTML",
+		"#"+paginationID,
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	content := dev_employeeanalytic.EmployeeAnalyticScreen(
+		listID,
+		paginationID,
+		breadcrumb,
+		filtercomponent,
+		listingcomponent,
+		paginationcomponent,
+	)
+	css := dev_employeeanalytic.CSSEmployeeAnalytic()
+	js := dev_employeeanalytic.JSEmployeeAnalytic()
+
+	view := dev_employeeanalytic.ShowEmployeeAnalytic(title, content, css, js, navbaruser, sidbaruser)
+	return utils.View(c, view)
+}
+
+func (ea *EmployeeAnalyticHandler) HandlePagination(c echo.Context) error {
+
+	pageparam := c.QueryParam("page")
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+	search := c.QueryParam("search")
+	startdate := c.QueryParam("startdate")
+	enddate := c.QueryParam("enddate")
+
+	var retVal []templ.Component
+	logger, _ := zap.NewProduction()
+	page, err := strconv.Atoi(pageparam)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error convert page param")
+		return err
+	}
+
+	listdata, totalPage, err := ea.EmployeeAnalyticServices.ListingEmployeeAnalytic(search, startdate, enddate, page, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error convert page param")
+		return err
+	}
+	listcomponent := dev_employeeanalytic.ListingData(listdata, listID)
+
+	paginationcomponent := pagination.PaginationV3(
+		totalPage,
+		page,
+		"/dev/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID,
+		"outerHTML", "", "",
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	retVal = append(retVal, listcomponent)
+	retVal = append(retVal, paginationcomponent)
+	return utils.ViewMulti(c, retVal)
+}
+
+func (ea *EmployeeAnalyticHandler) HandleFilter(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	search := c.QueryParam("search")
+	startdate := c.QueryParam("startdate")
+	enddate := c.QueryParam("enddate")
+	listID := c.QueryParam("listID")
+	paginationID := c.QueryParam("paginationID")
+
+	dataList, totalPage, err := ea.EmployeeAnalyticServices.ListingEmployeeAnalytic(search, startdate, enddate, 1, 5)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error Get Listing Data", zap.Any("error", err))
+		return err
+	}
+
+	listcomponent := dev_employeeanalytic.ListingData(dataList, listID)
+	paginationcomponent := pagination.PaginationV3(
+		totalPage, 1,
+		"/dev/dashboard_pic/changepage",
+		paginationID,
+		"#listID, #paginationID, #searchID, #startdateID, #enddateID",
+		"#"+paginationID, "outerHTML", "", "",
+		dev_employeeanalytic.BeforeRequestContent(),
+		dev_employeeanalytic.AfterRequestContent(),
+	)
+
+	var retval []templ.Component
+	retval = append(retval, listcomponent)
+	retval = append(retval, paginationcomponent)
+	return utils.ViewMulti(c, retval)
+}
+
+func (ea *EmployeeAnalyticHandler) HandleIntoDetail(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	id := c.Param("id")
+
+	logger.Info("params", zap.Any("id", id))
+
+	url := "/dev/detail/" + id
+	c.Response().Header().Set("HX-Redirect", url)
+
+	return nil
+}
--- a/handlers/dev/groupresult.handlers.go
+++ b/handlers/dev/groupresult.handlers.go
@@ -411,10 +411,9 @@ func (lh *GroupResultHandler) HandlerShowGroupResultV1(c echo.Context) error {
 		Link:        "/dev/groupresult/delete",
 		HxTarget:    "#" + dialogdeleteBodyID,
 		HxSwap:      "outerHTML",
-		// HxInclude:   "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID,
-		HxInclude:  "#tableID, #paginationID, #searchID, #dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID + ", #dialogEditBodyID, #dialogEditID",
-		ModalID:    dialogdeleteID,
-		ModalTitle: "Delete-User Group",
+		HxInclude:   "#tableID, #paginationID, #searchID,#dialogDeleteBodyID, #dialogDeleteID, #" + searchID + ", #currpage" + paginationID,
+		ModalID:     dialogdeleteID,
+		ModalTitle:  "Delete-User Group",
 		DialogBody: groupresult.DeleteConfirmationBody(
 			models.CustomTextFieldv2Prm{Type: "hidden", Value: "0", Name: "groupresultid"},
 			dialogdeleteBodyID, "Apakah anda yakin menghapus user group berikut ?",
@@ -1250,7 +1249,6 @@ func (lh *GroupResultHandler) HandleDeleteForm(c echo.Context) error {
 	id := c.QueryParam("id")
 	dialogDeleteID := c.QueryParam("dialogDeleteID")
 	dialogDeleteBodyID := c.QueryParam("dialogDeleteBodyID")
-
 	dataGroupList, err := lh.GroupResultService.GetGroupResultByIDV1(id)
 	if err != nil {
 		// test := mastermenuusergrouptryandy.DialogNewBody(code, name, "", "Name cannot empty")
@@ -1265,6 +1263,7 @@ func (lh *GroupResultHandler) HandleDeleteForm(c echo.Context) error {
 			customtoastv2.CustomToastV2Show("Error", err.Error(), "danger"),
 			test})
 		return coba
+
 	}

 	form := groupresult.DeleteConfirmationBody(
--- a/handlers/dev/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.samplestation.handlers.go
+++ b/handlers/dev/md.samplestation.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,20 @@
 package public_handlers

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

 	"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 +27,133 @@ type LoginHandler struct {
 	LoginService LoginService
 }

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

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

 	return utils.View(c, si)
 }
+
+func (lh *LoginHandler) HandleSignIn(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+
+	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.Any("error multi signin", err))
+
+		si := public_login.ShowLogin("Login ", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+
+		// loginform := public_login.FormSignin(false)
+		// return utils.View(c, loginform)
+	}
+	if resp.Status == "ERR" {
+		defer logger.Sync()
+		logger.Info("Error", zap.Any("ERR", resp.Status))
+
+		si := public_login.ShowLogin("Login ", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+		// loginform := public_login.FormSignin(false)
+		// return utils.View(c, loginform)
+	}
+
+	defer logger.Sync()
+	logger.Info("valid", zap.Any("value", resp))
+
+	var url string
+	switch resp.Data.Type {
+	case "cpone":
+		url = "/one-ui"
+	case "pic":
+		url = "/corp/dashboard_pic"
+	case "patient":
+		url = "/corp/dashboard_pat"
+	default:
+		url = "/one-ui"
+	}
+
+	user, err := json.Marshal(resp.Data.User)
+	if err != nil {
+		defer logger.Sync()
+		logger.Info("Error", zap.Error(err))
+
+		si := public_login.ShowLogin("Login ", public_login.MainLogin(false), public_login.CssLogin(), public_login.JsLogin())
+		return utils.View(c, si)
+
+		// loginform := public_login.FormSignin(false)
+		// return utils.View(c, loginform)
+	}
+
+	cookie := new(http.Cookie)
+	cookie.Name = "token"
+	cookie.Value = resp.Data.Token
+	cookie.Path = "/"
+	cookie.HttpOnly = true
+
+	c.SetCookie(cookie)
+
+	userString := string(user)
+	store := `
+	<script>
+		console.log("store token");
+		const token = "` + resp.Data.Token + `";
+		const user = JSON.stringify(` + userString + `);
+		localStorage.setItem("token", token);
+		localStorage.setItem("user", user);
+
+		htmx.on("htmx:configRequest", (e)=> {
+			e.detail.headers["Authentication"] = "Bearer ` + resp.Data.Token + `"
+		})		
+
+		setTimeout(() => {
+			htmx.ajax('GET', '/login/redirect?url=` + url + `')
+		}, 200)
+	</script>	
+	`
+	c.Response().Header().Set("HX-Trigger", "script")
+	return c.String(http.StatusOK, store)
+}
+
+func (lh *LoginHandler) HandleRedirect(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	url := c.QueryParam("url")
+	token := c.Request().Header.Get("Authentication")
+	logger.Info("params", zap.Any("url", url), zap.Any("token", token))
+
+	c.Response().Header().Set("HX-Redirect", url)
+	return c.String(http.StatusOK, url)
+}
+
+func (lh *LoginHandler) HandleSignOut(c echo.Context) error {
+	logger, _ := zap.NewProduction()
+	logger.Info("Logout")
+	expire := time.Now().Add(-7 * 24 * time.Hour)
+	cookie := new(http.Cookie)
+	cookie.Name = "token"
+	cookie.Value = ""
+	cookie.Path = "/"
+	cookie.Expires = expire
+	cookie.HttpOnly = true
+
+	c.SetCookie(cookie)
+
+	ret := `
+	<script>
+		console.log("signout")
+		localStorage.removeItem("token")
+		localStorage.removeItem("user")
+
+		setTimeout(() => {
+			window.location.replace("/login");
+		}, 200)
+	</script>
+	`
+	c.Response().Header().Set("HX-Trigger", "script")
+	return c.String(http.StatusOK, ret)
+}
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -1,12 +1,15 @@
 package handlers

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

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

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

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

 }

@@ -66,8 +69,17 @@ 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)
+	public.GET("login/redirect", loginHadlr.HandleRedirect)
+	public.GET("login/signout", loginHadlr.HandleSignOut)

 	// kartu kontrol
 	publicKartuKontrolServices := public_services.NewServicesKartuKontrol(appStore)
@@ -90,16 +102,78 @@ 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", auth.IsLoggedIn)
+	// corp := app.Group("/corp")
 	l := corporate_services.NewServicesCompany(appStore)
 	lh := corporate_handlers.NewCompanyHandler(l)
-	public.GET("/company", lh.ShowCompany)
-	patientHandler := corporate_handlers.NewPatientHandler(l)
-	public.GET("/patient", patientHandler.ShowPatient)
+	corp.GET("/company", lh.ShowCompany)
+
+	// dashboard_pic
+	dashbrdPicServ := corporate_services.NewDashboardPicServices(appStore)
+	dashbrdPicHandl := corporate_handlers.NewDashboardPicHandler(dashbrdPicServ)
+	corp.GET("/dashboard_pic", dashbrdPicHandl.HandleShowEmployeeAnalyticScreen)
+	corp.GET("/dashboard_pic/changepage", dashbrdPicHandl.HandlePagination)
+	corp.GET("/dashboard_pic/filter", dashbrdPicHandl.HandleFilter)
+	corp.GET("/dashboard_pic/click/:id", dashbrdPicHandl.HandleToDetail)
+
+	// mcu detail
+	mcudServ := corporate_services.NewMcuDetailServices(appStore)
+	mcudHandr := corporate_handlers.NewMcuDetailHandler(mcudServ)
+	corp.GET("/dashboard_pic/detail/:id", mcudHandr.HandlerShowMcuDetailScreen)
+
+	// tab kepesertaan
+	kepesertaanSrvs := mcu_corporate_services.NewTabKepersertaanService(appStore)
+	kepesertaanHdlr := mcu_corporate_handlers.NewTabKepersertaanHandler(kepesertaanSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkepesertaan", kepesertaanHdlr.HandleShowTabKepesertaan)
+
+	// tab kelainan global
+	kelainanglobalSrvs := mcu_corporate_services.NewTabKelainanGlobalServices(appStore)
+	kelainanglobalHdlr := mcu_corporate_handlers.NewTabKelainanGlobalHandler(kelainanglobalSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainanglobal", kelainanglobalHdlr.HandleShowTabKelainanGlobal)
+
+	// tab kelainan lab
+	kelainanlabSrvs := mcu_corporate_services.NewTabKelainanLabServices(appStore)
+	kelainanlabHdlr := mcu_corporate_handlers.NewTabKelainanLabHandler(kelainanlabSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainanlab", kelainanlabHdlr.HandleShowTabKelainanLab)
+
+	// tab kelainan non lab
+	kelnonlabSrvs := mcu_corporate_services.NewTabKelainanNonLabServices(appStore)
+	kelnonlabHdlr := mcu_corporate_handlers.NewTabKelainanNonLabHandler(kelnonlabSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainannonlab", kelnonlabHdlr.HandleShowTabKelainanNonLab)
+
+	// tab kelainan fisik
+	kelainanfisikSrvs := mcu_corporate_services.NewTabKelainanFisikServices(appStore)
+	kelainanfisikHdlr := mcu_corporate_handlers.NewTabKelainanFisikHandler(kelainanfisikSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainanfisik", kelainanfisikHdlr.HandleShowTabKelainanFisik)
+
+	// tab kesimpulan
+	kesimpulanSrv := mcu_corporate_services.NewTabKesimpulanServices(appStore)
+	kesimpulanHdr := mcu_corporate_handlers.NewTabKesimpulanHandler(kesimpulanSrv)
+	corp.GET("/dashboard_pic/detail/:id/tabkesimpulan", kesimpulanHdr.HandleShowTabKesimpulanScreen)
+
+	// tab daftar peserta
+	daftarpesertaServ := mcu_corporate_services.NewTabDaftarPesertaServices(appStore)
+	daftarpesertaHandl := mcu_corporate_handlers.NewTabDaftarPesertaHandlers(daftarpesertaServ)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta", daftarpesertaHandl.HandleShowTabDaftarPeserta)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta/changepage", daftarpesertaHandl.HandlePagination)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta/openreport", daftarpesertaHandl.HandleOpenReportDialog)
+
+	// tab keuangan
+	keuanganService := mcu_corporate_services.NewTabKeuanganServices(appStore)
+	keuanganHandler := mcu_corporate_handlers.NewTabKeuanganHandler(keuanganService)
+	corp.GET("/dashboard_pic/detail/:id/tabkeuangan", keuanganHandler.HandleShowTabKeuangan)
+	corp.GET("/dashboard_pic/detail/:id/tabkeuangan/changepage", keuanganHandler.HandleChangePage)
+
+	patienServices := corporate_services.NewPatientServices(appStore)
+	patientHandler := corporate_handlers.NewPatientHandler(patienServices)
+	corp.GET("/dashboard_pat", patientHandler.HandleShowPatient)
+	corp.GET("/dashboard_pat/content", patientHandler.LoadLocalData)
+	corp.GET("/dashboard_pat/changepage", patientHandler.HandleChangePage)
+	corp.GET("/dashboard_pat/open", patientHandler.HandleOpenReport)
 }

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

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

-	//New User Group
-	devMdUserGroupServices := dev_services.NewMdUserGroupServices(appStore)
-	devMdUserGroupHandlers := dev_handlers.NewMdUserGroupHandler(devMdUserGroupServices)
-	dev.GET("/md/usergroupv2", devMdUserGroupHandlers.HandleShowMdUserGroupScreen)
-	dev.GET("/md/usergroupv2/filter", devMdUserGroupHandlers.HandleFilterMdUserGroup)
-	dev.GET("/md/usergroupv2/changepage", devMdUserGroupHandlers.HandleChangePageMdUserGroup)
-	dev.POST("/md/usergroupv2/closeaddform", devMdUserGroupHandlers.HandleCloseFormAdd)
-	dev.POST("/md/usergroupv2/add", devMdUserGroupHandlers.HandleAddUserGroup)
-	dev.GET("/md/usergroupv2/openedit", devMdUserGroupHandlers.HandleOpenEditForm)
-	dev.POST("/md/usergroupv2/closeeditform", devMdUserGroupHandlers.HandleCloseFormEdit)
-	dev.POST("/md/usergroupv2/edit", devMdUserGroupHandlers.HandleEditUserGroup)
-	dev.GET("/md/usergroupv2/opendelete", devMdUserGroupHandlers.HandleOpenDeleteForm)
-	dev.POST("/md/usergroupv2/closedeleteform", devMdUserGroupHandlers.HandleCloseFormDelete)
-	dev.POST("/md/usergroupv2/delete", devMdUserGroupHandlers.HandleDeleteUserGroup)
+	// employee analytic
+	devEmplAnaServices := dev_services.NewEmployeeAnalyticServices(appStore)
+	devEmplAnaHandler := dev_handlers.NewEmployeeAnalyticHandler(devEmplAnaServices)
+	dev.GET("/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)
@@ -262,6 +333,37 @@ func SetupRoutesDev(app *echo.Echo, appStore db.AppStore) {
 	dev.POST("/groupresult/add", devGRhandlers.AddGroupResult)
 	dev.POST("/groupresult/edit", devGRhandlers.EditGroupResult)
 	dev.POST("/groupresult/delete", devGRhandlers.DeleteGroupResult)
+
+	//New User Group
+	devMdUserGroupServices := dev_services.NewMdUserGroupServices(appStore)
+	devMdUserGroupHandlers := dev_handlers.NewMdUserGroupHandler(devMdUserGroupServices)
+	dev.GET("/md/usergroupv2", devMdUserGroupHandlers.HandleShowMdUserGroupScreen)
+	dev.GET("/md/usergroupv2/filter", devMdUserGroupHandlers.HandleFilterMdUserGroup)
+	dev.GET("/md/usergroupv2/changepage", devMdUserGroupHandlers.HandleChangePageMdUserGroup)
+	dev.POST("/md/usergroupv2/closeaddform", devMdUserGroupHandlers.HandleCloseFormAdd)
+	dev.POST("/md/usergroupv2/add", devMdUserGroupHandlers.HandleAddUserGroup)
+	dev.GET("/md/usergroupv2/openedit", devMdUserGroupHandlers.HandleOpenEditForm)
+	dev.POST("/md/usergroupv2/closeeditform", devMdUserGroupHandlers.HandleCloseFormEdit)
+	dev.POST("/md/usergroupv2/edit", devMdUserGroupHandlers.HandleEditUserGroup)
+	dev.GET("/md/usergroupv2/opendelete", devMdUserGroupHandlers.HandleOpenDeleteForm)
+	dev.POST("/md/usergroupv2/closedeleteform", devMdUserGroupHandlers.HandleCloseFormDelete)
+	dev.POST("/md/usergroupv2/delete", devMdUserGroupHandlers.HandleDeleteUserGroup)
+
+	// md sample station
+	devMDSampleStationServices := dev_services.NewMDSampleStationServices(appStore)
+	devMDSampleStationHandlers := dev_handlers.NewMDSampleStationHandler(devMDSampleStationServices)
+	dev.GET("/md/samplestation", devMDSampleStationHandlers.HandleShowMDSampleStationScreen)
+	dev.GET("/md/samplestation/filter", devMDSampleStationHandlers.HandleFilterMDSS)
+	dev.GET("/md/samplestation/changepage", devMDSampleStationHandlers.HandleChangePageSampleStation)
+	dev.POST("/md/samplestation/add", devMDSampleStationHandlers.HandleAddMDSampleStation)
+	dev.POST("/md/samplestation/closeaddform", devMDSampleStationHandlers.HandleCloseFormAdd)
+	dev.GET("/md/samplestation/opendelete", devMDSampleStationHandlers.HandleOpenDeleteForm)
+	dev.POST("/md/samplestation/closedeleteform", devMDSampleStationHandlers.HandleCloseFormDelete)
+	dev.POST("/md/samplestation/delete", devMDSampleStationHandlers.HandleDeleteMDSS)
+	dev.GET("/md/samplestation/openedit", devMDSampleStationHandlers.HandleOpenEditForm)
+	dev.POST("/md/samplestation/edit", devMDSampleStationHandlers.HandleEditMDSS)
+	dev.POST("/md/samplestation/closeeditform", devMDSampleStationHandlers.HandleCloseEditForm)
+
 	// masterdata nat unit
 	devMdNatUnitServices := dev_services.NewMdNatUnitServices(appStore)
 	devMdNatUnitHandlers := dev_handlers.NeWMdNatUnitHandler(devMdNatUnitServices)
@@ -305,4 +407,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,174 @@
+package layout
+
+templ DashboardLayout(
+    title string, 
+    css templ.Component, 
+    js templ.Component,
+    navbaruser templ.Component,
+    sidebaruser templ.Component,
+) {
+	<!DOCTYPE html>
+    <html lang="en">
+		<!--begin::Head-->
+		<head>
+			<base href="/"/>
+			<meta charset="utf-8"/>
+			<title>Company Portal | { title }</title>
+			<meta name="description" content="Company Portal"/>
+			<meta
+				name="viewport"
+				content="width=device-width, initial-scale=1, shrink-to-fit=no"
+			/>
+			<!--begin::Fonts-->
+			<link
+				rel="stylesheet"
+				href="assets/css/googlefont/poppins.css"
+			/>
+			<!--end::Fonts-->
+			<!--begin::Page Custom Styles(used by this page)-->
+			<link
+				href="assets/css/pages/login/login-1.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<!--end::Page Custom Styles-->
+			<!--begin::Global Theme Styles(used by all pages)-->
+			<link
+				href="assets/plugins/global/plugins.bundle.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				href="assets/plugins/custom/prismjs/prismjs.bundle.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link href="assets/css/style.bundle.css" rel="stylesheet" type="text/css"/>
+			<!--end::Global Theme Styles-->
+			<!--begin::Layout Themes(used by all pages)-->
+			<link
+				href="assets/css/themes/layout/header/base/light.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				href="assets/css/themes/layout/header/menu/light.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				href="assets/css/themes/layout/brand/dark.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				href="assets/css/themes/layout/aside/dark.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<!--end::Layout Themes-->
+			<link
+				rel="shortcut icon"
+				href="asset-corporate-portal/media/logo/logo-small.jpg"
+			/>
+			<!--end::Layout Themes SAS-->
+			<link
+				href="asset-corporate-portal/css/sas.bundle.css"
+				rel="stylesheet"
+				type="text/css"
+			/>
+			<link
+				rel="stylesheet"
+				href="assets/css/googlefont/publicsans.css"
+			/>
+			<link
+				rel="stylesheet"
+				href="assets/css/googlefont/roboto.css"
+			/>
+			<!-- slick -->
+			<link
+				rel="stylesheet"
+				type="text/css"
+				href="assets/css/slick/slick.css"
+			/>
+			<link
+				rel="stylesheet"
+				type="text/css"
+				href="assets/css/slick/slick-theme.css"
+			/>
+			@css
+		</head>
+		<!--end::Head-->
+        <!--begin::Body-->
+        <body id="kt_body" class="header-fixed header-mobile-fixed subheader-enabled subheader-fixed subheader-mobile-fixed aside-enabled aside-fixed aside-minimize-hoverable page-loading bg-white">
+            <script src="assets/js/htmx/htmx.min.js"></script>
+			<!--start::Navbar Mobile-->
+			<div id="kt_header_mobile" class="header-mobile align-items-center  header-mobile-fixed ">
+				<!--begin::Logo-->
+				<a href="index.html">
+					<img alt="Logo" src="asset-corporate-portal/media/logo/logo.png" style="object-fit: contain;height: 4vh;"/>
+				</a>
+				<!--end::Logo-->
+				<!--begin::Toolbar-->
+				<div class="d-flex align-items-center">
+					<!--begin::Topbar Mobile Toggle-->
+					<button class="btn btn-hover-text-primary p-0 ml-2" id="kt_header_mobile_topbar_toggle">
+						<span class="svg-icon svg-icon-xl">
+							<!--begin::Svg Icon | path:/assets/media/svg/icons/General/User.svg-->
+							<svg
+								xmlns="http://www.w3.org/2000/svg"
+								xmlns:xlink="http://www.w3.org/1999/xlink"
+								width="24px"
+								height="24px"
+								viewBox="0 0 24 24"
+								version="1.1"
+							>
+								<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+									<polygon points="0 0 24 0 24 24 0 24"></polygon>
+									<path
+										d="M12,11 C9.790861,11 8,9.209139 8,7 C8,4.790861 9.790861,3 12,3 C14.209139,3 16,4.790861 16,7 C16,9.209139 14.209139,11 12,11 Z"
+										fill="#000000"
+										fill-rule="nonzero"
+										opacity="0.3"
+									></path>
+									<path
+										d="M3.00065168,20.1992055 C3.38825852,15.4265159 7.26191235,13 11.9833413,13 C16.7712164,13 20.7048837,15.2931929 20.9979143,20.2 C21.0095879,20.3954741 20.9979143,21 20.2466999,21 C16.541124,21 11.0347247,21 3.72750223,21 C3.47671215,21 2.97953825,20.45918 3.00065168,20.1992055 Z"
+										fill="#000000"
+										fill-rule="nonzero"
+									></path>
+								</g>
+							</svg><!--end::Svg Icon-->
+						</span>
+					</button>
+					<!--end::Topbar Mobile Toggle-->
+				</div>
+				<!--end::Toolbar-->
+			</div>
+			<!--start::Navbar Mobile-->
+            <!--start::Navbar Laptop With Sidebar-->			
+            <div class="mb-24 mt-8" style="padding-left: 10vw; padding-right: 10vw;">
+                <div class="align-item-center">
+					@navbaruser
+				</div>
+                <div class="mt-16">
+                    { children... }
+                </div>
+            </div>
+            <!--end::Navbar Laptop With Sidebar-->
+            @sidebaruser
+			<!--begin::Global Config(global config for global JS scripts)-->
+			<script src="asset-corporate-portal/js/ktappsetting.js"></script>
+			<!--end::Global Config-->
+			<!--begin::Global Theme Bundle(used by all pages)-->
+			<script src="assets/plugins/global/plugins.bundle.js"></script>
+			<script src="assets/plugins/custom/prismjs/prismjs.bundle.js"></script>
+			<script src="assets/js/scripts.bundle.js"></script>
+			<!--end::Global Theme Bundle-->
+			<script src="assets/js/iconify/iconify.min.js"></script>
+			// bootstrap datepicker
+			<script src="assets/js/pages/crud/forms/widgets/bootstrap-datepicker.js"></script>
+			@js
+			<!--end::Page Scripts-->
+        </body>
+    </html>
+}
--- a/layout/layout_dashboard_templ.go
+++ b/layout/layout_dashboard_templ.go
@@ -0,0 +1,94 @@
+// Code generated by templ - DO NOT EDIT.
+
+// templ: version: v0.2.663
+package layout
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+func DashboardLayout(
+	title string,
+	css templ.Component,
+	js templ.Component,
+	navbaruser templ.Component,
+	sidebaruser templ.Component,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!doctype html><html lang=\"en\"><!--begin::Head--><head><base href=\"/\"><meta charset=\"utf-8\"><title>Company Portal | ")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var2 string
+		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(title)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `layout\layout_dashboard.templ`, Line: 16, Col: 34}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</title><meta name=\"description\" content=\"Company Portal\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1, shrink-to-fit=no\"><!--begin::Fonts--><link rel=\"stylesheet\" href=\"assets/css/googlefont/poppins.css\"><!--end::Fonts--><!--begin::Page Custom Styles(used by this page)--><link href=\"assets/css/pages/login/login-1.css\" rel=\"stylesheet\" type=\"text/css\"><!--end::Page Custom Styles--><!--begin::Global Theme Styles(used by all pages)--><link href=\"assets/plugins/global/plugins.bundle.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/plugins/custom/prismjs/prismjs.bundle.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/css/style.bundle.css\" rel=\"stylesheet\" type=\"text/css\"><!--end::Global Theme Styles--><!--begin::Layout Themes(used by all pages)--><link href=\"assets/css/themes/layout/header/base/light.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/css/themes/layout/header/menu/light.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/css/themes/layout/brand/dark.css\" rel=\"stylesheet\" type=\"text/css\"><link href=\"assets/css/themes/layout/aside/dark.css\" rel=\"stylesheet\" type=\"text/css\"><!--end::Layout Themes--><link rel=\"shortcut icon\" href=\"asset-corporate-portal/media/logo/logo-small.jpg\"><!--end::Layout Themes SAS--><link href=\"asset-corporate-portal/css/sas.bundle.css\" rel=\"stylesheet\" type=\"text/css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/publicsans.css\"><link rel=\"stylesheet\" href=\"assets/css/googlefont/roboto.css\"><!-- slick --><link rel=\"stylesheet\" type=\"text/css\" href=\"assets/css/slick/slick.css\"><link rel=\"stylesheet\" type=\"text/css\" href=\"assets/css/slick/slick-theme.css\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = css.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</head><!--end::Head--><!--begin::Body--><body id=\"kt_body\" class=\"header-fixed header-mobile-fixed subheader-enabled subheader-fixed subheader-mobile-fixed aside-enabled aside-fixed aside-minimize-hoverable page-loading bg-white\"><script src=\"assets/js/htmx/htmx.min.js\"></script><!--start::Navbar Mobile--><div id=\"kt_header_mobile\" class=\"header-mobile align-items-center  header-mobile-fixed \"><!--begin::Logo--><a href=\"index.html\"><img alt=\"Logo\" src=\"asset-corporate-portal/media/logo/logo.png\" style=\"object-fit: contain;height: 4vh;\"></a><!--end::Logo--><!--begin::Toolbar--><div class=\"d-flex align-items-center\"><!--begin::Topbar Mobile Toggle--><button class=\"btn btn-hover-text-primary p-0 ml-2\" id=\"kt_header_mobile_topbar_toggle\"><span class=\"svg-icon svg-icon-xl\"><!--begin::Svg Icon | path:/assets/media/svg/icons/General/User.svg--><svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" width=\"24px\" height=\"24px\" viewBox=\"0 0 24 24\" version=\"1.1\"><g stroke=\"none\" stroke-width=\"1\" fill=\"none\" fill-rule=\"evenodd\"><polygon points=\"0 0 24 0 24 24 0 24\"></polygon> <path d=\"M12,11 C9.790861,11 8,9.209139 8,7 C8,4.790861 9.790861,3 12,3 C14.209139,3 16,4.790861 16,7 C16,9.209139 14.209139,11 12,11 Z\" fill=\"#000000\" fill-rule=\"nonzero\" opacity=\"0.3\"></path> <path d=\"M3.00065168,20.1992055 C3.38825852,15.4265159 7.26191235,13 11.9833413,13 C16.7712164,13 20.7048837,15.2931929 20.9979143,20.2 C21.0095879,20.3954741 20.9979143,21 20.2466999,21 C16.541124,21 11.0347247,21 3.72750223,21 C3.47671215,21 2.97953825,20.45918 3.00065168,20.1992055 Z\" fill=\"#000000\" fill-rule=\"nonzero\"></path></g></svg><!--end::Svg Icon--></span></button><!--end::Topbar Mobile Toggle--></div><!--end::Toolbar--></div><!--start::Navbar Mobile--><!--start::Navbar Laptop With Sidebar--><div class=\"mb-24 mt-8\" style=\"padding-left: 10vw; padding-right: 10vw;\"><div class=\"align-item-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = navbaruser.Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><div class=\"mt-16\">")
+		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/chart.models.go
+++ b/models/chart.models.go
@@ -0,0 +1,155 @@
+package models
+
+type SeriesData struct {
+	Value int    `json:"value"`
+	Name  string `json:"name"`
+}
+
+type Series struct {
+	Label struct {
+		Position  string `json:"position"`
+		Formatter string `json:"formatter"`
+	} `json:"label"`
+	Name      string   `json:"name"`
+	Type      string   `json:"type"`
+	Radius    []string `json:"radius"`
+	ItemStyle struct {
+		BorderRadius int    `json:"borderRadius"`
+		BorderColor  string `json:"borderColor"`
+		BorderWidth  int    `json:"borderWidth"`
+	} `json:"itemStyle"`
+	Data     []SeriesData `json:"data"`
+	Emphasis struct {
+		ItemStyle struct {
+			ShadowBlur    int    `json:"shadowBlur"`
+			ShadowOffsetX int    `json:"shadowOffsetX"`
+			ShadowColor   string `json:"shadowColor"`
+		} `json:"itemStyle"`
+	} `json:"emphasis"`
+}
+
+type Piechart struct {
+	Title struct {
+		Text    string `json:"text"`
+		SubText string `json:"subtext"`
+		Left    string `json:"left"`
+	} `json:"title"`
+	Tooltip struct {
+		Trigger string `json:"trigger"`
+	} `json:"tooltip"`
+	Legend struct {
+		Top    string `json:"top"`
+		Left   string `json:"left"`
+		Orient string `json:"orient"`
+		Height int    `json:"height"`
+	} `json:"legend"`
+	Series []Series `json:"series"`
+}
+
+type Barchart struct {
+	Title struct {
+		Text string `json:"text"`
+	} `json:"title"`
+	Dataset struct {
+		Source [][]interface{} `json:"source"`
+	} `json:"dataset"`
+	Grid struct {
+		ContainLabel bool `json:"containLabel"`
+	} `json:"grid"`
+	XAxis struct {
+		Name string `json:"name"`
+	} `json:"xAxis"`
+	YAxis struct {
+		Type string `json:"type"`
+	} `json:"yAxis"`
+	VisualMap struct {
+		Orient    string `json:"orient"`
+		Left      string `json:"left"`
+		Min       int    `json:"min"`
+		Max       int    `json:"max"`
+		Show      bool   `json:"show"`
+		Dimension int    `json:"dimension"`
+		InRange   struct {
+			Color []string `json:"color"`
+		} `json:"inRange"`
+	} `json:"visualMap"`
+	Series []struct {
+		Label struct {
+			Position  string `json:"position"`
+			Show      bool   `json:"show"`
+			Formatter string `json:"formatter"`
+		} `json:"label"`
+		Type   string `json:"type"`
+		Encode struct {
+			X string `json:"x"`
+			Y string `json:"y"`
+		} `json:"encode"`
+	} `json:"series"`
+	Tooltip struct {
+		Trigger     string `json:"trigger"`
+		AxisPointer struct {
+			Type string `json:"type"`
+		} `json:"axisPointer"`
+	} `json:"tooltip"`
+}
+
+type BarDataset struct {
+	Source [][]interface{} `json:"source"`
+}
+
+type BarchartV2 struct {
+	Title struct {
+		Text string `json:"text"`
+	} `json:"title"`
+	Dataset struct {
+		Source [][]interface{} `json:"source"`
+	} `json:"dataset"`
+	Grid struct {
+		ContainLabel bool `json:"containLabel"`
+	} `json:"grid"`
+	XAxis struct {
+		Name      string `json:"name"`
+		Type      string `json:"type"`
+		AxisLabel struct {
+			Interval int `json:"interval"`
+			Rotate   int `json:"rotate"`
+		} `json:"axisLabel"`
+	} `json:"xAxis"`
+	YAxis struct {
+		Type          string `json:"type"`
+		Name          string `json:"name"`
+		NameTextStyle struct {
+			Align string `json:"align"`
+		} `json:"nameTextStyle"`
+		NameGap int `json:"nameGap"`
+	} `json:"yAxis"`
+	VisualMap struct {
+		Orient    string `json:"orient"`
+		Left      string `json:"left"`
+		Min       int    `json:"min"`
+		Max       int    `json:"max"`
+		Dimension int    `json:"dimension"`
+		Show      bool   `json:"show"`
+		InRange   struct {
+			Color []string `json:"color"`
+		} `json:"inRange"`
+	} `json:"visualMap"`
+	Series []struct {
+		Label struct {
+			Position  string `json:"position"`
+			Show      bool   `json:"show"`
+			Formatter string `json:"formatter"`
+		} `json:"label"`
+		Type   string `json:"type"`
+		Encode struct {
+			X string `json:"x"`
+			Y string `json:"y"`
+		} `json:"encode"`
+	} `json:"series"`
+	Tooltip struct {
+		Trigger     string `json:"trigger"`
+		AxisPointer struct {
+			Type string `json:"type"`
+		} `json:"axisPointer"`
+	} `json:"tooltip"`
+}
--- a/models/customradiobutton.models.go
+++ b/models/customradiobutton.models.go
@@ -0,0 +1,16 @@
+package models
+
+type CustomRadioButtonv1Prm struct {
+	HxTarget    string `default:"hxTarget"`
+	HxGet       string `default:"hxGet"`
+	HxIndicator string `default:"hxIndicator"`
+	HxInclude   string `default:"hxInclude"`
+	HxTrigger   string `default:"hxTrigger"`
+	Label       string `default:"Label"`
+	Name        string `default:"name"`
+	Text        string `default:"text"`
+	// Type        string `default:"text"`
+	Value    string `default:""`
+	ErrorMsg string `default:""`
+	ID       string
+}
--- a/models/dashboardpatient.models.go
+++ b/models/dashboardpatient.models.go
@@ -0,0 +1,11 @@
+package models
+
+type DashboardPatient struct {
+	T_OrderHeaderID          int    `db:"T_OrderHeaderID"`
+	T_OrderHeaderDate        string `db:"T_OrderHeaderDate"`
+	T_OrderHeaderLabNumber   string `db:"T_OrderHeaderLabNumber"`
+	T_OrderHeaderM_PatientID int    `db:"T_OrderHeaderM_PatientID"`
+	T_OrderHeaderCorporateID int    `db:"T_OrderHeaderCorporateID"`
+	T_OrderHeaderMgm_McuID   int    `db:"T_OrderHeaderMgm_McuID"`
+	T_OrderHeaderIsActive    string `db:"T_OrderHeaderIsActive"`
+}
--- a/models/employeeanalytic.models.go
+++ b/models/employeeanalytic.models.go
@@ -0,0 +1,15 @@
+package models
+
+type DashboardPic struct {
+	Mgm_McuID                     int    `db:"Mgm_McuID"`
+	Mgm_McuLabel                  string `db:"Mgm_McuLabel"`
+	Mgm_McuFlagRelasiBayarSendiri string `db:"Mgm_McuFlagRelasiBayarSendiri"`
+	Mgm_McuBisaTambahPemeriksaan  string `db:"Mgm_McuBisaTambahPemeriksaan"`
+	Mgm_McuCorporateID            int    `db:"Mgm_McuCorporateID"`
+	Mgm_McuNumber                 string `db:"Mgm_McuNumber"`
+	Mgm_McuNumberNational         string `db:"Mgm_McuNumberNational"`
+	Mgm_McuNote                   string `db:"Mgm_McuNote"`
+	Mgm_McuStartDate              string `db:"Mgm_McuStartDate"`
+	Mgm_McuEndDate                string `db:"Mgm_McuEndDate"`
+	Mgm_McuIsActive               string `db:"Mgm_McuIsActive"`
+}
--- a/models/kesimpulan.models.go
+++ b/models/kesimpulan.models.go
@@ -0,0 +1,7 @@
+package models
+
+type ModelKesimpulanLab struct {
+	Nomor string `db:"nomor"`
+	Test  string `db:"Test"`
+	Total string `db:"total"`
+}
--- a/models/keuangan.models.go
+++ b/models/keuangan.models.go
@@ -0,0 +1,34 @@
+package models
+
+type KeuanganModel struct {
+	F_BillID          int    `db:"F_BillID"`
+	F_BillNo          string `db:"F_BillNo"`
+	F_BillCorporateID int    `db:"F_BillCorporateID"`
+	F_BillDueDate     string `db:"F_BillDueDate"`
+	F_BillTotal       int    `db:"F_BillTotal"`
+	F_BillUnpaid      int    `db:"F_BillUnpaid"`
+	F_BillCreated     string `db:"F_BillCreated"`
+	BillPayment       []BillPaymentModel
+	TotalBillPayment  int
+}
+
+type BillPaymentModel struct {
+	F_BillPaymentID       int     `db:"F_BillPaymentID"`
+	F_BillPaymentF_BillID int     `db:"F_BillPaymentF_BillID"`
+	F_BillPaymentDate     string  `db:"F_BillPaymentDate"`
+	F_BillPaymentNumber   string  `db:"F_BillPaymentNumber"`
+	F_BillPaymentAmount   float64 `db:"F_BillPaymentAmount"`
+}
+
+type TotalOrderHeader struct {
+	T_OrderHeaderID          int     `db:"T_OrderHeaderID"`
+	T_OrderHeaderCorporateID int     `db:"T_OrderHeaderCorporateID"`
+	T_OrderHeaderTotal       float64 `db:"T_OrderHeaderTotal"`
+	T_OrderHeaderCreated     string  `db:"T_OrderHeaderCreated"`
+}
+
+type TotalBillCard struct {
+	TotalTagihan   int
+	TotalPelunasan int
+	TotalHutang    int
+}
--- a/models/login.models.go
+++ b/models/login.models.go
@@ -0,0 +1,89 @@
+package models
+
+type ResponseApi struct {
+	Status string `json:"status"`
+	Data   struct {
+		User struct {
+			MUserID                      string `json:"M_UserID"`
+			MUserEmail                   string `json:"M_UserEmail"`
+			MUserUsername                string `json:"M_UserUsername"`
+			MUserGroupDashboard          string `json:"M_UserGroupDashboard"`
+			MUserDefaultTSampleStationID string `json:"M_UserDefaultT_SampleStationID"`
+			MStaffName                   string `json:"M_StaffName"`
+			IsCourier                    string `json:"is_courier"`
+			TimeAutologout               string `json:"time_autologout"`
+			IP                           string `json:"ip"`
+			Agent                        string `json:"agent"`
+			Version                      string `json:"version"`
+			LastLogin                    string `json:"last-login"`
+		} `json:"user"`
+		Token string `json:"token"`
+		Type  string `json:"type"`
+	} `json:"data"`
+	Message string `json:"message"`
+	Query   string `json:"query"`
+	DbError struct {
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"db_error"`
+}
+
+type ResponseInvalid struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+	Query   string `json:"query"`
+	DbError struct {
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"db_error"`
+}
+
+type ResponseValid struct {
+	Status string `json:"status"`
+	Data   struct {
+		User struct {
+			MUserID                      string `json:"M_UserID"`
+			MUserEmail                   string `json:"M_UserEmail"`
+			MUserUsername                string `json:"M_UserUsername"`
+			MUserGroupDashboard          string `json:"M_UserGroupDashboard"`
+			MUserDefaultTSampleStationID string `json:"M_UserDefaultT_SampleStationID"`
+			MStaffName                   string `json:"M_StaffName"`
+			IsCourier                    string `json:"is_courier"`
+			TimeAutologout               string `json:"time_autologout"`
+			IP                           string `json:"ip"`
+			Agent                        string `json:"agent"`
+			Version                      string `json:"version"`
+			LastLogin                    string `json:"last-login"`
+		} `json:"user"`
+		Token string `json:"token"`
+		Type  string `json:"type"`
+	} `json:"data"`
+}
+
+type Response struct {
+	Status  string `json:"status"`
+	Message string `json:"message"`
+	Query   string `json:"query"`
+	DbError struct {
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"db_error"`
+	Data struct {
+		User struct {
+			MUserID                      string `json:"M_UserID"`
+			MUserEmail                   string `json:"M_UserEmail"`
+			MUserUsername                string `json:"M_UserUsername"`
+			MUserGroupDashboard          string `json:"M_UserGroupDashboard"`
+			MUserDefaultTSampleStationID string `json:"M_UserDefaultT_SampleStationID"`
+			MStaffName                   string `json:"M_StaffName"`
+			IsCourier                    string `json:"is_courier"`
+			TimeAutologout               string `json:"time_autologout"`
+			IP                           string `json:"ip"`
+			Agent                        string `json:"agent"`
+			Version                      string `json:"version"`
+			LastLogin                    string `json:"last-login"`
+		} `json:"user"`
+		Token string `json:"token"`
+		Type  string `json:"type"`
+	} `json:"data"`
+}
--- a/models/mcudaftarpeserta.models.go
+++ b/models/mcudaftarpeserta.models.go
@@ -0,0 +1,27 @@
+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"`
+}
+
+type ModelMcuPesertaReport struct {
+	So_ResultEntryID                  int    `db:"So_ResultEntryID"`
+	So_ResultEntryT_OrderHeaderID     int    `db:"So_ResultEntryT_OrderHeaderID"`
+	So_ResultEntryNonlab_TemplateID   int    `db:"So_ResultEntryNonlab_TemplateID"`
+	So_ResultEntryNonlab_TemplateName string `db:"So_ResultEntryNonlab_TemplateName"`
+}
+
+type TabViewReportMcu struct {
+	Name string
+	Link string
+}
--- a/models/samplestation.models.go
+++ b/models/samplestation.models.go
@@ -0,0 +1,47 @@
+package models
+
+import "github.com/a-h/templ"
+
+type MDSampleStation struct {
+	T_SampleStationID          int    `db:"T_SampleStationID"`
+	T_SampleStationCode        string `db:"T_SampleStationCode"`
+	T_SampleStationName        string `db:"T_SampleStationName"`
+	T_SampleStationNat_GroupID string `db:"T_SampleStationNat_GroupID"`
+	T_SampleStationIsNonLab    string `db:"T_SampleStationIsNonLab"`
+	T_SampleStationIsActive    string `db:"T_SampleStationIsActive"`
+}
+
+type MDSampleStationForm struct {
+	IDComponent  string
+	Link         string
+	HxTarget     string
+	HxSwap       string
+	HxInclude    string
+	ModalID      string
+	ModalTitle   string
+	InputID      CustomTextFieldv2Prm
+	InputCode    CustomTextFieldv2Prm
+	InputName    CustomTextFieldv2Prm
+	InputGroup   CustomDropdownv1Prm
+	DialogBody   templ.Component
+	DialogAction templ.Component
+	ButtonClose  templ.Component
+}
+
+type MDSampleStationConfirmation struct {
+	IDComponent  string
+	Link         string
+	HxTarget     string
+	HxSwap       string
+	HxInclude    string
+	ModalID      string
+	ModalTitle   string
+	DialogBody   templ.Component
+	DialogAction templ.Component
+	ButtonClose  templ.Component
+}
+
+type MDSampleStationGroup struct {
+	ID    int    `default:"id"`
+	Group string `default:"group"`
+}
--- a/models/tabkelainanfisik.models.go
+++ b/models/tabkelainanfisik.models.go
@@ -0,0 +1,7 @@
+package models
+
+type KelainanFisikDataModel struct {
+	Test                      string `db:"test"`
+	Total                     int    `db:"total"`
+	Mcu_KelainanClasification string `db:"Mcu_KelainanClasification"`
+}
--- a/models/tabkelainanglobal.models.go
+++ b/models/tabkelainanglobal.models.go
@@ -0,0 +1,11 @@
+package models
+
+type KelainanGlobalMCUModel struct {
+	Test  string `db:"Test"`
+	Total int    `db:"total"`
+}
+
+type KelainanGlobalFisikModel struct {
+	Mcu_KelainanName string `db:"Mcu_KelainanName"`
+	Total            int    `db:"total"`
+}
--- a/models/tabkelainanlab.models.go
+++ b/models/tabkelainanlab.models.go
@@ -0,0 +1,6 @@
+package models
+
+type KelainanLabModel struct {
+	Mcu_KelainanName string `db:"Mcu_KelainanName"`
+	Total            int    `db:"total"`
+}
--- a/models/tabkelainannonlab.models.go
+++ b/models/tabkelainannonlab.models.go
@@ -0,0 +1,6 @@
+package models
+
+type KelNonLabModel struct {
+	Kelainan string `db:"kelainan"`
+	Total    int    `db:"total"`
+}
--- a/models/tabkepesertaan.models.go
+++ b/models/tabkepesertaan.models.go
@@ -0,0 +1,16 @@
+package models
+
+type TotalPesertaModel struct {
+	Peserta                 int `db:"peserta"`
+	Mgm_McuTotalParticipant int `db:"Mgm_McuTotalParticipant"`
+}
+
+type GenderPesertaModel struct {
+	M_PatientGender string `db:"M_PatientGender"`
+	Jumlah          int    `db:"Jumlah"`
+}
+
+type UmurPesertaModel struct {
+	Umur  string `db:"umur"`
+	Total int    `db:"total"`
+}
--- a/models/terminology.models.go
+++ b/models/terminology.models.go
@@ -0,0 +1,29 @@
+package models
+
+import "database/sql"
+
+type TerminologyV0 struct {
+	ResourceType    string         `db:"resource_type"`
+	AttributePath   string         `db:"attribute_path"`
+	Code            string         `db:"code"`
+	ParentCode      string         `db:"parent_code"`
+	Display         string         `db:"display"`
+	DisplayEn       string         `db:"display_en"`
+	CodeSystem      string         `db:"code_system"`
+	OrderNo         uint           `db:"order_no"`
+	FtIndex         sql.NullString `db:"ft_index"`
+	UseInd          bool           `db:"use_ind"`
+	Description     sql.NullString `db:"description"`
+	StatusCd        string         `db:"status_cd"`
+	CreatedDttm     string         `db:"created_dttm"`
+	CreatedUserID   uint           `db:"created_user_id"`
+	UpdatedDttm     string         `db:"updated_dttm"`
+	UpdatedUserID   uint           `db:"updated_user_id"`
+	NullifiedDttm   string         `db:"nullified_dttm"`
+	NullifiedUserID uint           `db:"nullified_user_id"`
+}
+
+type TerminologyParamv0 struct {
+	AttributePath string `json:"AttributePath"`
+	CodeSystem    string `json:"CodeSystem"`
+}
--- a/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/app.services.go
+++ b/services/app.services.go
@@ -1,8 +1,14 @@
 package services

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

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

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

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

+	var term []models.TerminologyV0
+
+	query := `
+		SELECT
+			*
+		FROM terminology
+		WHERE status_cd = 'normal'
+		AND code_system = ?
+		AND attribute_path = ?
+	`
+
+	logger.Info("QUERY SEARCH TERMINOLOGY",
+		zap.String("query search", query),
+	)
+
+	if err := dbx.Handlex.Select(&term, query,
+		inp.CodeSystem,
+		inp.AttributePath); err != nil {
+		return nil, fmt.Errorf("error querying database terminology: %v", err)
+	}
+
+	return term, nil
 }
--- a/services/corporate/dashboardpic.services.go
+++ b/services/corporate/dashboardpic.services.go
@@ -0,0 +1,147 @@
+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:  "/corp/dashboard_pic",
+			},
+			{
+				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) GetCorporateName(userID string) (string, error) {
+	var corpName string
+
+	q := `
+		SELECT
+		c.CorporateName
+		FROM mgm_mcu mm
+		JOIN corporate c ON c.CorporateID = mm.Mgm_McuCorporateID
+		AND CorporateIsActive = 'Y'
+		WHERE mm.Mgm_McuID = ?
+		AND mm.Mgm_McuIsActive = 'Y'
+	`
+	if err := dbx.Handlex.Get(&corpName, q, userID); err != nil {
+		return "PT. ABC", err
+	}
+
+	return corpName, 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,65 @@
+package corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+)
+
+type McuDetailServices struct {
+	McuDetailStore db.AppStore
+}
+
+func NewMcuDetailServices(uStore db.AppStore) *McuDetailServices {
+	return &McuDetailServices{
+		McuDetailStore: uStore,
+	}
+}
+
+func (mcud *McuDetailServices) GetBreadcrumb(id string) (models.BreadCrumbV1, error) {
+	var mcu models.DashboardPic
+
+	breadcrumb := models.BreadCrumbV1{
+		Title: "",
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/corp/dashboard_pic",
+			},
+			{
+				Item: "Employee Health Medical Analytic",
+				Url:  "/corp/dashboard_pic",
+			},
+			{
+				Item: "",
+				Url:  "",
+			},
+		},
+	}
+
+	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_McuID = ?
+	`
+	if err := dbx.Handlex.Get(&mcu, q, id); err != nil {
+		return breadcrumb, err
+	}
+
+	breadcrumb.Title = mcu.Mgm_McuLabel
+	breadcrumb.Item[2].Item = mcu.Mgm_McuLabel
+
+	return breadcrumb, nil
+}
--- a/services/corporate/mcudetail/tabdaftarpeserta.services.go
+++ b/services/corporate/mcudetail/tabdaftarpeserta.services.go
@@ -0,0 +1,146 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strconv"
+
+	"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 T_OrderHeaderLabNumber 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
+}
+
+func (tdps *TabDaftarPesertaServices) GetReportMcu(orderheaderID string) ([]models.TabViewReportMcu, error) {
+	var ret []models.TabViewReportMcu
+	var data []models.ModelMcuPesertaReport
+	var totalData int
+
+	q := `
+		SELECT COUNT(*)
+		FROM so_resultentry
+		WHERE So_ResultEntryT_OrderHeaderID = ?
+		AND So_ResultEntryIsActive = 'Y'
+	`
+	if err := dbx.Handlex.Get(&totalData, q, orderheaderID); err != nil {
+		return ret, fmt.Errorf("error get total mcu report: %v", err)
+	}
+
+	q = `
+		SELECT
+		So_ResultEntryID,
+		So_ResultEntryT_OrderHeaderID,
+		So_ResultEntryNonlab_TemplateID,
+		So_ResultEntryNonlab_TemplateName		
+		FROM so_resultentry
+		WHERE So_ResultEntryT_OrderHeaderID = ?
+		AND So_ResultEntryIsActive = 'Y'
+		ORDER BY So_ResultEntryNonlab_TemplateID
+	`
+	if err := dbx.Handlex.Select(&data, q, orderheaderID); err != nil {
+		return ret, err
+	}
+
+	// Lab
+	ret = append(ret, models.TabViewReportMcu{Name: "Hasil Laboratorium", Link: "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_test.rptdesign&__format=pdf&PID=" + orderheaderID + "&username=adhi&tm=1717726294764"})
+
+	// Non-lab
+	for _, n := range data {
+		var link models.TabViewReportMcu
+
+		switch n.So_ResultEntryNonlab_TemplateName {
+		case "ECG":
+			link.Name = "Elektromedis"
+			link.Link = "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_hasil_so_elmd.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&username=adhi&tm=1717726294764"
+		case "Thorax PA":
+			link.Name = "Radiologi"
+			link.Link = "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_hasil_so_xray.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&username=adhi&tm=1717726294764"
+		case "Audiometri":
+			link.Name = "Audiometri"
+			link.Link = "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_hasil_so_audiometri.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&username=adhi&tm=1717726294764"
+		case "Spirometri":
+			link.Name = "Spirometri"
+			link.Link = "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_hasil_so_spirometri.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&username=adhi&tm=1717726294764"
+		case "Fisik Umum":
+			namaFisik := []string{"Hasil Fisik", "Hasil Pajanan", "Riwayat"}
+			linkFisik := []string{
+				"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_fisik.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&PType=fisik&username=adhi&tm=1717726294764",
+				"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_pajanan.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&PType=fisik&username=adhi&tm=1717726294764",
+				"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_riwayat.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&PType=riwayat&username=adhi&tm=1717726294764",
+			}
+			for i := 0; i < 3; i++ {
+				ret = append(ret, models.TabViewReportMcu{Name: namaFisik[i], Link: linkFisik[i]})
+			}
+			continue
+		}
+
+		ret = append(ret, link)
+	}
+
+	ret = append(ret, models.TabViewReportMcu{Name: "Resume Individu", Link: "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_resume.rptdesign&__format=pdf&PID=" + orderheaderID + "&username=adhi&tm=1717726294764"})
+
+	return ret, nil
+}
--- a/services/corporate/mcudetail/tabkelainanfisik.services.go
+++ b/services/corporate/mcudetail/tabkelainanfisik.services.go
@@ -0,0 +1,207 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"strconv"
+
+	"go.uber.org/zap"
+)
+
+type TabKelainanFisikServices struct {
+	TabKelainanFisikStore db.AppStore
+}
+
+func NewTabKelainanFisikServices(store db.AppStore) *TabKelainanFisikServices {
+	return &TabKelainanFisikServices{
+		TabKelainanFisikStore: store,
+	}
+}
+
+func (tkf *TabKelainanFisikServices) GetPieChartConf(title string, subtext string, data []models.SeriesData) (models.Piechart, error) {
+	option := models.Piechart{
+		Title: struct {
+			Text    string `json:"text"`
+			SubText string `json:"subtext"`
+			Left    string `json:"left"`
+		}{
+			Text:    title,
+			SubText: subtext,
+			Left:    "center",
+		},
+		Tooltip: struct {
+			Trigger string `json:"trigger"`
+		}{
+			Trigger: "item",
+		},
+		Legend: struct {
+			Top    string `json:"top"`
+			Left   string `json:"left"`
+			Orient string `json:"orient"`
+			Height int    `json:"height"`
+		}{
+			Top:    "bottom",
+			Left:   "center",
+			Orient: "vertical",
+			Height: 75,
+		},
+		Series: []models.Series{
+			{
+				Label: struct {
+					Position  string `json:"position"`
+					Formatter string `json:"formatter"`
+				}{
+					Position:  "inner",
+					Formatter: "{d}%",
+				},
+				Name:   "Access From",
+				Type:   "pie",
+				Radius: []string{"20%", "50%"},
+				ItemStyle: struct {
+					BorderRadius int    `json:"borderRadius"`
+					BorderColor  string `json:"borderColor"`
+					BorderWidth  int    `json:"borderWidth"`
+				}{
+					BorderRadius: 10,
+					BorderColor:  "#fff",
+					BorderWidth:  2,
+				},
+				Data: data,
+				Emphasis: struct {
+					ItemStyle struct {
+						ShadowBlur    int    `json:"shadowBlur"`
+						ShadowOffsetX int    `json:"shadowOffsetX"`
+						ShadowColor   string `json:"shadowColor"`
+					} `json:"itemStyle"`
+				}{
+					ItemStyle: struct {
+						ShadowBlur    int    `json:"shadowBlur"`
+						ShadowOffsetX int    `json:"shadowOffsetX"`
+						ShadowColor   string `json:"shadowColor"`
+					}{
+						ShadowBlur:    10,
+						ShadowOffsetX: 0,
+						ShadowColor:   "rgba(0, 0, 0, 0.5)",
+					},
+				},
+			},
+		},
+	}
+
+	return option, nil
+}
+
+func (tkf *TabKelainanFisikServices) GetKelainanFisikBMI(mcuID string) (models.Piechart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Piechart
+	var data []models.KelainanFisikDataModel
+
+	q := `
+	SELECT    
+	CASE
+	WHEN Mgm_HeaderIsNormal = "Y" THEN "Normal"  
+	WHEN Mgm_HeaderIsNormal = "N" THEN Mcu_KelainanName 
+	ELSE "Tidak diperiksa" END AS test,
+	COUNT(Mgm_HeaderT_OrderHeaderID)  AS total,
+	IFNULL(Mcu_KelainanClasification, "") AS Mcu_KelainanClasification
+	FROM mgm_header
+	LEFT JOIN mgm_detail ON Mgm_DetailMgm_HeaderID = Mgm_HeaderID  AND Mgm_DetailIsActive = 'Y'
+	LEFT JOIN mcu_kelainan ON Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+	LEFT 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_HeaderNat_TestCode = 'STATUS GIZI'
+	GROUP BY 
+	CASE
+	WHEN Mgm_HeaderIsNormal = "Y" THEN "Normal"  
+	WHEN Mgm_HeaderIsNormal = "N" THEN Mcu_KelainanName ELSE
+	"Tidak diperiksa" END
+	ORDER BY  COUNT(Mgm_HeaderT_OrderHeaderID) DESC	
+	`
+
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get data kel fisik bmi %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Status Index Masa Tubuh (BMI)"
+	subtext := ""
+	chartData := []models.SeriesData{}
+
+	if data != nil {
+		for _, d := range data {
+			chartData = append(chartData, models.SeriesData{
+				Value: d.Total,
+				Name:  d.Test + ": " + strconv.Itoa(d.Total) + " Peserta",
+			})
+		}
+	} else {
+		chartData = append(chartData, models.SeriesData{Value: 0, Name: "No Data"})
+	}
+
+	option, err := tkf.GetPieChartConf(title, subtext, chartData)
+	if err != nil {
+		return option, fmt.Errorf("error get & insert data into chart: %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkf *TabKelainanFisikServices) GetKelainanFisikHipertensi(mcuID string) (models.Piechart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Piechart
+	var data []models.KelainanFisikDataModel
+
+	q := `
+	SELECT
+	CASE
+	WHEN Mgm_HeaderIsNormal = "Y" THEN "Normal"  
+	WHEN Mgm_HeaderIsNormal = "N" THEN Mcu_KelainanName 
+	ELSE "Tidak diperiksa" END AS test,
+	COUNT(Mgm_HeaderT_OrderHeaderID) AS total,
+	IFNULL(Mcu_KelainanClasification, "") AS Mcu_KelainanClasification
+	FROM mgm_header
+	LEFT JOIN mgm_detail ON Mgm_DetailMgm_HeaderID = Mgm_HeaderID AND Mgm_DetailIsActive = 'Y'
+	LEFT JOIN mcu_kelainan ON Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+	LEFT 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_HeaderNat_TestCode = 'TANDA VITAL'
+	GROUP BY 
+	CASE
+	WHEN Mgm_HeaderIsNormal = "Y" THEN "Normal"  
+	WHEN Mgm_HeaderIsNormal = "N" THEN Mcu_KelainanName 
+	ELSE "Tidak diperiksa" END 
+	ORDER BY count(Mgm_HeaderT_OrderHeaderID) DESC	
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get data kel fisik hipertensi: %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Kriteria Hipertensi"
+	subtext := ""
+	chartData := []models.SeriesData{}
+
+	if data != nil {
+		for _, d := range data {
+			chartData = append(chartData, models.SeriesData{
+				Value: d.Total,
+				Name:  d.Test + ": " + strconv.Itoa(d.Total) + " Peserta",
+			})
+		}
+	} else {
+		chartData = append(chartData, models.SeriesData{Value: 0, Name: "No Data"})
+	}
+
+	option, err := tkf.GetPieChartConf(title, subtext, chartData)
+	if err != nil {
+		return option, fmt.Errorf("error get and insert data into piechart : %v", err)
+	}
+
+	return option, nil
+}
--- a/services/corporate/mcudetail/tabkelainanglobal.services.go
+++ b/services/corporate/mcudetail/tabkelainanglobal.services.go
@@ -0,0 +1,201 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strconv"
+
+	"go.uber.org/zap"
+)
+
+type TabKelainanGlobalServices struct {
+	TabKelainanGlobalServicesStore db.AppStore
+}
+
+func NewTabKelainanGlobalServices(store db.AppStore) *TabKelainanGlobalServices {
+	return &TabKelainanGlobalServices{
+		TabKelainanGlobalServicesStore: store,
+	}
+}
+
+func (tkg *TabKelainanGlobalServices) GetBarChartConf(title string, data models.BarDataset) (models.Barchart, error) {
+	option := models.Barchart{}
+	option.Title = struct {
+		Text string "json:\"text\""
+	}{title}
+	option.Dataset = data
+	option.Grid.ContainLabel = true
+	option.XAxis.Name = "amount"
+	option.YAxis.Type = "category"
+	option.VisualMap.Orient = "horizontal"
+	option.VisualMap.Left = "center"
+	option.VisualMap.Min = 10
+	option.VisualMap.Max = 100
+	option.VisualMap.Show = false
+	option.VisualMap.Dimension = 0
+	option.VisualMap.InRange.Color = []string{"#42aaf5", "#00eaf2", "#035bff"}
+	option.Series = []struct {
+		Label struct {
+			Position  string "json:\"position\""
+			Show      bool   "json:\"show\""
+			Formatter string "json:\"formatter\""
+		} "json:\"label\""
+		Type   string "json:\"type\""
+		Encode struct {
+			X string "json:\"x\""
+			Y string "json:\"y\""
+		} "json:\"encode\""
+	}{
+		{
+			Label: struct {
+				Position  string "json:\"position\""
+				Show      bool   "json:\"show\""
+				Formatter string "json:\"formatter\""
+			}{
+				Position:  "right",
+				Show:      true,
+				Formatter: "{@[3]} %",
+			},
+			Type: "bar",
+			Encode: struct {
+				X string "json:\"x\""
+				Y string "json:\"y\""
+			}{
+				X: "score",
+				Y: "product",
+			},
+		},
+	}
+	option.Tooltip = struct {
+		Trigger     string "json:\"trigger\""
+		AxisPointer struct {
+			Type string "json:\"type\""
+		} "json:\"axisPointer\""
+	}{
+		Trigger: "axis",
+		AxisPointer: struct {
+			Type string "json:\"type\""
+		}{
+			Type: "shadow",
+		},
+	}
+
+	return option, nil
+}
+
+func (tkg *TabKelainanGlobalServices) GetKelainanGlobalMCU(mcuID string) (models.Barchart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Barchart
+	var data []models.KelainanGlobalMCUModel
+
+	q := `
+	SELECT
+	IFNULL(Nat_TestName ,Mcu_KelainanGroupName) AS Test,
+	COUNT(Mgm_HeaderT_OrderHeaderID) 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_HeaderIsNormal = 'N' 
+	GROUP BY Mcu_KelainanGroupID ORDER BY COUNT(Mgm_HeaderT_OrderHeaderID) DESC	
+	`
+	// Mgm_DetailMcu_KelainanID ->> versi php
+	// Mcu_KelainanGroupID ->> versi excel
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get data kelainan global mcu %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Kelainan MCU"
+	chartData := models.BarDataset{
+		Source: [][]interface{}{
+			{"score", "amount", "product", "percentage"},
+		},
+	}
+
+	max := 1
+	for _, d := range data {
+		if d.Total >= max {
+			max = d.Total
+		}
+	}
+
+	for _, d := range data {
+		percentage := float64(d.Total) / float64(max) * 100
+		roundedPercentage := math.Round(percentage*100) / 100
+		percentStr := strconv.FormatFloat(roundedPercentage, 'f', -1, 64)
+		chartData.Source = append(chartData.Source, []interface{}{
+			d.Total, d.Total, d.Test, percentStr,
+		})
+	}
+
+	option, err := tkg.GetBarChartConf(title, chartData)
+	if err != nil {
+		return option, fmt.Errorf("error insert data to barchart %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkg *TabKelainanGlobalServices) GetKelainanFisik(mcuID string) (models.Barchart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Barchart
+	var data []models.KelainanGlobalFisikModel
+
+	q := `
+	SELECT 
+	Mcu_KelainanName, 
+	COUNT(Mgm_HeaderT_OrderHeaderID)  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
+	WHERE Mgm_HeaderIsActive = 'Y'  AND Mgm_HeaderMgm_McuID = ?
+	AND Mgm_HeaderType = 'F'
+	AND Mgm_HeaderIsNormal = 'N'
+	GROUP BY Mcu_KelainanID  
+	ORDER BY total DESC	
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get data kelainan global fisik %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Kelainan Fisik"
+	chartData := models.BarDataset{
+		Source: [][]interface{}{
+			{"score", "amount", "product", "percentage"},
+		},
+	}
+
+	max := 1
+	for _, d := range data {
+		if d.Total >= max {
+			max = d.Total
+		}
+	}
+
+	for _, d := range data {
+		percentage := float64(d.Total) / float64(max) * 100
+		roundedPercentage := math.Round(percentage*100) / 100
+		percentStr := strconv.FormatFloat(roundedPercentage, 'f', -1, 64)
+		chartData.Source = append(chartData.Source, []interface{}{
+			d.Total, d.Total, d.Mcu_KelainanName, percentStr,
+		})
+	}
+
+	option, err := tkg.GetBarChartConf(title, chartData)
+	if err != nil {
+		return option, nil
+	}
+
+	return option, nil
+}
--- a/services/corporate/mcudetail/tabkelainanlab.services.go
+++ b/services/corporate/mcudetail/tabkelainanlab.services.go
@@ -0,0 +1,448 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strconv"
+
+	"go.uber.org/zap"
+)
+
+type TabKelainanLabServices struct {
+	TabKelainanLabStore db.AppStore
+}
+
+func NewTabKelainanLabServices(store db.AppStore) *TabKelainanLabServices {
+	return &TabKelainanLabServices{
+		TabKelainanLabStore: store,
+	}
+}
+
+func (tkl *TabKelainanLabServices) ConfBarchart(title string, data models.BarDataset) (models.Barchart, error) {
+	option := models.Barchart{}
+
+	option.Title = struct {
+		Text string "json:\"text\""
+	}{title}
+	option.Dataset = data
+	option.Grid.ContainLabel = true
+	option.XAxis.Name = "amount"
+	option.YAxis.Type = "category"
+	option.VisualMap.Orient = "horizontal"
+	option.VisualMap.Left = "center"
+	option.VisualMap.Min = 1
+	option.VisualMap.Max = 100
+	option.VisualMap.Show = false
+	option.VisualMap.Dimension = 0
+	option.VisualMap.InRange.Color = []string{"#42aaf5", "#00eaf2", "#035bff"}
+	option.Series = []struct {
+		Label struct {
+			Position  string "json:\"position\""
+			Show      bool   "json:\"show\""
+			Formatter string "json:\"formatter\""
+		} "json:\"label\""
+		Type   string "json:\"type\""
+		Encode struct {
+			X string "json:\"x\""
+			Y string "json:\"y\""
+		} "json:\"encode\""
+	}{
+		{
+			Label: struct {
+				Position  string "json:\"position\""
+				Show      bool   "json:\"show\""
+				Formatter string "json:\"formatter\""
+			}{
+				Position:  "right",
+				Show:      true,
+				Formatter: "{@[3]} %",
+			},
+			Type: "bar",
+			Encode: struct {
+				X string "json:\"x\""
+				Y string "json:\"y\""
+			}{
+				X: "score",
+				Y: "product",
+			},
+		},
+	}
+	option.Tooltip = struct {
+		Trigger     string "json:\"trigger\""
+		AxisPointer struct {
+			Type string "json:\"type\""
+		} "json:\"axisPointer\""
+	}{
+		Trigger: "axis",
+		AxisPointer: struct {
+			Type string "json:\"type\""
+		}{
+			Type: "shadow",
+		},
+	}
+
+	return option, nil
+}
+
+func (tkl *TabKelainanLabServices) ConfBarchartVertical(title string, data []models.KelainanLabModel) (models.BarchartV2, error) {
+
+	chartData := models.BarDataset{
+		Source: [][]interface{}{
+			{"score", "amount", "product"},
+		},
+	}
+
+	cnt := len(data)
+	for idx, d := range data {
+		chartData.Source = append(chartData.Source, []interface{}{
+			idx, d.Total, d.Mcu_KelainanName,
+		})
+	}
+
+	option := models.BarchartV2{
+		Title: struct {
+			Text string "json:\"text\""
+		}{title},
+		Dataset: struct {
+			Source [][]interface{} "json:\"source\""
+		}{chartData.Source},
+		Grid: struct {
+			ContainLabel bool "json:\"containLabel\""
+		}{true},
+		XAxis: struct {
+			Name      string "json:\"name\""
+			Type      string "json:\"type\""
+			AxisLabel struct {
+				Interval int "json:\"interval\""
+				Rotate   int "json:\"rotate\""
+			} "json:\"axisLabel\""
+		}{
+			Name: "",
+			Type: "category",
+			AxisLabel: struct {
+				Interval int "json:\"interval\""
+				Rotate   int "json:\"rotate\""
+			}{
+				Interval: 0,
+				Rotate:   0,
+			},
+		},
+		YAxis: struct {
+			Type          string "json:\"type\""
+			Name          string "json:\"name\""
+			NameTextStyle struct {
+				Align string "json:\"align\""
+			} "json:\"nameTextStyle\""
+			NameGap int "json:\"nameGap\""
+		}{
+			Type: "value",
+			Name: "",
+			NameTextStyle: struct {
+				Align string "json:\"align\""
+			}{
+				Align: "right",
+			},
+			NameGap: 20,
+		},
+		VisualMap: struct {
+			Orient    string "json:\"orient\""
+			Left      string "json:\"left\""
+			Min       int    "json:\"min\""
+			Max       int    "json:\"max\""
+			Dimension int    "json:\"dimension\""
+			Show      bool   "json:\"show\""
+			InRange   struct {
+				Color []string "json:\"color\""
+			} "json:\"inRange\""
+		}{
+			Orient:    "horizontal",
+			Left:      "center",
+			Min:       0,
+			Max:       cnt,
+			Dimension: 0,
+			Show:      false,
+			InRange: struct {
+				Color []string "json:\"color\""
+			}{
+				Color: []string{"#42aaf5", "#00eaf2", "#035bff"},
+			},
+		},
+		Series: []struct {
+			Label struct {
+				Position  string "json:\"position\""
+				Show      bool   "json:\"show\""
+				Formatter string "json:\"formatter\""
+			} "json:\"label\""
+			Type   string "json:\"type\""
+			Encode struct {
+				X string "json:\"x\""
+				Y string "json:\"y\""
+			} "json:\"encode\""
+		}{
+			{
+				Label: struct {
+					Position  string "json:\"position\""
+					Show      bool   "json:\"show\""
+					Formatter string "json:\"formatter\""
+				}{
+					Position:  "inside",
+					Show:      true,
+					Formatter: "{@[1]}",
+				},
+				Type: "bar",
+				Encode: struct {
+					X string "json:\"x\""
+					Y string "json:\"y\""
+				}{
+					X: "product",
+					Y: "amount",
+				},
+			},
+		},
+		Tooltip: struct {
+			Trigger     string "json:\"trigger\""
+			AxisPointer struct {
+				Type string "json:\"type\""
+			} "json:\"axisPointer\""
+		}{
+			Trigger: "axis",
+			AxisPointer: struct {
+				Type string "json:\"type\""
+			}{
+				Type: "shadow",
+			},
+		},
+	}
+
+	return option, nil
+}
+
+func (tkl *TabKelainanLabServices) GetDataPresentaseKelainanLab(mcuID string) (models.Barchart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Barchart
+	var data []models.KelainanLabModel
+
+	q := `
+	SELECT
+	Mcu_KelainanName, 
+	COUNT(Mgm_HeaderT_OrderHeaderID) 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
+	WHERE Mgm_HeaderIsActive = 'Y' AND Mgm_HeaderMgm_McuID = ?
+	AND Mgm_HeaderType = 'L'
+	AND Mgm_HeaderIsNormal = 'N'
+	GROUP BY Mcu_KelainanID  ORDER BY COUNT(Mgm_HeaderT_OrderHeaderID) DESC	
+	`
+
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get total presentase fisik %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Data Presentase Kelainan Lab"
+	chartData := models.BarDataset{
+		Source: [][]interface{}{
+			{"score", "amount", "product", "percentage"},
+		},
+	}
+
+	max := 1
+	for _, d := range data {
+		if d.Total >= max {
+			max = d.Total
+		}
+	}
+
+	for _, d := range data {
+		percentage := float64(d.Total) / float64(max) * 100
+		roundedPercentage := math.Round(percentage*100) / 100
+		percentStr := strconv.FormatFloat(roundedPercentage, 'f', -1, 64)
+		chartData.Source = append(chartData.Source, []interface{}{
+			d.Total, d.Total, d.Mcu_KelainanName, percentStr,
+		})
+	}
+
+	option, err := tkl.ConfBarchart(title, chartData)
+	if err != nil {
+		return option, fmt.Errorf("error insert data to chart %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkl *TabKelainanLabServices) GetHematologi(mcuID string) (models.BarchartV2, error) {
+	logger, _ := zap.NewProduction()
+	var option models.BarchartV2
+	var data []models.KelainanLabModel
+
+	q := `
+	SELECT Mcu_KelainanName, 
+	COUNT(Mgm_HeaderT_OrderHeaderID) 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
+	WHERE Mgm_HeaderIsActive = 'Y' AND Mgm_HeaderMgm_McuID = ?
+	AND Mgm_HeaderType = 'L'
+	AND Mgm_HeaderIsNormal = 'N'
+	AND Mcu_KelainanGroupID = 14
+	GROUP BY Mcu_KelainanID 
+	ORDER BY COUNT(Mgm_HeaderT_OrderHeaderID) DESC
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get hematologi %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Hematologi"
+	option, err := tkl.ConfBarchartVertical(title, data)
+	if err != nil {
+		return option, fmt.Errorf("error insert data to chart %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkl *TabKelainanLabServices) GetUrinalisa(mcuID string) (models.BarchartV2, error) {
+	logger, _ := zap.NewProduction()
+	var option models.BarchartV2
+	var data []models.KelainanLabModel
+
+	q := `
+	SELECT
+	Mcu_KelainanName,
+	COUNT(Mgm_HeaderT_OrderHeaderID) 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
+	WHERE Mgm_HeaderIsActive = 'Y' AND Mgm_HeaderMgm_McuID = ?
+	AND Mgm_HeaderType = 'L'
+	AND Mgm_HeaderIsNormal = 'N'
+	AND Mcu_KelainanGroupID = 15
+	GROUP BY Mcu_KelainanID  
+	ORDER BY COUNT(Mgm_HeaderT_OrderHeaderID) DESC	
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get urinalisa %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Urinalisa"
+	option, err := tkl.ConfBarchartVertical(title, data)
+	if err != nil {
+		return option, fmt.Errorf("error insert data to chart %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkl *TabKelainanLabServices) GetGangguanFungsiHati(mcuID string) (models.BarchartV2, error) {
+	logger, _ := zap.NewProduction()
+	var option models.BarchartV2
+	var data []models.KelainanLabModel
+
+	q := `
+	SELECT Mcu_KelainanName, 
+	COUNT(Mgm_HeaderT_OrderHeaderID) 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
+	WHERE Mgm_HeaderIsActive = 'Y' AND Mgm_HeaderMgm_McuID = ?
+	AND Mgm_HeaderType = 'L'
+	AND Mgm_HeaderIsNormal = 'N'
+	AND Mcu_KelainanGroupID = 16
+	GROUP BY Mcu_KelainanID 
+	ORDER BY COUNT(Mgm_HeaderT_OrderHeaderID) DESC	
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get gangguan fungsi hati %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Gangguan Fungsi Hati"
+	option, err := tkl.ConfBarchartVertical(title, data)
+	if err != nil {
+		return option, fmt.Errorf("error insert data to chart %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkl *TabKelainanLabServices) GetGangguanMetabolismeLemak(mcuID string) (models.BarchartV2, error) {
+	logger, _ := zap.NewProduction()
+	var option models.BarchartV2
+	var data []models.KelainanLabModel
+
+	q := `
+	SELECT 
+	IFNULL(Mcu_KelainanName,'Normal') AS Mcu_KelainanName,
+	COUNT(Mgm_HeaderT_OrderHeaderID) AS total
+	FROM mgm_header
+	LEFT JOIN mgm_detail ON Mgm_DetailMgm_HeaderID = Mgm_HeaderID AND Mgm_DetailIsActive = 'Y'
+	LEFT JOIN mcu_kelainan ON Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+	LEFT JOIN mcu_kelainangroup ON Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+	WHERE Mgm_HeaderIsActive = 'Y' AND Mgm_HeaderNat_TestCode IN ( '10520300','10520400') 
+	AND Mgm_HeaderMgm_McuID = ?
+	GROUP BY Mcu_KelainanID
+	ORDER BY total DESC
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get gangguan metabolisme lemak  %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Gangguan Metabolisme Lemak"
+	option, err := tkl.ConfBarchartVertical(title, data)
+	if err != nil {
+		return option, fmt.Errorf("error insert data to chart %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkl *TabKelainanLabServices) GetPeningkatanGlukosa(mcuID string) (models.BarchartV2, error) {
+	logger, _ := zap.NewProduction()
+	var option models.BarchartV2
+	var data []models.KelainanLabModel
+
+	q := `
+	SELECT IFNULL(Mcu_KelainanName,'Normal') AS Mcu_KelainanName,
+	COUNT(Mgm_HeaderT_OrderHeaderID) AS total
+	FROM mgm_header
+	LEFT JOIN mgm_detail ON Mgm_DetailMgm_HeaderID = Mgm_HeaderID AND Mgm_DetailIsActive = 'Y'
+	LEFT JOIN mcu_kelainan ON Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+	LEFT JOIN mcu_kelainangroup ON Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+	WHERE Mgm_HeaderIsActive = 'Y' AND Mgm_HeaderNat_TestCode = 10540200 
+	AND Mgm_HeaderMgm_McuID = ?
+	GROUP BY Mcu_KelainanID	
+	ORDER BY total DESC
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get peningkatan glukosa %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Peningkatan Glukosa"
+	option, err := tkl.ConfBarchartVertical(title, data)
+	if err != nil {
+		return option, fmt.Errorf("error insert data to chart %v", err)
+	}
+
+	return option, nil
+}
--- a/services/corporate/mcudetail/tabkelainannonlab.services.go
+++ b/services/corporate/mcudetail/tabkelainannonlab.services.go
@@ -0,0 +1,309 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strconv"
+
+	"go.uber.org/zap"
+)
+
+type TabKelainanNonLabServices struct {
+	TabKelainanNonLabStore db.AppStore
+}
+
+func NewTabKelainanNonLabServices(store db.AppStore) *TabKelainanNonLabServices {
+	return &TabKelainanNonLabServices{
+		TabKelainanNonLabStore: store,
+	}
+}
+
+func (tknl *TabKelainanNonLabServices) GetBarChartConf(title string, data models.BarDataset) (models.Barchart, error) {
+	option := models.Barchart{}
+	option.Title = struct {
+		Text string "json:\"text\""
+	}{title}
+	option.Dataset = data
+	option.Grid.ContainLabel = true
+	option.XAxis.Name = "amount"
+	option.YAxis.Type = "category"
+	option.VisualMap.Orient = "horizontal"
+	option.VisualMap.Left = "center"
+	option.VisualMap.Min = 10
+	option.VisualMap.Max = 100
+	option.VisualMap.Show = false
+	option.VisualMap.Dimension = 0
+	option.VisualMap.InRange.Color = []string{"#42aaf5", "#00eaf2", "#035bff"}
+	option.Series = []struct {
+		Label struct {
+			Position  string "json:\"position\""
+			Show      bool   "json:\"show\""
+			Formatter string "json:\"formatter\""
+		} "json:\"label\""
+		Type   string "json:\"type\""
+		Encode struct {
+			X string "json:\"x\""
+			Y string "json:\"y\""
+		} "json:\"encode\""
+	}{
+		{
+			Label: struct {
+				Position  string "json:\"position\""
+				Show      bool   "json:\"show\""
+				Formatter string "json:\"formatter\""
+			}{
+				Position:  "right",
+				Show:      true,
+				Formatter: "{@[3]} %",
+			},
+			Type: "bar",
+			Encode: struct {
+				X string "json:\"x\""
+				Y string "json:\"y\""
+			}{
+				X: "amount",
+				Y: "product",
+			},
+		},
+	}
+	option.Tooltip = struct {
+		Trigger     string "json:\"trigger\""
+		AxisPointer struct {
+			Type string "json:\"type\""
+		} "json:\"axisPointer\""
+	}{
+		Trigger: "axis",
+		AxisPointer: struct {
+			Type string "json:\"type\""
+		}{
+			Type: "shadow",
+		},
+	}
+
+	return option, nil
+}
+
+func (tknl *TabKelainanNonLabServices) ConfBarchartVertical(title string, data []models.KelNonLabModel) (models.BarchartV2, error) {
+	chartData := models.BarDataset{
+		Source: [][]interface{}{
+			{"score", "amount", "product"},
+		},
+	}
+
+	cnt := len(data)
+	for idx, d := range data {
+		chartData.Source = append(chartData.Source, []interface{}{
+			idx, d.Total, d.Kelainan,
+		})
+	}
+
+	option := models.BarchartV2{
+		Title: struct {
+			Text string "json:\"text\""
+		}{title},
+		Dataset: struct {
+			Source [][]interface{} "json:\"source\""
+		}{chartData.Source},
+		Grid: struct {
+			ContainLabel bool "json:\"containLabel\""
+		}{true},
+		XAxis: struct {
+			Name      string "json:\"name\""
+			Type      string "json:\"type\""
+			AxisLabel struct {
+				Interval int "json:\"interval\""
+				Rotate   int "json:\"rotate\""
+			} "json:\"axisLabel\""
+		}{
+			Name: "",
+			Type: "category",
+			AxisLabel: struct {
+				Interval int "json:\"interval\""
+				Rotate   int "json:\"rotate\""
+			}{
+				Interval: 0,
+				Rotate:   0,
+			},
+		},
+		YAxis: struct {
+			Type          string "json:\"type\""
+			Name          string "json:\"name\""
+			NameTextStyle struct {
+				Align string "json:\"align\""
+			} "json:\"nameTextStyle\""
+			NameGap int "json:\"nameGap\""
+		}{
+			Type: "value",
+			Name: "",
+			NameTextStyle: struct {
+				Align string "json:\"align\""
+			}{
+				Align: "right",
+			},
+			NameGap: 20,
+		},
+		VisualMap: struct {
+			Orient    string "json:\"orient\""
+			Left      string "json:\"left\""
+			Min       int    "json:\"min\""
+			Max       int    "json:\"max\""
+			Dimension int    "json:\"dimension\""
+			Show      bool   "json:\"show\""
+			InRange   struct {
+				Color []string "json:\"color\""
+			} "json:\"inRange\""
+		}{
+			Orient:    "horizontal",
+			Left:      "center",
+			Min:       0,
+			Max:       cnt,
+			Dimension: 0,
+			Show:      false,
+			InRange: struct {
+				Color []string "json:\"color\""
+			}{
+				Color: []string{"#42aaf5", "#00eaf2", "#035bff"},
+			},
+		},
+		Series: []struct {
+			Label struct {
+				Position  string "json:\"position\""
+				Show      bool   "json:\"show\""
+				Formatter string "json:\"formatter\""
+			} "json:\"label\""
+			Type   string "json:\"type\""
+			Encode struct {
+				X string "json:\"x\""
+				Y string "json:\"y\""
+			} "json:\"encode\""
+		}{
+			{
+				Label: struct {
+					Position  string "json:\"position\""
+					Show      bool   "json:\"show\""
+					Formatter string "json:\"formatter\""
+				}{
+					Position:  "inside",
+					Show:      true,
+					Formatter: "{@[1]}",
+				},
+				Type: "bar",
+				Encode: struct {
+					X string "json:\"x\""
+					Y string "json:\"y\""
+				}{
+					X: "product",
+					Y: "amount",
+				},
+			},
+		},
+		Tooltip: struct {
+			Trigger     string "json:\"trigger\""
+			AxisPointer struct {
+				Type string "json:\"type\""
+			} "json:\"axisPointer\""
+		}{
+			Trigger: "axis",
+			AxisPointer: struct {
+				Type string "json:\"type\""
+			}{
+				Type: "shadow",
+			},
+		},
+	}
+
+	return option, nil
+}
+
+func (tknl *TabKelainanNonLabServices) GetDataKelNonLab(mcuID string) (models.Barchart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Barchart
+	var data []models.KelNonLabModel
+
+	q := `
+	SELECT concat(Nat_TestName,"/",Mcu_KelainanName) AS kelainan, 
+	COUNT(Mgm_HeaderT_OrderHeaderID) AS total
+	FROM mgm_header
+	LEFT JOIN mgm_detail ON Mgm_DetailMgm_HeaderID = Mgm_HeaderID AND Mgm_DetailIsActive = 'Y'
+	LEFT JOIN mcu_kelainan ON Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+	LEFT 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 Mcu_KelainanID  
+	ORDER BY COUNT(Mgm_HeaderT_OrderHeaderID) DESC
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get data kelainan global mcu %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Data Presentase Kelainan Non Lab"
+	chartData := models.BarDataset{
+		Source: [][]interface{}{
+			{"score", "amount", "product", "percentage"},
+		},
+	}
+
+	max := 1
+	for _, d := range data {
+		if d.Total >= max {
+			max = d.Total
+		}
+	}
+
+	for _, d := range data {
+		percentage := float64(d.Total) / float64(max) * 100
+		roundedPercentage := math.Round(percentage*100) / 100
+		percentStr := strconv.FormatFloat(roundedPercentage, 'f', -1, 64)
+		chartData.Source = append(chartData.Source, []interface{}{
+			d.Total, d.Total, d.Kelainan, percentStr,
+		})
+	}
+
+	option, err := tknl.GetBarChartConf(title, chartData)
+	if err != nil {
+		return option, fmt.Errorf("error insert data to barchart %v", err)
+	}
+
+	return option, nil
+}
+
+func (tknl *TabKelainanNonLabServices) GetThoraxPA(mcuID string) (models.BarchartV2, error) {
+	logger, _ := zap.NewProduction()
+	var option models.BarchartV2
+	var data []models.KelNonLabModel
+
+	q := `
+	SELECT 
+	IFNULL(Mcu_KelainanName,'Normal') AS kelainan,
+	COUNT(Mgm_HeaderT_OrderHeaderID) AS total
+	FROM mgm_header
+	LEFT JOIN mgm_detail ON Mgm_DetailMgm_HeaderID = Mgm_HeaderID AND Mgm_DetailIsActive = 'Y'
+	LEFT JOIN mcu_kelainan ON Mgm_DetailMcu_KelainanID = Mcu_KelainanID
+	LEFT JOIN mcu_kelainangroup ON Mgm_DetailMcu_KelainanGroupID = Mcu_KelainanGroupID
+	WHERE Mgm_HeaderIsActive = 'Y' AND Mgm_HeaderNat_TestCode = 30150100 
+	AND Mgm_HeaderIsNormal = 'N' AND Mgm_HeaderMgm_McuID = ?
+	GROUP BY Mcu_KelainanID 
+	ORDER BY total DESC
+	`
+
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get data kelainan global mcu %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Thorax PA"
+	option, err := tknl.ConfBarchartVertical(title, data)
+	if err != nil {
+		return option, fmt.Errorf("error insert data into chart %v", err)
+	}
+
+	return option, nil
+}
--- a/services/corporate/mcudetail/tabkepesertaan.services.go
+++ b/services/corporate/mcudetail/tabkepesertaan.services.go
@@ -0,0 +1,250 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"strconv"
+
+	"go.uber.org/zap"
+)
+
+type TabKepersertaanServices struct {
+	TabKepersertaanServiceStore db.AppStore
+}
+
+func NewTabKepersertaanService(store db.AppStore) *TabKepersertaanServices {
+	return &TabKepersertaanServices{
+		TabKepersertaanServiceStore: store,
+	}
+}
+
+func (tkp *TabKepersertaanServices) GetPieChartConf(title string, subtext string, data []models.SeriesData) (models.Piechart, error) {
+
+	option := models.Piechart{
+		Title: struct {
+			Text    string `json:"text"`
+			SubText string `json:"subtext"`
+			Left    string `json:"left"`
+		}{
+			Text:    title,
+			SubText: subtext,
+			Left:    "center",
+		},
+		Tooltip: struct {
+			Trigger string `json:"trigger"`
+		}{
+			Trigger: "item",
+		},
+		Legend: struct {
+			Top    string `json:"top"`
+			Left   string `json:"left"`
+			Orient string `json:"orient"`
+			Height int    `json:"height"`
+		}{
+			Top:    "bottom",
+			Left:   "center",
+			Orient: "vertical",
+			Height: 75,
+		},
+		Series: []models.Series{
+			{
+				Label: struct {
+					Position  string `json:"position"`
+					Formatter string `json:"formatter"`
+				}{
+					Position:  "inner",
+					Formatter: "{d}%",
+				},
+				Name:   "Access From",
+				Type:   "pie",
+				Radius: []string{"20%", "50%"},
+				ItemStyle: struct {
+					BorderRadius int    `json:"borderRadius"`
+					BorderColor  string `json:"borderColor"`
+					BorderWidth  int    `json:"borderWidth"`
+				}{
+					BorderRadius: 10,
+					BorderColor:  "#fff",
+					BorderWidth:  2,
+				},
+				Data: data,
+				Emphasis: struct {
+					ItemStyle struct {
+						ShadowBlur    int    `json:"shadowBlur"`
+						ShadowOffsetX int    `json:"shadowOffsetX"`
+						ShadowColor   string `json:"shadowColor"`
+					} `json:"itemStyle"`
+				}{
+					ItemStyle: struct {
+						ShadowBlur    int    `json:"shadowBlur"`
+						ShadowOffsetX int    `json:"shadowOffsetX"`
+						ShadowColor   string `json:"shadowColor"`
+					}{
+						ShadowBlur:    10,
+						ShadowOffsetX: 0,
+						ShadowColor:   "rgba(0, 0, 0, 0.5)",
+					},
+				},
+			},
+		},
+	}
+
+	return option, nil
+}
+
+func (tkp *TabKepersertaanServices) GetTotalKepesertaanMCU(mcuID string) (models.Piechart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Piechart
+	var data models.TotalPesertaModel
+
+	q := `
+		SELECT 
+		COUNT(mo.Mcu_OrderID) AS peserta,
+		mm.Mgm_McuTotalParticipant
+		FROM mgm_mcu mm
+		LEFT JOIN t_orderheader toh ON toh.T_OrderHeaderMgm_McuID = mm.Mgm_McuID
+		AND T_OrderHeaderIsActive = 'Y'
+		LEFT JOIN mcu_order mo ON mo.Mcu_OrderT_OrderHeaderID = toh.T_OrderHeaderID
+		WHERE mm.Mgm_McuID = ? AND mm.Mgm_McuIsActive = 'Y'
+	`
+	if err := dbx.Handlex.Get(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get total participant %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	title := "Peserta MCU"
+	subtext := "Total Peserta " + strconv.Itoa(data.Mgm_McuTotalParticipant)
+	chartData := []models.SeriesData{}
+
+	if data.Mgm_McuTotalParticipant == 0 {
+		chartData = append(chartData, models.SeriesData{Value: 0, Name: "No Data"})
+	} else {
+		chartData = []models.SeriesData{
+			{
+				Value: data.Peserta,
+				Name:  "Sudah MCU: " + strconv.Itoa(data.Peserta) + " peserta",
+			},
+			{
+				Value: data.Mgm_McuTotalParticipant - data.Peserta,
+				Name:  "Belum MCU: " + strconv.Itoa(data.Mgm_McuTotalParticipant-data.Peserta) + " peserta",
+			},
+		}
+	}
+
+	option, err := tkp.GetPieChartConf(title, subtext, chartData)
+	if err != nil {
+		return option, fmt.Errorf("error get piechart total peserta: %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkp *TabKepersertaanServices) GetKepesertaanByGender(mcuID string) (models.Piechart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Piechart
+	var data []models.GenderPesertaModel
+
+	title := "Peserta MCU"
+	subtext := "Berdasarkan jenis kelamin"
+	chartData := []models.SeriesData{}
+
+	q := `
+		SELECT
+		CASE
+        	WHEN M_PatientGender = 'male' THEN 'Laki-laki'
+        	WHEN M_PatientGender = 'female' THEN 'Perempuan'
+        	ELSE M_PatientGender
+    	END AS M_PatientGender,
+		COUNT(*) AS Jumlah
+		FROM mcu_order
+		JOIN t_orderheader ON Mcu_OrderT_OrderHeaderID = T_OrderHeaderID 
+		AND T_OrderHeaderIsActive = 'Y'
+		LEFT JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID 
+		AND M_PatientIsActive = 'Y'
+		WHERE Mcu_OrderMgm_McuID = ?
+		GROUP BY M_PatientGender
+	`
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get total gender %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("resp data", zap.Any("data", data))
+
+	if data != nil {
+		for _, d := range data {
+			chartData = append(chartData, models.SeriesData{
+				Value: d.Jumlah,
+				Name:  d.M_PatientGender + ": " + strconv.Itoa(d.Jumlah) + " Peserta",
+			})
+		}
+	} else {
+		chartData = append(chartData, models.SeriesData{Value: 0, Name: "No Data"})
+	}
+
+	option, err := tkp.GetPieChartConf(title, subtext, chartData)
+	if err != nil {
+		return option, fmt.Errorf("error get piechart total gender: %v", err)
+	}
+
+	return option, nil
+}
+
+func (tkp *TabKepersertaanServices) GetKepesertaanByUmur(mcuID string) (models.Piechart, error) {
+	logger, _ := zap.NewProduction()
+	var option models.Piechart
+	var data []models.UmurPesertaModel
+
+	title := "Peserta MCU"
+	subtext := "Berdasarkan umur"
+	chartData := []models.SeriesData{}
+
+	q := `
+		SELECT  
+		CASE 
+			WHEN LEFT(T_OrderHeaderM_PatientAge,2) < '30'  then  "1. < 30 tahun"  
+			WHEN LEFT(T_OrderHeaderM_PatientAge,2) >=    '30' AND LEFT(T_OrderHeaderM_PatientAge,2)  < '40'  then   "2. 30 -< 40 tahun"  
+			WHEN LEFT(T_OrderHeaderM_PatientAge,2) >=   '40' AND LEFT(T_OrderHeaderM_PatientAge,2)  < '50'  then   "3. 40 - < 50 tahun"  
+			WHEN LEFT(T_OrderHeaderM_PatientAge,2)   >= '50' then   "4. > 50 tahun" else  "" 
+		END AS umur,
+		COUNT(Mcu_OrderT_OrderHeaderID) AS total
+		FROM mcu_order 
+		JOIN t_orderheader ON Mcu_OrderT_OrderHeaderID = T_OrderHeaderID AND T_OrderHeaderIsActive = 'Y'
+		LEFT JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID  AND M_PatientIsActive = 'Y'
+		WHERE  Mcu_OrderMgm_McuID = ?
+		GROUP BY 
+		CASE 
+			WHEN LEFT(T_OrderHeaderM_PatientAge,2) < '30'  then  "1. < 30 tahun"
+			WHEN LEFT(T_OrderHeaderM_PatientAge,2) >=    '30' AND LEFT(T_OrderHeaderM_PatientAge,2)  < '40'  then   "2. 30 -< 40 tahun"
+			WHEN LEFT(T_OrderHeaderM_PatientAge,2) >=   '40' AND LEFT(T_OrderHeaderM_PatientAge,2)  < '50'  then   "3. 40 - < 50 tahun"
+			WHEN LEFT(T_OrderHeaderM_PatientAge,2)   >= '50' then   "4. > 50 tahun" else  ""
+		END
+		ORDER BY umur
+	`
+
+	if err := dbx.Handlex.Select(&data, q, mcuID); err != nil {
+		return option, fmt.Errorf("error get data jumlah umur: %v", err)
+	}
+	defer logger.Sync()
+	logger.Info("response data", zap.Any("data", data))
+
+	if data != nil {
+		for _, d := range data {
+			chartData = append(chartData, models.SeriesData{
+				Value: d.Total,
+				Name:  d.Umur + ": " + strconv.Itoa(d.Total) + " Peserta",
+			})
+		}
+	} else {
+		chartData = append(chartData, models.SeriesData{Value: 0, Name: "No Data"})
+	}
+
+	option, err := tkp.GetPieChartConf(title, subtext, chartData)
+	if err != nil {
+		return option, fmt.Errorf("error get piechart jumlah umur: %v", err)
+	}
+
+	return option, 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/mcudetail/tabkeuangan.services.go
+++ b/services/corporate/mcudetail/tabkeuangan.services.go
@@ -0,0 +1,198 @@
+package mcu_corporate_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+
+	"go.uber.org/zap"
+)
+
+type TabKeuanganServices struct {
+	TabKeuanganStore db.AppStore
+}
+
+func NewTabKeuanganServices(uStore db.AppStore) *TabKeuanganServices {
+	return &TabKeuanganServices{
+		TabKeuanganStore: uStore,
+	}
+}
+
+func (tks *TabKeuanganServices) GetTotalOrderKeuangan(mcuID string) (int, error) {
+	logger, _ := zap.NewProduction()
+	var mcu models.DashboardPic
+	ret := 0
+	var data []models.TotalOrderHeader
+
+	q := `
+		SELECT
+		Mgm_McuID,
+		Mgm_McuLabel,
+		Mgm_McuCorporateID,
+		Mgm_McuIsActive
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuID = ?
+	`
+	if err := dbx.Handlex.Get(&mcu, q, mcuID); err != nil {
+		defer logger.Sync()
+		logger.Info("error get corportate id", zap.Any("mcuID", mcuID))
+		return ret, fmt.Errorf("error get corporate id: %v", err)
+	}
+
+	q = `
+		SELECT
+		T_OrderHeaderID,
+		T_OrderHeaderCorporateID,
+		T_OrderHeaderTotal,
+		T_OrderHeaderCreated
+		FROM t_orderheader
+		WHERE T_OrderHeaderIsActive = 'Y'
+		AND T_OrderHeaderCorporateID = ?
+	`
+	if err := dbx.Handlex.Select(&data, q, mcu.Mgm_McuCorporateID); err != nil {
+		defer logger.Sync()
+		logger.Info("error get orderheader data by corp id", zap.Any("corpID", mcu.Mgm_McuCorporateID))
+		return ret, fmt.Errorf("error get orderheader data by corp id: %v", err)
+	}
+
+	for _, d := range data {
+		ret = ret + int(d.T_OrderHeaderTotal)
+	}
+
+	return ret, nil
+}
+
+func (tks *TabKeuanganServices) GetTotalCardData(mcuID string) (models.TotalBillCard, error) {
+	logger, _ := zap.NewProduction()
+	var ret models.TotalBillCard
+	var mcu models.DashboardPic
+	var uang []models.KeuanganModel
+
+	q := `
+		SELECT
+		Mgm_McuID,
+		Mgm_McuLabel,
+		Mgm_McuCorporateID,
+		Mgm_McuIsActive
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuID = ?
+	`
+	if err := dbx.Handlex.Get(&mcu, q, mcuID); err != nil {
+		defer logger.Sync()
+		logger.Info("error get corportate id", zap.Any("mcuID", mcuID))
+		return ret, fmt.Errorf("error get corporate id: %v", err)
+	}
+
+	q = `
+		SELECT
+		fb.F_BillID,
+		fb.F_BillNo,
+		fb.F_BillCorporateID,
+		DATE_FORMAT(fb.F_BillDueDate, '%e %M %Y') AS F_BillDueDate,
+		fb.F_BillTotal,
+		fb.F_BillUnpaid,
+		DATE_FORMAT(fb.F_BillCreated, '%e %M %Y') AS F_BillCreated
+		FROM f_bill fb
+		WHERE fb.F_BillIsActive = 'Y'
+		AND fb.F_BillCorporateID = ?
+	`
+
+	if err := dbx.Handlex.Select(&uang, q, mcu.Mgm_McuCorporateID); err != nil {
+		defer logger.Sync()
+		logger.Error("Error Get List Bill Data", zap.Any("corpID", mcu.Mgm_McuCorporateID))
+		return ret, fmt.Errorf("error query database: %v", err)
+	}
+
+	for _, bill := range uang {
+		ret.TotalTagihan = ret.TotalTagihan + bill.F_BillTotal
+		ret.TotalHutang = ret.TotalHutang + bill.F_BillUnpaid
+	}
+	ret.TotalPelunasan = ret.TotalTagihan - ret.TotalHutang
+
+	return ret, nil
+}
+
+func (tks *TabKeuanganServices) GetListingDataKeuangan(mcuID string, currentpage int, rowperpage int) ([]models.KeuanganModel, int, error) {
+	logger, _ := zap.NewProduction()
+	var ret []models.KeuanganModel
+	var totalData int
+	var mcu models.DashboardPic
+
+	q := `
+		SELECT
+		Mgm_McuID,
+		Mgm_McuLabel,
+		Mgm_McuCorporateID,
+		Mgm_McuIsActive
+		FROM mgm_mcu
+		WHERE Mgm_McuIsActive = 'Y'
+		AND Mgm_McuID = ?
+	`
+	if err := dbx.Handlex.Get(&mcu, q, mcuID); err != nil {
+		defer logger.Sync()
+		logger.Info("error get corportate id", zap.Any("mcuID", mcuID))
+		return ret, 0, fmt.Errorf("error get corporate id: %v", err)
+	}
+
+	offset := (currentpage - 1) * rowperpage
+	querytotal := `
+		SELECT COUNT(*)
+		FROM f_bill
+		WHERE F_BillIsActive = 'Y' AND F_BillCorporateID = ?
+	`
+	if err := dbx.Handlex.Get(&totalData, querytotal, mcu.Mgm_McuCorporateID); err != nil {
+		return nil, 0, fmt.Errorf("error query get total data: %v", err)
+	}
+
+	q = `
+		SELECT
+		fb.F_BillID,
+		fb.F_BillNo,
+		fb.F_BillCorporateID,
+		DATE_FORMAT(fb.F_BillDueDate, '%e %M %Y') AS F_BillDueDate,
+		fb.F_BillTotal,
+		fb.F_BillUnpaid,
+		DATE_FORMAT(fb.F_BillCreated, '%e %M %Y') AS F_BillCreated
+		FROM f_bill fb
+		WHERE fb.F_BillIsActive = 'Y'
+		AND fb.F_BillCorporateID = ?
+		LIMIT ? OFFSET ?
+	`
+
+	if err := dbx.Handlex.Select(&ret, q, mcu.Mgm_McuCorporateID, rowperpage, offset); err != nil {
+		defer logger.Sync()
+		logger.Error("Error Get List Bill Data", zap.Any("corpID", mcu.Mgm_McuCorporateID))
+		return ret, 0, fmt.Errorf("error query database: %v", err)
+	}
+
+	for idx, data := range ret {
+		var paym []models.BillPaymentModel
+
+		q := `
+			SELECT
+			F_BillPaymentID,
+			F_BillPaymentF_BillID,
+			DATE_FORMAT(F_BillPaymentDate, '%e %M %Y') AS F_BillPaymentDate,
+			F_BillPaymentNumber,
+			F_BillPaymentAmount
+			FROM f_bill_payment
+			WHERE F_BillPaymentIsActive = 'Y'
+			AND F_BillPaymentF_BillID = ?
+		`
+		if err := dbx.Handlex.Select(&paym, q, data.F_BillID); err != nil {
+			defer logger.Sync()
+			logger.Error("Error Get List Payment Data", zap.Any("billID", data.F_BillID))
+			return ret, 0, fmt.Errorf("error query database: %v", err)
+		}
+
+		ret[idx].BillPayment = append(ret[idx].BillPayment, paym...)
+		ret[idx].TotalBillPayment = data.F_BillTotal - data.F_BillUnpaid
+	}
+
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowperpage)))
+	return ret, totalPage, nil
+}
--- a/services/corporate/patient.services.go
+++ b/services/corporate/patient.services.go
@@ -1,15 +1,221 @@
 package corporate_services

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

-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) GetPatientData(email string) (string, error) {
+	var ret string
+	prmEmail := "%" + email + "%"
+	q := `
+		SELECT
+		M_PatientName
+		FROM m_patient
+		WHERE M_PatientEmail LIKE ?
+		AND M_PatientIsActive = 'Y'
+	`
+	if err := dbx.Handlex.Get(&ret, q, prmEmail); err != nil {
+		return ret, err
+	}
+
+	return ret, nil
+}
+
+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 = ?
+	`
+	if err := dbx.Handlex.Get(&totalData, q, prmSearch, patID); 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 = ?
+		LIMIT ? OFFSET ?
+	`
+	if err := dbx.Handlex.Select(&ret, q, prmSearch, patID, 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
+}
+
+func (sp *PatientServices) GetListtingData(email string, currentpage int, rowperpage int) ([]models.DashboardPatient, int, error) {
+	logger, _ := zap.NewProduction()
+	var ret []models.DashboardPatient
+	var totalData int
+
+	prmEmail := "%" + email + "%"
+	offset := (currentpage - 1) * rowperpage
+	q := `
+		SELECT COUNT(*)
+		FROM m_patient mp
+		JOIN t_orderheader toh ON toh.T_OrderHeaderM_PatientID = mp.M_PatientID AND toh.T_OrderHeaderIsActive = 'Y'
+		WHERE mp.M_PatientEmail LIKE ?
+		AND mp.M_PatientIsActive = 'Y'
+	`
+	if err := dbx.Handlex.Get(&totalData, q, prmEmail); err != nil {
+		return nil, 0, fmt.Errorf("error query get total data: %v", err)
+	}
+
+	q = `
+		SELECT
+		toh.T_OrderHeaderID,
+		toh.T_OrderHeaderDate,
+		toh.T_OrderHeaderLabNumber,
+		toh.T_OrderHeaderM_PatientID,
+		toh.T_OrderHeaderCorporateID,
+		toh.T_OrderHeaderMgm_McuID,
+		toh.T_OrderHeaderIsActive
+		FROM m_patient mp
+		JOIN t_orderheader toh ON toh.T_OrderHeaderM_PatientID = mp.M_PatientID AND toh.T_OrderHeaderIsActive = 'Y'
+		WHERE mp.M_PatientEmail LIKE ?
+		AND mp.M_PatientIsActive = 'Y'
+		LIMIT ? OFFSET ?	
+	`
+	if err := dbx.Handlex.Select(&ret, q, prmEmail, rowperpage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error query get list data: %v", err)
+	}
+	logger.Info("response", zap.Any("data", ret))
+
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowperpage)))
+	return ret, totalPage, nil
+}
+
+func (sp *PatientServices) GetReportMcu(orderheaderID string) ([]models.TabViewReportMcu, error) {
+	var ret []models.TabViewReportMcu
+	var data []models.ModelMcuPesertaReport
+	var totalData int
+
+	q := `
+		SELECT COUNT(*)
+		FROM so_resultentry
+		WHERE So_ResultEntryT_OrderHeaderID = ?
+		AND So_ResultEntryIsActive = 'Y'
+	`
+	if err := dbx.Handlex.Get(&totalData, q, orderheaderID); err != nil {
+		return ret, fmt.Errorf("error get total mcu report: %v", err)
+	}
+
+	q = `
+		SELECT
+		So_ResultEntryID,
+		So_ResultEntryT_OrderHeaderID,
+		So_ResultEntryNonlab_TemplateID,
+		So_ResultEntryNonlab_TemplateName		
+		FROM so_resultentry
+		WHERE So_ResultEntryT_OrderHeaderID = ?
+		AND So_ResultEntryIsActive = 'Y'
+		ORDER BY So_ResultEntryNonlab_TemplateID
+	`
+	if err := dbx.Handlex.Select(&data, q, orderheaderID); err != nil {
+		return ret, err
+	}
+
+	// Lab
+	ret = append(ret, models.TabViewReportMcu{Name: "Hasil Laboratorium", Link: "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_test.rptdesign&__format=pdf&PID=" + orderheaderID + "&username=adhi&tm=1717726294764"})
+
+	// Non-lab
+	for _, n := range data {
+		var link models.TabViewReportMcu
+
+		switch n.So_ResultEntryNonlab_TemplateName {
+		case "ECG":
+			link.Name = "Elektromedis"
+			link.Link = "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_hasil_so_elmd.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&username=adhi&tm=1717726294764"
+		case "Thorax PA":
+			link.Name = "Radiologi"
+			link.Link = "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_hasil_so_xray.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&username=adhi&tm=1717726294764"
+		case "Audiometri":
+			link.Name = "Audiometri"
+			link.Link = "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_hasil_so_audiometri.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&username=adhi&tm=1717726294764"
+		case "Spirometri":
+			link.Name = "Spirometri"
+			link.Link = "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/lab/rpt_hasil_so_spirometri.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&username=adhi&tm=1717726294764"
+		case "Fisik Umum":
+			namaFisik := []string{"Hasil Fisik", "Hasil Pajanan", "Riwayat"}
+			linkFisik := []string{
+				"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_fisik.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&PType=fisik&username=adhi&tm=1717726294764",
+				"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_pajanan.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&PType=fisik&username=adhi&tm=1717726294764",
+				"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/mcu_riwayat.rptdesign&__format=pdf&PID=" + strconv.Itoa(n.So_ResultEntryID) + "&PType=riwayat&username=adhi&tm=1717726294764",
+			}
+			for i := 0; i < 3; i++ {
+				ret = append(ret, models.TabViewReportMcu{Name: namaFisik[i], Link: linkFisik[i]})
+			}
+			continue
+		}
+
+		ret = append(ret, link)
+	}
+	ret = append(ret, models.TabViewReportMcu{Name: "Resume Individu", Link: "https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_resume.rptdesign&__format=pdf&PID=" + orderheaderID + "&username=adhi&tm=1717726294764"})
+
+	return ret, 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.samplestation.services.go
+++ b/services/dev/md.samplestation.services.go
@@ -0,0 +1,277 @@
+package dev_services
+
+import (
+	"cpone/db"
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
+	"math"
+	"strconv"
+	"strings"
+
+	"go.uber.org/zap"
+)
+
+func NewMDSampleStationServices(uStore db.AppStore) *MDSampleStationServices {
+	return &MDSampleStationServices{
+		MDSampleStationStore: uStore,
+	}
+}
+
+type MDSampleStationServices struct {
+	MDSampleStationStore db.AppStore
+}
+
+func (ss *MDSampleStationServices) GetMDSampleStationBreadcrumb() (models.BreadCrumbV1, error) {
+	var ret models.BreadCrumbV1
+
+	Breadcrumb := models.BreadCrumbV1{
+		Title: "Master Sample Station",
+		Item: []models.ItemBreadCrumbV1{
+			{
+				Item: "Dashboard",
+				Url:  "/dev/dashboard",
+			},
+			{
+				Item: "Master",
+				Url:  "/dev/master",
+			},
+			{
+				Item: "Sample Stasion",
+				Url:  "",
+			},
+		},
+	}
+
+	ret = Breadcrumb
+	return ret, nil
+}
+
+func (ss *MDSampleStationServices) GetListSampleStation(search string, currentPage int, rowPerPage int) ([]models.MDSampleStation, int, error) {
+	var sampleStationList []models.MDSampleStation
+	var totalData int
+
+	offset := (currentPage - 1) * rowPerPage
+	prm := "%" + strings.TrimSpace(search) + "%"
+	querytotal := `
+	SELECT COUNT(*)
+	FROM t_samplestation 
+	WHERE T_SampleStationIsActive = 'Y' AND (T_SampleStationCode LIKE ? OR T_SampleStationName LIKE ?)
+	`
+	if err := dbx.Handlex.Get(&totalData, querytotal, prm, prm); err != nil {
+		return nil, 0, fmt.Errorf("error query get total data: %v", err)
+	}
+
+	query := `
+	SELECT
+	T_SampleStationID,
+	T_SampleStationCode,
+	T_SampleStationName,
+	T_SampleStationNat_GroupID,
+	T_SampleStationIsNonLab,
+	T_SampleStationIsActive
+	FROM t_samplestation
+	WHERE T_SampleStationIsActive = 'Y'
+	AND (T_SampleStationCode LIKE ? OR T_SampleStationName LIKE ?)
+	ORDER BY T_SampleStationID ASC
+	LIMIT ? OFFSET ?
+	`
+	if err := dbx.Handlex.Select(&sampleStationList, query, prm, prm, rowPerPage, offset); err != nil {
+		return nil, 0, fmt.Errorf("error query database: %v", err)
+	}
+
+	for i := range sampleStationList {
+		if len(sampleStationList[i].T_SampleStationIsNonLab) == 0 {
+			sampleStationList[i].T_SampleStationIsNonLab = "LAB"
+		}
+	}
+
+	totalPage := int(math.Ceil(float64(totalData) / float64(rowPerPage)))
+
+	return sampleStationList, totalPage, nil
+}
+
+func (ss *MDSampleStationServices) GetMDSampleStationByID(id string) (models.MDSampleStation, error) {
+	logger, _ := zap.NewProduction()
+
+	var ret models.MDSampleStation
+	q := `
+		SELECT
+		T_SampleStationID,
+		T_SampleStationCode,
+		T_SampleStationName,
+		T_SampleStationNat_GroupID,
+		T_SampleStationIsNonLab,
+		T_SampleStationIsActive		
+		FROM t_samplestation 
+		WHERE T_SampleStationID = ?`
+
+	err := dbx.Handlex.Get(&ret, q, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get data by ID", zap.String("ID", id), zap.Error(err))
+		return ret, fmt.Errorf("query get data by id failed")
+	}
+
+	if len(ret.T_SampleStationIsNonLab) == 0 {
+		ret.T_SampleStationIsNonLab = "LAB"
+	}
+
+	return ret, nil
+}
+
+func (ss *MDSampleStationServices) GetListGroupSampleStation() ([]models.MDSampleStationGroup, error) {
+	data := []models.MDSampleStationGroup{
+		{
+			ID:    1,
+			Group: "RADIODIAGNOSTIC",
+		},
+		{
+			ID:    2,
+			Group: "ELEKTROMEDIS",
+		},
+		{
+			ID:    3,
+			Group: "LAB",
+		},
+		{
+			ID:    4,
+			Group: "OTHERS",
+		},
+	}
+	return data, nil
+}
+
+func (ss *MDSampleStationServices) AddMDSampleStation(code string, name string, group string) (models.MDSampleStation, error) {
+	logger, _ := zap.NewProduction()
+	var data models.MDSampleStation
+
+	if strings.ToUpper(group) == "LAB" {
+		group = " "
+	}
+
+	// cek existing code & name
+	var count int
+	var prmCode = "%" + code + "%"
+	var prmName = "%" + name + "%"
+	q := `
+		SELECT COUNT(*)
+		FROM t_samplestation
+		WHERE (T_SampleStationCode LIKE ? OR T_SampleStationName LIKE ?) 
+		AND T_SampleStationIsActive = 'Y'
+	`
+	err := dbx.Handlex.Get(&count, q, prmCode, prmName)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("cek duplicate", zap.Any("code", prmCode), zap.Any("name", prmName))
+		return data, fmt.Errorf("query failed to cek duplicate")
+	}
+	if count > 0 {
+		defer logger.Sync()
+		logger.Error("duplicate data", zap.Any("code", code), zap.Any("name", name))
+		return data, fmt.Errorf("duplicate code or name")
+	}
+
+	q = `
+		INSERT INTO t_samplestation (
+			T_SampleStationCode,
+			T_SampleStationName,
+			T_SampleStationIsNonLab,
+			T_SampleStationCreated,
+			T_SampleStationCreatedUserID
+		) VALUES (?,?,?,NOW(),1);
+	`
+	rst := dbx.Handlex.MustExec(q, code, name, group)
+	insertedID, err := rst.LastInsertId()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("error insert data", zap.Any("code", code), zap.Any("name", name), zap.Any("group", group))
+		return data, fmt.Errorf("query failed insert data")
+	}
+
+	s := strconv.Itoa(int(insertedID))
+
+	return ss.GetMDSampleStationByID(s)
+}
+
+func (ss *MDSampleStationServices) EditMDSampleStation(id string, code string, name string, group string) (models.MDSampleStation, error) {
+	logger, _ := zap.NewProduction()
+	var ret models.MDSampleStation
+
+	if strings.ToUpper(group) == "LAB" {
+		group = " "
+	}
+
+	// cek existeing code & name
+	var count int
+	var prmCode = "%" + code + "%"
+	var prmName = "%" + name + "%"
+	q := `
+		SELECT COUNT(*)
+		FROM t_samplestation
+		WHERE (T_SampleStationCode LIKE ? OR T_SampleStationName LIKE ?) 
+		AND T_SampleStationIsActive = 'Y'
+		AND T_SampleStationID <> ?
+	`
+	err := dbx.Handlex.Get(&count, q, prmCode, prmName, id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("cek duplicate", zap.Any("code", code), zap.Any("name", name))
+		return ret, fmt.Errorf("query failed to cek duplicate")
+	}
+	if count > 0 {
+		defer logger.Sync()
+		logger.Error("duplicate data", zap.Any("code", code), zap.Any("name", name))
+		return ret, fmt.Errorf("duplicate code or name")
+	}
+
+	// update data
+	q = `
+		UPDATE t_samplestation SET 
+			T_SampleStationCode = ?,
+			T_SampleStationName = ?,
+			T_SampleStationIsNonLab = ?,
+			T_SampleStationLastUpdated = NOW(),
+			T_SampleStationLastUpdatedUserID = 1
+		WHERE T_SampleStationID = ?;
+	`
+	updt := dbx.Handlex.MustExec(q, code, name, group, id)
+	_, err = updt.RowsAffected()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("error update data", zap.Any("code", code), zap.Any("name", name), zap.Any("group", group))
+		return ret, fmt.Errorf("query failed to update data")
+	}
+
+	return ss.GetMDSampleStationByID(id)
+}
+
+func (ss *MDSampleStationServices) DeleteMDSampleStation(id string) (models.MDSampleStation, error) {
+	logger, _ := zap.NewProduction()
+	var ret models.MDSampleStation
+
+	q := `
+	UPDATE t_samplestation
+	SET 
+	T_SampleStationIsActive = 'N',
+	T_SampleStationDeleted = NOW(),
+	T_SampleStationDeletedUserID = '1'
+	WHERE T_SampleStationID = ?;
+	`
+	dlt := dbx.Handlex.MustExec(q, id)
+	_, err := dlt.RowsAffected()
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error delete sample station", zap.String("id", id))
+		return ret, fmt.Errorf("query failed")
+	}
+
+	ret, err = ss.GetMDSampleStationByID(id)
+	if err != nil {
+		defer logger.Sync()
+		logger.Error("Error get sample station id", zap.String("id", id))
+		return ret, fmt.Errorf("query failed")
+	}
+
+	return ret, nil
+}
--- a/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/utils/chartcolor.utils.go
+++ b/utils/chartcolor.utils.go
@@ -0,0 +1,28 @@
+package utils
+
+import (
+	"fmt"
+	"math"
+)
+
+// InterpolateColor calculates a color between two given colors based on progress (0 to 1)
+func InterpolateColor(start, end string, progress float64) string {
+	r1, g1, b1 := HexToRGB(start)
+	r2, g2, b2 := HexToRGB(end)
+
+	r := int(math.Round(float64(r1)*(1-progress) + float64(r2)*progress))
+	g := int(math.Round(float64(g1)*(1-progress) + float64(g2)*progress))
+	b := int(math.Round(float64(b1)*(1-progress) + float64(b2)*progress))
+
+	return fmt.Sprintf("#%02x%02x%02x", r, g, b)
+}
+
+// Helper function to convert hex to RGB
+func HexToRGB(hex string) (int, int, int) {
+	var r, g, b int
+	_, err := fmt.Sscanf(hex, "#%02x%02x%02x", &r, &g, &b)
+	if err != nil {
+		return 0, 0, 0
+	}
+	return r, g, b
+}
--- a/utils/formatRibuan.utils.go
+++ b/utils/formatRibuan.utils.go
@@ -0,0 +1,12 @@
+package utils
+
+import (
+	"golang.org/x/text/language"
+	"golang.org/x/text/message"
+)
+
+func FormatRibuan(amount int) string {
+	p := message.NewPrinter(language.Indonesian)
+	formated := p.Sprintf("%v", amount)
+	return formated
+}
--- a/views/corporate/dashboardpic/dashboardpic.templ
+++ b/views/corporate/dashboardpic/dashboardpic.templ
@@ -0,0 +1,117 @@
+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() {
+	<script>
+		document.body.addEventListener('htmx:configRequest', function(evt) {
+			const token = localStorage.getItem("token");
+			if (token) {
+				evt.detail.headers['Authentication'] = "Bearer " + token;
+			}
+		});	
+	</script>
+}
+
+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,220 @@
+// 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)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script>\r\n\t\tdocument.body.addEventListener('htmx:configRequest', function(evt) {\r\n\t\t\tconst token = localStorage.getItem(\"token\");\r\n\t\t\tif (token) {\r\n\t\t\t\tevt.detail.headers['Authentication'] = \"Bearer \" + token;\r\n\t\t\t}\r\n\t\t});\t\r\n\t</script>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+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
@@ -0,0 +1,316 @@
+// 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"
+
+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\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-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\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("\" 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\corporate\dashboardpic\filterdashboardpic.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\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(hxTarget)
+		if templ_7745c5c3_Err != nil {
+			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-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\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-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\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-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\dashboardpic\filterdashboardpic.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\corporate\dashboardpic\filterdashboardpic.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\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
+		}
+		_, 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\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
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/dashboardpic/listingdashboardpic.templ
+++ b/views/corporate/dashboardpic/listingdashboardpic.templ
@@ -0,0 +1,48 @@
+package corporate_dashboardpic
+
+import "cpone/models"
+import "strconv"
+
+templ ListingData(
+    data []models.DashboardPic,
+    listID string,
+) {
+    <div id={listID} class="align-items-center py-8 flex-column" hx-swap-oob="true">
+        if len(data) == 0 {
+            <div class="text-center">
+                <h4>Data Tidak Ditemukan</h4>
+            </div>
+        } else {
+            <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,230 @@
+// 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 py-8 flex-column\" hx-swap-oob=\"true\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if len(data) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"text-center\"><h4>Data Tidak Ditemukan</h4></div>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<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: 20, Col: 68}
+					}
+					_, 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: 20, Col: 159}
+					}
+					_, 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: 24, Col: 68}
+					}
+					_, 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: 24, Col: 164}
+					}
+					_, 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>")
+			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 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: 38, 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: 41, 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: 44, 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: 44, 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,75 @@
+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() {
+    <script src="assets/js/echarts-js/echart.min.js"></script>
+}
+
+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,156 @@
+// 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)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<script src=\"assets/js/echarts-js/echart.min.js\"></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 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,124 @@
+package corporate_mcudetail
+
+import "cpone/component/modal"
+import "cpone/models"
+import "strconv"
+
+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,
+    tabComponent templ.Component,
+    hxOnLoad templ.ComponentScript,
+) {
+    <div id={ IDComponent } hx-on::load={ hxOnLoad }>
+        @tabComponent
+    </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>
+}
+
+templ TabReportView(
+    datamcu []models.TabViewReportMcu,
+) {
+    <div>
+        <ul class="nav nav-tabs nav-tabs-line">
+            for i, v := range datamcu {
+                if i == 0 {
+                    <li class="nav-item">
+                        <a class="nav-link active" data-toggle="tab" href={templ.URL("#kt_tab_pat_" + strconv.Itoa(i))}>{ v.Name }</a>
+                    </li>
+                } else {
+                    <li class="nav-item">
+                        <a class="nav-link" data-toggle="tab" href={templ.URL("#kt_tab_pat_" + strconv.Itoa(i))}>{ v.Name }</a>
+                    </li>  
+                }
+            }
+        </ul>
+    </div>
+    <div class="tab-content mt-5" id="patTabContent">
+        for i, v := range datamcu {
+            if i == 0 {
+                <div class="tab-pane fade show active" id={"kt_tab_pat_" + strconv.Itoa(i)} role="tabpanel" aria-labelledby={"kt_tab_pat_" + strconv.Itoa(i)} style="height: 700px;">
+                    <object data={ v.Link } type="application/pdf" width="100%" height="100%"></object>
+                </div>                
+            } else {
+                <div class="tab-pane fade show" id={"kt_tab_pat_" + strconv.Itoa(i)} role="tabpanel" aria-labelledby={"kt_tab_pat_" + strconv.Itoa(i)} style="height: 700px;">
+                    <object data={ v.Link } type="application/pdf" width="100%" height="100%"></object>
+                </div>
+            }
+        }
+    </div>
+}
+
+// <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>
--- a/views/corporate/mcu/mcutab/modaldaftarpeserta_templ.go
+++ b/views/corporate/mcu/mcutab/modaldaftarpeserta_templ.go
@@ -0,0 +1,419 @@
+// 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"
+import "cpone/models"
+import "strconv"
+
+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: 20, 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: 21, 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,
+	tabComponent 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_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: 37, 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("\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tabComponent.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 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_Var7 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var7 == nil {
+			templ_7745c5c3_Var7 = 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_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("\" 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
+	})
+}
+
+func TabReportView(
+	datamcu []models.TabViewReportMcu,
+) 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_7745c5c3_Buffer.WriteString("<div><ul class=\"nav nav-tabs nav-tabs-line\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i, v := range datamcu {
+			if i == 0 {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<li class=\"nav-item\"><a class=\"nav-link active\" data-toggle=\"tab\" href=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var10 templ.SafeURL = templ.URL("#kt_tab_pat_" + strconv.Itoa(i))
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(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(v.Name)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 70, Col: 128}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var11))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</a></li>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var12 templ.SafeURL = templ.URL("#kt_tab_pat_" + strconv.Itoa(i))
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var12)))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var13 string
+				templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(v.Name)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 74, Col: 121}
+				}
+				_, 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("</a></li>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</ul></div><div class=\"tab-content mt-5\" id=\"patTabContent\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i, v := range datamcu {
+			if i == 0 {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"tab-pane fade show active\" id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var14 string
+				templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs("kt_tab_pat_" + strconv.Itoa(i))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 83, Col: 90}
+				}
+				_, 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("\" role=\"tabpanel\" aria-labelledby=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var15 string
+				templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs("kt_tab_pat_" + strconv.Itoa(i))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 83, Col: 156}
+				}
+				_, 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("\" style=\"height: 700px;\"><object data=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var16 string
+				templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(v.Link)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 84, Col: 41}
+				}
+				_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"tab-pane fade show\" id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var17 string
+				templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs("kt_tab_pat_" + strconv.Itoa(i))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 87, Col: 83}
+				}
+				_, 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("\" role=\"tabpanel\" aria-labelledby=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var18 string
+				templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs("kt_tab_pat_" + strconv.Itoa(i))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 87, Col: 149}
+				}
+				_, 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("\" style=\"height: 700px;\"><object data=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var19 string
+				templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(v.Link)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\modaldaftarpeserta.templ`, Line: 88, Col: 41}
+				}
+				_, 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("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div>")
+				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
+	})
+}
+
+// <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>
--- 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/tabkelainanfisik.templ
+++ b/views/corporate/mcu/mcutab/tabkelainanfisik.templ
@@ -0,0 +1,46 @@
+package corporate_mcudetail
+
+templ Tabkelainanfisik(
+    chartsxs []templ.Component,
+    chartsmd []templ.Component,
+    chartslg []templ.Component,    
+) {
+    <div class="container-fluid">
+        <div class="d-flex justify-content-center py-10">
+            <h2 class="title text-black" style="margin-bottom: 0;">Data Presentase Kelainan Fisik</h2>
+        </div>
+
+        // xs
+        <div class="d-xs-block d-sm-block d-md-none">
+            <div class="row justify-content-center">
+                for _, c := range chartsxs {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+
+        // md
+        <div class="d-none d-md-block d-lg-none">
+            <div class="row justify-content-center">
+                for _, c := range chartsmd {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }                
+            </div>
+        </div>
+
+        // lg
+        <div class="d-none d-lg-block">
+            <div class="row justify-content-center">
+                for _, c := range chartslg {
+                    <div class="col-6 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+    </div>
+}
--- a/views/corporate/mcu/mcutab/tabkelainanfisik_templ.go
+++ b/views/corporate/mcu/mcutab/tabkelainanfisik_templ.go
@@ -0,0 +1,93 @@
+// 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 Tabkelainanfisik(
+	chartsxs []templ.Component,
+	chartsmd []templ.Component,
+	chartslg []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=\"d-flex justify-content-center py-10\"><h2 class=\"title text-black\" style=\"margin-bottom: 0;\">Data Presentase Kelainan Fisik</h2></div><div class=\"d-xs-block d-sm-block d-md-none\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartsxs {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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 class=\"d-none d-md-block d-lg-none\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartsmd {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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 class=\"d-none d-lg-block\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartslg {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-6 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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
+	})
+}
--- a/views/corporate/mcu/mcutab/tabkelainanglobal.templ
+++ b/views/corporate/mcu/mcutab/tabkelainanglobal.templ
@@ -0,0 +1,46 @@
+package corporate_mcudetail
+
+templ TabKelainanGlobal(
+    chartsxs []templ.Component,
+    chartsmd []templ.Component,
+    chartslg []templ.Component,
+) {
+    <div class="container-fluid">
+        <div class="d-flex justify-content-center py-10">
+            <h2 class="title text-black" style="margin-bottom: 0;">Data Kelainan Global</h2>
+        </div>
+        
+        // xs
+        <div class="d-xs-block d-sm-block d-md-none">
+            <div class="row justify-content-center">
+                for _, c := range chartsxs {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+
+        // md
+        <div class="d-none d-md-block d-lg-none">
+            <div class="row justify-content-center">
+                for _, c := range chartsmd {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+
+        // lg
+        <div class="d-none d-lg-block">
+            <div class="row justify-content-center">
+                for _, c := range chartslg {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+    </div>
+}
--- a/views/corporate/mcu/mcutab/tabkelainanglobal_templ.go
+++ b/views/corporate/mcu/mcutab/tabkelainanglobal_templ.go
@@ -0,0 +1,93 @@
+// 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 TabKelainanGlobal(
+	chartsxs []templ.Component,
+	chartsmd []templ.Component,
+	chartslg []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=\"d-flex justify-content-center py-10\"><h2 class=\"title text-black\" style=\"margin-bottom: 0;\">Data Kelainan Global</h2></div><div class=\"d-xs-block d-sm-block d-md-none\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartsxs {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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 class=\"d-none d-md-block d-lg-none\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartsmd {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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 class=\"d-none d-lg-block\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartslg {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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
+	})
+}
--- a/views/corporate/mcu/mcutab/tabkelainanlab.templ
+++ b/views/corporate/mcu/mcutab/tabkelainanlab.templ
@@ -0,0 +1,50 @@
+package corporate_mcudetail
+
+templ TabKelainanLab(
+    chartpresentaselg templ.Component,
+    chartsxs []templ.Component,
+    chartsmd []templ.Component,
+    chartslg []templ.Component,
+) {
+    <div class="container-fluid">
+        <div class="d-flex justify-content-center py-10">
+            <h2 class="title text-black" style="margin-bottom: 0;">Data Kelainan Lab</h2>
+        </div>
+        
+        // xs
+        <div class="d-xs-block d-sm-block d-md-none">
+            <div class="row justify-content-center">
+                for _, c := range chartsxs {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+
+        // md
+        <div class="d-none d-md-block d-lg-none">
+            <div class="row justify-content-center">
+                for _, c := range chartsmd {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+
+        // lg
+        <div class="d-none d-lg-block">
+            <div class="row justify-content-center">
+                <div class="col-12 my-4">
+                    @ChartCard(chartpresentaselg)
+                </div>
+                for _, c := range chartslg{
+                    <div class="col-6 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+    </div>
+}
--- a/views/corporate/mcu/mcutab/tabkelainanlab_templ.go
+++ b/views/corporate/mcu/mcutab/tabkelainanlab_templ.go
@@ -0,0 +1,102 @@
+// 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 TabKelainanLab(
+	chartpresentaselg templ.Component,
+	chartsxs []templ.Component,
+	chartsmd []templ.Component,
+	chartslg []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=\"d-flex justify-content-center py-10\"><h2 class=\"title text-black\" style=\"margin-bottom: 0;\">Data Kelainan Lab</h2></div><div class=\"d-xs-block d-sm-block d-md-none\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartsxs {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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 class=\"d-none d-md-block d-lg-none\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartsmd {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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 class=\"d-none d-lg-block\"><div class=\"row justify-content-center\"><div class=\"col-12 my-4\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = ChartCard(chartpresentaselg).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
+		}
+		for _, c := range chartslg {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-6 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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
+	})
+}
--- a/views/corporate/mcu/mcutab/tabkelainannonlab.templ
+++ b/views/corporate/mcu/mcutab/tabkelainannonlab.templ
@@ -0,0 +1,62 @@
+package corporate_mcudetail
+
+templ TabKelainanNonLab(
+    // chartpresentase templ.Component,
+    // chartthorax templ.Component,
+    chartsxs []templ.Component,
+    chartsmd []templ.Component,
+    chartslg []templ.Component,    
+) {
+    <div class="container-fluid">
+        <div class="d-flex justify-content-center py-10">
+            <h2 class="title text-black" style="margin-bottom: 0;">Data Kelainan Non Lab</h2>
+        </div>
+        
+        // xs
+        <div class="d-xs-block d-sm-block d-md-none">
+            <div class="row justify-content-center">
+                for _, c := range chartsxs {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+
+        // md
+        <div class="d-none d-md-block d-lg-none">
+            <div class="row justify-content-center">
+                for _, c := range chartsmd {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+
+        // lg
+        <div class="d-none d-lg-block">
+            <div class="row justify-content-center">
+                // <div class="col-12 my-4">
+                //     <div class="card shadow p-4" style="display: flex; justify-content: center; align-items: center; height: 100%;">
+                //         <div class="d-flex flex-column pt-8">
+                //             @chartpresentase
+                //         </div>
+                //     </div>
+                // </div>
+                // <div class="col-12 my-4">
+                //     <div class="card shadow p-4" style="display: flex; justify-content: center; align-items: center; height: 100%;">
+                //         <div class="d-flex flex-column pt-8">
+                //             @chartthorax
+                //         </div>
+                //     </div>
+                // </div>
+                for _, c := range chartslg {
+                    <div class="col-12 my-4">
+                        @ChartCard(c)
+                    </div>
+                }
+            </div>
+        </div>
+    </div>
+}
--- a/views/corporate/mcu/mcutab/tabkelainannonlab_templ.go
+++ b/views/corporate/mcu/mcutab/tabkelainannonlab_templ.go
@@ -0,0 +1,95 @@
+// 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 TabKelainanNonLab(
+	// chartpresentase templ.Component,
+	// chartthorax templ.Component,
+	chartsxs []templ.Component,
+	chartsmd []templ.Component,
+	chartslg []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=\"d-flex justify-content-center py-10\"><h2 class=\"title text-black\" style=\"margin-bottom: 0;\">Data Kelainan Non Lab</h2></div><div class=\"d-xs-block d-sm-block d-md-none\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartsxs {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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 class=\"d-none d-md-block d-lg-none\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartsmd {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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 class=\"d-none d-lg-block\"><div class=\"row justify-content-center\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for _, c := range chartslg {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			templ_7745c5c3_Err = ChartCard(c).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
+	})
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
adibwp	e4364f0c4f	add xs layout echarts	2024-07-08 08:47:56 +07:00
adibwp	f2d8207f25	add echart barchart	2024-07-05 10:55:47 +07:00
adibwp	eb7343117b	add echart kelainan lab	2024-07-03 10:47:43 +07:00
adibwp	7a22f5e4d0	add tab kelainan fisik echarts	2024-07-01 15:58:35 +07:00
adibwp	1c7e223195	add chart tab kepesertaan	2024-06-27 15:56:43 +07:00
adibwp	2a25c60cc2	add piechart dummy tab peserta	2024-06-26 18:13:48 +07:00
adibwp	9008cac97d	add tabview kepersetaan	2024-06-26 18:13:48 +07:00
adibwp	91a157b023	add tab view kepesertaan	2024-06-26 18:13:48 +07:00
adibwp	54de2a0ece	add tabchartkepesertaan	2024-06-26 18:13:48 +07:00
adibwp	9af95cfd9f	update url spirometri	2024-06-26 17:16:00 +07:00
adibwp	0e7f438c6a	add corporate name	2024-06-26 14:59:01 +07:00
adibwp	78af5abdf0	add resume individu rpt	2024-06-26 13:20:26 +07:00
adibwp	2179017556	fix ulr rpt audiometri	2024-06-26 11:19:59 +07:00
adibwp	accd8d57d9	add audiometry rpt	2024-06-26 09:56:58 +07:00
adibwp	dbad97d0f2	add formating ribuan keuangan + alert salah login	2024-06-25 16:49:21 +07:00
adibwp	322a70b582	add tab keuangan table	2024-06-24 16:35:03 +07:00
kaeltorus	2cb5ceac47	slicing form-keuangan	2024-06-24 16:35:03 +07:00
adibwp	fdc8c54eed	add blank tab keuangan	2024-06-22 11:15:50 +07:00
adibwp	c771187889	add authgurad	2024-06-21 18:54:06 +07:00
adibwp	5826d72988	change pagination number	2024-06-20 17:49:30 +07:00
adibwp	664c041acf	add executive summary	2024-06-20 16:57:14 +07:00
adibwp	7094dadbdf	dinamis report tab	2024-06-19 19:52:43 +07:00
adibwp	8f818f9e94	add testign script auth guard	2024-06-18 09:54:58 +07:00
adibwp	78487fafd0	change url report minus hasil non lab	2024-06-18 08:40:51 +07:00
adibwp	16a2bd45f5	add dialog report dafter peserta	2024-06-18 07:57:59 +07:00
adibwp	fd4f792d8a	add dialog report	2024-06-18 06:46:35 +07:00
adibwp	e1200fae61	add dialog cetak mcu	2024-06-15 15:52:56 +07:00
adibwp	3bc13d64bc	add pic tab daftar peserta + pagination	2024-06-14 16:51:16 +07:00
adibwp	b279a942dd	split table daftar peserta	2024-06-14 11:17:14 +07:00
adibwp	17e1268cac	add hardcode tab daftar peserta	2024-06-14 11:17:14 +07:00
Hanan Askarim	e6b5435337	add listing daftar peserta	2024-06-14 11:14:36 +07:00
adibwp	2f651cba3d	add tab kesimpulan	2024-06-13 23:06:55 +07:00
Hanan Askarim	16de8d4493	fisik slicing	2024-06-13 21:02:12 +07:00
Hanan Askarim	8dd071a924	fis kesimpulan	2024-06-13 21:02:12 +07:00
Hanan Askarim	1bfeb97a57	add fisik	2024-06-13 21:02:12 +07:00
Hanan Askarim	988cee93c2	add kesimpulan non lab	2024-06-13 21:02:11 +07:00
Hanan Askarim	fe3cb753b5	add listing lab	2024-06-13 21:02:11 +07:00
Hanan Askarim	23382aa755	label keterangan	2024-06-13 21:02:11 +07:00
Hanan Askarim	49a9f76574	fisik	2024-06-13 21:02:11 +07:00
Hanan Askarim	126f623298	add accordion	2024-06-13 21:02:11 +07:00
Hanan Askarim	1c727a5ae7	slicing fisik	2024-06-13 21:02:11 +07:00
Hanan Askarim	18b89453ba	kesimpulan dan saran	2024-06-13 21:02:11 +07:00
adibwp	b508eb68da	tab view mcu bagian daftar peserta	2024-06-13 20:54:28 +07:00
adibwp	7f3e75a8e3	fix routing	2024-06-13 15:49:07 +07:00
adibwp	d1ff7ba2fb	fix routing	2024-06-13 15:16:46 +07:00
adibwp	52a161195e	fix detail mcu	2024-06-13 15:03:40 +07:00
adibwp	6deadec9a3	add redirect ke detail mcu	2024-06-13 15:03:40 +07:00
adibwp	c04b8b1081	multi login	2024-06-13 15:03:39 +07:00
adibwp	e1c8ddd8f0	multi login progress	2024-06-13 15:03:39 +07:00
adibwp	e6a5925588	pindah dashboard_pic ke corp route	2024-06-13 15:03:39 +07:00
adibwp	a2fc463990	add public dashboard_pic	2024-06-13 15:03:39 +07:00
adibwp	246dd34542	add store to localStorage	2024-06-13 15:03:39 +07:00
adibwp	9f822c5514	add login multi api & redirect	2024-06-13 15:03:39 +07:00
adibwp	dd980b4430	add click with id params	2024-06-13 15:03:38 +07:00
Hanan Askarim	f30189816b	add link report	2024-06-13 15:03:38 +07:00
adibwp	8dfdc3fece	object pdf	2024-06-13 15:03:38 +07:00
adibwp	2d67b7b723	add html tab	2024-06-13 15:03:38 +07:00
kaeltorus	f825bc1639	slicing riwayatfisik	2024-06-13 08:37:57 +07:00
adibwp	2058220370	fix pagination	2024-06-10 11:55:23 +07:00
adibwp	6045c459da	add styling	2024-06-10 11:40:07 +07:00
adibwp	86264a05e2	add filter listing employee health medic analytic	2024-06-10 10:12:41 +07:00
adibwp	ae807c1615	listing card data	2024-06-08 09:48:39 +07:00
adibwp	88596ac6d9	add routes home + fix container footer	2024-06-07 09:36:57 +07:00
sindhu	c7a66aae8d	add koneksi ke cpone_log	2024-06-05 13:54:26 +07:00
sindhu	a4319bee07	change parameter terminology	2024-05-30 15:30:37 +07:00
sindhu	dbead529fe	modify sql null string terminology model	2024-05-30 15:29:46 +07:00
sindhu	1ed188e3ff	add get terminology list in app services	2024-05-30 11:55:07 +07:00
Sas Andy	1e978188ee	modal xl	2024-05-30 09:37:09 +07:00
adibwp	2c183a43cc	add error log	2024-05-29 15:58:22 +07:00
adibwp	2909b06966	add edit func sample station	2024-05-29 15:58:22 +07:00
adibwp	f2d0db174e	modal with func add data	2024-05-29 15:58:21 +07:00
adibwp	42f24d1c77	modal sample station	2024-05-29 15:58:21 +07:00
adibwp	ada2ae9052	fix rebase conflict	2024-05-29 15:58:21 +07:00
adibwp	ac4feb51c1	refactor sample station + loading	2024-05-29 15:58:21 +07:00
adibwp	44eca754f5	add sample station handler, services, model	2024-05-29 15:58:21 +07:00
sindhu	6e7a84f4aa	step 4 : delete group result	2024-05-29 15:58:21 +07:00
sindhu	f6296003c9	step 3 : edit data group result	2024-05-29 15:58:21 +07:00
sindhu	c6c61c7caf	step 2 : add data group result with form validation	2024-05-29 15:58:20 +07:00
sindhu	1b0522146c	step 1 : listing, search and pagination group result	2024-05-29 15:58:20 +07:00
adibwp	d92cc9727c	listing data minus pagination + bug dislpay group name	2024-05-29 15:58:20 +07:00
adibwp	b947c1c6c4	add sample station handler, services, model	2024-05-29 15:58:20 +07:00
adibwp	59a3f87644	add templ for md-sample-station	2024-05-29 15:58:20 +07:00
kaeltorus	3719cbff71	Merge branch 'mike'	2024-05-29 14:24:00 +07:00
kaeltorus	fb29e251d9	Merge branch 'mike'	2024-05-29 11:33:08 +07:00
sindhu	275205f5dd	add model radio button	2024-05-29 11:22:49 +07:00