Use of embedded struct.

diff --git a/main.go b/main.go
index c5b52cabbbaa1254ab03da5872559f0a42fb154d..844585b4ab95c09a907b960157cc0f8c186b3fb6 100644 (file)
--- a/main.go
+++ b/main.go
@@ -12,7 +12,7 @@ import (
 
 type missingCol func (map[string]interface{}) interface{}
 
-type column struct {
+type Column struct {
        Name string
        Title string
        Align int
@@ -26,14 +26,14 @@ var rowTmpl = "<tr>\n{{ . }}</tr>\n"
 var rowColTmpl = "\t<td{{ if (eq .Align 1) }}align='center'{{ else if (eq .Align 2) }}align='right'{{ end }}>{{ .Value }}</td>\n"
 
 type grid struct {
-       cols []column
+       cols []Column
        headerTmpl string
        headerRowTmpl string
        rowTmpl string
        rowColTmpl string
 }
 
-func (g *grid) addColumn (c column) {
+func (g *grid) addColumn (c Column) {
        g.cols = append(g.cols, c)
 }
 
@@ -81,6 +81,11 @@ func (g *grid) getHeader () string {
 }
 
 func (g *grid) getRowFromMap (m map[string]interface{}) string {
+       type nc struct {
+               Column
+               Value interface{}
+       }
+
        rtmpl := g.rowTmpl
        if rtmpl == "" {
                rtmpl = rowTmpl
@@ -113,13 +118,11 @@ func (g *grid) getRowFromMap (m map[string]interface{}) string {
                        }
                }
 
-               m := make(map[string]interface{})
-               m["Name"] = c.Name
-               m["Align"] = c.Align
-               m["Value"] = v
+               nnc := nc{Column: c, Value: v}
+               fmt.Println(nnc)
 
                var b bytes.Buffer
-               err = tc.Execute(&b, m)
+               err = tc.Execute(&b, nnc)
 
                ret += b.String()
        }
@@ -145,21 +148,21 @@ func main() {
 
        g.headerTmpl = "<thead><tr>\n{{ . }}</tr></thead>\n"
 
-       g.rowColTmpl = "\t<td data-name='{{.Name}}' {{ if (eq .Align 1) }}align='center'{{ else if (eq .Align 2) }}align='right'{{ end }}>{{ .Value }}</td>\n"
+       g.rowColTmpl = "\t<td data-name='{{.Column.Name}}' {{ if (eq .Align 1) }}align='center'{{ else if (eq .Align 2) }}align='right'{{ end }}>{{ .Value }}</td>\n"
 
-       c := column{Name: "id", Title: "ID"}
+       c := Column{Name: "id", Title: "ID"}
        g.addColumn(c)
 
-       c = column{Name: "name", Title: "Name"}
+       c = Column{Name: "name", Title: "Name"}
        g.addColumn(c)
 
-       c = column{Name: "surname", Title: "Surname"}
+       c = Column{Name: "surname", Title: "Surname"}
        g.addColumn(c)
 
-       c = column{Name: "age", Title: "Age"}
+       c = Column{Name: "age", Title: "Age"}
        g.addColumn(c)
 
-       c = column{Name: "btn", Title: "Buttons"}
+       c = Column{Name: "btn", Title: "Buttons"}
        c.toCall = missing
        c.Align = 2
        g.addColumn(c)