add echart barchart

handlers/corporate/mcudetail/tabkelainanlab.handlers.go

@@ -12,11 +12,11 @@ import (
 
 type TabKelainanLabServices interface {
 	GetDataPresentaseKelainanLab(mcuID string) (models.Barchart, error)
-	GetHematologi(mcuID string) (models.Barchart, error)
-	GetUrinalisa(mcuID string) (models.Barchart, error)
-	GetGangguanFungsiHati(mcuID string) (models.Barchart, error)
-	GetGangguanMetabolismeLemak(mcuID string) (models.Barchart, error)
-	GetPeningkatanGlukosa(mcuID string) (models.Barchart, error)
+	GetHematologi(mcuID string) (models.BarchartV2, error)
+	GetUrinalisa(mcuID string) (models.BarchartV2, error)
+	GetGangguanFungsiHati(mcuID string) (models.BarchartV2, error)
+	GetGangguanMetabolismeLemak(mcuID string) (models.BarchartV2, error)
+	GetPeningkatanGlukosa(mcuID string) (models.BarchartV2, error)
 }
 
 type TabKelainanLabHandler struct {

handlers/corporate/mcudetail/tabkelainannonlab.handlers.go

@@ -0,0 +1,57 @@
+package mcu_corporate_handlers
+
+import (
+	"cpone/component/chart"
+	"cpone/models"
+	"cpone/utils"
+	corporate_mcudetail "cpone/views/corporate/mcu/mcutab"
+	"encoding/json"
+
+	"github.com/labstack/echo/v4"
+)
+
+type TabKelainanNonLabServices interface {
+	GetDataKelNonLab(mcuID string) (models.Barchart, error)
+	GetThoraxPA(mcuID string) (models.BarchartV2, error)
+}
+
+type TabKelainanNonLabHandler struct {
+	TabKelainanNonLabServices TabKelainanNonLabServices
+}
+
+func NewTabKelainanNonLabHandler(tknl TabKelainanNonLabServices) *TabKelainanNonLabHandler {
+	return &TabKelainanNonLabHandler{
+		TabKelainanNonLabServices: tknl,
+	}
+}
+
+func (tknl *TabKelainanNonLabHandler) HandleShowTabKelainanNonLab(c echo.Context) error {
+	id := c.Param("id")
+
+	datapre, err := tknl.TabKelainanNonLabServices.GetDataKelNonLab(id)
+	if err != nil {
+		return err
+	}
+
+	thorax, err := tknl.TabKelainanNonLabServices.GetThoraxPA(id)
+	if err != nil {
+		return err
+	}
+
+	dataprejson, err := json.MarshalIndent(datapre, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	thrxjson, err := json.MarshalIndent(thorax, "", "    ")
+	if err != nil {
+		return err
+	}
+
+	content := corporate_mcudetail.TabKelainanNonLab(
+		chart.ShowChartFixed("datanonlg", string(dataprejson), "1000px", "450px"),
+		chart.ShowChartFixed("thoraxlg", string(thrxjson), "600px", "450px"),
+	)
+
+	return utils.View(c, content)
+}

handlers/routes.go

@@ -131,10 +131,16 @@ func SetupRoutesCorporate(app *echo.Echo, appStore db.AppStore) {
 	kelainanglobalHdlr := mcu_corporate_handlers.NewTabKelainanGlobalHandler(kelainanglobalSrvs)
 	corp.GET("/dashboard_pic/detail/:id/tabkelainanglobal", kelainanglobalHdlr.HandleShowTabKelainanGlobal)
 
+	// tab kelainan lab
 	kelainanlabSrvs := mcu_corporate_services.NewTabKelainanLabServices(appStore)
 	kelainanlabHdlr := mcu_corporate_handlers.NewTabKelainanLabHandler(kelainanlabSrvs)
 	corp.GET("/dashboard_pic/detail/:id/tabkelainanlab", kelainanlabHdlr.HandleShowTabKelainanLab)
 
+	// tab kelainan non lab
+	kelnonlabSrvs := mcu_corporate_services.NewTabKelainanNonLabServices(appStore)
+	kelnonlabHdlr := mcu_corporate_handlers.NewTabKelainanNonLabHandler(kelnonlabSrvs)
+	corp.GET("/dashboard_pic/detail/:id/tabkelainannonlab", kelnonlabHdlr.HandleShowTabKelainanNonLab)
+
 	// tab kelainan fisik
 	kelainanfisikSrvs := mcu_corporate_services.NewTabKelainanFisikServices(appStore)
 	kelainanfisikHdlr := mcu_corporate_handlers.NewTabKelainanFisikHandler(kelainanfisikSrvs)