add routes home + fix container footer

component/customdropdown/customdropdown_templ.go

@@ -376,7 +376,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var23 string
 		templ_7745c5c3_Var23, templ_7745c5c3_Err = templ.JoinStringErrs(idCmp)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 80, Col: 12}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 81, Col: 12}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var23))
 		if templ_7745c5c3_Err != nil {
@@ -389,7 +389,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var24 string
 		templ_7745c5c3_Var24, templ_7745c5c3_Err = templ.JoinStringErrs(hxName)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 81, Col: 15}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 82, Col: 15}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var24))
 		if templ_7745c5c3_Err != nil {
@@ -402,7 +402,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var25 string
 		templ_7745c5c3_Var25, templ_7745c5c3_Err = templ.JoinStringErrs(hxInclude)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 82, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 83, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var25))
 		if templ_7745c5c3_Err != nil {
@@ -415,7 +415,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var26 string
 		templ_7745c5c3_Var26, templ_7745c5c3_Err = templ.JoinStringErrs(hxGet)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 83, Col: 16}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 84, Col: 16}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var26))
 		if templ_7745c5c3_Err != nil {
@@ -428,7 +428,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var27 string
 		templ_7745c5c3_Var27, templ_7745c5c3_Err = templ.JoinStringErrs(hxSwap)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 84, Col: 18}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 85, Col: 18}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var27))
 		if templ_7745c5c3_Err != nil {
@@ -441,7 +441,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var28 string
 		templ_7745c5c3_Var28, templ_7745c5c3_Err = templ.JoinStringErrs(hxTarget)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 85, Col: 22}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 86, Col: 22}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var28))
 		if templ_7745c5c3_Err != nil {
@@ -454,7 +454,7 @@ func CustomDropdownFilter(
 		var templ_7745c5c3_Var29 string
 		templ_7745c5c3_Var29, templ_7745c5c3_Err = templ.JoinStringErrs(hxTrigger)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 86, Col: 24}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 87, Col: 24}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var29))
 		if templ_7745c5c3_Err != nil {
@@ -518,7 +518,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var33 string
 		templ_7745c5c3_Var33, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Label)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 97, Col: 87}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 98, Col: 87}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var33))
 		if templ_7745c5c3_Err != nil {
@@ -546,7 +546,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var34 string
 		templ_7745c5c3_Var34, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Placeholder)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 106, Col: 26}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 107, Col: 26}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var34))
 		if templ_7745c5c3_Err != nil {
@@ -559,7 +559,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var35 string
 		templ_7745c5c3_Var35, templ_7745c5c3_Err = templ.JoinStringErrs(inp.Name)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 109, Col: 18}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 110, Col: 18}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var35))
 		if templ_7745c5c3_Err != nil {
@@ -572,7 +572,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var36 string
 		templ_7745c5c3_Var36, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ID)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 110, Col: 14}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 111, Col: 14}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var36))
 		if templ_7745c5c3_Err != nil {
@@ -593,7 +593,7 @@ func CustomDropdownForm(
 		var templ_7745c5c3_Var37 string
 		templ_7745c5c3_Var37, templ_7745c5c3_Err = templ.JoinStringErrs(inp.ErrorMsg)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 115, Col: 17}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `component\customdropdown\customdropdown.templ`, Line: 116, Col: 17}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var37))
 		if templ_7745c5c3_Err != nil {

handlers/routes.go

@@ -66,6 +66,7 @@ func SetupRoutesPublic(app *echo.Echo, appStore db.AppStore) {
 	l := public_services.NewServicesLandingPage(public_services.LandingPage{}, appStore)
 	lh := public_handlers.NewLandingPageHandler(l)
 	public.GET("landingpage", lh.ShowLandingPage)
+	public.GET("home", lh.ShowLandingPage)
 	loginHdr := public_handlers.NewLoginHandler(l)
 	public.GET("login", loginHdr.HandlerShowLogin)
 

models/terminology.models.go

@@ -0,0 +1,29 @@
+package models
+
+import "database/sql"
+
+type TerminologyV0 struct {
+	ResourceType    string         `db:"resource_type"`
+	AttributePath   string         `db:"attribute_path"`
+	Code            string         `db:"code"`
+	ParentCode      string         `db:"parent_code"`
+	Display         string         `db:"display"`
+	DisplayEn       string         `db:"display_en"`
+	CodeSystem      string         `db:"code_system"`
+	OrderNo         uint           `db:"order_no"`
+	FtIndex         sql.NullString `db:"ft_index"`
+	UseInd          bool           `db:"use_ind"`
+	Description     sql.NullString `db:"description"`
+	StatusCd        string         `db:"status_cd"`
+	CreatedDttm     string         `db:"created_dttm"`
+	CreatedUserID   uint           `db:"created_user_id"`
+	UpdatedDttm     string         `db:"updated_dttm"`
+	UpdatedUserID   uint           `db:"updated_user_id"`
+	NullifiedDttm   string         `db:"nullified_dttm"`
+	NullifiedUserID uint           `db:"nullified_user_id"`
+}
+
+type TerminologyParamv0 struct {
+	AttributePath string `json:"AttributePath"`
+	CodeSystem    string `json:"CodeSystem"`
+}

package/database/database.go

@@ -16,6 +16,10 @@ import (
 var Handle *sql.DB
 var Handlex *sqlx.DB
 
+// log
+var HandleLog *sql.DB
+var HandlexLog *sqlx.DB
+
 func InitDB() {
 	println(config.Data.Get("DBhost"))
 	if config.Data.Get("DBhost") == "" {
@@ -28,6 +32,15 @@ func InitDB() {
 		}
 		Handle = handle
 
+		// log handle
+		handlelog, err := sql.Open("sqlite", config.Data.Get("DBnamelog"))
+		if err != nil {
+			// log.Fatalf("🔥 failed to connect to the database: %s", err.Error())
+			log.Panic(err)
+		}
+		HandleLog = handlelog
+		// log handle
+
 		db, err := sqlx.Open("sqlite", config.Data.Get("DBname"))
 
 		if err != nil {
@@ -35,6 +48,16 @@ func InitDB() {
 		}
 
 		Handlex = db
+
+		// log
+		dblog, err := sqlx.Open("sqlite", config.Data.Get("DBnamelog"))
+
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		HandlexLog = dblog
+		// log
 	} else {
 		println("mysql")
 		dsn := config.Data.Get("DBuser") + ":" + config.Data.Get("DBpass") + "@tcp(" + config.Data.Get("DBhost") + ":" + config.Data.Get("DBport") + ")/" + config.Data.Get("DBname")
@@ -50,6 +73,21 @@ func InitDB() {
 		}
 		Handle = handle
 
+		// log
+		dsnlog := config.Data.Get("DBuser") + ":" + config.Data.Get("DBpass") + "@tcp(" + config.Data.Get("DBhost") + ":" + config.Data.Get("DBport") + ")/" + config.Data.Get("DBnamelog")
+		println(dsnlog)
+		handlelog, err := sql.Open("mysql", dsnlog)
+
+		if err != nil {
+			log.Panic(err)
+		}
+
+		if err = handlelog.Ping(); err != nil {
+			log.Panic(err)
+		}
+		HandleLog = handlelog
+		// log
+
 		// sqlx
 		db, err := sqlx.Open("mysql", dsn)
 
@@ -59,6 +97,16 @@ func InitDB() {
 
 		Handlex = db
 
+		// log
+		dblog, err := sqlx.Open("mysql", dsnlog)
+
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		HandlexLog = dblog
+		// log
+
 	}
 	log.Println("🚀 Connected Successfully to the Database")
 

services/app.services.go

@@ -1,8 +1,14 @@
 package services
 
-import "cpone/models"
+import (
+	"cpone/models"
+	dbx "cpone/package/database"
+	"fmt"
 
-//Func get menu sidebar
+	"go.uber.org/zap"
+)
+
+// Func get menu sidebar
 func GetMenu() ([]models.Menu, error) {
 
 	// dummyBreadcrumb := []Breadcrumb{
@@ -515,6 +521,30 @@ func GetUserLogin() (models.User, error) {
 	return a, nil
 }
 
-func GetTerminology(attributePath string, codeSystem string) {
+func GetTerminologyList(inp models.TerminologyParamv0) ([]models.TerminologyV0, error) {
+	logger, _ := zap.NewProduction()
+	defer logger.Sync()
 
+	var term []models.TerminologyV0
+
+	query := `
+		SELECT
+			*
+		FROM terminology
+		WHERE status_cd = 'normal'
+		AND code_system = ?
+		AND attribute_path = ?
+	`
+
+	logger.Info("QUERY SEARCH TERMINOLOGY",
+		zap.String("query search", query),
+	)
+
+	if err := dbx.Handlex.Select(&term, query,
+		inp.CodeSystem,
+		inp.AttributePath); err != nil {
+		return nil, fmt.Errorf("error querying database terminology: %v", err)
+	}
+
+	return term, nil
 }

views/public/landingpage/landingpage.templ

@@ -35,25 +35,25 @@ templ MainLandingPage(medicalServiceComponent templ.Component, listAdvantageComp
 		@medicalServiceComponent
 		<!-- Our Medical Service END -->
 		<!-- Why Westerindo START  belum fix di ukuran < 1400 -->
-		<div class="container p-0 mt-5 ">
-			<div class="row">
+		// <div class="container p-0 mt-5 ">
+			<div class="row mt-5">
 				@HeaderSection("Why Westerindo", "With a dedicated team of professionals we’re committed to providing medical attention tailored to your needs, ensuring a journey to optimal health and vitality.")
 			</div>
 			@listAdvantageComponent
-		</div>
+		// </div>
 		<!-- Why Westerindo END -->
 		<!-- Promotion START -->
-		<div class="container mt-4">
-			<div class="row">
+		// <div class="container mt-4">
+			<div class="row mt-4">
 				@HeaderSection("Promotions", "Seize This Opportunity to Enhance Your Health")
 			</div>
 			@listPromotion
-		</div>
+		// </div>
 		<!-- Promotion END -->
-		<!-- footer START -->
-		@footer
-		<!-- footer END -->
 	</div>
+  <!-- footer START -->
+		@footer
+  <!-- footer END -->
 }
 
 templ CssLandingPage() {

views/public/landingpage/landingpage_templ.go

@@ -51,7 +51,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Our Medical Service END --><!-- Why Westerindo START  belum fix di ukuran < 1400 --><div class=\"container p-0 mt-5 \"><div class=\"row\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Our Medical Service END --><!-- Why Westerindo START  belum fix di ukuran < 1400 --><div class=\"row mt-5\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -67,7 +67,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Why Westerindo END --><!-- Promotion START --><div class=\"container mt-4\"><div class=\"row\">")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Why Westerindo END --><!-- Promotion START --><div class=\"row mt-4\">")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -83,7 +83,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("</div><!-- Promotion END --><!-- footer START -->")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- Promotion END --></div><!-- footer START -->")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -91,7 +91,7 @@ func MainLandingPage(medicalServiceComponent templ.Component, listAdvantageCompo
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- footer END --></div>")
+		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("<!-- footer END -->")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}