change typo label

edit query and graph component
add split string func
2024-08-22 17:25:43 +07:00 · 2024-08-22 16:08:05 +07:00 · 2024-08-15 16:18:55 +07:00 · 2024-08-15 15:50:59 +07:00 · 2024-08-14 13:59:15 +07:00
48 changed files with 2056 additions and 740 deletions
--- a/component/chart/chart.templ
+++ b/component/chart/chart.templ
@@ -36,9 +36,9 @@ templ ShowChartFixed(idDiv string, udata string, width string, height string) {

 script GenerateChartFixed(idDiv string, udata string, width string, height string) {
    htmx.onLoad(function(elt) {
-        console.log("elt ",elt)
+        // console.log("elt ",elt)
        var element = document.getElementById(idDiv);
-        console.log("element ",element)
+        // console.log("element ",element)
        if (element) {
            element.style.height = height;
            element.style.width = width;
@@ -52,8 +52,48 @@ script GenerateChartFixed(idDiv string, udata string, width string, height strin

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

 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)
+		Name: `__templ_GenerateChartFixed_c5bf`,
+		Function: `function __templ_GenerateChartFixed_c5bf(idDiv, udata, width, height){htmx.onLoad(function(elt) {
+        // console.log("elt ",elt)
        var element = document.getElementById(idDiv);
-        console.log("element ",element)
+        // console.log("element ",element)
        if (element) {
            element.style.height = height;
            element.style.width = width;
@@ -142,12 +142,94 @@ func GenerateChartFixed(idDiv string, udata string, width string, height string)

        // var option_001 = JSON.parse(udata);
        option[idDiv] = JSON.parse(udata);
-        console.log("option ", option)
+        // 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),
+		Call:       templ.SafeScript(`__templ_GenerateChartFixed_c5bf`, idDiv, udata, width, height),
+		CallInline: templ.SafeScriptInline(`__templ_GenerateChartFixed_c5bf`, idDiv, udata, width, height),
+	}
+}
+
+func ShowChartResponsiveWidth(idDiv string, udata string, height string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var5 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var5 == nil {
+			templ_7745c5c3_Var5 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 string
+		templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(idDiv)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\chart\chart.templ`, Line: 62, Col: 19}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" class=\"mx-auto\" style=\"width: 100%;\"></div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = GenerateChartResponsive(idDiv, udata, height).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func GenerateChartResponsive(idDiv string, udata string, height string) templ.ComponentScript {
+	return templ.ComponentScript{
+		Name: `__templ_GenerateChartResponsive_fa78`,
+		Function: `function __templ_GenerateChartResponsive_fa78(idDiv, udata, height){htmx.onLoad(function(elt) {
+        // console.log("elt ",elt)
+        var element = document.getElementById(idDiv);
+        // console.log("element ",element)
+        if (element) {
+            element.style.height = height;
+        }
+
+        var myChart = {}; 
+        var option = {};
+
+        // var myChart_001 = echarts.init(document.getElementById(idDiv));
+        myChart[idDiv] = echarts.init(element);
+
+        // var option_001 = JSON.parse(udata);
+        option[idDiv] = JSON.parse(udata);
+        // console.log("option ", option)
+        // myChart_001.setOption(option_001);
+        if (option[idDiv]['series']['radius']) {
+            option[idDiv]['series']['radius'] = ['30%', '55%'];
+        } else {
+            option[idDiv]['series'][0]['radius'] = ['30%', '55%'];
+        }
+    
+        myChart[idDiv].setOption(option[idDiv]);
+
+        var resizeObserver = new ResizeObserver(function() {
+            myChart[idDiv].resize();
+        });
+
+        resizeObserver.observe(element);
+    });
+}`,
+		Call:       templ.SafeScript(`__templ_GenerateChartResponsive_fa78`, idDiv, udata, height),
+		CallInline: templ.SafeScriptInline(`__templ_GenerateChartResponsive_fa78`, idDiv, udata, height),
 	}
 }
--- a/component/sidebar_user_profile/sidebar_user_profile.templ
+++ b/component/sidebar_user_profile/sidebar_user_profile.templ
@@ -36,8 +36,10 @@ templ Navbaruserprofile(dataUser models.User) {
 				<a 
 					class="btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block"
 					hx-get="/login/signout"
+					hx-indicator=".logoutloading"
 					style="width: 100%"
 				>
+					<span class="htmx-indicator spinner-border spinner-border-sm logoutloading" role="status" aria-hidden="true"></span>
 					Sign Out
 				</a>
 			</div>
--- a/component/sidebar_user_profile/sidebar_user_profile_templ.go
+++ b/component/sidebar_user_profile/sidebar_user_profile_templ.go
@@ -33,7 +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><div class=\"navi mt-2\"><a class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block\" style=\"width: 100%\" data-toggle=\"modal\" data-target=\"#modal-ganti-pass\">Change Password\r</a></div><div class=\"navi mt-2\"><a class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block\" hx-get=\"/login/signout\" style=\"width: 100%\">Sign Out\r</a></div></div><!--end::Content--></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--end::Header--><!--begin::Separator--><div class=\"separator separator-dashed my-7\"></div><div class=\"navi mt-2\"><a class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block\" style=\"width: 100%\" data-toggle=\"modal\" data-target=\"#modal-ganti-pass\">Change Password\r</a></div><div class=\"navi mt-2\"><a class=\"btn btn-sm btn-light-primary font-weight-bolder py-2 px-5 block\" hx-get=\"/login/signout\" hx-indicator=\".logoutloading\" style=\"width: 100%\"><span class=\"htmx-indicator spinner-border spinner-border-sm logoutloading\" role=\"status\" aria-hidden=\"true\"></span> Sign Out\r</a></div></div><!--end::Content--></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -68,7 +68,7 @@ func ProfileHeader(dataUser models.User) templ.Component {
 		var templ_7745c5c3_Var3 string
 		templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(dataUser.UserFullName)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\sidebar_user_profile\sidebar_user_profile.templ`, Line: 59, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\sidebar_user_profile\sidebar_user_profile.templ`, Line: 61, Col: 27}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
 		if templ_7745c5c3_Err != nil {
@@ -81,7 +81,7 @@ func ProfileHeader(dataUser models.User) templ.Component {
 		var templ_7745c5c3_Var4 string
 		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(dataUser.UserPosition)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\sidebar_user_profile\sidebar_user_profile.templ`, Line: 62, Col: 27}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\sidebar_user_profile\sidebar_user_profile.templ`, Line: 64, Col: 27}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
--- a/handlers/corporate/mcudetail.handlers.go
+++ b/handlers/corporate/mcudetail.handlers.go
@@ -16,6 +16,7 @@ import (

 type McuDetailServices interface {
 	GetBreadcrumb(id string) (models.BreadCrumbV1, error)
+	GetTabNameList(id string) ([]models.McuTabModels, error)
 }

 type McuDetailHandler struct {
@@ -58,9 +59,17 @@ func (mcud *McuDetailHandler) HandlerShowMcuDetailScreen(c echo.Context) error {
 	navbaruser := navbarmenu.NavbarWithLogo(user)
 	sidbaruser := sidebaruserprofile.Navbaruserprofile(user)

+	// test := []models.McuTabModels{}
+	tabname, err := mcud.McuDetailServices.GetTabNameList(id)
+	if err != nil {
+		return err
+	}
+	// logger.Info("List tab name", zap.Any("tav", tabname))
+
 	content := corporate_mcudetail.McuDetailScreen(
 		breadcrumb,
-		corporate_mcudetail.TabViewMcuDetail(id),
+		// corporate_mcudetail.TabViewMcuDetail(id),
+		corporate_mcudetail.McuDetailTabView(id, tabname),
 	)
 	css := corporate_mcudetail.CSSMcuDetail(
 		corporate_tabmcudetail.CssKesimpulan(),
--- a/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go
+++ b/handlers/corporate/mcudetail/tabdaftarpeserta.handlers.go
@@ -20,6 +20,8 @@ type TabDaftarPesertaServices interface {
 	GenerataPasswordMCU(mgmMCUID string, host string) (models.GeneratePasswordResponse, error)
 	GetAkunPeserta(patientID string) (models.AuthPatient, error)
 	GetListReportPesertaV4(orderheaderID string, staffname string) ([]models.TabViewReportMcu, error)
+	ResetPasswordPeserta(token string, newPassword string, email string, authuserid string) (models.ResponseStatus, error)
+	DetailTestdanPaket(orderheaderID string) ([]models.TableTestPaket, error)
 }

 type TabDaftarPesertaHandlers struct {
@@ -47,6 +49,9 @@ func (tdp *TabDaftarPesertaHandlers) HandleShowTabDaftarPeserta(c echo.Context)
 	dialogAkunID := utils.GenerateRandomID("dialogakunID")
 	dialogAkunBodyID := utils.GenerateRandomID("dialogakunbodyID")

+	dialogDetailID := utils.GenerateRandomID("dialogdetailID")
+	dialogDetailBodyID := utils.GenerateRandomID("dialogdetailBodyID")
+
 	id := c.Param("id")
 	logger.Info("Params", zap.Any("id", id))

@@ -66,6 +71,10 @@ func (tdp *TabDaftarPesertaHandlers) HandleShowTabDaftarPeserta(c echo.Context)
 		"#"+dialogAkunBodyID,
 		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
 		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/opendetail",
+		"#"+dialogDetailBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogDetailID, #dialogDetailBodyID",
+		"outerHTML",
 	)

 	pagination := pagination.PaginationV3(
@@ -165,13 +174,13 @@ func (tdp *TabDaftarPesertaHandlers) HandleShowTabDaftarPeserta(c echo.Context)
 			ID:    "akunpesertaemailid",
 		},
 		models.CustomTextFieldv2Prm{
-			Label: "Password",
-			Name:  "akunpesertapass",
+			Label: "Password baru",
+			Name:  "akunpesertapassnew",
 			Type:  "password",
-			ID:    "akunpesertapassid",
+			ID:    "akunpesertapassnewid",
 		},
 		models.CustomTextFieldv2Prm{
-			Label: "Ketik ulang password",
+			Label: "Ulangi password baru",
 			Name:  "akunpesertapasscek",
 			Type:  "password",
 			ID:    "akunpesertapasscekid",
@@ -200,12 +209,46 @@ func (tdp *TabDaftarPesertaHandlers) HandleShowTabDaftarPeserta(c echo.Context)
 		"outerHTML",
 		"#tableID, #paginationID, #dialogAkunID, #contentlayout, #dialogAkunBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogReportID, #dialogReportBodyID, #currpage"+paginationID,
 		dialogAkunID,
-		"Ubah Password Akun Peserta",
+		"Reset Password Akun Peserta",
 		dialogAkunBody,
 		dialogAkunClose,
 		dialogAkunAction,
 	)

+	// dialog detali pemeriksaan
+
+	detailData, err := tdp.TabDaftarPesertaServices.DetailTestdanPaket("")
+	if err != nil {
+		return err
+	}
+
+	detailTable := corporate_mcudetail.TableDetailMCU(detailData)
+
+	dialodDetailBody := corporate_mcudetail.ModalRptBody(
+		dialogDetailBodyID,
+		detailTable,
+		corporate_mcudetail.JsShowModal(""),
+	)
+
+	closeDetail := corporate_mcudetail.ModalClose(
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/closedetail",
+		"#"+dialogDetailBodyID,
+		"outerHTML",
+		"#"+dialogDetailID,
+	)
+
+	modalDetail := corporate_mcudetail.DialogReport(
+		"detailmcu",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/dialogdetail",
+		"#"+dialogDetailBodyID,
+		"outerHTML",
+		"#tableID, #paginationID, #dialogAkunID, #dialogAkunBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogReportID, #dialogReportBodyID"+paginationID,
+		dialogDetailID,
+		"Detail Pemeriksaan",
+		dialodDetailBody,
+		closeDetail,
+	)
+
 	content := corporate_mcudetail.TabDaftarPesertaScreen(
 		tableID,
 		paginationID,
@@ -215,10 +258,13 @@ func (tdp *TabDaftarPesertaHandlers) HandleShowTabDaftarPeserta(c echo.Context)
 		dialogGeneratePassBodyID,
 		dialogAkunID,
 		dialogAkunBodyID,
+		dialogDetailID,
+		dialogDetailBodyID,
 		clayout,
 		modaldialog,
 		modalGenPass,
 		dialogAkunView,
+		modalDetail,
 	)

 	return utils.View(c, content)
@@ -231,6 +277,7 @@ func (tdp *TabDaftarPesertaHandlers) HandlePagination(c echo.Context) error {

 	dialogReportBodyID := c.QueryParam("dialogReportBodyID")
 	dialogAkunBodyID := c.QueryParam("dialogAkunBodyID")
+	dialogDetailBodyID := c.QueryParam("dialogDetailBodyID")

 	id := c.Param("id")

@@ -255,6 +302,10 @@ func (tdp *TabDaftarPesertaHandlers) HandlePagination(c echo.Context) error {
 		"#"+dialogAkunBodyID,
 		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
 		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/opendetail",
+		"#"+dialogDetailBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogDetailID, #dialogDetailBodyID",
+		"outerHTML",
 	)

 	pagination := pagination.PaginationV3(
@@ -262,7 +313,7 @@ func (tdp *TabDaftarPesertaHandlers) HandlePagination(c echo.Context) error {
 		page,
 		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/changepage",
 		paginationID,
-		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogReportID, #dialogReportBodyID, #currPage"+paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogDetailID, #dialogDetailBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogReportID, #dialogReportBodyID, #currPage"+paginationID,
 		"#contentlayout",
 		"outerHTML", "", "",
 		corporate_mcudetail.BeforeRequestContent(),
@@ -419,13 +470,13 @@ func (tdp *TabDaftarPesertaHandlers) HandleOpenViewAkun(c echo.Context) error {
 				ID:    "akunpesertaemailid",
 			},
 			models.CustomTextFieldv2Prm{
-				Label: "Password Akun",
-				Name:  "akunpesertapass",
+				Label: "Password baru",
+				Name:  "akunpesertapassnew",
 				Type:  "password",
-				ID:    "akunpesertapassid",
+				ID:    "akunpesertapassnewid",
 			},
 			models.CustomTextFieldv2Prm{
-				Label: "Ketik ulang password",
+				Label: "Ulangi password baru",
 				Name:  "akunpesertapasscek",
 				Type:  "password",
 				ID:    "akunpesertapasscekid",
@@ -455,16 +506,18 @@ func (tdp *TabDaftarPesertaHandlers) HandleOpenViewAkun(c echo.Context) error {
 			Value: akun.AuthPatientEmail,
 		},
 		models.CustomTextFieldv2Prm{
-			Label: "Password Akun",
-			Name:  "akunpesertapass",
-			Type:  "password",
-			ID:    "akunpesertapassid",
+			Label:       "Password baru",
+			Name:        "akunpesertapassnew",
+			Type:        "password",
+			ID:          "akunpesertapassnewid",
+			Placeholder: "Masukan password baru",
 		},
 		models.CustomTextFieldv2Prm{
-			Label: "Ketik ulang password",
-			Name:  "akunpesertapasscek",
-			Type:  "password",
-			ID:    "akunpesertapasscekid",
+			Label:       "Ulangi password baru",
+			Name:        "akunpesertapasscek",
+			Type:        "password",
+			ID:          "akunpesertapasscekid",
+			Placeholder: "Masukan ulang password baru",
 		},
 		corporate_mcudetail.JsShowModal("#"+dialogAkunID),
 	)
@@ -495,13 +548,13 @@ func (tdp *TabDaftarPesertaHandlers) HandleCloseViewAkun(c echo.Context) error {
 			ID:    "akunpesertaemailid",
 		},
 		models.CustomTextFieldv2Prm{
-			Label: "Password Akun",
-			Name:  "akunpesertapass",
+			Label: "Password baru",
+			Name:  "akunpesertapassnew",
 			Type:  "password",
-			ID:    "akunpesertapassid",
+			ID:    "akunpesertapassnewid",
 		},
 		models.CustomTextFieldv2Prm{
-			Label: "Ketik ulang password",
+			Label: "Ulangi password baru",
 			Name:  "akunpesertapasscek",
 			Type:  "password",
 			ID:    "akunpesertapasscekid",
@@ -514,6 +567,9 @@ func (tdp *TabDaftarPesertaHandlers) HandleCloseViewAkun(c echo.Context) error {
 func (tdp *TabDaftarPesertaHandlers) HandleAkun(c echo.Context) error {
 	logger, _ := zap.NewProduction()

+	userToken := c.Get("user").(*jwt.Token)
+	token := userToken.Raw
+
 	patientID := c.FormValue("akunpesertaid")
 	dialogAkunID := c.FormValue("dialogAkunID")
 	dialogAkunBodyID := c.FormValue("dialogAkunBodyID")
@@ -521,39 +577,34 @@ func (tdp *TabDaftarPesertaHandlers) HandleAkun(c echo.Context) error {

 	akunID := c.FormValue("akunpesertaid")
 	akunEmail := c.FormValue("akunpesertaemail")
-	akunPass := c.FormValue("akunpesertapass")
-	akunPasscek := c.FormValue("akunpesertapasscek")
+	oldPass := c.FormValue("akunpesertapassold")
+	newPass := c.FormValue("akunpesertapassnew")
+	newPasscek := c.FormValue("akunpesertapasscek")

 	formValidation := ""
-	emailValidation := ""
-	passValidation := ""
-	pass2Validation := ""
+	newValidation := ""
+	cekValidation := ""

-	if strings.TrimSpace(akunEmail) == "" {
-		formValidation = "Email tidak boleh kosong"
-		emailValidation = "Email tidak boleh kosong"
-	}
-	if strings.TrimSpace(akunPass) == "" {
+	if strings.TrimSpace(newPass) == "" {
 		formValidation = "Password tidak boleh kosong"
-		passValidation = "Password tidak boleh kosong"
+		newValidation = "Password tidak boleh kosong"
 	}
-	if strings.TrimSpace(akunPasscek) == "" {
+	if strings.TrimSpace(newPasscek) == "" {
 		formValidation = "Password tidak boleh kosong"
-		pass2Validation = "Password tidak boleh kosong"
+		cekValidation = "Password tidak boleh kosong"
 	}
-	if strings.TrimSpace(akunEmail) == "" && strings.TrimSpace(akunPass) == "" && strings.TrimSpace(akunPasscek) == "" {
-		formValidation = "Email dan Password tidak boleh kosong"
-		emailValidation = "Email tidak boleh kosong"
-		passValidation = "Password tidak boleh kosong"
-		pass2Validation = "Password tidak boleh kosong"
+	if strings.TrimSpace(oldPass) == "" && strings.TrimSpace(newPass) == "" && strings.TrimSpace(newPasscek) == "" {
+		formValidation = "Password lama dan baru tidak boleh kosong"
+		newValidation = "Password baru tidak boleh kosong"
+		cekValidation = "Password baru tidak boleh kosong"
 	}
-	if strings.TrimSpace(akunPass) != strings.TrimSpace(akunPasscek) {
+	if strings.TrimSpace(newPass) != strings.TrimSpace(newPasscek) {
 		formValidation = "Password tidak sama"
-		passValidation = "Password tidak sama"
-		pass2Validation = "Password tidak sama"
+		newValidation = "Password tidak sama"
+		cekValidation = "Password tidak sama"
 	}

-	if formValidation != "" || emailValidation != "" || passValidation != "" || pass2Validation != "" {
+	if formValidation != "" || newValidation != "" || cekValidation != "" {
 		dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
 			dialogAkunBodyID,
 			models.CustomTextFieldv2Prm{
@@ -565,28 +616,27 @@ func (tdp *TabDaftarPesertaHandlers) HandleAkun(c echo.Context) error {
 				Value:       akunID,
 			},
 			models.CustomTextFieldv2Prm{
-				Label:    "Email Akun",
-				Name:     "akunpesertaemail",
-				Type:     "text",
-				ID:       "akunpesertaemailid",
-				Value:    akunEmail,
-				ErrorMsg: emailValidation,
+				Label: "Email Akun",
+				Name:  "akunpesertaemail",
+				Type:  "text",
+				ID:    "akunpesertaemailid",
+				Value: akunEmail,
 			},
 			models.CustomTextFieldv2Prm{
-				Label:    "Password Akun",
-				Name:     "akunpesertapass",
-				Type:     "password",
-				ID:       "akunpesertapassid",
-				Value:    akunPass,
-				ErrorMsg: passValidation,
+				Label:       "Password baru",
+				Name:        "akunpesertapassnew",
+				Type:        "password",
+				ID:          "akunpesertapassnewid",
+				Placeholder: "Masukan password baru",
+				ErrorMsg:    newValidation,
 			},
 			models.CustomTextFieldv2Prm{
-				Label:    "Ketik ulang password",
-				Name:     "akunpesertapasscek",
-				Type:     "password",
-				ID:       "akunpesertapasscekid",
-				Value:    akunPasscek,
-				ErrorMsg: pass2Validation,
+				Label:       "Ulangi password baru",
+				Name:        "akunpesertapasscek",
+				Type:        "password",
+				ID:          "akunpesertapasscekid",
+				Placeholder: "Masukan ulang password baru",
+				ErrorMsg:    cekValidation,
 			},
 			corporate_mcudetail.JsShowModal(""),
 		)
@@ -595,6 +645,51 @@ func (tdp *TabDaftarPesertaHandlers) HandleAkun(c echo.Context) error {
 		return utils.ViewMulti(c, retVal)
 	}

+	resp, err := tdp.TabDaftarPesertaServices.ResetPasswordPeserta(token, newPass, akunEmail, akunID)
+	dialogAkunErr := corporate_mcudetail.ModalViewAkunBody(
+		dialogAkunBodyID,
+		models.CustomTextFieldv2Prm{
+			Label:       "ID Akun Peserta",
+			Name:        "akunpesertaid",
+			Placeholder: "ID Akun Peserta",
+			Type:        "hidden",
+			ID:          "akunpesertaidid",
+			Value:       akunID,
+		},
+		models.CustomTextFieldv2Prm{
+			Label: "Email Akun",
+			Name:  "akunpesertaemail",
+			Type:  "text",
+			ID:    "akunpesertaemailid",
+			Value: akunEmail,
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Password baru",
+			Name:        "akunpesertapassnew",
+			Type:        "password",
+			ID:          "akunpesertapassnewid",
+			Placeholder: "Masukan password baru",
+		},
+		models.CustomTextFieldv2Prm{
+			Label:       "Ulangi password baru",
+			Name:        "akunpesertapasscek",
+			Type:        "password",
+			ID:          "akunpesertapasscekid",
+			Placeholder: "Masukan ulang password baru",
+		},
+		corporate_mcudetail.JsHideModal(""),
+	)
+
+	if err != nil {
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", err.Error(), "warning")
+		return utils.ViewMulti(c, []templ.Component{toastwarning, dialogAkunErr})
+	}
+
+	if resp.Status == "ERR" {
+		toastwarning := customtoastv2.CustomToastV2Show("Warning", resp.Message, "warning")
+		return utils.ViewMulti(c, []templ.Component{toastwarning, dialogAkunErr})
+	}
+
 	dialogAkunBody := corporate_mcudetail.ModalViewAkunBody(
 		dialogAkunBodyID,
 		models.CustomTextFieldv2Prm{
@@ -611,26 +706,31 @@ func (tdp *TabDaftarPesertaHandlers) HandleAkun(c echo.Context) error {
 			ID:    "akunpesertaemailid",
 		},
 		models.CustomTextFieldv2Prm{
-			Label: "Password Akun",
-			Name:  "akunpesertapass",
-			Type:  "password",
-			ID:    "akunpesertapassid",
+			Label:       "Password baru",
+			Name:        "akunpesertapassnew",
+			Type:        "password",
+			ID:          "akunpesertapassnewid",
+			Placeholder: "Masukan password baru",
 		},
 		models.CustomTextFieldv2Prm{
-			Label: "Ketik ulang password",
-			Name:  "akunpesertapasscek",
-			Type:  "password",
-			ID:    "akunpesertapasscekid",
+			Label:       "Ulangi password baru",
+			Name:        "akunpesertapasscek",
+			Type:        "password",
+			ID:          "akunpesertapasscekid",
+			Placeholder: "Masukan ulang password baru",
 		},
 		corporate_mcudetail.JsHideModal("#"+dialogAkunID),
 	)
-	return utils.View(c, dialogAkunBody)
+	toastwarning := customtoastv2.CustomToastV2Show("Success", "Berhasil reset password peserta: "+akunEmail, "success")
+	retVal := []templ.Component{toastwarning, dialogAkunBody}
+	return utils.ViewMulti(c, retVal)
 }

 func (tdp *TabDaftarPesertaHandlers) HandleContentReload(c echo.Context) error {
 	id := c.Param("id")
 	dialogReportBodyID := c.FormValue("dialogReportBodyID")
 	dialogAkunBodyID := c.FormValue("dialogAkunBodyID")
+	dialogDetailBodyID := c.FormValue("dialogDetailBodyID")

 	tableID := c.FormValue("tableID")
 	paginationID := c.FormValue("paginationID")
@@ -656,6 +756,10 @@ func (tdp *TabDaftarPesertaHandlers) HandleContentReload(c echo.Context) error {
 		"#"+dialogAkunBodyID,
 		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID",
 		"outerHTML",
+		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/opendetail",
+		"#"+dialogDetailBodyID,
+		"#tableID, #paginationID, #dialogReportID, #dialogReportBodyID, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogDetailID, #dialogDetailBodyID",
+		"outerHTML",
 	)

 	pagination := pagination.PaginationV3(
@@ -663,7 +767,7 @@ func (tdp *TabDaftarPesertaHandlers) HandleContentReload(c echo.Context) error {
 		currpage,
 		"/corp/dashboard_pic/detail/"+id+"/tabdaftarpeserta/changepage",
 		paginationID,
-		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogReportID, #dialogReportBodyID, #currPage"+paginationID,
+		"#tableID, #paginationID, #loading-parent, #loading-child, #loading-spinner, #loadingcontent, #dialogGenPassID, #dialogGenPassBodyID, #dialogAkunID, #dialogAkunBodyID, #dialogReportID, #dialogReportBodyID, #dialogDetailID, #dialogDetailBodyID, #currPage"+paginationID,
 		"#contentlayout",
 		"outerHTML", "", "",
 		corporate_mcudetail.BeforeRequestContent(),
@@ -673,3 +777,29 @@ func (tdp *TabDaftarPesertaHandlers) HandleContentReload(c echo.Context) error {
 	clayout := corporate_mcudetail.ContentLayout(table, pagination)
 	return utils.View(c, clayout)
 }
+
+func (tdp *TabDaftarPesertaHandlers) HandleOpenDetail(c echo.Context) error {
+	idx := c.QueryParam("idx")
+	dialogDetailID := c.QueryParam("dialogDetailID")
+	dialogDetailBodyID := c.QueryParam("dialogDetailBodyID")
+
+	detailData, err := tdp.TabDaftarPesertaServices.DetailTestdanPaket(idx)
+	if err != nil {
+		tab := corporate_mcudetail.TableDetailMCU([]models.TableTestPaket{})
+		mod := corporate_mcudetail.ModalRptBody(
+			dialogDetailBodyID,
+			tab,
+			corporate_mcudetail.JsShowModal("#"+dialogDetailID),
+		)
+		return utils.View(c, mod)
+	}
+
+	tablecomponent := corporate_mcudetail.TableDetailMCU(detailData)
+	detailBody := corporate_mcudetail.ModalRptBody(
+		dialogDetailBodyID,
+		tablecomponent,
+		corporate_mcudetail.JsShowModal("#"+dialogDetailID),
+	)
+
+	return utils.View(c, detailBody)
+}
--- a/handlers/corporate/mcudetail/tabkelainanfisik.hanlders.go
+++ b/handlers/corporate/mcudetail/tabkelainanfisik.hanlders.go
@@ -5,7 +5,7 @@ import (
 	"cpone/models"
 	"cpone/utils"
 	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
-	"encoding/json"
+	"strings"

 	"github.com/a-h/templ"
 	"github.com/labstack/echo/v4"
@@ -20,6 +20,7 @@ type TabKelainanFisikServices interface {
 	GetKelFisikAlkohol(mcuID string) (models.Piechart, error)
 	GetKelFisikMerokok(mcuID string) (models.Piechart, error)
 	GetKelFisikOlahraga(mcuID string) (models.Piechart, error)
+	GetChartRenderFisik(mcuID string) ([]models.McuTabModels, error)
 }

 type TabKelainanFisikHandler struct {
@@ -37,110 +38,38 @@ func (tkf *TabKelainanFisikHandler) HandleShowTabKelainanFisik(c echo.Context) e
 	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
-	}
-	bmijson, err := json.MarshalIndent(bmi, "", "    ")
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}
+
+	tablist, err := tkf.TabKelainanFisikServices.GetChartRenderFisik(id)
 	if err != nil {
 		return err
 	}

-	hiper, err := tkf.TabKelainanFisikServices.GetKelainanFisikHipertensi(id)
-	if err != nil {
-		return err
-	}
-	hiperjson, err := json.MarshalIndent(hiper, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	refraksi, err := tkf.TabKelainanFisikServices.GetKelainanFisikRefraksi(id)
-	if err != nil {
-		return err
-	}
-	refraksijson, err := json.MarshalIndent(refraksi, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	alkohol, err := tkf.TabKelainanFisikServices.GetKelFisikAlkohol(id)
-	if err != nil {
-		return err
-	}
-	alkoholjson, err := json.MarshalIndent(alkohol, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	merokok, err := tkf.TabKelainanFisikServices.GetKelFisikMerokok(id)
-	if err != nil {
-		return err
-	}
-	merokokjson, err := json.MarshalIndent(merokok, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	olahraga, err := tkf.TabKelainanFisikServices.GetKelFisikOlahraga(id)
-	if err != nil {
-		return err
-	}
-	olahragajson, err := json.MarshalIndent(olahraga, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	chartsxs := []templ.Component{
-		chart.ShowChartFixed("bmixs", string(bmijson), "400px", "450px"),
-		chart.ShowChartFixed("hprxs", string(hiperjson), "400px", "450px"),
-		chart.ShowChartFixed("rfkxs", string(refraksijson), "400px", "450px"),
-		chart.ShowChartFixed("alkxs", string(alkoholjson), "400px", "450px"),
-		chart.ShowChartFixed("rkkxs", string(merokokjson), "400px", "450px"),
-		chart.ShowChartFixed("olhxs", string(olahragajson), "400px", "450px"),
-	}
-
-	chartsmd := []templ.Component{
-		chart.ShowChartFixed("bmimd", string(bmijson), "450px", "450px"),
-		chart.ShowChartFixed("hprmd", string(hiperjson), "450px", "450px"),
-		chart.ShowChartFixed("rfkmd", string(refraksijson), "450px", "450px"),
-		chart.ShowChartFixed("alkmd", string(alkoholjson), "450px", "450px"),
-		chart.ShowChartFixed("rkkmd", string(merokokjson), "450px", "450px"),
-		chart.ShowChartFixed("olhmd", string(olahragajson), "450px", "450px"),
-	}
-
-	chartslg := []templ.Component{
-		chart.ShowChartFixed("bmilg", string(bmijson), "600px", "450px"),
-		chart.ShowChartFixed("hprlg", string(hiperjson), "600px", "450px"),
-		chart.ShowChartFixed("rfklg", string(refraksijson), "600px", "450px"),
-		chart.ShowChartFixed("alklg", string(alkoholjson), "600px", "450px"),
-		chart.ShowChartFixed("rkklg", string(merokokjson), "600px", "450px"),
-		chart.ShowChartFixed("olhlg", string(olahragajson), "600px", "450px"),
-	}
-
-	fisik, err := tkf.TabKelainanFisikServices.GetKelainanFisikPresentase(id)
-	if err != nil {
-		return err
-	}
-
-	fisikjson, err := json.MarshalIndent(fisik, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	barchart := []templ.Component{
-		chart.ShowChartFixed("fislg", string(fisikjson), "1000px", "450px"),
-		chart.ShowChartFixed("fismd", string(fisikjson), "500px", "450px"),
-		chart.ShowChartFixed("fisxs", string(fisikjson), "250px", "450px"),
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
 	}

 	content := corporate_mcudetail.Tabkelainanfisik(
 		chartsxs,
 		chartsmd,
 		chartslg,
-		barchart,
 	)

 	return utils.View(c, content)
--- a/handlers/corporate/mcudetail/tabkelainanglobal.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainanglobal.handlers.go
@@ -5,16 +5,16 @@ import (
 	"cpone/models"
 	"cpone/utils"
 	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
-	"encoding/json"
+	"strings"

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

 type TabKelainanGlobalServices interface {
 	GetKelainanFisik(mcuID string) (models.Barchart, error)
 	GetKelainanGlobalV2(mcuID string) (models.Barchart, error)
+	GetChartRenderGlobal(mcuID string) ([]models.McuTabModels, error)
 }

 type TabKelainanGlobalHandler struct {
@@ -28,44 +28,33 @@ func NewTabKelainanGlobalHandler(tkg TabKelainanGlobalServices) *TabKelainanGlob
 }

 func (tkg *TabKelainanGlobalHandler) HandleShowTabKelainanGlobal(c echo.Context) error {
-	logger, _ := zap.NewProduction()
 	id := c.Param("id")

-	logger.Info("params", zap.Any("id", id))
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}

-	kelmcu, err := tkg.TabKelainanGlobalServices.GetKelainanGlobalV2(id)
+	tablist, err := tkg.TabKelainanGlobalServices.GetChartRenderGlobal(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"),
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
 	}

 	content := corporate_mcudetail.TabKelainanGlobal(
--- a/handlers/corporate/mcudetail/tabkelainanlab.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainanlab.handlers.go
@@ -5,7 +5,7 @@ import (
 	"cpone/models"
 	"cpone/utils"
 	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
-	"encoding/json"
+	"strings"

 	"github.com/a-h/templ"
 	"github.com/labstack/echo/v4"
@@ -18,6 +18,7 @@ type TabKelainanLabServices interface {
 	GetGangguanFungsiHati(mcuID string) (models.BarchartV2, error)
 	GetGangguanMetabolismeLemak(mcuID string) (models.BarchartV2, error)
 	GetPeningkatanGlukosa(mcuID string) (models.BarchartV2, error)
+	GetChartRenderLab(mcuID string) ([]models.McuTabModels, error)
 }

 type TabKelainanLabHandler struct {
@@ -33,85 +34,31 @@ func NewTabKelainanLabHandler(tkl TabKelainanLabServices) *TabKelainanLabHandler
 func (tkl *TabKelainanLabHandler) HandleShowTabKelainanLab(c echo.Context) error {
 	id := c.Param("id")

-	datapre, err := tkl.TabKelainanLabServices.GetDataPresentaseKelainanLab(id)
-	if err != nil {
-		return err
-	}
-	dataprejson, err := json.MarshalIndent(datapre, "", "    ")
+	tablist, err := tkl.TabKelainanLabServices.GetChartRenderLab(id)
 	if err != nil {
 		return err
 	}

-	hematologi, err := tkl.TabKelainanLabServices.GetHematologi(id)
-	if err != nil {
-		return err
-	}
-	hemajson, err := json.MarshalIndent(hematologi, "", "    ")
-	if err != nil {
-		return err
-	}
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}

-	urinalisa, err := tkl.TabKelainanLabServices.GetUrinalisa(id)
-	if err != nil {
-		return err
-	}
-	urinjson, err := json.MarshalIndent(urinalisa, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	hati, err := tkl.TabKelainanLabServices.GetGangguanFungsiHati(id)
-	if err != nil {
-		return err
-	}
-	hatijson, err := json.MarshalIndent(hati, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	lemak, err := tkl.TabKelainanLabServices.GetGangguanMetabolismeLemak(id)
-	if err != nil {
-		return err
-	}
-	lemakjson, err := json.MarshalIndent(lemak, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	glukosa, err := tkl.TabKelainanLabServices.GetPeningkatanGlukosa(id)
-	if err != nil {
-		return err
-	}
-	glukosjson, err := json.MarshalIndent(glukosa, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	chartsxs := []templ.Component{
-		chart.ShowChartFixed("dataprexs", string(dataprejson), "350px", "450px"),
-		chart.ShowChartFixed("hemaxs", string(hemajson), "300px", "450px"),
-		chart.ShowChartFixed("urinxs", string(urinjson), "300px", "450px"),
-		chart.ShowChartFixed("hatixs", string(hatijson), "300px", "450px"),
-		chart.ShowChartFixed("lemakxs", string(lemakjson), "300px", "450px"),
-		chart.ShowChartFixed("glukosxs", string(glukosjson), "300px", "450px"),
-	}
-
-	chartsmd := []templ.Component{
-		chart.ShowChartFixed("datapremd", string(dataprejson), "500px", "450px"),
-		chart.ShowChartFixed("hemamd", string(hemajson), "450px", "450px"),
-		chart.ShowChartFixed("urinmd", string(urinjson), "450px", "450px"),
-		chart.ShowChartFixed("hatimd", string(hatijson), "450px", "450px"),
-		chart.ShowChartFixed("lemakmd", string(lemakjson), "450px", "450px"),
-		chart.ShowChartFixed("glukosmd", string(glukosjson), "450px", "450px"),
-	}
-
-	chartslg := []templ.Component{
-		chart.ShowChartFixed("dataprelg", string(dataprejson), "1000px", "450px"),
-		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"),
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
 	}

 	content := corporate_mcudetail.TabKelainanLab(
--- a/handlers/corporate/mcudetail/tabkelainannonlab.handlers.go
+++ b/handlers/corporate/mcudetail/tabkelainannonlab.handlers.go
@@ -5,7 +5,7 @@ import (
 	"cpone/models"
 	"cpone/utils"
 	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
-	"encoding/json"
+	"strings"

 	"github.com/a-h/templ"
 	"github.com/labstack/echo/v4"
@@ -17,6 +17,7 @@ type TabKelainanNonLabServices interface {
 	GetGangguanJantung(mcuID string) (models.BarchartV2, error)
 	GetAutospirometri(mcuID string) (models.BarchartV2, error)
 	GetPendengaran(mcuID string) (models.BarchartV2, error)
+	GetChartRenderNonLab(mcuID string) ([]models.McuTabModels, error)
 }

 type TabKelainanNonLabHandler struct {
@@ -32,73 +33,31 @@ func NewTabKelainanNonLabHandler(tknl TabKelainanNonLabServices) *TabKelainanNon
 func (tknl *TabKelainanNonLabHandler) HandleShowTabKelainanNonLab(c echo.Context) error {
 	id := c.Param("id")

-	datapre, err := tknl.TabKelainanNonLabServices.GetDataKelNonLab(id)
-	if err != nil {
-		return err
-	}
-	dataprejson, err := json.MarshalIndent(datapre, "", "    ")
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}
+
+	tablist, err := tknl.TabKelainanNonLabServices.GetChartRenderNonLab(id)
 	if err != nil {
 		return err
 	}

-	thorax, err := tknl.TabKelainanNonLabServices.GetThoraxPA(id)
-	if err != nil {
-		return err
-	}
-	thrxjson, err := json.MarshalIndent(thorax, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	jantung, err := tknl.TabKelainanNonLabServices.GetGangguanJantung(id)
-	if err != nil {
-		return err
-	}
-	jantungjson, err := json.MarshalIndent(jantung, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	autospiro, err := tknl.TabKelainanNonLabServices.GetAutospirometri(id)
-	if err != nil {
-		return err
-	}
-	autospirojson, err := json.MarshalIndent(autospiro, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	pendengaran, err := tknl.TabKelainanNonLabServices.GetPendengaran(id)
-	if err != nil {
-		return err
-	}
-	pendengaranjson, err := json.MarshalIndent(pendengaran, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	chartsxs := []templ.Component{
-		chart.ShowChartFixed("datanonxs", string(dataprejson), "300px", "450px"),
-		chart.ShowChartFixed("jantungxs", string(jantungjson), "300px", "450px"),
-		chart.ShowChartFixed("thoraxxs", string(thrxjson), "300px", "450px"),
-		chart.ShowChartFixed("spiroxs", string(autospirojson), "300px", "450px"),
-		chart.ShowChartFixed("dengarxs", string(pendengaranjson), "300px", "450px"),
-	}
-
-	chartsmd := []templ.Component{
-		chart.ShowChartFixed("datanonmd", string(dataprejson), "500px", "450px"),
-		chart.ShowChartFixed("jantungmd", string(jantungjson), "500px", "450px"),
-		chart.ShowChartFixed("thoraxmd", string(thrxjson), "500px", "450px"),
-		chart.ShowChartFixed("spiromd", string(autospirojson), "500px", "450px"),
-		chart.ShowChartFixed("dengarmd", string(pendengaranjson), "500px", "450px"),
-	}
-
-	chartslg := []templ.Component{
-		chart.ShowChartFixed("datanonlg", string(dataprejson), "1000px", "450px"),
-		chart.ShowChartFixed("jantunglg", string(jantungjson), "600px", "450px"),
-		chart.ShowChartFixed("thoraxlg", string(thrxjson), "600px", "450px"),
-		chart.ShowChartFixed("spirolg", string(autospirojson), "600px", "450px"),
-		chart.ShowChartFixed("dengarlg", string(pendengaranjson), "600px", "450px"),
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
 	}

 	content := corporate_mcudetail.TabKelainanNonLab(
--- a/handlers/corporate/mcudetail/tabkepesertaan.handlers.go
+++ b/handlers/corporate/mcudetail/tabkepesertaan.handlers.go
@@ -5,7 +5,7 @@ import (
 	"cpone/models"
 	"cpone/utils"
 	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
-	"encoding/json"
+	"strings"

 	"github.com/a-h/templ"
 	"github.com/labstack/echo/v4"
@@ -16,6 +16,7 @@ type TabKepersertaanServices interface {
 	GetTotalKepesertaanMCU(mcuID string) (models.Piechart, error)
 	GetKepesertaanByGender(mcuID string) (models.Piechart, error)
 	GetKepesertaanByUmur(mcuID string) (models.Piechart, error)
+	GetChartRenderPeserta(mcuID string) ([]models.McuTabModels, error)
 }

 type TabKepersertaanHandler struct {
@@ -35,52 +36,31 @@ func (tkh *TabKepersertaanHandler) HandleShowTabKepesertaan(c echo.Context) erro
 	id := c.Param("id")
 	logger.Info("Params", zap.Any("id", id))

-	peserta, err := tkh.TabKepersertaanServices.GetTotalKepesertaanMCU(id)
+	tablist, err := tkh.TabKepersertaanServices.GetChartRenderPeserta(id)
 	if err != nil {
 		return err
 	}

-	gender, err := tkh.TabKepersertaanServices.GetKepesertaanByGender(id)
-	if err != nil {
-		return err
-	}
+	chartsxs := []templ.Component{}
+	chartsmd := []templ.Component{}
+	chartslg := []templ.Component{}

-	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"),
+	for _, d := range tablist {
+		chartsxs = append(chartsxs, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"xs", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartsmd = append(chartsmd, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"md", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
+		chartslg = append(chartslg, chart.ShowChartResponsiveWidth(
+			strings.ToLower(strings.ReplaceAll(d.Mcu_ImageGrafikName+"lg", " ", "")),
+			d.Mcu_ImageGrafikJsonRender,
+			"450px",
+		))
 	}

 	content := corporate_mcudetail.TabKepesertaan(
--- a/handlers/routes.go
+++ b/handlers/routes.go
@@ -64,6 +64,7 @@ func SetupRoutesEmployee(app *echo.Echo, e *dev_handlers.EmployeeHandler) {
 func SetupRoutesProject(app *echo.Echo) {

 }
+
 func SetupRoutesPublic(app *echo.Echo, appStore db.AppStore) {
 	public := app.Group("/")
 	l := public_services.NewServicesLandingPage(public_services.LandingPage{}, appStore)
@@ -102,6 +103,7 @@ func SetupRoutesPublic(app *echo.Echo, appStore db.AppStore) {
 	// redirect to survey mcu page
 	public.GET("redirectsurveymcu", publicKartuKontrolhandlers.HandlerRedirectToSurveyMcu)
 }
+
 func SetupRoutesCorporate(app *echo.Echo, appStore db.AppStore) {
 	corp := app.Group("/corp", auth.IsLoggedIn)
 	// corp := app.Group("/corp")
@@ -170,6 +172,7 @@ func SetupRoutesCorporate(app *echo.Echo, appStore db.AppStore) {
 	corp.POST("/dashboard_pic/detail/:id/tabdaftarpeserta/closeviewakun", daftarpesertaHandl.HandleCloseViewAkun)
 	corp.POST("/dashboard_pic/detail/:id/tabdaftarpeserta/viewakun", daftarpesertaHandl.HandleAkun)
 	corp.POST("/dashboard_pic/detail/:id/tabdaftarpeserta/reload", daftarpesertaHandl.HandleContentReload)
+	corp.GET("/dashboard_pic/detail/:id/tabdaftarpeserta/opendetail", daftarpesertaHandl.HandleOpenDetail)

 	// tab keuangan
 	keuanganService := mcu_corporate_services.NewTabKeuanganServices(appStore)
--- a/models/chart.models.go
+++ b/models/chart.models.go
@@ -49,6 +49,7 @@ type Piechart struct {
 type Barchart struct {
 	Title struct {
 		Text string `json:"text"`
+		Left string `json:"left"`
 	} `json:"title"`
 	Dataset struct {
 		Source [][]interface{} `json:"source"`
@@ -110,6 +111,7 @@ type BarDataset struct {
 type BarchartV2 struct {
 	Title struct {
 		Text string `json:"text"`
+		Left string `json:"left"`
 	} `json:"title"`
 	Dataset struct {
 		Source [][]interface{} `json:"source"`
--- a/models/mcudaftarpeserta.models.go
+++ b/models/mcudaftarpeserta.models.go
@@ -14,7 +14,8 @@ type ModelMcuDaftarPeserta struct {
 	Age                       string `db:"age"`
 	AuthPatientEmail          string `db:"authPatientEmail"`
 	AuthPatientIsActive       string `db:"authPatientIsActive"`
-	Nama_Paket                string `db:"nama_paket"`
+	Test_Paket                string `db:"test_paket"`
+	List_Paket                string `db:"list_paket"`
 }

 type SoResultEntryReportModel struct {
@@ -84,3 +85,20 @@ type ResumeMCU struct {
 	Mcu_ResumeID string `db:"Mcu_ResumeID"`
 	Datetime     string `db:"Datetime"`
 }
+
+type DetailPaketMCU struct {
+	T_OrderDetailOrderT_PacketID   string `db:"T_OrderDetailOrderT_PacketID"`
+	T_OrderDetailOrderT_PacketName string `db:"T_OrderDetailOrderT_PacketName"`
+	T_TestName                     string `db:"T_TestName"`
+}
+
+type DetailTestMCU struct {
+	T_OrderDetailOrderT_TestID   string `db:"T_OrderDetailOrderT_TestID"`
+	T_OrderDetailOrderT_TestName string `db:"T_OrderDetailOrderT_TestName"`
+}
+
+type TableTestPaket struct {
+	Nomor     int
+	NamaTest  string
+	NamaPaket string
+}
--- a/models/mcutab.models.go
+++ b/models/mcutab.models.go
@@ -0,0 +1,10 @@
+package models
+
+type McuTabModels struct {
+	Mcu_ImageGrafikGroupResult string `db:"Mcu_ImageGrafikGroupResult"`
+	Mcu_ImageGrafikGroupMenu   string `db:"Mcu_ImageGrafikGroupMenu"`
+	Mcu_ImageGrafikName        string `db:"Mcu_ImageGrafikName"`
+	Mcu_ImageGrafikJsonRender  string `db:"Mcu_ImageGrafikJsonRender"`
+	TabID                      string
+	TabName                    string
+}
--- a/services/corporate/mcudetail.services.go
+++ b/services/corporate/mcudetail.services.go
@@ -4,6 +4,7 @@ import (
 	"cpone/db"
 	"cpone/models"
 	dbx "cpone/package/database"
+	"fmt"
 )

 type McuDetailServices struct {
@@ -63,3 +64,48 @@ func (mcud *McuDetailServices) GetBreadcrumb(id string) (models.BreadCrumbV1, er

 	return breadcrumb, nil
 }
+
+func (mcud *McuDetailServices) GetTabNameList(id string) ([]models.McuTabModels, error) {
+	var ret []models.McuTabModels
+
+	q := `
+		SELECT
+		Mcu_ImageGrafikGroupResult,
+		Mcu_ImageGrafikGroupMenu,
+		Mcu_ImageGrafikName,
+		Mcu_ImageGrafikJsonRender
+		FROM mgm_mcugrafik
+		JOIN mcu_image_grafik ON Mcu_ImageGrafikID = Mgm_McuGrafikMcu_ImageGrafikID
+		WHERE Mgm_McuGrafikMgm_McuID = ?
+		AND Mgm_McuGrafikIsActive = 'Y'
+		GROUP BY Mcu_ImageGrafikGroupMenu, Mcu_ImageGrafikGroupResult
+		ORDER BY Mcu_ImageGrafikID
+	`
+	if err := dbx.Handlex.Select(&ret, q, id); err != nil {
+		return ret, fmt.Errorf("error get data tab name: %v", err)
+	}
+
+	for i, d := range ret {
+		switch d.Mcu_ImageGrafikGroupMenu {
+		case "SUMMARY":
+			if d.Mcu_ImageGrafikGroupResult == "LAB" {
+				ret[i].TabID = "tabkelainanlab"
+				ret[i].TabName = "Kelainan Lab"
+			} else if d.Mcu_ImageGrafikGroupResult == "NONLAB" {
+				ret[i].TabID = "tabkelainannonlab"
+				ret[i].TabName = "Kelainan Non Lab"
+			} else {
+				ret[i].TabID = "tabkelainanfisik"
+				ret[i].TabName = "Kelainan Fisik"
+			}
+		case "GLOBAL":
+			ret[i].TabID = "tabkelainanglobal"
+			ret[i].TabName = "Kelainan Global"
+		case "PESERTA":
+			ret[i].TabID = "tabkepesertaan"
+			ret[i].TabName = "Peserta"
+		}
+	}
+
+	return ret, nil
+}
--- a/services/corporate/mcudetail/tabdaftarpeserta.services.go
+++ b/services/corporate/mcudetail/tabdaftarpeserta.services.go
@@ -11,6 +11,7 @@ import (
 	"io"
 	"math"
 	"net/http"
+	"net/url"
 	"strconv"

 	"go.uber.org/zap"
@@ -42,34 +43,39 @@ func (tdps *TabDaftarPesertaServices) GetListDaftarPesertaMCU(id string, current
 	}

 	query := `
-		SELECT 
-		T_OrderHeaderID,
-		T_OrderHeaderDate,
-		IFNULL(T_OrderHeaderLabNumber, 0) AS 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'
+		SELECT *,
+		GROUP_CONCAT(test_paket) as list_paket
+		FROM (
+			SELECT 
+			T_OrderHeaderID,
+			T_OrderHeaderDate,
+			IFNULL(T_OrderHeaderLabNumber, 0) AS 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,
-		IFNULL(authPatientEmail, "none") AS authPatientEmail,
-		IFNULL(authPatientIsActive, "N") AS authPatientIsActive,
-		CASE
-			WHEN T_OrderDetailOrderIsPacket = 'Y' THEN T_OrderDetailOrderT_PacketName
-			ELSE T_OrderDetailOrderT_TestName
-		END AS nama_paket
-		FROM t_orderheader
-		JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID AND M_PatientIsActive = 'Y'
-		JOIN t_orderdetailorder ON T_OrderDetailOrderT_OrderHeaderID = T_OrderHeaderID 
-		AND T_OrderDetailOrderIsActive = 'Y'
-		LEFT JOIN auth_patient ON M_PatientID = authPatientM_PatientID AND  authPatientIsActive = 'Y'
-		WHERE T_OrderHeaderIsActive = 'Y' AND T_OrderHeaderMgm_McuID = ?
+			END AS jenisKelamin,
+			M_PatientDOB,
+			FLOOR(DATEDIFF(CURDATE(), M_PatientDOB)/ 365.25) AS age,
+			IFNULL(authPatientEmail, "none") AS authPatientEmail,
+			IFNULL(authPatientIsActive, "N") AS authPatientIsActive,
+			CASE
+				WHEN T_OrderDetailOrderIsPacket = 'Y' THEN T_OrderDetailOrderT_PacketName
+				ELSE T_OrderDetailOrderT_TestName
+			END AS test_paket
+			FROM t_orderheader
+			JOIN m_patient ON T_OrderHeaderM_PatientID = M_PatientID AND M_PatientIsActive = 'Y'
+			JOIN t_orderdetailorder ON T_OrderDetailOrderT_OrderHeaderID = T_OrderHeaderID 
+			AND T_OrderDetailOrderIsActive = 'Y'
+			LEFT JOIN auth_patient ON M_PatientID = authPatientM_PatientID AND  authPatientIsActive = 'Y'
+			WHERE T_OrderHeaderIsActive = 'Y' AND T_OrderHeaderMgm_McuID = ?
+		) x
+		GROUP BY T_OrderHeaderID
 		ORDER BY T_OrderHeaderLabNumber ASC
 		LIMIT ? OFFSET ?
 	`
@@ -82,6 +88,62 @@ func (tdps *TabDaftarPesertaServices) GetListDaftarPesertaMCU(id string, current
 	return listDaftarPeserta, totalPage, nil
 }

+func (tdps *TabDaftarPesertaServices) DetailTestdanPaket(orderheaderID string) ([]models.TableTestPaket, error) {
+	var listPaket []models.DetailPaketMCU
+	var listTest []models.DetailTestMCU
+	var ret []models.TableTestPaket
+
+	// get list test name
+	qr := `
+		SELECT
+		T_OrderDetailOrderT_TestID,
+		T_OrderDetailOrderT_TestName
+		FROM t_orderdetailorder
+		WHERE T_OrderDetailOrderT_OrderHeaderID = ?
+		AND T_OrderDetailOrderIsActive = 'Y'
+		AND T_OrderDetailOrderIsPacket = 'N'
+	`
+	if err := dbx.Handlex.Select(&listTest, qr, orderheaderID); err != nil {
+		return ret, err
+	}
+
+	// get detail paket
+	q := `
+		SELECT
+		T_OrderDetailOrderT_PacketID,
+		T_OrderDetailOrderT_PacketName,
+		T_TestName
+		FROM t_orderdetailorder
+		JOIN t_packetdetail ON T_PacketDetailT_PacketID = T_OrderDetailOrderT_PacketID AND T_PacketDetailIsActive = 'Y'
+		JOIN t_test ON T_TestName = T_PacketDetailT_TestID AND T_TestIsActive = 'Y'
+		WHERE T_OrderDetailOrderT_OrderHeaderID = ? AND T_OrderDetailOrderIsActive = 'Y'
+	`
+	if err := dbx.Handlex.Select(&listPaket, q, orderheaderID); err != nil {
+		return ret, err
+	}
+
+	nomor := 1
+	for _, d := range listTest {
+		ret = append(ret, models.TableTestPaket{
+			Nomor:     nomor,
+			NamaTest:  d.T_OrderDetailOrderT_TestName,
+			NamaPaket: d.T_OrderDetailOrderT_TestName,
+		})
+		nomor++
+	}
+
+	for _, d := range listPaket {
+		ret = append(ret, models.TableTestPaket{
+			Nomor:     nomor,
+			NamaTest:  d.T_TestName,
+			NamaPaket: d.T_OrderDetailOrderT_PacketName,
+		})
+		nomor++
+	}
+
+	return ret, nil
+}
+
 func (tdps *TabDaftarPesertaServices) GenerataPasswordMCU(mgmMCUID string, host string) (models.GeneratePasswordResponse, error) {
 	logger, _ := zap.NewProduction()
 	var ret models.GeneratePasswordResponse
@@ -109,7 +171,7 @@ func (tdps *TabDaftarPesertaServices) GenerataPasswordMCU(mgmMCUID string, host
 }

 func (tdps *TabDaftarPesertaServices) GetAkunPeserta(patientID string) (models.AuthPatient, error) {
-	logger, _ := zap.NewProduction()
+	// logger, _ := zap.NewProduction()
 	var ret models.AuthPatient

 	q := `
@@ -126,7 +188,49 @@ func (tdps *TabDaftarPesertaServices) GetAkunPeserta(patientID string) (models.A
 	if err := dbx.Handlex.Get(&ret, q, patientID); err != nil {
 		return ret, fmt.Errorf("error get akun peserta")
 	}
-	logger.Info("response", zap.Any("data", ret))
+	// logger.Info("response", zap.Any("data", ret))
+
+	return ret, nil
+}
+
+func (tdps *TabDaftarPesertaServices) ResetPasswordPeserta(token string, newPassword string, email string, authuserid string) (models.ResponseStatus, error) {
+	var ret models.ResponseStatus
+
+	uri := "https://" + config.Data.Get("servername") + "/one-api/mockup/system/menu/reset_password_pat"
+
+	params := url.Values{}
+	params.Add("new", newPassword)
+	params.Add("email", email)
+	params.Add("authuserid", authuserid)
+	params.Add("token", token)
+
+	req, err := http.PostForm(uri, params)
+	if err != nil {
+		ret = models.ResponseStatus{
+			Status:  "ERR",
+			Message: "error request change password",
+		}
+		return ret, err
+	}
+	defer req.Body.Close()
+
+	resp, err := io.ReadAll(req.Body)
+	if err != nil {
+		ret = models.ResponseStatus{
+			Status:  "ERR",
+			Message: "error read response",
+		}
+		return ret, err
+	}
+
+	err = json.Unmarshal(resp, &ret)
+	if err != nil {
+		ret = models.ResponseStatus{
+			Status:  "ERR",
+			Message: "error unmarshal response",
+		}
+		return ret, err
+	}

 	return ret, nil
 }
--- a/services/corporate/mcudetail/tabkelainanfisik.services.go
+++ b/services/corporate/mcudetail/tabkelainanfisik.services.go
@@ -4,6 +4,7 @@ import (
 	"cpone/db"
 	"cpone/models"
 	dbx "cpone/package/database"
+	"cpone/utils"
 	"fmt"
 	"math"
 	"strconv"
@@ -103,18 +104,22 @@ func (tkf *TabKelainanFisikServices) GetBarChartConf(title string, data models.B
 	option := models.Barchart{}
 	option.Title = struct {
 		Text string "json:\"text\""
-	}{title}
+		Left string `json:"left"`
+	}{
+		Text: title,
+		Left: "center",
+	}
 	option.Dataset = data
 	option.Grid.ContainLabel = true
-	option.XAxis.Name = "amount"
+	option.XAxis.Name = "person"
 	option.YAxis.Type = "category"
 	option.VisualMap.Orient = "horizontal"
 	option.VisualMap.Left = "center"
-	option.VisualMap.Min = 10
-	option.VisualMap.Max = 100
+	option.VisualMap.Min = 0
+	option.VisualMap.Max = 10
 	option.VisualMap.Show = false
 	option.VisualMap.Dimension = 0
-	option.VisualMap.InRange.Color = []string{"#42aaf5", "#00eaf2", "#035bff"}
+	option.VisualMap.InRange.Color = []string{"#035bff", "#42aaf5", "#00eaf2"}
 	option.Series = []struct {
 		Label struct {
 			Position  string "json:\"position\""
@@ -237,8 +242,9 @@ func (tkf *TabKelainanFisikServices) GetKelainanFisikPresentase(mcuID string) (m
 		percentage := float64(d.Total) / float64(jumlahPeserta.Peserta) * 100
 		roundedPercentage := math.Round(percentage*100) / 100
 		percentStr := strconv.FormatFloat(roundedPercentage, 'f', -1, 64)
+		newText := utils.SplitStrings(d.Mcu_KelainanName, 2)
 		chartData.Source = append(chartData.Source, []interface{}{
-			i, d.Total, d.Mcu_KelainanName, percentStr,
+			i, d.Total, newText, percentStr,
 		})
 	}

@@ -558,3 +564,26 @@ func (tkf *TabKelainanFisikServices) GetKelFisikOlahraga(mcuID string) (models.P

 	return option, nil
 }
+
+func (tkf *TabKelainanFisikServices) GetChartRenderFisik(mcuID string) ([]models.McuTabModels, error) {
+	var ret []models.McuTabModels
+
+	q := `
+	SELECT
+	Mcu_ImageGrafikGroupResult,
+	Mcu_ImageGrafikGroupMenu,
+	Mcu_ImageGrafikName,
+	Mcu_ImageGrafikJsonRender
+	FROM mgm_mcugrafik
+	JOIN mcu_image_grafik ON Mcu_ImageGrafikID = Mgm_McuGrafikMcu_ImageGrafikID
+	WHERE Mgm_McuGrafikMgm_McuID = ?
+	AND Mcu_ImageGrafikGroupResult = "FISIK"
+	AND Mgm_McuGrafikIsActive = 'Y'
+	ORDER BY Mcu_ImageGrafikID
+	`
+	if err := dbx.Handlex.Select(&ret, q, mcuID); err != nil {
+		return ret, fmt.Errorf("error get data tab peserta: %v", err)
+	}
+
+	return ret, nil
+}
--- a/services/corporate/mcudetail/tabkelainanglobal.services.go
+++ b/services/corporate/mcudetail/tabkelainanglobal.services.go
@@ -4,6 +4,7 @@ import (
 	"cpone/db"
 	"cpone/models"
 	dbx "cpone/package/database"
+	"cpone/utils"
 	"fmt"
 	"math"
 	"strconv"
@@ -30,18 +31,22 @@ func (tkg *TabKelainanGlobalServices) GetBarChartConf(title string, data models.
 	option := models.Barchart{}
 	option.Title = struct {
 		Text string "json:\"text\""
-	}{title}
+		Left string `json:"left"`
+	}{
+		Text: title,
+		Left: "center",
+	}
 	option.Dataset = data
 	option.Grid.ContainLabel = true
-	option.XAxis.Name = "amount"
+	option.XAxis.Name = "person"
 	option.YAxis.Type = "category"
 	option.VisualMap.Orient = "horizontal"
 	option.VisualMap.Left = "center"
-	option.VisualMap.Min = 10
-	option.VisualMap.Max = 100
+	option.VisualMap.Min = 0
+	option.VisualMap.Max = 10
 	option.VisualMap.Show = false
 	option.VisualMap.Dimension = 0
-	option.VisualMap.InRange.Color = []string{"#42aaf5", "#00eaf2", "#035bff"}
+	option.VisualMap.InRange.Color = []string{"#035bff", "#42aaf5", "#00eaf2"}
 	option.Series = []struct {
 		Label struct {
 			Position  string "json:\"position\""
@@ -154,12 +159,12 @@ func (tkg *TabKelainanGlobalServices) GetKelainanGlobalMCU(mcuID string) (models
 		}
 	}

-	for _, d := range data {
+	for i, 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,
+			i, d.Total, d.Test, percentStr,
 		})
 	}

@@ -302,12 +307,13 @@ func (tkg *TabKelainanGlobalServices) GetKelainanGlobalV2(mcuID string) (models.
 		},
 	}

-	for _, d := range data {
+	for i, d := range data {
 		percentage := float64(d.Total) / float64(jumlahPeserta.Peserta) * 100
 		roundedPercentage := math.Round(percentage*100) / 100
 		percentStr := strconv.FormatFloat(roundedPercentage, 'f', -1, 64)
+		newText := utils.SplitStrings(d.Test, 2)
 		chartData.Source = append(chartData.Source, []interface{}{
-			d.Mcu_KelainanID, d.Total, d.Test, percentStr,
+			i, d.Total, newText, percentStr,
 		})
 	}

@@ -318,3 +324,26 @@ func (tkg *TabKelainanGlobalServices) GetKelainanGlobalV2(mcuID string) (models.

 	return option, nil
 }
+
+func (tkg *TabKelainanGlobalServices) GetChartRenderGlobal(mcuID string) ([]models.McuTabModels, error) {
+	var ret []models.McuTabModels
+
+	q := `
+	SELECT
+	Mcu_ImageGrafikGroupResult,
+	Mcu_ImageGrafikGroupMenu,
+	Mcu_ImageGrafikName,
+	Mcu_ImageGrafikJsonRender
+	FROM mgm_mcugrafik
+	JOIN mcu_image_grafik ON Mcu_ImageGrafikID = Mgm_McuGrafikMcu_ImageGrafikID
+	WHERE Mgm_McuGrafikMgm_McuID = ?
+	AND Mcu_ImageGrafikGroupMenu = "GLOBAL"
+	AND Mgm_McuGrafikIsActive = 'Y'
+	ORDER BY Mcu_ImageGrafikID
+	`
+	if err := dbx.Handlex.Select(&ret, q, mcuID); err != nil {
+		return ret, fmt.Errorf("error get data tab peserta: %v", err)
+	}
+
+	return ret, nil
+}
--- a/services/corporate/mcudetail/tabkelainanlab.services.go
+++ b/services/corporate/mcudetail/tabkelainanlab.services.go
@@ -4,6 +4,7 @@ import (
 	"cpone/db"
 	"cpone/models"
 	dbx "cpone/package/database"
+	"cpone/utils"
 	"fmt"
 	"math"
 	"strconv"
@@ -30,18 +31,22 @@ func (tkl *TabKelainanLabServices) ConfBarchart(title string, data models.BarDat
 	option := models.Barchart{}
 	option.Title = struct {
 		Text string "json:\"text\""
-	}{title}
+		Left string `json:"left"`
+	}{
+		Text: title,
+		Left: "center",
+	}
 	option.Dataset = data
 	option.Grid.ContainLabel = true
-	option.XAxis.Name = "amount"
+	option.XAxis.Name = "person"
 	option.YAxis.Type = "category"
 	option.VisualMap.Orient = "horizontal"
 	option.VisualMap.Left = "center"
-	option.VisualMap.Min = 1
-	option.VisualMap.Max = 100
+	option.VisualMap.Min = 0
+	option.VisualMap.Max = 10
 	option.VisualMap.Show = false
 	option.VisualMap.Dimension = 0
-	option.VisualMap.InRange.Color = []string{"#42aaf5", "#00eaf2", "#035bff"}
+	option.VisualMap.InRange.Color = []string{"#035bff", "#42aaf5", "#00eaf2"}
 	option.Series = []struct {
 		Label struct {
 			Position  string "json:\"position\""
@@ -128,15 +133,20 @@ func (tkl *TabKelainanLabServices) ConfBarchartVertical(title string, data []mod

 	cnt := len(data)
 	for idx, d := range data {
+		newText := utils.SplitStrings(d.Mcu_KelainanName, 2)
 		chartData.Source = append(chartData.Source, []interface{}{
-			idx, d.Total, d.Mcu_KelainanName,
+			idx, d.Total, newText,
 		})
 	}

 	option := models.BarchartV2{
 		Title: struct {
 			Text string "json:\"text\""
-		}{title},
+			Left string `json:"left"`
+		}{
+			Text: title,
+			Left: "center",
+		},
 		Dataset: struct {
 			Source [][]interface{} "json:\"source\""
 		}{chartData.Source},
@@ -158,7 +168,7 @@ func (tkl *TabKelainanLabServices) ConfBarchartVertical(title string, data []mod
 				Rotate   int "json:\"rotate\""
 			}{
 				Interval: 0,
-				Rotate:   20,
+				Rotate:   0,
 			},
 		},
 		YAxis: struct {
@@ -198,7 +208,7 @@ func (tkl *TabKelainanLabServices) ConfBarchartVertical(title string, data []mod
 			InRange: struct {
 				Color []string "json:\"color\""
 			}{
-				Color: []string{"#42aaf5", "#00eaf2", "#035bff"},
+				Color: []string{"#035bff", "#42aaf5", "#00eaf2"},
 			},
 		},
 		Series: []struct {
@@ -324,12 +334,13 @@ func (tkl *TabKelainanLabServices) GetDataPresentaseKelainanLab(mcuID string) (m
 		return option, fmt.Errorf("error get jumlah peserta %v", err)
 	}

-	for _, d := range data {
+	for i, d := range data {
 		percentage := float64(d.Total) / float64(jumlahPeserta.Peserta) * 100
 		roundedPercentage := math.Round(percentage*100) / 100
 		percentStr := strconv.FormatFloat(roundedPercentage, 'f', -1, 64)
+		newText := utils.SplitStrings(d.Mcu_KelainanName, 2)
 		chartData.Source = append(chartData.Source, []interface{}{
-			d.Mcu_KelainanID, d.Total, d.Mcu_KelainanName, percentStr,
+			i, d.Total, newText, percentStr,
 		})
 	}

@@ -514,3 +525,26 @@ func (tkl *TabKelainanLabServices) GetPeningkatanGlukosa(mcuID string) (models.B

 	return option, nil
 }
+
+func (tkl *TabKelainanLabServices) GetChartRenderLab(mcuID string) ([]models.McuTabModels, error) {
+	var ret []models.McuTabModels
+
+	q := `
+	SELECT
+	Mcu_ImageGrafikGroupResult,
+	Mcu_ImageGrafikGroupMenu,
+	Mcu_ImageGrafikName,
+	Mcu_ImageGrafikJsonRender
+	FROM mgm_mcugrafik
+	JOIN mcu_image_grafik ON Mcu_ImageGrafikID = Mgm_McuGrafikMcu_ImageGrafikID
+	WHERE Mgm_McuGrafikMgm_McuID = ?
+	AND Mcu_ImageGrafikGroupResult = "LAB"
+	AND Mgm_McuGrafikIsActive = 'Y'
+	ORDER BY Mcu_ImageGrafikID
+	`
+	if err := dbx.Handlex.Select(&ret, q, mcuID); err != nil {
+		return ret, fmt.Errorf("error get data tab peserta: %v", err)
+	}
+
+	return ret, nil
+}
--- a/services/corporate/mcudetail/tabkelainannonlab.services.go
+++ b/services/corporate/mcudetail/tabkelainannonlab.services.go
@@ -4,6 +4,7 @@ import (
 	"cpone/db"
 	"cpone/models"
 	dbx "cpone/package/database"
+	"cpone/utils"
 	"fmt"
 	"math"
 	"strconv"
@@ -30,18 +31,22 @@ func (tknl *TabKelainanNonLabServices) GetBarChartConf(title string, data models
 	option := models.Barchart{}
 	option.Title = struct {
 		Text string "json:\"text\""
-	}{title}
+		Left string `json:"left"`
+	}{
+		Text: title,
+		Left: "center",
+	}
 	option.Dataset = data
 	option.Grid.ContainLabel = true
-	option.XAxis.Name = "amount"
+	option.XAxis.Name = "person"
 	option.YAxis.Type = "category"
 	option.VisualMap.Orient = "horizontal"
 	option.VisualMap.Left = "center"
-	option.VisualMap.Min = 1
-	option.VisualMap.Max = 100
+	option.VisualMap.Min = 0
+	option.VisualMap.Max = 4
 	option.VisualMap.Show = false
 	option.VisualMap.Dimension = 0
-	option.VisualMap.InRange.Color = []string{"#42aaf5", "#00eaf2", "#035bff"}
+	option.VisualMap.InRange.Color = []string{"#035bff", "#42aaf5", "#00eaf2"}
 	option.Series = []struct {
 		Label struct {
 			Position  string "json:\"position\""
@@ -128,22 +133,27 @@ func (tknl *TabKelainanNonLabServices) ConfBarchartVertical(title string, data [

 	cnt := len(data)
 	for idx, d := range data {
-		if len(d.Test) > 30 {
-			var newText = d.Test[:30] + "-  \n" + d.Test[30:]
-			chartData.Source = append(chartData.Source, []interface{}{
-				idx, d.Total, newText,
-			})
-			continue
-		}
+		// if len(d.Test) > 30 {
+		// 	var newText = d.Test[:30] + "-  \n" + d.Test[30:]
+		// 	chartData.Source = append(chartData.Source, []interface{}{
+		// 		idx, d.Total, newText,
+		// 	})
+		// 	continue
+		// }
+		newText := utils.SplitStrings(d.Test, 2)
 		chartData.Source = append(chartData.Source, []interface{}{
-			idx, d.Total, d.Test,
+			idx, d.Total, newText,
 		})
 	}

 	option := models.BarchartV2{
 		Title: struct {
 			Text string "json:\"text\""
-		}{title},
+			Left string `json:"left"`
+		}{
+			Text: title,
+			Left: "center",
+		},
 		Dataset: struct {
 			Source [][]interface{} "json:\"source\""
 		}{chartData.Source},
@@ -165,7 +175,7 @@ func (tknl *TabKelainanNonLabServices) ConfBarchartVertical(title string, data [
 				Rotate   int "json:\"rotate\""
 			}{
 				Interval: 0,
-				Rotate:   20,
+				Rotate:   0,
 			},
 		},
 		YAxis: struct {
@@ -205,7 +215,7 @@ func (tknl *TabKelainanNonLabServices) ConfBarchartVertical(title string, data [
 			InRange: struct {
 				Color []string "json:\"color\""
 			}{
-				Color: []string{"#42aaf5", "#00eaf2", "#035bff"},
+				Color: []string{"#035bff", "#42aaf5", "#00eaf2"},
 			},
 		},
 		Series: []struct {
@@ -331,12 +341,13 @@ func (tknl *TabKelainanNonLabServices) GetDataKelNonLab(mcuID string) (models.Ba
 		return option, fmt.Errorf("error get jumlah peserta %v", err)
 	}

-	for _, d := range data {
+	for i, d := range data {
 		percentage := float64(d.Total) / float64(jumlahPeserta.Peserta) * 100
 		roundedPercentage := math.Round(percentage*100) / 100
 		percentStr := strconv.FormatFloat(roundedPercentage, 'f', -1, 64)
+		newText := utils.SplitStrings(d.Test, 2)
 		chartData.Source = append(chartData.Source, []interface{}{
-			d.Mcu_KelainanID, d.Total, d.Test, percentStr,
+			i, d.Total, newText, percentStr,
 		})
 	}

@@ -480,3 +491,26 @@ func (tknl *TabKelainanNonLabServices) GetPendengaran(mcuID string) (models.Barc

 	return option, nil
 }
+
+func (tknl *TabKelainanNonLabServices) GetChartRenderNonLab(mcuID string) ([]models.McuTabModels, error) {
+	var ret []models.McuTabModels
+
+	q := `
+	SELECT
+	Mcu_ImageGrafikGroupResult,
+	Mcu_ImageGrafikGroupMenu,
+	Mcu_ImageGrafikName,
+	Mcu_ImageGrafikJsonRender
+	FROM mgm_mcugrafik
+	JOIN mcu_image_grafik ON Mcu_ImageGrafikID = Mgm_McuGrafikMcu_ImageGrafikID
+	WHERE Mgm_McuGrafikMgm_McuID = ?
+	AND Mcu_ImageGrafikGroupResult = "NONLAB"
+	AND Mgm_McuGrafikIsActive = 'Y'
+	ORDER BY Mcu_ImageGrafikID
+	`
+	if err := dbx.Handlex.Select(&ret, q, mcuID); err != nil {
+		return ret, fmt.Errorf("error get data tab peserta: %v", err)
+	}
+
+	return ret, nil
+}
--- a/services/corporate/mcudetail/tabkepesertaan.services.go
+++ b/services/corporate/mcudetail/tabkepesertaan.services.go
@@ -242,3 +242,26 @@ func (tkp *TabKepersertaanServices) GetKepesertaanByUmur(mcuID string) (models.P

 	return option, nil
 }
+
+func (tkp *TabKepersertaanServices) GetChartRenderPeserta(mcuID string) ([]models.McuTabModels, error) {
+	var ret []models.McuTabModels
+
+	q := `
+	SELECT
+	Mcu_ImageGrafikGroupResult,
+	Mcu_ImageGrafikGroupMenu,
+	Mcu_ImageGrafikName,
+	Mcu_ImageGrafikJsonRender
+	FROM mgm_mcugrafik
+	JOIN mcu_image_grafik ON Mcu_ImageGrafikID = Mgm_McuGrafikMcu_ImageGrafikID
+	WHERE Mgm_McuGrafikMgm_McuID = ?
+	AND Mcu_ImageGrafikGroupMenu = "PESERTA"
+	AND Mgm_McuGrafikIsActive = 'Y'
+	ORDER BY Mcu_ImageGrafikID
+	`
+	if err := dbx.Handlex.Select(&ret, q, mcuID); err != nil {
+		return ret, fmt.Errorf("error get data tab peserta: %v", err)
+	}
+
+	return ret, nil
+}
--- a/utils/chartcolor.utils.go
+++ b/utils/chartcolor.utils.go
@@ -1,28 +0,0 @@
-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/splitStrings.utils.go
+++ b/utils/splitStrings.utils.go
@@ -0,0 +1,20 @@
+package utils
+
+import (
+	"strings"
+)
+
+func SplitStrings(text string, count int) string {
+	words := strings.Split(text, " ")
+	var result strings.Builder
+
+	for i := 0; i < len(words); i += count {
+		if i+count < len(words) {
+			result.WriteString(strings.Join(words[i:i+count], " ") + "\n")
+		} else {
+			result.WriteString(strings.Join(words[i:], " "))
+		}
+	}
+
+	return result.String()
+}
--- a/views/corporate/dashboardpic/filterdashboardpic.templ
+++ b/views/corporate/dashboardpic/filterdashboardpic.templ
@@ -11,7 +11,7 @@ templ FilterListing(
 ) {
    <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>
+            <label class="text-black font-weight-bolder">Start Date:</label>
        </div>
        <div class="col-12 col-sm-9 col-md-2 col-lg-2 col-xl-2 mb-2">
            <input 
--- a/views/corporate/dashboardpic/filterdashboardpic_templ.go
+++ b/views/corporate/dashboardpic/filterdashboardpic_templ.go
@@ -31,7 +31,7 @@ func FilterListing(
 			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\">")
+		_, 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\">Start 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
 		}
--- a/views/corporate/mcu/mcutab.templ
+++ b/views/corporate/mcu/mcutab.templ
@@ -0,0 +1,158 @@
+package corporate_mcudetail
+
+import "cpone/models"
+import "strconv"
+
+templ McuDetailTabView(
+    McuID string,
+    McuTab []models.McuTabModels,
+) {
+    <div>
+        <ul class="nav nav-tabs nav-tabs-line">
+            for i, d := range McuTab {
+                if i == 0 {
+                    <li class="nav-item">
+                        <a 
+                            class="nav-link active" 
+                            data-toggle="tab" 
+                            href={templ.URL("#mcu_tab_" + strconv.Itoa(i))}
+                        >{ d.TabName }</a>
+                    </li>
+                } else {
+                    <li class="nav-item">
+                        <a 
+                            class="nav-link" 
+                            data-toggle="tab" 
+                            href={templ.URL("#mcu_tab_" + strconv.Itoa(i))}
+                        >{ d.TabName }</a>
+                    </li>
+                }
+            }
+            <li class="nav-item">
+                <a
+                    if len(McuTab) == 0 {
+                        class="nav-link active"
+                    } else {
+                        class="nav-link"
+                    }
+                    data-toggle="tab"
+                    href={templ.URL("#mcu_tab_" + strconv.Itoa(len(McuTab) + 1))}
+                >Kesimpulan</a>
+            </li>
+            <li class="nav-item">
+                <a
+                    class="nav-link"
+                    data-toggle="tab"
+                    href={templ.URL("#mcu_tab_" + strconv.Itoa(len(McuTab) + 2))}
+                >Daftar Peserta</a>
+            </li>
+            <li class="nav-item">
+                <a
+                    class="nav-link"
+                    data-toggle="tab"
+                    href={templ.URL("#mcu_tab_" + strconv.Itoa(len(McuTab) + 3))}
+                >Executive Summary</a>
+            </li>
+            <li class="nav-item">
+                <a
+                    class="nav-link"
+                    data-toggle="tab"
+                    href={templ.URL("#mcu_tab_" + strconv.Itoa(len(McuTab) + 4))}
+                >Keuangan</a>
+            </li>
+        </ul>
+    </div>
+    <div class="tab-content mt-5" id="mcutabcontent">
+        for i, d := range McuTab {
+            if i == 0 {
+                <div 
+                    class="tab-pane fade show active" role="tabpanel"
+                    id={"mcu_tab_" + strconv.Itoa(i)}
+                    aria-labelledby={"mcu_tab_" + strconv.Itoa(i)}
+                    hx-get={"/corp/dashboard_pic/detail/" + McuID +"/" + d.TabID}
+                    hx-target={"#" + d.TabID}
+                    hx-trigger="load"
+                    hx-indicator={"." + d.TabID + d.Mcu_ImageGrafikGroupMenu}
+                >
+                    <div id={d.TabID}></div>
+                    <div style="display: flex; justify-content: center; align-items: center;">
+                        <span class={"htmx-indicator spinner-border spinner-border-lg " + d.TabID + d.Mcu_ImageGrafikGroupMenu} role="status" aria-hidden="true"></span>
+                    </div>
+                </div>
+            } else {
+                <div 
+                    class="tab-pane fade" role="tabpanel"
+                    id={"mcu_tab_" + strconv.Itoa(i)}
+                    aria-labelledby={"mcu_tab_" + strconv.Itoa(i)}
+                    hx-get={"/corp/dashboard_pic/detail/" + McuID +"/" + d.TabID}
+                    hx-target={"#" + d.TabID}
+                    hx-trigger="load"
+                    hx-indicator={"." + d.TabID + d.Mcu_ImageGrafikGroupMenu}
+                >
+                    <div id={d.TabID}></div>
+                    <div style="display: flex; justify-content: center; align-items: center;">
+                        <span class={"htmx-indicator spinner-border spinner-border-lg " + d.TabID + d.Mcu_ImageGrafikGroupMenu} role="status" aria-hidden="true"></span>
+                    </div>
+                </div>
+            }
+        }
+        <div 
+            if len(McuTab) == 0 { 
+                class="tab-pane fade show active" 
+            } else {
+                class="tab-pane fade"
+            }
+            role="tabpanel"
+            id={"mcu_tab_" + strconv.Itoa(len(McuTab) + 1)}
+            aria-labelledby={"mcu_tab_" + strconv.Itoa(len(McuTab) + 1)}
+            hx-get={"/corp/dashboard_pic/detail/" + McuID +"/tabkesimpulan"}
+            hx-target="#tabkesimpulan"
+            hx-trigger="load"
+            hx-indicator=".kesimpulanloading"
+        >
+            <div id="tabkesimpulan"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg kesimpulanloading" role="status" aria-hidden="true"></span>
+			</div>
+        </div>
+        <div 
+            class="tab-pane fade" role="tabpanel"
+            id={"mcu_tab_" + strconv.Itoa(len(McuTab) + 2)}
+            aria-labelledby={"mcu_tab_" + strconv.Itoa(len(McuTab) + 2)}
+            hx-get={"/corp/dashboard_pic/detail/" + McuID +"/tabdaftarpeserta"}
+            hx-target="#tabdaftarpeserta"
+            hx-trigger="load"
+            hx-indicator=".tabdaftarpesertaload"
+        >
+            <div id="tabdaftarpeserta"></div>
+            <div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg tabdaftarpesertaload" role="status" aria-hidden="true"></span>
+			</div>
+        </div>
+        <div 
+            class="tab-pane fade" role="tabpanel"
+            id={"mcu_tab_" + strconv.Itoa(len(McuTab) + 3)}
+            aria-labelledby={"mcu_tab_" + strconv.Itoa(len(McuTab) + 3)}
+            style="height: 700px;"
+        >
+            <object 
+                data={"/birt/run?__report=report/one/mcu/rpt_executive_summary_mcu_001.rptdesign&__format=pdf&PID="+McuID+"&username=admin&tm=1722914077866"} 
+                type="application/pdf" width="100%" height="100%"
+            ></object>
+        </div>
+        <div 
+            class="tab-pane fade" role="tabpanel"
+            id={"mcu_tab_" + strconv.Itoa(len(McuTab) + 4)}
+            aria-labelledby={"mcu_tab_" + strconv.Itoa(len(McuTab) + 4)}
+            hx-get={"/corp/dashboard_pic/detail/" + McuID +"/tabkeuangan"}
+            hx-target="#tabkeuangan"
+            hx-trigger="load"
+            hx-indicator=".uangloading"
+        >
+            <div id="tabkeuangan"></div>
+            <div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg uangloading" role="status" aria-hidden="true"></span>
+			</div>
+        </div>
+    </div>
+}
--- a/views/corporate/mcu/mcutab/modalgeneratepass.templ
+++ b/views/corporate/mcu/mcutab/modalgeneratepass.templ
@@ -104,14 +104,14 @@ templ ModalViewAkunBody(
    IDComponent string,
    akunID models.CustomTextFieldv2Prm,
    akunEmail models.CustomTextFieldv2Prm,
-    akunPass models.CustomTextFieldv2Prm,
-    akunPassCek models.CustomTextFieldv2Prm,
+    newPass models.CustomTextFieldv2Prm,
+    newPassCek models.CustomTextFieldv2Prm,
    hxOnLoad templ.ComponentScript,
 ) {
    <div id={ IDComponent } hx-on::load={ hxOnLoad }>
        @customtextfield.CustomTextFieldv2(akunID)
        @customtextfield.CustomTextFieldv2(akunEmail)
-        @customtextfield.CustomTextFieldv2(akunPass)
-        @customtextfield.CustomTextFieldv2(akunPassCek)
+        @customtextfield.CustomTextFieldv2(newPass)
+        @customtextfield.CustomTextFieldv2(newPassCek)
    </div>
 }
--- a/views/corporate/mcu/mcutab/modalgeneratepass_templ.go
+++ b/views/corporate/mcu/mcutab/modalgeneratepass_templ.go
@@ -325,8 +325,8 @@ func ModalViewAkunBody(
 	IDComponent string,
 	akunID models.CustomTextFieldv2Prm,
 	akunEmail models.CustomTextFieldv2Prm,
-	akunPass models.CustomTextFieldv2Prm,
-	akunPassCek models.CustomTextFieldv2Prm,
+	newPass models.CustomTextFieldv2Prm,
+	newPassCek models.CustomTextFieldv2Prm,
 	hxOnLoad templ.ComponentScript,
 ) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
@@ -379,11 +379,11 @@ func ModalViewAkunBody(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(akunPass).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(newPass).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(akunPassCek).Render(ctx, templ_7745c5c3_Buffer)
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(newPassCek).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/corporate/mcu/mcutab/tabdaftarpeserta.templ
+++ b/views/corporate/mcu/mcutab/tabdaftarpeserta.templ
@@ -13,10 +13,13 @@ templ TabDaftarPesertaScreen(
    dialogGenPassBodyID string,
    dialogAkunID string,
    dialogAkunBodyID string,
+    dialogDetailID string,
+    dialogDetailBodyID string,
    content templ.Component,
    dialogReport templ.Component,
    dialogGenPass templ.Component,
    dialogViewAkun templ.Component,
+    dialogDetail templ.Component,
 ) {
    <div class="container-fluid">
        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "tableID",
@@ -51,6 +54,14 @@ templ TabDaftarPesertaScreen(
            Name: "dialogAkunBodyID",
            Type: "hidden",
            Value: dialogAkunBodyID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDetailID",
+            Name: "dialogDetailID",
+            Type: "hidden",
+            Value: dialogDetailID})
+        @customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDetailBodyID",
+            Name: "dialogDetailBodyID",
+            Type: "hidden",
+            Value: dialogDetailBodyID})
        <div class="row align-items-center justify-content-center py-10">
            <div class="col-md-2 col-sm-12 p-0">               
            </div>
@@ -75,6 +86,7 @@ templ TabDaftarPesertaScreen(
            @dialogReport
            @dialogGenPass
            @dialogViewAkun
+            @dialogDetail
            <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>
--- a/views/corporate/mcu/mcutab/tabdaftarpeserta_templ.go
+++ b/views/corporate/mcu/mcutab/tabdaftarpeserta_templ.go
@@ -23,10 +23,13 @@ func TabDaftarPesertaScreen(
 	dialogGenPassBodyID string,
 	dialogAkunID string,
 	dialogAkunBodyID string,
+	dialogDetailID string,
+	dialogDetailBodyID string,
 	content templ.Component,
 	dialogReport templ.Component,
 	dialogGenPass templ.Component,
 	dialogViewAkun templ.Component,
+	dialogDetail 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)
@@ -100,6 +103,20 @@ func TabDaftarPesertaScreen(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDetailID",
+			Name:  "dialogDetailID",
+			Type:  "hidden",
+			Value: dialogDetailID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = customtextfield.CustomTextFieldv2(models.CustomTextFieldv2Prm{ID: "dialogDetailBodyID",
+			Name:  "dialogDetailBodyID",
+			Type:  "hidden",
+			Value: dialogDetailBodyID}).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row align-items-center justify-content-center py-10\"><div class=\"col-md-2 col-sm-12 p-0\"></div><div class=\"col-md-8 col-sm-12 p-0\"><h2 class=\"title text-black\" style=\"margin-bottom: 0; text-align: center;\">Daftar Peserta</h2></div><div class=\"col-md-2 d-none d-lg-block d-xl-block d-md-block d-sm-none\"><div class=\"d-flex justify-content-end\"><button type=\"button\" class=\"btn btn-primary\" data-toggle=\"modal\" data-target=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -107,7 +124,7 @@ func TabDaftarPesertaScreen(
 		var templ_7745c5c3_Var2 string
 		templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs("#" + dialogGenPassID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabdaftarpeserta.templ`, Line: 66, Col: 58}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabdaftarpeserta.templ`, Line: 77, Col: 58}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2))
 		if templ_7745c5c3_Err != nil {
@@ -133,6 +150,10 @@ func TabDaftarPesertaScreen(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
+		templ_7745c5c3_Err = dialogDetail.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
--- a/views/corporate/mcu/mcutab/tabkelainanfisik.templ
+++ b/views/corporate/mcu/mcutab/tabkelainanfisik.templ
@@ -4,19 +4,15 @@ templ Tabkelainanfisik(
    chartsxs []templ.Component,
    chartsmd []templ.Component,
    chartslg []templ.Component,
-    barchart []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>
+            <h2 class="title text-black" style="margin-bottom: 0;">Data Kelainan Fisik</h2>
        </div>

        // xs
        <div class="d-xs-block d-sm-block d-md-none">
            <div class="row justify-content-center">
-                <div class="col-12 my-4">
-                    @ChartCard(barchart[2])
-                </div>
                for _, c := range chartsxs {
                    <div class="col-12 my-4">
                        @ChartCard(c)
@@ -28,9 +24,6 @@ templ Tabkelainanfisik(
        // md
        <div class="d-none d-md-block d-lg-none">
            <div class="row justify-content-center">
-                <div class="col-12 my-4">
-                    @ChartCard(barchart[1])
-                </div>
                for _, c := range chartsmd {
                    <div class="col-12 my-4">
                        @ChartCard(c)
@@ -42,11 +35,8 @@ templ Tabkelainanfisik(
        // lg
        <div class="d-none d-lg-block">
            <div class="row justify-content-center">
-                <div class="col-12 my-4">
-                    @ChartCard(barchart[0])
-                </div>
                for _, c := range chartslg {
-                    <div class="col-6 my-4">
+                    <div class="m-4" style="width: 47%;">
                        @ChartCard(c)
                    </div>
                }
--- a/views/corporate/mcu/mcutab/tabkelainanfisik_templ.go
+++ b/views/corporate/mcu/mcutab/tabkelainanfisik_templ.go
@@ -14,7 +14,6 @@ func Tabkelainanfisik(
 	chartsxs []templ.Component,
 	chartsmd []templ.Component,
 	chartslg []templ.Component,
-	barchart []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)
@@ -28,15 +27,7 @@ func Tabkelainanfisik(
 			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\"><div class=\"col-12 my-4\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = ChartCard(barchart[2]).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"container-fluid\"><div class=\"d-flex justify-content-center py-10\"><h2 class=\"title text-black\" style=\"margin-bottom: 0;\">Data 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
 		}
@@ -54,15 +45,7 @@ func Tabkelainanfisik(
 				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\"><div class=\"col-12 my-4\">")
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		templ_7745c5c3_Err = ChartCard(barchart[1]).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></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
 		}
@@ -80,20 +63,12 @@ func Tabkelainanfisik(
 				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(barchart[0]).Render(ctx, templ_7745c5c3_Buffer)
-		if templ_7745c5c3_Err != nil {
-			return templ_7745c5c3_Err
-		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div></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\">")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"m-4\" style=\"width: 47%;\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
--- a/views/corporate/mcu/mcutab/tabkelainanglobal.templ
+++ b/views/corporate/mcu/mcutab/tabkelainanglobal.templ
@@ -36,7 +36,7 @@ templ TabKelainanGlobal(
        <div class="d-none d-lg-block">
            <div class="row justify-content-center">
                for _, c := range chartslg {
-                    <div class="col-12 my-4">
+                    <div class="m-4" style="width: 100%;">
                        @ChartCard(c)
                    </div>
                }
--- a/views/corporate/mcu/mcutab/tabkelainanglobal_templ.go
+++ b/views/corporate/mcu/mcutab/tabkelainanglobal_templ.go
@@ -68,7 +68,7 @@ func TabKelainanGlobal(
 			return templ_7745c5c3_Err
 		}
 		for _, c := range chartslg {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-12 my-4\">")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"m-4\" style=\"width: 100%;\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
--- a/views/corporate/mcu/mcutab/tabkelainanlab.templ
+++ b/views/corporate/mcu/mcutab/tabkelainanlab.templ
@@ -35,16 +35,19 @@ templ TabKelainanLab(
        // lg
        <div class="d-none d-lg-block">
            <div class="row justify-content-center">
-                for i, c := range chartslg {
-                    if i == 0 {
-                        <div class="col-12 my-4">
-                            @ChartCard(c)
-                        </div>
-                    } else {
-                        <div class="col-6 my-4">
-                            @ChartCard(c)
-                        </div>
-                    }
+                for _, c := range chartslg {
+                    // if i == 0 {
+                    //     <div class="col-12 my-4">
+                    //         @ChartCard(c)
+                    //     </div>
+                    // } else {
+                    //     <div class="col-6 my-4">
+                    //         @ChartCard(c)
+                    //     </div>
+                    // }
+                    <div class="m-4" style="width: 47%;">
+                        @ChartCard(c)
+                    </div>
                }
            </div>
        </div>
--- a/views/corporate/mcu/mcutab/tabkelainanlab_templ.go
+++ b/views/corporate/mcu/mcutab/tabkelainanlab_templ.go
@@ -67,33 +67,18 @@ func TabKelainanLab(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for i, c := range chartslg {
-			if i == 0 {
-				_, 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
-				}
-			} else {
-				_, 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
-				}
+		for _, c := range chartslg {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("         <div class=\"m-4\" style=\"width: 47%;\">")
+			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>")
--- a/views/corporate/mcu/mcutab/tabkelainannonlab.templ
+++ b/views/corporate/mcu/mcutab/tabkelainannonlab.templ
@@ -35,16 +35,10 @@ templ TabKelainanNonLab(
        // lg
        <div class="d-none d-lg-block">
            <div class="row justify-content-center">
-                for i, c := range chartslg {
-                    if i == 0 {
-                        <div class="col-12 my-4">
-                            @ChartCard(c)
-                        </div>
-                    } else {
-                        <div class="col-6 my-4">
-                            @ChartCard(c)
-                        </div>
-                    }
+                for _, c := range chartslg {
+                    <div class="m-4" style="width: 47%;">
+                        @ChartCard(c)
+                    </div>
                }
            </div>
        </div>
--- a/views/corporate/mcu/mcutab/tabkelainannonlab_templ.go
+++ b/views/corporate/mcu/mcutab/tabkelainannonlab_templ.go
@@ -67,33 +67,18 @@ func TabKelainanNonLab(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		for i, c := range chartslg {
-			if i == 0 {
-				_, 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
-				}
-			} else {
-				_, 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
-				}
+		for _, c := range chartslg {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"m-4\" style=\"width: 47%;\">")
+			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>")
--- a/views/corporate/mcu/mcutab/tabkepesertaan.templ
+++ b/views/corporate/mcu/mcutab/tabkepesertaan.templ
@@ -36,7 +36,7 @@ templ TabKepesertaan(
        <div class="d-none d-lg-block">
            <div class="row justify-content-center">
                for _, c := range chartslg {
-                    <div class="col-6 my-4">
+                    <div class="m-4" style="width: 47%;">
                        @ChartCard(c)
                    </div>
                }
@@ -48,8 +48,8 @@ templ TabKepesertaan(
 templ ChartCard(
    charts templ.Component,
 ) {
-    <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">
+    <div class="card shadow p-4" style="display: flex; justify-content: center; align-items: center; height: 100%; width: 100%;">
+        <div class="d-flex flex-column pt-8" style="width: 100%;">
            @charts
        </div>
    </div>
--- a/views/corporate/mcu/mcutab/tabkepesertaan_templ.go
+++ b/views/corporate/mcu/mcutab/tabkepesertaan_templ.go
@@ -68,7 +68,7 @@ func TabKepesertaan(
 			return templ_7745c5c3_Err
 		}
 		for _, c := range chartslg {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"col-6 my-4\">")
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"m-4\" style=\"width: 47%;\">")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -107,7 +107,7 @@ func ChartCard(
 			templ_7745c5c3_Var2 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<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\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"card shadow p-4\" style=\"display: flex; justify-content: center; align-items: center; height: 100%; width: 100%;\"><div class=\"d-flex flex-column pt-8\" style=\"width: 100%;\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/corporate/mcu/mcutab/tabledaftarpeserta.templ
+++ b/views/corporate/mcu/mcutab/tabledaftarpeserta.templ
@@ -2,6 +2,7 @@ package corporate_mcudetail

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


 templ ContentLayout(
@@ -25,6 +26,10 @@ templ TableDaftarPeserta(
    hxTargetAcc string,
    hxIncludeAcc string,
    hxSwapAcc string,
+    hxGetDetail string,
+    hxTargetDetail string,
+    hxIncludeDetail string,
+    hxSwapDetail string,
 ) {
    <div id={ tableID }>
        @tablecomponent.TableV3([]string{"NOMOR LAB", "NAMA", "JENIS KELAMIN", "UMUR", "NAMA PAKET", "AKSI"},
@@ -38,6 +43,10 @@ templ TableDaftarPeserta(
                hxTargetAcc,
                hxIncludeAcc,
                hxSwapAcc,
+                hxGetDetail,
+                hxTargetDetail,
+                hxIncludeDetail,
+                hxSwapDetail,
            ))
    </div>
 }
@@ -52,6 +61,10 @@ templ ItemRow(
    hxTargetAcc string,
    hxIncludeAcc string,
    hxSwapAcc string,
+    hxGetDetail string,
+    hxTargetDetail string,
+    hxIncludeDetail string,
+    hxSwapDetail string,
 ) {
    if len(data) == 0 {
        <tr>
@@ -64,7 +77,7 @@ templ ItemRow(
            <td>{ v.M_PatientName }</td>
            <td>{ v.JenisKelamin }</td>
            <td>{ v.Age }</td>
-            <td>{ v.Nama_Paket }</td>
+            <td>{ v.List_Paket }</td>
            <td>
                @ItemAction(v,
                    hxGetRpt,
@@ -75,6 +88,10 @@ templ ItemRow(
                    hxTargetAcc,
                    hxIncludeAcc,
                    hxSwapAcc,
+                    hxGetDetail,
+                    hxTargetDetail,
+                    hxIncludeDetail,
+                    hxSwapDetail,
                )
            </td>
        </tr>
@@ -91,17 +108,33 @@ templ ItemAction(
    hxTargetAcc string,
    hxIncludeAcc string,
    hxSwapAcc string,
+    hxGetDetail string,
+    hxTargetDetail string,
+    hxIncludeDetail string,
+    hxSwapDetail string,
 ) {
    <div class="row px-5 d-flex justify-content-around">
+        <a
+            type="button"
+            class="btn btn-icon"
+            title="Detail test dan paket"
+            hx-get={ hxGetDetail +"?idx=" + data.T_OrderHeaderID }
+            hx-target={ hxTargetDetail }
+            hx-swap={ hxSwapDetail }
+            hx-include={ hxIncludeDetail }
+        >
+            <i class="flaticon2-list-1"></i>
+        </a>
        <a
            type="button"
            class="btn btn-icon"
            hx-get={ hxGetRpt +"?idx=" + data.T_OrderHeaderID }
            hx-target={ hxTargetRpt }
            hx-swap={ hxSwapRpt }
-            hx-include={ hxIncludeRpt }            
+            hx-include={ hxIncludeRpt }
+            title="Laporan MCU"
        >
-            <i class="flaticon-doc"></i>
+            <i class="flaticon2-file"></i>
        </a>
        if data.AuthPatientEmail != "none" {
            <a 
@@ -111,6 +144,7 @@ templ ItemAction(
                hx-target={ hxTargetAcc }
                hx-swap={ hxSwapAcc }
                hx-include={ hxIncludeAcc }
+                title="Ganti password peserta"
            >
                <i class="flaticon2-edit"></i>
            </a>
@@ -126,10 +160,34 @@ templ ItemAction(
                <i class="flaticon2-edit"></i>
            </a>
        }
-        // <a
-        //     class="btn btn-icon"
-        // >
-        //     <i class="la la-shield icon-xl"></i>
-        // </a>
    </div>
+}
+
+
+templ TableDetailMCU(
+    data []models.TableTestPaket,
+) {
+    <div id="table-detail-mcu" style="max-height: 700px; overflow-y: auto;">
+        @tablecomponent.TableV3([]string{"NOMOR", "NAMA TEST", "NAMA PAKET"},
+            []string{"20%","40%","40%"},
+            DetailRow(data),
+        )
+    </div>
+}
+
+templ DetailRow(
+    data []models.TableTestPaket,
+) {
+    if len(data) == 0 {
+        <tr>
+            <td colspan="3" class="text-center">Data Tidak Ditemukan</td>
+        </tr>
+    }
+    for _, v := range data {
+        <tr>
+            <td>{ strconv.Itoa(v.Nomor) }</td>
+            <td>{ v.NamaTest }</td>
+            <td>{ v.NamaPaket }</td>
+        </tr>
+    }
 }
--- a/views/corporate/mcu/mcutab/tabledaftarpeserta_templ.go
+++ b/views/corporate/mcu/mcutab/tabledaftarpeserta_templ.go
@@ -12,6 +12,7 @@ import "bytes"

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

 func ContentLayout(
 	tablecomponent templ.Component,
@@ -76,6 +77,10 @@ func TableDaftarPeserta(
 	hxTargetAcc string,
 	hxIncludeAcc string,
 	hxSwapAcc string,
+	hxGetDetail string,
+	hxTargetDetail string,
+	hxIncludeDetail string,
+	hxSwapDetail 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)
@@ -96,7 +101,7 @@ func TableDaftarPeserta(
 		var templ_7745c5c3_Var4 string
 		templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(tableID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 29, Col: 21}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 34, Col: 21}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 		if templ_7745c5c3_Err != nil {
@@ -117,6 +122,10 @@ func TableDaftarPeserta(
 				hxTargetAcc,
 				hxIncludeAcc,
 				hxSwapAcc,
+				hxGetDetail,
+				hxTargetDetail,
+				hxIncludeDetail,
+				hxSwapDetail,
 			)).Render(ctx, templ_7745c5c3_Buffer)
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
@@ -142,6 +151,10 @@ func ItemRow(
 	hxTargetAcc string,
 	hxIncludeAcc string,
 	hxSwapAcc string,
+	hxGetDetail string,
+	hxTargetDetail string,
+	hxIncludeDetail string,
+	hxSwapDetail 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)
@@ -169,7 +182,7 @@ func ItemRow(
 			var templ_7745c5c3_Var6 string
 			templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(v.T_OrderHeaderLabNumber)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 63, Col: 42}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 76, Col: 42}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6))
 			if templ_7745c5c3_Err != nil {
@@ -182,7 +195,7 @@ func ItemRow(
 			var templ_7745c5c3_Var7 string
 			templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(v.M_PatientName)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 64, Col: 33}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 77, Col: 33}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 			if templ_7745c5c3_Err != nil {
@@ -195,7 +208,7 @@ func ItemRow(
 			var templ_7745c5c3_Var8 string
 			templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(v.JenisKelamin)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 65, Col: 32}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 78, Col: 32}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 			if templ_7745c5c3_Err != nil {
@@ -208,7 +221,7 @@ func ItemRow(
 			var templ_7745c5c3_Var9 string
 			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(v.Age)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 66, Col: 23}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 79, Col: 23}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 			if templ_7745c5c3_Err != nil {
@@ -219,9 +232,9 @@ func ItemRow(
 				return templ_7745c5c3_Err
 			}
 			var templ_7745c5c3_Var10 string
-			templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(v.Nama_Paket)
+			templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs(v.List_Paket)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 67, Col: 30}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 80, Col: 30}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 			if templ_7745c5c3_Err != nil {
@@ -240,6 +253,10 @@ func ItemRow(
 				hxTargetAcc,
 				hxIncludeAcc,
 				hxSwapAcc,
+				hxGetDetail,
+				hxTargetDetail,
+				hxIncludeDetail,
+				hxSwapDetail,
 			).Render(ctx, templ_7745c5c3_Buffer)
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
@@ -266,6 +283,10 @@ func ItemAction(
 	hxTargetAcc string,
 	hxIncludeAcc string,
 	hxSwapAcc string,
+	hxGetDetail string,
+	hxTargetDetail string,
+	hxIncludeDetail string,
+	hxSwapDetail 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)
@@ -279,14 +300,14 @@ func ItemAction(
 			templ_7745c5c3_Var11 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row px-5 d-flex justify-content-around\"><a type=\"button\" class=\"btn btn-icon\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"row px-5 d-flex justify-content-around\"><a type=\"button\" class=\"btn btn-icon\" title=\"Detail test dan paket\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var12 string
-		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetRpt + "?idx=" + data.T_OrderHeaderID)
+		templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetDetail + "?idx=" + data.T_OrderHeaderID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 99, Col: 61}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 121, Col: 64}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 		if templ_7745c5c3_Err != nil {
@@ -297,9 +318,9 @@ func ItemAction(
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var13 string
-		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetRpt)
+		templ_7745c5c3_Var13, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetDetail)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 100, Col: 35}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 122, Col: 38}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var13))
 		if templ_7745c5c3_Err != nil {
@@ -310,9 +331,9 @@ func ItemAction(
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var14 string
-		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapRpt)
+		templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapDetail)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 101, Col: 31}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 123, Col: 34}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 		if templ_7745c5c3_Err != nil {
@@ -323,15 +344,67 @@ func ItemAction(
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var15 string
-		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeRpt)
+		templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeDetail)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 102, Col: 37}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 124, Col: 40}
 		}
 		_, 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("\"><i class=\"flaticon-doc\"></i></a> ")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><i class=\"flaticon2-list-1\"></i></a> <a type=\"button\" class=\"btn btn-icon\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var16 string
+		templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetRpt + "?idx=" + data.T_OrderHeaderID)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 131, Col: 61}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var17 string
+		templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetRpt)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 132, Col: 35}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var18 string
+		templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapRpt)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 133, Col: 31}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var19 string
+		templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeRpt)
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 134, Col: 37}
+		}
+		_, 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("\" title=\"Laporan MCU\"><i class=\"flaticon2-file\"></i></a> ")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -340,67 +413,10 @@ func ItemAction(
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-			var templ_7745c5c3_Var16 string
-			templ_7745c5c3_Var16, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetAcc + "?patid=" + data.M_PatientID)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 110, Col: 64}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var16))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var17 string
-			templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetAcc)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 111, Col: 39}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var17))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var18 string
-			templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapAcc)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 112, Col: 35}
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var18))
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-			var templ_7745c5c3_Var19 string
-			templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeAcc)
-			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 113, 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("\"><i class=\"flaticon2-edit\"></i></a>")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
-		} else {
-			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btn btn-icon d-none\" hx-get=\"")
-			if templ_7745c5c3_Err != nil {
-				return templ_7745c5c3_Err
-			}
 			var templ_7745c5c3_Var20 string
 			templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetAcc + "?patid=" + data.M_PatientID)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 121, Col: 64}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 143, Col: 64}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var20))
 			if templ_7745c5c3_Err != nil {
@@ -413,7 +429,7 @@ func ItemAction(
 			var templ_7745c5c3_Var21 string
 			templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetAcc)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 122, Col: 39}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 144, Col: 39}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
 			if templ_7745c5c3_Err != nil {
@@ -426,7 +442,7 @@ func ItemAction(
 			var templ_7745c5c3_Var22 string
 			templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapAcc)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 123, Col: 35}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 145, Col: 35}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
 			if templ_7745c5c3_Err != nil {
@@ -439,12 +455,69 @@ func ItemAction(
 			var templ_7745c5c3_Var23 string
 			templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeAcc)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 124, Col: 41}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 146, Col: 41}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" title=\"Ganti password peserta\"><i class=\"flaticon2-edit\"></i></a>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<a type=\"button\" class=\"btn btn-icon d-none\" hx-get=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var24 string
+			templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(hxGetAcc + "?patid=" + data.M_PatientID)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 155, Col: 64}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var25 string
+			templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(hxTargetAcc)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 156, Col: 39}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-swap=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var26 string
+			templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwapAcc)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 157, Col: 35}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-include=\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var27 string
+			templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(hxIncludeAcc)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 158, Col: 41}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"><i class=\"flaticon2-edit\"></i></a>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
@@ -460,3 +533,113 @@ func ItemAction(
 		return templ_7745c5c3_Err
 	})
 }
+
+func TableDetailMCU(
+	data []models.TableTestPaket,
+) 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_Var28 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var28 == nil {
+			templ_7745c5c3_Var28 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div id=\"table-detail-mcu\" style=\"max-height: 700px; overflow-y: auto;\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		templ_7745c5c3_Err = tablecomponent.TableV3([]string{"NOMOR", "NAMA TEST", "NAMA PAKET"},
+			[]string{"20%", "40%", "40%"},
+			DetailRow(data),
+		).Render(ctx, templ_7745c5c3_Buffer)
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div>")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
+
+func DetailRow(
+	data []models.TableTestPaket,
+) 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_Var29 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var29 == nil {
+			templ_7745c5c3_Var29 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		if len(data) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td colspan=\"3\" class=\"text-center\">Data Tidak Ditemukan</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		for _, v := range data {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<tr><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var30 string
+			templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs(strconv.Itoa(v.Nomor))
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 188, Col: 39}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var31 string
+			templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs(v.NamaTest)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 189, Col: 28}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td><td>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			var templ_7745c5c3_Var32 string
+			templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs(v.NamaPaket)
+			if templ_7745c5c3_Err != nil {
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab\tabledaftarpeserta.templ`, Line: 190, Col: 29}
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</td></tr>")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		if !templ_7745c5c3_IsBuffer {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W)
+		}
+		return templ_7745c5c3_Err
+	})
+}
--- a/views/corporate/mcu/mcutab_templ.go
+++ b/views/corporate/mcu/mcutab_templ.go
@@ -0,0 +1,541 @@
+// 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/models"
+import "strconv"
+
+func McuDetailTabView(
+	McuID string,
+	McuTab []models.McuTabModels,
+) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, templ_7745c5c3_W io.Writer) (templ_7745c5c3_Err error) {
+		templ_7745c5c3_Buffer, templ_7745c5c3_IsBuffer := templ_7745c5c3_W.(*bytes.Buffer)
+		if !templ_7745c5c3_IsBuffer {
+			templ_7745c5c3_Buffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templ_7745c5c3_Buffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		templ_7745c5c3_Var1 := templ.GetChildren(ctx)
+		if templ_7745c5c3_Var1 == nil {
+			templ_7745c5c3_Var1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div><ul class=\"nav nav-tabs nav-tabs-line\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i, d := range McuTab {
+			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_Var2 templ.SafeURL = templ.URL("#mcu_tab_" + strconv.Itoa(i))
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(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(d.TabName)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 19, Col: 36}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</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_Var4 templ.SafeURL = templ.URL("#mcu_tab_" + strconv.Itoa(i))
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(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(d.TabName)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 27, Col: 36}
+				}
+				_, 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("</a></li>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<li class=\"nav-item\"><a")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		if len(McuTab) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"nav-link active\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"nav-link\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" data-toggle=\"tab\" href=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var6 templ.SafeURL = templ.URL("#mcu_tab_" + strconv.Itoa(len(McuTab)+1))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var6)))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Kesimpulan</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var7 templ.SafeURL = templ.URL("#mcu_tab_" + strconv.Itoa(len(McuTab)+2))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var7)))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Daftar Peserta</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var8 templ.SafeURL = templ.URL("#mcu_tab_" + strconv.Itoa(len(McuTab)+3))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var8)))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Executive Summary</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var9 templ.SafeURL = templ.URL("#mcu_tab_" + strconv.Itoa(len(McuTab)+4))
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(string(templ_7745c5c3_Var9)))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\">Keuangan</a></li></ul></div><div class=\"tab-content mt-5\" id=\"mcutabcontent\">")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		for i, d := range McuTab {
+			if i == 0 {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"tab-pane fade show active\" role=\"tabpanel\" id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var10 string
+				templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(i))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 70, Col: 52}
+				}
+				_, 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("\" aria-labelledby=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var11 string
+				templ_7745c5c3_Var11, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(i))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 71, Col: 65}
+				}
+				_, 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-get=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var12 string
+				templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + McuID + "/" + d.TabID)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 72, Col: 80}
+				}
+				_, 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("#" + d.TabID)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 73, Col: 44}
+				}
+				_, 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-trigger=\"load\" hx-indicator=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var14 string
+				templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs("." + d.TabID + d.Mcu_ImageGrafikGroupMenu)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 75, Col: 76}
+				}
+				_, 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("\"><div id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var15 string
+				templ_7745c5c3_Var15, templ_7745c5c3_Err = templ.JoinStringErrs(d.TabID)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 77, Col: 36}
+				}
+				_, 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("\"></div><div style=\"display: flex; justify-content: center; align-items: center;\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var16 = []any{"htmx-indicator spinner-border spinner-border-lg " + d.TabID + d.Mcu_ImageGrafikGroupMenu}
+				templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var16...)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<span class=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var17 string
+				templ_7745c5c3_Var17, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var16).String())
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 1, Col: 0}
+				}
+				_, 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=\"status\" aria-hidden=\"true\"></span></div></div>")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+			} else {
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<div class=\"tab-pane fade\" role=\"tabpanel\" id=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var18 string
+				templ_7745c5c3_Var18, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(i))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 85, Col: 52}
+				}
+				_, 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("\" aria-labelledby=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var19 string
+				templ_7745c5c3_Var19, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(i))
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 86, Col: 65}
+				}
+				_, 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-get=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var20 string
+				templ_7745c5c3_Var20, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + McuID + "/" + d.TabID)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 87, Col: 80}
+				}
+				_, 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-target=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var21 string
+				templ_7745c5c3_Var21, templ_7745c5c3_Err = templ.JoinStringErrs("#" + d.TabID)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 88, Col: 44}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var21))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-trigger=\"load\" hx-indicator=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var22 string
+				templ_7745c5c3_Var22, templ_7745c5c3_Err = templ.JoinStringErrs("." + d.TabID + d.Mcu_ImageGrafikGroupMenu)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 90, Col: 76}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var22))
+				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_Var23 string
+				templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(d.TabID)
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 92, Col: 36}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\"></div><div style=\"display: flex; justify-content: center; align-items: center;\">")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var24 = []any{"htmx-indicator spinner-border spinner-border-lg " + d.TabID + d.Mcu_ImageGrafikGroupMenu}
+				templ_7745c5c3_Err = templ.RenderCSSItems(ctx, templ_7745c5c3_Buffer, templ_7745c5c3_Var24...)
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<span class=\"")
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				var templ_7745c5c3_Var25 string
+				templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(templ.CSSClasses(templ_7745c5c3_Var24).String())
+				if templ_7745c5c3_Err != nil {
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 1, Col: 0}
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
+				if templ_7745c5c3_Err != nil {
+					return templ_7745c5c3_Err
+				}
+				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" role=\"status\" aria-hidden=\"true\"></span></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 len(McuTab) == 0 {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"tab-pane fade show active\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		} else {
+			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" class=\"tab-pane fade\"")
+			if templ_7745c5c3_Err != nil {
+				return templ_7745c5c3_Err
+			}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(" role=\"tabpanel\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var26 string
+		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(len(McuTab)+1))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 106, Col: 58}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" aria-labelledby=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var27 string
+		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(len(McuTab)+1))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 107, Col: 71}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var28 string
+		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + McuID + "/tabkesimpulan")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 108, Col: 75}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkesimpulan\" hx-trigger=\"load\" hx-indicator=\".kesimpulanloading\"><div id=\"tabkesimpulan\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg kesimpulanloading\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" role=\"tabpanel\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var29 string
+		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(len(McuTab)+2))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 120, Col: 58}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" aria-labelledby=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var30 string
+		templ_7745c5c3_Var30, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(len(McuTab)+2))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 121, Col: 71}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var30))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var31 string
+		templ_7745c5c3_Var31, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + McuID + "/tabdaftarpeserta")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 122, Col: 78}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var31))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabdaftarpeserta\" hx-trigger=\"load\" hx-indicator=\".tabdaftarpesertaload\"><div id=\"tabdaftarpeserta\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg tabdaftarpesertaload\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" role=\"tabpanel\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var32 string
+		templ_7745c5c3_Var32, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(len(McuTab)+3))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 134, Col: 58}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var32))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" aria-labelledby=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var33 string
+		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(len(McuTab)+3))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 135, Col: 71}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" style=\"height: 700px;\"><object data=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var34 string
+		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs("/birt/run?__report=report/one/mcu/rpt_executive_summary_mcu_001.rptdesign&__format=pdf&PID=" + McuID + "&username=admin&tm=1722914077866")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 139, Col: 156}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" role=\"tabpanel\" id=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var35 string
+		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(len(McuTab)+4))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 145, Col: 58}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" aria-labelledby=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var36 string
+		templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs("mcu_tab_" + strconv.Itoa(len(McuTab)+4))
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 146, Col: 71}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-get=\"")
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		var templ_7745c5c3_Var37 string
+		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs("/corp/dashboard_pic/detail/" + McuID + "/tabkeuangan")
+		if templ_7745c5c3_Err != nil {
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutab.templ`, Line: 147, Col: 73}
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37))
+		if templ_7745c5c3_Err != nil {
+			return templ_7745c5c3_Err
+		}
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkeuangan\" hx-trigger=\"load\" hx-indicator=\".uangloading\"><div id=\"tabkeuangan\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg uangloading\" role=\"status\" aria-hidden=\"true\"></span></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/mcutabview.templ
+++ b/views/corporate/mcu/mcutabview.templ
@@ -6,67 +6,85 @@ templ TabViewMcuDetail(
 	<div>
 		<ul class="nav nav-tabs nav-tabs-line">
 			<li class="nav-item">
-				<a class="nav-link active" data-toggle="tab" href="#kt_tab_pane_1" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkepesertaan"} hx-target="#tabkepesertaan" hx-trigger="load">Peserta</a>
+				<a class="nav-link active" data-toggle="tab" href="#kt_tab_pane_1" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkepesertaan"} hx-target="#tabkepesertaan" hx-trigger="load" hx-indicator=".kepesertaanloading">Peserta</a>
 			</li>
 			<li class="nav-item">
-				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_2" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkelainanglobal"} hx-target="#tabkelainanglobal" hx-trigger="click">Kelainan global</a>
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_2" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkelainanglobal"} hx-target="#tabkelainanglobal" hx-trigger="load" hx-indicator=".globalloading">Kelainan global</a>
 			</li>
 			<li class="nav-item">
-				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_3" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkelainanlab"} hx-target="#tabkelainanlab" hx-trigger="click">Kelainan Lab</a>
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_3" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkelainanlab"} hx-target="#tabkelainanlab" hx-trigger="load" hx-indicator=".labloading">Kelainan Lab</a>
 			</li>
 			<li class="nav-item">
-				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_4" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkelainannonlab"} hx-target="#tabkelainannonlab" hx-trigger="click">kelainan Non Lab</a>
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_4" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkelainannonlab"} hx-target="#tabkelainannonlab" hx-trigger="load" hx-indicator=".nonlabloading">kelainan Non Lab</a>
 			</li>
 			<li class="nav-item">
-				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_5" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkelainanfisik"} hx-target="#tabkelainanfisik" hx-trigger="click">kelainan Fisik</a>
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_5" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkelainanfisik"} hx-target="#tabkelainanfisik" hx-trigger="load" hx-indicator=".fisikloading">kelainan Fisik</a>
 			</li>
 			<li class="nav-item">
-				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_6" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkesimpulan"} hx-target="#tabkesimpulan">Kesimpulan</a>
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_6" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkesimpulan"} hx-target="#tabkesimpulan" hx-indicator=".kesimpulanloading">Kesimpulan</a>
 			</li>
 			<li class="nav-item">
-				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_7" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabdaftarpeserta"} hx-target="#tabdaftarpeserta">Daftar Peserta</a>
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_7" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabdaftarpeserta"} hx-target="#tabdaftarpeserta" hx-indicator=".daftperloading">Daftar Peserta</a>
 			</li>
 			<li class="nav-item">
 				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_8">Executive Summary</a>
 			</li>
 			<li class="nav-item">
-				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_9" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkeuangan"} hx-target="#tabkeuangan">Keuangan</a>
+				<a class="nav-link" data-toggle="tab" href="#kt_tab_pane_9" hx-get={"/corp/dashboard_pic/detail/" + id +"/tabkeuangan"} hx-target="#tabkeuangan" hx-indicator=".uangloading">Keuangan</a>
 			</li>			
 		</ul>
 	</div>
 	<div class="tab-content mt-5" id="myTabContent">
 		<div class="tab-pane fade show active" id="kt_tab_pane_1" role="tabpanel" aria-labelledby="kt_tab_pane_1">
-			// <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_001.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
 			<div id="tabkepesertaan"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg kepesertaanloading" role="status" aria-hidden="true"></span>
+			</div>
 		</div>
 		<div class="tab-pane fade" id="kt_tab_pane_2" role="tabpanel" aria-labelledby="kt_tab_pane_2">
-			// <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_002.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
 			<div id="tabkelainanglobal"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg globalloading" role="status" aria-hidden="true"></span>
+			</div>
 		</div>
 		<div class="tab-pane fade" id="kt_tab_pane_3" role="tabpanel" aria-labelledby="kt_tab_pane_3">
-			// <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_003.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
 			<div id="tabkelainanlab"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg labloading" role="status" aria-hidden="true"></span>
+			</div>
 		</div>
 		<div class="tab-pane fade" id="kt_tab_pane_4" role="tabpanel" aria-labelledby="kt_tab_pane_4" style="height: 800px;">
-			// <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_004.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
 			<div id="tabkelainannonlab"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg nonlabloading" role="status" aria-hidden="true"></span>
+			</div>
 		</div>
 		<div class="tab-pane fade" id="kt_tab_pane_5" role="tabpanel" aria-labelledby="kt_tab_pane_5">
-			// <object data={"https://devcpone.aplikasi.web.id/birt/run?__report=report/one/mcu/rpt_mcu_graph_005.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
 			<div id="tabkelainanfisik"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg fisikloading" role="status" aria-hidden="true"></span>
+			</div>
 		</div>
 		<div class="tab-pane fade" id="kt_tab_pane_6" role="tabpanel" aria-labelledby="kt_tab_pane_6">
 			<div id="tabkesimpulan"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg kesimpulanloading" role="status" aria-hidden="true"></span>
+			</div>
 		</div>
 		<div class="tab-pane fade" id="kt_tab_pane_7" role="tabpanel" aria-labelledby="kt_tab_pane_7">
 			<div id="tabdaftarpeserta"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg daftperloading" role="status" aria-hidden="true"></span>
+			</div>
 		</div>
 		<div class="tab-pane fade" id="kt_tab_pane_8" role="tabpanel" aria-labelledby="kt_tab_pane_8" style="height: 800px;">
-			// <object data={"/birt/run?__report=report/one/mcu/rpt_summary_executive.rptdesign&__format=pdf&PID="+id+"&username=adhi&tm=1717726294764"} type="application/pdf" width="100%" height="100%"></object>
 			<object data={"/birt/run?__report=report/one/mcu/rpt_executive_summary_mcu_001.rptdesign&__format=pdf&PID="+id+"&username=admin&tm=1722914077866"} type="application/pdf" width="100%" height="100%"></object>
 		</div>
 		<div class="tab-pane fade" id="kt_tab_pane_9" role="tabpanel" aria-labelledby="kt_tab_pane_9">
 			<div id="tabkeuangan"></div>
+			<div style="display: flex; justify-content: center; align-items: center;">
+				<span class="htmx-indicator spinner-border spinner-border-lg uangloading" role="status" aria-hidden="true"></span>
+			</div>
 		</div>		
 	</div>
 }
--- a/views/corporate/mcu/mcutabview_templ.go
+++ b/views/corporate/mcu/mcutabview_templ.go
@@ -38,7 +38,7 @@ func TabViewMcuDetail(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkepesertaan\" hx-trigger=\"load\">Peserta</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_2\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkepesertaan\" hx-trigger=\"load\" hx-indicator=\".kepesertaanloading\">Peserta</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_2\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -51,7 +51,7 @@ func TabViewMcuDetail(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkelainanglobal\" hx-trigger=\"click\">Kelainan global</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_3\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkelainanglobal\" hx-trigger=\"load\" hx-indicator=\".globalloading\">Kelainan global</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_3\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -64,7 +64,7 @@ func TabViewMcuDetail(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkelainanlab\" hx-trigger=\"click\">Kelainan Lab</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_4\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkelainanlab\" hx-trigger=\"load\" hx-indicator=\".labloading\">Kelainan Lab</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_4\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -77,7 +77,7 @@ func TabViewMcuDetail(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkelainannonlab\" hx-trigger=\"click\">kelainan Non Lab</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_5\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkelainannonlab\" hx-trigger=\"load\" hx-indicator=\".nonlabloading\">kelainan Non Lab</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_5\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -90,7 +90,7 @@ func TabViewMcuDetail(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkelainanfisik\" hx-trigger=\"click\">kelainan Fisik</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_6\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkelainanfisik\" hx-trigger=\"load\" hx-indicator=\".fisikloading\">kelainan Fisik</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_6\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -103,7 +103,7 @@ func TabViewMcuDetail(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkesimpulan\">Kesimpulan</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_7\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkesimpulan\" hx-indicator=\".kesimpulanloading\">Kesimpulan</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_7\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -116,7 +116,7 @@ func TabViewMcuDetail(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabdaftarpeserta\">Daftar Peserta</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_8\">Executive Summary</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_9\" hx-get=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabdaftarpeserta\" hx-indicator=\".daftperloading\">Daftar Peserta</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_8\">Executive Summary</a></li><li class=\"nav-item\"><a class=\"nav-link\" data-toggle=\"tab\" href=\"#kt_tab_pane_9\" hx-get=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -129,20 +129,20 @@ func TabViewMcuDetail(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkeuangan\">Keuangan</a></li></ul></div><div class=\"tab-content mt-5\" id=\"myTabContent\"><div class=\"tab-pane fade show active\" id=\"kt_tab_pane_1\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_1\"><div id=\"tabkepesertaan\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_2\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_2\"><div id=\"tabkelainanglobal\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_3\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_3\"><div id=\"tabkelainanlab\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_4\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_4\" style=\"height: 800px;\"><div id=\"tabkelainannonlab\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_5\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_5\"><div id=\"tabkelainanfisik\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_6\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_6\"><div id=\"tabkesimpulan\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_7\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_7\"><div id=\"tabdaftarpeserta\"></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_8\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_8\" style=\"height: 800px;\"><object data=\"")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" hx-target=\"#tabkeuangan\" hx-indicator=\".uangloading\">Keuangan</a></li></ul></div><div class=\"tab-content mt-5\" id=\"myTabContent\"><div class=\"tab-pane fade show active\" id=\"kt_tab_pane_1\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_1\"><div id=\"tabkepesertaan\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg kepesertaanloading\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_2\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_2\"><div id=\"tabkelainanglobal\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg globalloading\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_3\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_3\"><div id=\"tabkelainanlab\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg labloading\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_4\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_4\" style=\"height: 800px;\"><div id=\"tabkelainannonlab\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg nonlabloading\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_5\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_5\"><div id=\"tabkelainanfisik\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg fisikloading\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_6\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_6\"><div id=\"tabkesimpulan\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg kesimpulanloading\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_7\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_7\"><div id=\"tabdaftarpeserta\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg daftperloading\" role=\"status\" aria-hidden=\"true\"></span></div></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_8\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_8\" style=\"height: 800px;\"><object data=\"")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
 		var templ_7745c5c3_Var10 string
 		templ_7745c5c3_Var10, templ_7745c5c3_Err = templ.JoinStringErrs("/birt/run?__report=report/one/mcu/rpt_executive_summary_mcu_001.rptdesign&__format=pdf&PID=" + id + "&username=admin&tm=1722914077866")
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 66, Col: 148}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `views\corporate\mcu\mcutabview.templ`, Line: 81, Col: 148}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var10))
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_9\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_9\"><div id=\"tabkeuangan\"></div></div></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("\" type=\"application/pdf\" width=\"100%\" height=\"100%\"></object></div><div class=\"tab-pane fade\" id=\"kt_tab_pane_9\" role=\"tabpanel\" aria-labelledby=\"kt_tab_pane_9\"><div id=\"tabkeuangan\"></div><div style=\"display: flex; justify-content: center; align-items: center;\"><span class=\"htmx-indicator spinner-border spinner-border-lg uangloading\" role=\"status\" aria-hidden=\"true\"></span></div></div></div>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
--- a/views/public/login/logincomponent.templ
+++ b/views/public/login/logincomponent.templ
@@ -110,10 +110,12 @@ templ FormSignin(
 				hx-post="/login/signin"
 				hx-swap="outerHTML"
 				hx-target="#kt_login"
+				hx-indicator=".loginloading"
 				type="button"
 				id="kt_login_signin_submit"
 				class="btn btn-block font-weight-bolder text-white font-size-h6 px-8 py-4 my-3 mr-3 mt-5 btn-primary"
 			>
+				<span class="htmx-indicator spinner-border spinner-border-sm loginloading" role="status" aria-hidden="true"></span>
 				Sign In
 			</button>
 		</div>
--- a/views/public/login/logincomponent_templ.go
+++ b/views/public/login/logincomponent_templ.go
@@ -57,7 +57,7 @@ func FormSignin(
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--begin::Action--><div class=\"pb-lg-0 pb-5 pt-5\"><button hx-post=\"/login/signin\" hx-swap=\"outerHTML\" hx-target=\"#kt_login\" type=\"button\" id=\"kt_login_signin_submit\" class=\"btn btn-block font-weight-bolder text-white font-size-h6 px-8 py-4 my-3 mr-3 mt-5 btn-primary\">Sign In\r</button></div><!--end::Action--></form>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!--begin::Action--><div class=\"pb-lg-0 pb-5 pt-5\"><button hx-post=\"/login/signin\" hx-swap=\"outerHTML\" hx-target=\"#kt_login\" hx-indicator=\".loginloading\" type=\"button\" id=\"kt_login_signin_submit\" class=\"btn btn-block font-weight-bolder text-white font-size-h6 px-8 py-4 my-3 mr-3 mt-5 btn-primary\"><span class=\"htmx-indicator spinner-border spinner-border-sm loginloading\" role=\"status\" aria-hidden=\"true\"></span> Sign In\r</button></div><!--end::Action--></form>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
Author	SHA1	Message	Date
adibwp	fc2d9292c2	change typo label	2024-08-22 17:25:43 +07:00
adibwp	74d564e303	edit query and graph component	2024-08-22 16:08:05 +07:00
adibwp	d1b04676a7	add split string func	2024-08-15 16:18:55 +07:00
adibwp	31b2d6c793	edit graphic bar title, order, color	2024-08-15 15:50:59 +07:00
adibwp	72c7e714f5	add detail pemeriksaan	2024-08-14 13:59:15 +07:00