From 74d564e303a49c50e05e1b7d40005a619a9b227a Mon Sep 17 00:00:00 2001 From: adibwp Date: Thu, 22 Aug 2024 16:08:05 +0700 Subject: [PATCH] edit query and graph component --- component/chart/chart.templ | 47 +- component/chart/chart_templ.go | 97 +++- handlers/corporate/mcudetail.handlers.go | 11 +- .../mcudetail/tabkelainanfisik.hanlders.go | 117 +--- .../mcudetail/tabkelainanglobal.handlers.go | 55 +- .../mcudetail/tabkelainanlab.handlers.go | 97 +--- .../mcudetail/tabkelainannonlab.handlers.go | 87 +-- .../mcudetail/tabkepesertaan.handlers.go | 64 +-- models/mcutab.models.go | 10 + services/corporate/mcudetail.services.go | 46 ++ .../mcudetail/tabkelainanfisik.services.go | 23 + .../mcudetail/tabkelainanglobal.services.go | 23 + .../mcudetail/tabkelainanlab.services.go | 23 + .../mcudetail/tabkelainannonlab.services.go | 23 + .../mcudetail/tabkepesertaan.services.go | 23 + utils/splitStrings.utils.go | 4 +- views/corporate/mcu/mcutab.templ | 158 +++++ .../mcu/mcutab/tabkelainanfisik.templ | 14 +- .../mcu/mcutab/tabkelainanfisik_templ.go | 33 +- .../mcu/mcutab/tabkelainanglobal.templ | 2 +- .../mcu/mcutab/tabkelainanglobal_templ.go | 2 +- .../corporate/mcu/mcutab/tabkelainanlab.templ | 23 +- .../mcu/mcutab/tabkelainanlab_templ.go | 39 +- .../mcu/mcutab/tabkelainannonlab.templ | 14 +- .../mcu/mcutab/tabkelainannonlab_templ.go | 39 +- .../corporate/mcu/mcutab/tabkepesertaan.templ | 6 +- .../mcu/mcutab/tabkepesertaan_templ.go | 4 +- views/corporate/mcu/mcutab_templ.go | 541 ++++++++++++++++++ 28 files changed, 1183 insertions(+), 442 deletions(-) create mode 100644 models/mcutab.models.go create mode 100644 views/corporate/mcu/mcutab.templ create mode 100644 views/corporate/mcu/mcutab_templ.go diff --git a/component/chart/chart.templ b/component/chart/chart.templ index 7b789c0..16b75c0 100644 --- 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,49 @@ 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) { +
+ @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%']; + } + + console.log(option[idDiv]); + myChart[idDiv].setOption(option[idDiv]); + + var resizeObserver = new ResizeObserver(function() { + myChart[idDiv].resize(); + }); + + resizeObserver.observe(element); + }); } \ No newline at end of file diff --git a/component/chart/chart_templ.go b/component/chart/chart_templ.go index c96ed62..81476ee 100644 --- 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,95 @@ 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("
") + 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_ddb7`, + Function: `function __templ_GenerateChartResponsive_ddb7(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%']; + } + + console.log(option[idDiv]); + myChart[idDiv].setOption(option[idDiv]); + + var resizeObserver = new ResizeObserver(function() { + myChart[idDiv].resize(); + }); + + resizeObserver.observe(element); + }); +}`, + Call: templ.SafeScript(`__templ_GenerateChartResponsive_ddb7`, idDiv, udata, height), + CallInline: templ.SafeScriptInline(`__templ_GenerateChartResponsive_ddb7`, idDiv, udata, height), } } diff --git a/handlers/corporate/mcudetail.handlers.go b/handlers/corporate/mcudetail.handlers.go index 24f710e..2361262 100644 --- 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(), diff --git a/handlers/corporate/mcudetail/tabkelainanfisik.hanlders.go b/handlers/corporate/mcudetail/tabkelainanfisik.hanlders.go index 835103a..45c06c6 100644 --- 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), "300px", "450px"), - chart.ShowChartFixed("hprxs", string(hiperjson), "300px", "450px"), - chart.ShowChartFixed("rfkxs", string(refraksijson), "300px", "450px"), - chart.ShowChartFixed("alkxs", string(alkoholjson), "300px", "450px"), - chart.ShowChartFixed("rkkxs", string(merokokjson), "300px", "450px"), - chart.ShowChartFixed("olhxs", string(olahragajson), "300px", "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), "500px", "450px"), - chart.ShowChartFixed("hprlg", string(hiperjson), "500px", "450px"), - chart.ShowChartFixed("rfklg", string(refraksijson), "500px", "450px"), - chart.ShowChartFixed("alklg", string(alkoholjson), "500px", "450px"), - chart.ShowChartFixed("rkklg", string(merokokjson), "500px", "450px"), - chart.ShowChartFixed("olhlg", string(olahragajson), "500px", "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), "350px", "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) diff --git a/handlers/corporate/mcudetail/tabkelainanglobal.handlers.go b/handlers/corporate/mcudetail/tabkelainanglobal.handlers.go index fb67519..2e35a38 100644 --- 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( diff --git a/handlers/corporate/mcudetail/tabkelainanlab.handlers.go b/handlers/corporate/mcudetail/tabkelainanlab.handlers.go index 4ce93e4..e3b97d8 100644 --- 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), "500px", "450px"), - chart.ShowChartFixed("urinlg", string(urinjson), "500px", "450px"), - chart.ShowChartFixed("hatilg", string(hatijson), "500px", "450px"), - chart.ShowChartFixed("lemaklg", string(lemakjson), "500px", "450px"), - chart.ShowChartFixed("glukoslg", string(glukosjson), "500px", "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( diff --git a/handlers/corporate/mcudetail/tabkelainannonlab.handlers.go b/handlers/corporate/mcudetail/tabkelainannonlab.handlers.go index 2ad6f9d..dccf7fd 100644 --- 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), "350px", "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), "450px", "450px"), - chart.ShowChartFixed("thoraxmd", string(thrxjson), "450px", "450px"), - chart.ShowChartFixed("spiromd", string(autospirojson), "450px", "450px"), - chart.ShowChartFixed("dengarmd", string(pendengaranjson), "450px", "450px"), - } - - chartslg := []templ.Component{ - chart.ShowChartFixed("datanonlg", string(dataprejson), "1000px", "450px"), - chart.ShowChartFixed("jantunglg", string(jantungjson), "500px", "450px"), - chart.ShowChartFixed("thoraxlg", string(thrxjson), "500px", "450px"), - chart.ShowChartFixed("spirolg", string(autospirojson), "500px", "450px"), - chart.ShowChartFixed("dengarlg", string(pendengaranjson), "500px", "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( diff --git a/handlers/corporate/mcudetail/tabkepesertaan.handlers.go b/handlers/corporate/mcudetail/tabkepesertaan.handlers.go index df0e514..14f54cc 100644 --- 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), "300px", "450px"), - chart.ShowChartFixed("chartgenderxs", string(genderjson), "300px", "450px"), - chart.ShowChartFixed("chartumurxs", string(umurjson), "300px", "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), "500px", "450px"), - chart.ShowChartFixed("chartgender", string(genderjson), "500px", "450px"), - chart.ShowChartFixed("chartumur", string(umurjson), "500px", "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( diff --git a/models/mcutab.models.go b/models/mcutab.models.go new file mode 100644 index 0000000..71816bd --- /dev/null +++ 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 +} diff --git a/services/corporate/mcudetail.services.go b/services/corporate/mcudetail.services.go index db4ac27..73ee9ae 100644 --- 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 +} diff --git a/services/corporate/mcudetail/tabkelainanfisik.services.go b/services/corporate/mcudetail/tabkelainanfisik.services.go index fd040f4..464694c 100644 --- a/services/corporate/mcudetail/tabkelainanfisik.services.go +++ b/services/corporate/mcudetail/tabkelainanfisik.services.go @@ -564,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 +} diff --git a/services/corporate/mcudetail/tabkelainanglobal.services.go b/services/corporate/mcudetail/tabkelainanglobal.services.go index 085b238..453e9fc 100644 --- a/services/corporate/mcudetail/tabkelainanglobal.services.go +++ b/services/corporate/mcudetail/tabkelainanglobal.services.go @@ -324,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 +} diff --git a/services/corporate/mcudetail/tabkelainanlab.services.go b/services/corporate/mcudetail/tabkelainanlab.services.go index 8dc86c6..78488a9 100644 --- a/services/corporate/mcudetail/tabkelainanlab.services.go +++ b/services/corporate/mcudetail/tabkelainanlab.services.go @@ -525,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 +} diff --git a/services/corporate/mcudetail/tabkelainannonlab.services.go b/services/corporate/mcudetail/tabkelainannonlab.services.go index fc2a1be..7ad7b52 100644 --- a/services/corporate/mcudetail/tabkelainannonlab.services.go +++ b/services/corporate/mcudetail/tabkelainannonlab.services.go @@ -491,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 +} diff --git a/services/corporate/mcudetail/tabkepesertaan.services.go b/services/corporate/mcudetail/tabkepesertaan.services.go index ce763a7..f5d87ae 100644 --- 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 +} diff --git a/utils/splitStrings.utils.go b/utils/splitStrings.utils.go index 54df11e..ced8476 100644 --- a/utils/splitStrings.utils.go +++ b/utils/splitStrings.utils.go @@ -1,6 +1,8 @@ package utils -import "strings" +import ( + "strings" +) func SplitStrings(text string, count int) string { words := strings.Split(text, " ") diff --git a/views/corporate/mcu/mcutab.templ b/views/corporate/mcu/mcutab.templ new file mode 100644 index 0000000..d42c086 --- /dev/null +++ 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, +) { +
+ +
+
+ for i, d := range McuTab { + if i == 0 { +
+
+
+ +
+
+ } else { +
+
+
+ +
+
+ } + } +
+
+
+ +
+
+
+
+
+ +
+
+
+ +
+
+
+
+ +
+
+
+} \ No newline at end of file diff --git a/views/corporate/mcu/mcutab/tabkelainanfisik.templ b/views/corporate/mcu/mcutab/tabkelainanfisik.templ index 08c6b80..60be62a 100644 --- 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, ) {
-

Data Presentase Kelainan Fisik

+

Data Kelainan Fisik

// xs
-
- @ChartCard(barchart[2]) -
for _, c := range chartsxs {
@ChartCard(c) @@ -28,9 +24,6 @@ templ Tabkelainanfisik( // md
-
- @ChartCard(barchart[1]) -
for _, c := range chartsmd {
@ChartCard(c) @@ -42,11 +35,8 @@ templ Tabkelainanfisik( // lg
-
- @ChartCard(barchart[0]) -
for _, c := range chartslg { -
+
@ChartCard(c)
} diff --git a/views/corporate/mcu/mcutab/tabkelainanfisik_templ.go b/views/corporate/mcu/mcutab/tabkelainanfisik_templ.go index f940ed2..1615724 100644 --- 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("

Data Presentase Kelainan Fisik

") - 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("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Data Kelainan Fisik

") 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("
") - 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("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") 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("
") - 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("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } for _, c := range chartslg { - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/views/corporate/mcu/mcutab/tabkelainanglobal.templ b/views/corporate/mcu/mcutab/tabkelainanglobal.templ index f8ec7c8..ffa89d1 100644 --- a/views/corporate/mcu/mcutab/tabkelainanglobal.templ +++ b/views/corporate/mcu/mcutab/tabkelainanglobal.templ @@ -36,7 +36,7 @@ templ TabKelainanGlobal(
for _, c := range chartslg { -
+
@ChartCard(c)
} diff --git a/views/corporate/mcu/mcutab/tabkelainanglobal_templ.go b/views/corporate/mcu/mcutab/tabkelainanglobal_templ.go index 069d5e6..90995f7 100644 --- 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("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/views/corporate/mcu/mcutab/tabkelainanlab.templ b/views/corporate/mcu/mcutab/tabkelainanlab.templ index 5ca5e9f..d8006c8 100644 --- a/views/corporate/mcu/mcutab/tabkelainanlab.templ +++ b/views/corporate/mcu/mcutab/tabkelainanlab.templ @@ -35,16 +35,19 @@ templ TabKelainanLab( // lg
- for i, c := range chartslg { - if i == 0 { -
- @ChartCard(c) -
- } else { -
- @ChartCard(c) -
- } + for _, c := range chartslg { + // if i == 0 { + //
+ // @ChartCard(c) + //
+ // } else { + //
+ // @ChartCard(c) + //
+ // } +
+ @ChartCard(c) +
}
diff --git a/views/corporate/mcu/mcutab/tabkelainanlab_templ.go b/views/corporate/mcu/mcutab/tabkelainanlab_templ.go index da729e6..1592004 100644 --- 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("
") - 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("
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - } else { - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") - 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("
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } + for _, c := range chartslg { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + 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("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") diff --git a/views/corporate/mcu/mcutab/tabkelainannonlab.templ b/views/corporate/mcu/mcutab/tabkelainannonlab.templ index 74e23e7..3f466b4 100644 --- a/views/corporate/mcu/mcutab/tabkelainannonlab.templ +++ b/views/corporate/mcu/mcutab/tabkelainannonlab.templ @@ -35,16 +35,10 @@ templ TabKelainanNonLab( // lg
- for i, c := range chartslg { - if i == 0 { -
- @ChartCard(c) -
- } else { -
- @ChartCard(c) -
- } + for _, c := range chartslg { +
+ @ChartCard(c) +
}
diff --git a/views/corporate/mcu/mcutab/tabkelainannonlab_templ.go b/views/corporate/mcu/mcutab/tabkelainannonlab_templ.go index 2d294c4..dd828c1 100644 --- 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("
") - 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("
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } - } else { - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") - 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("
") - if templ_7745c5c3_Err != nil { - return templ_7745c5c3_Err - } + for _, c := range chartslg { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + 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("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err } } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") diff --git a/views/corporate/mcu/mcutab/tabkepesertaan.templ b/views/corporate/mcu/mcutab/tabkepesertaan.templ index 072bf7a..05045fe 100644 --- a/views/corporate/mcu/mcutab/tabkepesertaan.templ +++ b/views/corporate/mcu/mcutab/tabkepesertaan.templ @@ -36,7 +36,7 @@ templ TabKepesertaan(
for _, c := range chartslg { -
+
@ChartCard(c)
} @@ -48,8 +48,8 @@ templ TabKepesertaan( templ ChartCard( charts templ.Component, ) { -
-
+
+
@charts
diff --git a/views/corporate/mcu/mcutab/tabkepesertaan_templ.go b/views/corporate/mcu/mcutab/tabkepesertaan_templ.go index 700613e..1b249e4 100644 --- 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("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") 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("
") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/views/corporate/mcu/mcutab_templ.go b/views/corporate/mcu/mcutab_templ.go new file mode 100644 index 0000000..26834f1 --- /dev/null +++ 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("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + for i, d := range McuTab { + if i == 0 { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + 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("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } else { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + 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("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + if !templ_7745c5c3_IsBuffer { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) + } + return templ_7745c5c3_Err + }) +}