Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
d7fbef37db
|
|||
|
a1668b6e5a
|
|||
|
3a17edfaf0
|
|||
|
3320a9c19d
|
|||
|
8dcd8a270a
|
|||
|
03a9b276d8
|
|||
|
9c8cde384f
|
|||
|
99b000ecf4
|
|||
|
a173e30090
|
|||
|
a3481a7d2d
|
|||
|
a8e6f98a89
|
|||
|
ab805403b9
|
|||
|
1e98d351ce
|
@@ -46,7 +46,7 @@ var rexEnumPackage = rext.W(regexp.MustCompile(`^package\s+(?P<name>[A-Za-z0-9_]
|
||||
|
||||
var rexEnumDef = rext.W(regexp.MustCompile(`^\s*type\s+(?P<name>[A-Za-z0-9_]+)\s+(?P<type>[A-Za-z0-9_]+)\s*//\s*(@enum:type).*$`))
|
||||
|
||||
var rexEnumValueDef = rext.W(regexp.MustCompile(`^\s*(?P<name>[A-Za-z0-9_]+)\s+(?P<type>[A-Za-z0-9_]+)\s*=\s*(?P<value>("[A-Za-z0-9_:\s\-.]+"|[0-9]+))\s*(//(?P<comm>.*))?.*$`))
|
||||
var rexEnumValueDef = rext.W(regexp.MustCompile(`^\s*(?P<name>[A-Za-z0-9_]+)\s+(?P<type>[A-Za-z0-9_]+)\s*=\s*(?P<value>("[A-Za-z0-9_:\s\-.]*"|[0-9]+))\s*(//(?P<comm>.*))?.*$`))
|
||||
|
||||
var rexEnumChecksumConst = rext.W(regexp.MustCompile(`const ChecksumEnumGenerator = "(?P<cs>[A-Za-z0-9_]*)"`))
|
||||
|
||||
|
||||
@@ -12,6 +12,8 @@ import (
|
||||
var reflectTypeStr = reflect.TypeOf("")
|
||||
|
||||
func FromError(err error) *ExErr {
|
||||
|
||||
//goland:noinspection GoTypeAssertionOnErrors
|
||||
if verr, ok := err.(*ExErr); ok {
|
||||
// A simple ExErr
|
||||
return verr
|
||||
|
||||
@@ -86,3 +86,28 @@ func MessageMatch(e error, matcher func(string) bool) bool {
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
// OriginalError returns the lowest level error, probably the original/external error that was originally wrapped
|
||||
func OriginalError(e error) error {
|
||||
if e == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
//goland:noinspection GoTypeAssertionOnErrors
|
||||
bmerr, ok := e.(*ExErr)
|
||||
for !ok {
|
||||
return e
|
||||
}
|
||||
|
||||
for bmerr.OriginalError != nil {
|
||||
bmerr = bmerr.OriginalError
|
||||
}
|
||||
|
||||
if bmerr.WrappedErr != nil {
|
||||
if werr, ok := bmerr.WrappedErr.(error); ok {
|
||||
return werr
|
||||
}
|
||||
}
|
||||
|
||||
return bmerr
|
||||
}
|
||||
|
||||
@@ -7,10 +7,11 @@ import (
|
||||
)
|
||||
|
||||
type jsonHTTPResponse struct {
|
||||
statusCode int
|
||||
data any
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
statusCode int
|
||||
data any
|
||||
headers []headerval
|
||||
cookies []cookieval
|
||||
filterOverride *string
|
||||
}
|
||||
|
||||
func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
|
||||
@@ -18,6 +19,9 @@ func (j jsonHTTPResponse) jsonRenderer(g *gin.Context) json.GoJsonRender {
|
||||
if jsonfilter := g.GetString(jsonFilterKey); jsonfilter != "" {
|
||||
f = &jsonfilter
|
||||
}
|
||||
if j.filterOverride != nil {
|
||||
f = j.filterOverride
|
||||
}
|
||||
return json.GoJsonRender{Data: j.data, NilSafeSlices: true, NilSafeMaps: true, Filter: f}
|
||||
}
|
||||
|
||||
@@ -68,3 +72,7 @@ func (j jsonHTTPResponse) Headers() []string {
|
||||
func JSON(sc int, data any) HTTPResponse {
|
||||
return &jsonHTTPResponse{statusCode: sc, data: data}
|
||||
}
|
||||
|
||||
func JSONWithFilter(sc int, data any, f string) HTTPResponse {
|
||||
return &jsonHTTPResponse{statusCode: sc, data: data, filterOverride: &f}
|
||||
}
|
||||
|
||||
24
go.mod
24
go.mod
@@ -6,12 +6,12 @@ require (
|
||||
github.com/gin-gonic/gin v1.10.0
|
||||
github.com/glebarez/go-sqlite v1.22.0 // only needed for tests -.-
|
||||
github.com/jmoiron/sqlx v1.4.0
|
||||
github.com/rs/xid v1.5.0
|
||||
github.com/rs/xid v1.6.0
|
||||
github.com/rs/zerolog v1.33.0
|
||||
go.mongodb.org/mongo-driver v1.16.0
|
||||
golang.org/x/crypto v0.26.0
|
||||
golang.org/x/sys v0.23.0
|
||||
golang.org/x/term v0.23.0
|
||||
go.mongodb.org/mongo-driver v1.16.1
|
||||
golang.org/x/crypto v0.27.0
|
||||
golang.org/x/sys v0.25.0
|
||||
golang.org/x/term v0.24.0
|
||||
)
|
||||
|
||||
require (
|
||||
@@ -21,7 +21,7 @@ require (
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/bytedance/sonic v1.12.1 // indirect
|
||||
github.com/bytedance/sonic v1.12.2 // indirect
|
||||
github.com/bytedance/sonic/loader v0.2.0 // indirect
|
||||
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
|
||||
github.com/chenzhuoyu/iasm v0.9.1 // indirect
|
||||
@@ -32,7 +32,7 @@ require (
|
||||
github.com/gin-contrib/sse v0.1.0 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
github.com/go-playground/validator/v10 v10.22.0 // indirect
|
||||
github.com/go-playground/validator/v10 v10.22.1 // indirect
|
||||
github.com/goccy/go-json v0.10.3 // indirect
|
||||
github.com/golang/snappy v0.0.4 // indirect
|
||||
github.com/google/uuid v1.5.0 // indirect
|
||||
@@ -45,7 +45,7 @@ require (
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/montanaflynn/stats v0.7.1 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||
github.com/ugorji/go/codec v1.2.12 // indirect
|
||||
@@ -53,10 +53,10 @@ require (
|
||||
github.com/xdg-go/scram v1.1.2 // indirect
|
||||
github.com/xdg-go/stringprep v1.0.4 // indirect
|
||||
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
|
||||
golang.org/x/arch v0.9.0 // indirect
|
||||
golang.org/x/image v0.19.0 // indirect
|
||||
golang.org/x/net v0.28.0 // indirect
|
||||
golang.org/x/text v0.17.0 // indirect
|
||||
golang.org/x/arch v0.10.0 // indirect
|
||||
golang.org/x/image v0.20.0 // indirect
|
||||
golang.org/x/net v0.29.0 // indirect
|
||||
golang.org/x/text v0.18.0 // indirect
|
||||
google.golang.org/protobuf v1.34.2 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
modernc.org/libc v1.37.6 // indirect
|
||||
|
||||
26
go.sum
26
go.sum
@@ -28,6 +28,8 @@ github.com/bytedance/sonic v1.12.0 h1:YGPgxF9xzaCNvd/ZKdQ28yRovhfMFZQjuk6fKBzZ3l
|
||||
github.com/bytedance/sonic v1.12.0/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
|
||||
github.com/bytedance/sonic v1.12.1 h1:jWl5Qz1fy7X1ioY74WqO0KjAMtAGQs4sYnjiEBiyX24=
|
||||
github.com/bytedance/sonic v1.12.1/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
|
||||
github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg=
|
||||
github.com/bytedance/sonic v1.12.2/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
|
||||
github.com/bytedance/sonic/loader v0.1.0/go.mod h1:UmRT+IRTGKz/DAkzcEGzyVqQFJ7H9BqwBO3pm9H/+HY=
|
||||
github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
|
||||
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
|
||||
@@ -93,6 +95,8 @@ github.com/go-playground/validator/v10 v10.21.0 h1:4fZA11ovvtkdgaeev9RGWPgc1uj3H
|
||||
github.com/go-playground/validator/v10 v10.21.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
|
||||
github.com/go-playground/validator/v10 v10.22.0 h1:k6HsTZ0sTnROkhS//R0O+55JgM8C4Bx7ia+JlgcnOao=
|
||||
github.com/go-playground/validator/v10 v10.22.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
|
||||
github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
|
||||
github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
|
||||
github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
|
||||
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
|
||||
@@ -175,6 +179,8 @@ github.com/pelletier/go-toml/v2 v2.2.1 h1:9TA9+T8+8CUCO2+WYnDLCgrYi9+omqKXyjDtos
|
||||
github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
|
||||
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
|
||||
github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
|
||||
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
|
||||
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
|
||||
github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
@@ -184,6 +190,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
|
||||
github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
|
||||
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
|
||||
github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
|
||||
github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
|
||||
github.com/rs/zerolog v1.31.0 h1:FcTR3NnLWW+NnTwwhFWiJSZr4ECLpqCm6QsEnyvbV4A=
|
||||
github.com/rs/zerolog v1.31.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
|
||||
github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
|
||||
@@ -234,6 +242,8 @@ go.mongodb.org/mongo-driver v1.15.1 h1:l+RvoUOoMXFmADTLfYDm7On9dRm7p4T80/lEQM+r7
|
||||
go.mongodb.org/mongo-driver v1.15.1/go.mod h1:Vzb0Mk/pa7e6cWw85R4F/endUC3u0U9jGcNU603k65c=
|
||||
go.mongodb.org/mongo-driver v1.16.0 h1:tpRsfBJMROVHKpdGyc1BBEzzjDUWjItxbVSZ8Ls4BQ4=
|
||||
go.mongodb.org/mongo-driver v1.16.0/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
|
||||
go.mongodb.org/mongo-driver v1.16.1 h1:rIVLL3q0IHM39dvE+z2ulZLp9ENZKThVfuvN/IiN4l8=
|
||||
go.mongodb.org/mongo-driver v1.16.1/go.mod h1:oB6AhJQvFQL4LEHyXi6aJzQJtBiTQHiAd83l0GdFaiw=
|
||||
golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
|
||||
golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
|
||||
golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
||||
@@ -241,6 +251,8 @@ golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
|
||||
golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
||||
golang.org/x/arch v0.9.0 h1:ub9TgUInamJ8mrZIGlBG6/4TqWeMszd4N8lNorbrr6k=
|
||||
golang.org/x/arch v0.9.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
||||
golang.org/x/arch v0.10.0 h1:S3huipmSclq3PJMNe76NGwkBR504WFkQ5dhzWzP8ZW8=
|
||||
golang.org/x/arch v0.10.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
|
||||
@@ -265,6 +277,8 @@ golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
|
||||
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
|
||||
golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw=
|
||||
golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54=
|
||||
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
|
||||
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
|
||||
golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 h1:hVwzHzIUGRjiF7EcUjqNxk3NCfkPxbDKRdnNE1Rpg0U=
|
||||
golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
|
||||
@@ -276,6 +290,8 @@ golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
|
||||
golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
|
||||
golang.org/x/image v0.19.0 h1:D9FX4QWkLfkeqaC62SonffIIuYdOk/UE2XKUBgRIBIQ=
|
||||
golang.org/x/image v0.19.0/go.mod h1:y0zrRqlQRWQ5PXaYCOMLTW2fpsxZ8Qh9I/ohnInJEys=
|
||||
golang.org/x/image v0.20.0 h1:7cVCUjQwfL18gyBJOmYvptfSHS8Fb3YUDtfLIZ7Nbpw=
|
||||
golang.org/x/image v0.20.0/go.mod h1:0a88To4CYVBAHp5FXJm8o7QbUl37Vd85ply1vyD8auM=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
|
||||
@@ -300,6 +316,8 @@ golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
|
||||
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
|
||||
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
|
||||
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
|
||||
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
|
||||
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
|
||||
@@ -335,6 +353,10 @@ golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
|
||||
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.23.0 h1:YfKFowiIMvtgl1UERQoTPPToxltDeZfbj4H7dVUCwmM=
|
||||
golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
|
||||
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
|
||||
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
|
||||
@@ -353,6 +375,8 @@ golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk=
|
||||
golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4=
|
||||
golang.org/x/term v0.23.0 h1:F6D4vR+EHoL9/sWAWgAR1H2DcHr4PareCbAaCo1RpuU=
|
||||
golang.org/x/term v0.23.0/go.mod h1:DgV24QBUrK6jhZXl+20l6UWznPlwAHm1Q1mGHtydmSk=
|
||||
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
|
||||
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
@@ -367,6 +391,8 @@ golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
|
||||
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
|
||||
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
|
||||
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
|
||||
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
|
||||
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
|
||||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
package goext
|
||||
|
||||
const GoextVersion = "0.0.498"
|
||||
const GoextVersion = "0.0.511"
|
||||
|
||||
const GoextVersionTimestamp = "2024-08-07T17:26:35+0200"
|
||||
const GoextVersionTimestamp = "2024-09-15T18:22:07+0200"
|
||||
|
||||
@@ -1353,7 +1353,7 @@ func typeFields(t reflect.Type, tagkey string) structFields {
|
||||
|
||||
var jsonfilter []string
|
||||
jsonfilterTag := sf.Tag.Get("jsonfilter")
|
||||
if jsonfilterTag != "" && jsonfilterTag != "-" {
|
||||
if jsonfilterTag != "" {
|
||||
jsonfilter = strings.Split(jsonfilterTag, ",")
|
||||
}
|
||||
|
||||
|
||||
15
langext/io.go
Normal file
15
langext/io.go
Normal file
@@ -0,0 +1,15 @@
|
||||
package langext
|
||||
|
||||
import "io"
|
||||
|
||||
type nopCloser struct {
|
||||
io.Writer
|
||||
}
|
||||
|
||||
func (n nopCloser) Close() error {
|
||||
return nil // no op
|
||||
}
|
||||
|
||||
func WriteNopCloser(w io.Writer) io.WriteCloser {
|
||||
return nopCloser{w}
|
||||
}
|
||||
@@ -2,6 +2,9 @@ package timeext
|
||||
|
||||
import "time"
|
||||
|
||||
// YearDifference calculates the difference between two timestamps in years.
|
||||
// = t1 - t2
|
||||
// returns a float value
|
||||
func YearDifference(t1 time.Time, t2 time.Time, tz *time.Location) float64 {
|
||||
|
||||
yDelta := float64(t1.Year() - t2.Year())
|
||||
@@ -11,3 +14,31 @@ func YearDifference(t1 time.Time, t2 time.Time, tz *time.Location) float64 {
|
||||
|
||||
return yDelta + (processT1 - processT2)
|
||||
}
|
||||
|
||||
// MonthDifference calculates the difference between two timestamps in months.
|
||||
// = t1 - t2
|
||||
// returns a float value
|
||||
func MonthDifference(t1 time.Time, t2 time.Time) float64 {
|
||||
|
||||
yDelta := float64(t1.Year() - t2.Year())
|
||||
mDelta := float64(t1.Month() - t2.Month())
|
||||
|
||||
dDelta := float64(0)
|
||||
|
||||
t1MonthDays := DaysInMonth(t1)
|
||||
t2MonthDays := DaysInMonth(t2)
|
||||
|
||||
if t2.Year() > t1.Year() || (t2.Year() == t1.Year() && t2.Month() > t1.Month()) {
|
||||
dDelta -= 1
|
||||
dDelta += float64(t1MonthDays-t1.Day()) / float64(t1MonthDays)
|
||||
dDelta += float64(t2.Day()) / float64(t2MonthDays)
|
||||
} else if t2.Year() < t1.Year() || (t2.Year() == t1.Year() && t2.Month() < t1.Month()) {
|
||||
dDelta -= 1
|
||||
dDelta += float64(t1.Day()) / float64(t1MonthDays)
|
||||
dDelta += float64(t2MonthDays-t2.Day()) / float64(t2MonthDays)
|
||||
} else {
|
||||
dDelta += float64(t1.Day()-t2.Day()) / float64(t1MonthDays)
|
||||
}
|
||||
|
||||
return yDelta*12 + mDelta + dDelta
|
||||
}
|
||||
|
||||
@@ -81,3 +81,63 @@ func epsilonEquals(a, b float64) bool {
|
||||
epsilon := 0.01
|
||||
return math.Abs(a-b) < epsilon
|
||||
}
|
||||
|
||||
func TestMonthDifferenceSameDate(t *testing.T) {
|
||||
t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := 0.0
|
||||
result := MonthDifference(t2, t1)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMonthDifferenceSameMonth(t *testing.T) {
|
||||
t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2022, 1, 31, 0, 0, 0, 0, time.UTC)
|
||||
expected := 0.967741935483871 // Approximation of 30/31 days
|
||||
result := MonthDifference(t2, t1)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMonthDifferenceDifferentMonthsSameYear(t *testing.T) {
|
||||
t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2022, 3, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := 2.0
|
||||
result := MonthDifference(t2, t1)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMonthDifferenceDifferentYears(t *testing.T) {
|
||||
t1 := time.Date(2021, 12, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2022, 2, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := 2.0
|
||||
result := MonthDifference(t2, t1)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMonthDifferenceT1BeforeT2(t *testing.T) {
|
||||
t1 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2022, 6, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := 5.0
|
||||
result := MonthDifference(t2, t1)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMonthDifferenceT1AfterT2(t *testing.T) {
|
||||
t1 := time.Date(2022, 6, 1, 0, 0, 0, 0, time.UTC)
|
||||
t2 := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC)
|
||||
expected := -5.0
|
||||
result := MonthDifference(t2, t1)
|
||||
if !epsilonEquals(result, expected) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -184,3 +184,10 @@ func AddYears(t time.Time, yearCount float64, tz *time.Location) time.Time {
|
||||
|
||||
return t.Add(time.Duration(float64(t1.Sub(t0)) * floatCount))
|
||||
}
|
||||
|
||||
func DaysInMonth(t time.Time) int {
|
||||
// https://stackoverflow.com/a/73882035/1761622
|
||||
|
||||
y, m, _ := t.Date()
|
||||
return time.Date(y, m+1, 0, 0, 0, 0, 0, time.UTC).Day()
|
||||
}
|
||||
|
||||
@@ -191,3 +191,39 @@ func TestCombineDateAndTime_CombineDifferentParts(t *testing.T) {
|
||||
t.Errorf("Expected %v, got %v", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDaysInMonth_31Days(t *testing.T) {
|
||||
date := time.Date(2022, 1, 1, 0, 0, 0, 0, time.UTC) // January
|
||||
expected := 31
|
||||
result := DaysInMonth(date)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %d but got %d", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDaysInMonth_30Days(t *testing.T) {
|
||||
date := time.Date(2022, 4, 1, 0, 0, 0, 0, time.UTC) // April
|
||||
expected := 30
|
||||
result := DaysInMonth(date)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %d but got %d", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDaysInMonth_FebruaryLeapYear(t *testing.T) {
|
||||
date := time.Date(2020, 2, 1, 0, 0, 0, 0, time.UTC) // February in a leap year
|
||||
expected := 29
|
||||
result := DaysInMonth(date)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %d but got %d", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDaysInMonth_FebruaryNonLeapYear(t *testing.T) {
|
||||
date := time.Date(2021, 2, 1, 0, 0, 0, 0, time.UTC) // February in a non-leap year
|
||||
expected := 28
|
||||
result := DaysInMonth(date)
|
||||
if result != expected {
|
||||
t.Errorf("Expected %d but got %d", expected, result)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,11 @@ import (
|
||||
func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error) {
|
||||
r, err := c.findOneInternal(ctx, filter, false)
|
||||
if err != nil {
|
||||
return *new(TData), exerr.Wrap(err, "mongo-query[find-one] failed").Str("collection", c.Name()).Build()
|
||||
if filterId, ok := filter["_id"]; ok {
|
||||
return *new(TData), exerr.Wrap(err, "mongo-query[find-one] failed").Str("collection", c.Name()).Any("filter", filter).Any("filter_id", filterId).Build()
|
||||
} else {
|
||||
return *new(TData), exerr.Wrap(err, "mongo-query[find-one] failed").Str("collection", c.Name()).Any("filter", filter).Build()
|
||||
}
|
||||
}
|
||||
|
||||
return *r, nil
|
||||
@@ -21,7 +25,7 @@ func (c *Coll[TData]) FindOne(ctx context.Context, filter bson.M) (TData, error)
|
||||
func (c *Coll[TData]) FindOneOpt(ctx context.Context, filter bson.M) (*TData, error) {
|
||||
r, err := c.findOneInternal(ctx, filter, true)
|
||||
if err != nil {
|
||||
return nil, exerr.Wrap(err, "mongo-query[find-one-opt] failed").Str("collection", c.Name()).Build()
|
||||
return nil, exerr.Wrap(err, "mongo-query[find-one-opt] failed").Str("collection", c.Name()).Any("filter", filter).Build()
|
||||
}
|
||||
|
||||
return r, nil
|
||||
@@ -58,7 +62,11 @@ func (c *Coll[TData]) findOneInternal(ctx context.Context, filter bson.M, allowN
|
||||
return nil, nil
|
||||
}
|
||||
if err != nil {
|
||||
return nil, exerr.Wrap(err, "mongo-query[find-one] failed").Any("filter", filter).Str("collection", c.Name()).NoLog().Build()
|
||||
if filterId, ok := filter["_id"]; ok {
|
||||
return nil, exerr.Wrap(err, "mongo-query[find-one|internal] failed").Str("collection", c.Name()).Any("filter", filter).Any("filter_id", filterId).NoLog().Build()
|
||||
} else {
|
||||
return nil, exerr.Wrap(err, "mongo-query[find-one|internal] failed").Str("collection", c.Name()).Any("filter", filter).NoLog().Build()
|
||||
}
|
||||
}
|
||||
|
||||
return &res, nil
|
||||
|
||||
@@ -293,7 +293,7 @@ func (b *WPDFBuilder) Cell(txt string, opts ...*PDFCellOpt) {
|
||||
} else if ln == BreakToRight {
|
||||
b.Rect(b.GetX()-xBefore, *height, RectOutline, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).DrawColor(0, 128, 0))
|
||||
} else if ln == BreakToBelow {
|
||||
b.Rect(b.GetPageWidth(), *height, RectOutline, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).DrawColor(0, 128, 0))
|
||||
b.Rect(b.GetPageWidth()-xBefore-b.GetMarginRight(), *height, RectOutline, NewPDFRectOpt().X(xBefore).Y(yBefore).LineWidth(0.25).DrawColor(0, 128, 0))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -38,24 +38,6 @@ type TableBuilder struct {
|
||||
debug *bool
|
||||
}
|
||||
|
||||
type TableCell struct {
|
||||
Content string
|
||||
Style TableCellStyleOpt
|
||||
}
|
||||
|
||||
type TableCellStyleOpt struct {
|
||||
MultiCell *bool
|
||||
Ellipsize *bool
|
||||
PaddingHorz *float64
|
||||
MinWidth *float64
|
||||
|
||||
PDFCellOpt
|
||||
}
|
||||
|
||||
type tableRow struct {
|
||||
cells []TableCell
|
||||
}
|
||||
|
||||
func (r tableRow) maxFontSize(defaultFontSize float64) float64 {
|
||||
mfs := defaultFontSize
|
||||
for _, cell := range r.cells {
|
||||
@@ -71,8 +53,8 @@ func (b *TableBuilder) Widths(v ...string) *TableBuilder {
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *TableBuilder) DefaultStyle(s TableCellStyleOpt) *TableBuilder {
|
||||
b.defaultCellStyle = &s
|
||||
func (b *TableBuilder) DefaultStyle(s *TableCellStyleOpt) *TableBuilder {
|
||||
b.defaultCellStyle = s
|
||||
return b
|
||||
}
|
||||
|
||||
@@ -91,10 +73,10 @@ func (b *TableBuilder) AddRow(cells ...TableCell) *TableBuilder {
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *TableBuilder) AddRowWithStyle(style TableCellStyleOpt, cells ...string) *TableBuilder {
|
||||
func (b *TableBuilder) AddRowWithStyle(style *TableCellStyleOpt, cells ...string) *TableBuilder {
|
||||
tcels := make([]TableCell, 0, len(cells))
|
||||
for _, cell := range cells {
|
||||
tcels = append(tcels, TableCell{Content: cell, Style: style})
|
||||
tcels = append(tcels, TableCell{Content: cell, Style: *style})
|
||||
}
|
||||
|
||||
b.rows = append(b.rows, tableRow{cells: tcels})
|
||||
@@ -113,6 +95,10 @@ func (b *TableBuilder) AddRowDefaultStyle(cells ...string) *TableBuilder {
|
||||
return b
|
||||
}
|
||||
|
||||
func (b *TableBuilder) BuildRow() *TableRowBuilder {
|
||||
return &TableRowBuilder{tabbuilder: b, cells: make([]TableCell, 0)}
|
||||
}
|
||||
|
||||
func (b *TableBuilder) Build() {
|
||||
builder := b.builder
|
||||
|
||||
@@ -148,15 +134,19 @@ func (b *TableBuilder) Build() {
|
||||
str := cell.Content
|
||||
style := cell.Style
|
||||
|
||||
ellipsize := langext.Coalesce(style.Ellipsize, true)
|
||||
cellPaddingHorz := langext.Coalesce(style.PaddingHorz, 2)
|
||||
ellipsize := langext.Coalesce(style.ellipsize, true)
|
||||
cellPaddingHorz := langext.Coalesce(style.paddingHorz, 2)
|
||||
|
||||
fillHeight := langext.Coalesce(style.fillHeight, false)
|
||||
|
||||
bx := builder.GetX()
|
||||
by := builder.GetY()
|
||||
|
||||
cellWidth := columnWidths[cellIdx]
|
||||
|
||||
if langext.Coalesce(style.MultiCell, true) {
|
||||
_ = fillHeight // TODO implement, but how?? ( cells with fillHeight=true should have a border of the full column height, even if another column is growing it, but we do not know teh height beforehand ... )
|
||||
|
||||
if langext.Coalesce(style.multiCell, true) {
|
||||
|
||||
builder.MultiCell(str, style.PDFCellOpt.Copy().ToMulti().Width(cellWidth).Debug(debug))
|
||||
|
||||
@@ -230,8 +220,8 @@ func (b *TableBuilder) calculateColumns() []float64 {
|
||||
for _, row := range b.rows {
|
||||
if len(row.cells) > colIdx {
|
||||
|
||||
ph := langext.Coalesce(row.cells[colIdx].Style.PaddingHorz, 2)
|
||||
mw := langext.Coalesce(row.cells[colIdx].Style.MinWidth, 0)
|
||||
ph := langext.Coalesce(row.cells[colIdx].Style.paddingHorz, 2)
|
||||
mw := langext.Coalesce(row.cells[colIdx].Style.minWidth, 0)
|
||||
|
||||
minWidth = max(minWidth, ph+mw)
|
||||
|
||||
@@ -344,8 +334,8 @@ func defaultTableStyle() *TableCellStyleOpt {
|
||||
FillColorHex(uint32(0xF0F0F0)).
|
||||
TextColorHex(uint32(0x000000)).
|
||||
FillBackground(true),
|
||||
MinWidth: langext.Ptr(float64(5)),
|
||||
Ellipsize: langext.PTrue,
|
||||
MultiCell: langext.PFalse,
|
||||
minWidth: langext.Ptr(float64(5)),
|
||||
ellipsize: langext.PTrue,
|
||||
multiCell: langext.PFalse,
|
||||
}
|
||||
}
|
||||
|
||||
187
wpdf/wpdfTableCell.go
Normal file
187
wpdf/wpdfTableCell.go
Normal file
@@ -0,0 +1,187 @@
|
||||
package wpdf
|
||||
|
||||
import (
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/dataext"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
)
|
||||
|
||||
type TableCell struct {
|
||||
Content string
|
||||
Style TableCellStyleOpt
|
||||
}
|
||||
|
||||
type TableCellStyleOpt struct {
|
||||
multiCell *bool
|
||||
ellipsize *bool
|
||||
paddingHorz *float64
|
||||
minWidth *float64
|
||||
fillHeight *bool
|
||||
|
||||
PDFCellOpt
|
||||
}
|
||||
|
||||
func NewTableCellStyleOpt() *TableCellStyleOpt {
|
||||
return &TableCellStyleOpt{}
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) FillHeight(b bool) *TableCellStyleOpt {
|
||||
o.fillHeight = &b
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) MultiCell(v bool) *TableCellStyleOpt {
|
||||
o.multiCell = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Ellipsize(v bool) *TableCellStyleOpt {
|
||||
o.ellipsize = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) PaddingHorz(v float64) *TableCellStyleOpt {
|
||||
o.paddingHorz = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) MinWidth(v float64) *TableCellStyleOpt {
|
||||
o.minWidth = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) CellStyle(v PDFCellOpt) *TableCellStyleOpt {
|
||||
o.PDFCellOpt = v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Width(v float64) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.width = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Height(v float64) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.height = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Border(v PDFBorder) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.border = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) LnPos(v PDFTextBreak) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.ln = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Align(v PDFTextAlign) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.align = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) FillBackground(v bool) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fill = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Link(v int) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.link = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) LinkStr(v string) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.linkStr = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Font(fontName PDFFontFamily, fontStyle PDFFontStyle, fontSize float64) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fontNameOverride = &fontName
|
||||
o.PDFCellOpt.fontStyleOverride = &fontStyle
|
||||
o.PDFCellOpt.fontSizeOverride = &fontSize
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) FontName(v PDFFontFamily) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fontNameOverride = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) FontStyle(v PDFFontStyle) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fontStyleOverride = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) FontSize(v float64) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fontSizeOverride = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Bold() *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fontStyleOverride = langext.Ptr(Bold)
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Italic() *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fontStyleOverride = langext.Ptr(Italic)
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) LnAfter(v float64) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.extraLn = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) X(v float64) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.x = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) AutoWidth() *TableCellStyleOpt {
|
||||
o.PDFCellOpt.autoWidth = langext.PTrue
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) AutoWidthPaddingX(v float64) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.autoWidthPaddingX = &v
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) TextColor(cr, cg, cb int) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.textColor = langext.Ptr(rgbToColor(cr, cg, cb))
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) TextColorHex(c uint32) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.textColor = langext.Ptr(hexToColor(c))
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) BorderColor(cr, cg, cb int) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.borderColor = langext.Ptr(rgbToColor(cr, cg, cb))
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) BorderColorHex(c uint32) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.borderColor = langext.Ptr(hexToColor(c))
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) FillColor(cr, cg, cb int) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fillColor = langext.Ptr(rgbToColor(cr, cg, cb))
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) FillColorHex(c uint32) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.fillColor = langext.Ptr(hexToColor(c))
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Alpha(alpha float64, blendMode PDFBlendMode) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.alphaOverride = &dataext.Tuple[float64, PDFBlendMode]{V1: alpha, V2: blendMode}
|
||||
return o
|
||||
}
|
||||
|
||||
func (o *TableCellStyleOpt) Debug(v bool) *TableCellStyleOpt {
|
||||
o.PDFCellOpt.debug = &v
|
||||
return o
|
||||
}
|
||||
52
wpdf/wpdfTableRow.go
Normal file
52
wpdf/wpdfTableRow.go
Normal file
@@ -0,0 +1,52 @@
|
||||
package wpdf
|
||||
|
||||
import "gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
|
||||
type tableRow struct {
|
||||
cells []TableCell
|
||||
}
|
||||
|
||||
type TableRowBuilder struct {
|
||||
tabbuilder *TableBuilder
|
||||
defaultStyle *TableCellStyleOpt
|
||||
cells []TableCell
|
||||
}
|
||||
|
||||
func (r *TableRowBuilder) RowStyle(style *TableCellStyleOpt) *TableRowBuilder {
|
||||
r.defaultStyle = style
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *TableRowBuilder) Cell(cell string) *TableRowBuilder {
|
||||
r.cells = append(r.cells, TableCell{Content: cell, Style: langext.Coalesce3(r.defaultStyle, r.tabbuilder.defaultCellStyle, TableCellStyleOpt{})})
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *TableRowBuilder) Cells(cells ...string) *TableRowBuilder {
|
||||
for _, cell := range cells {
|
||||
r.cells = append(r.cells, TableCell{Content: cell, Style: langext.Coalesce3(r.defaultStyle, r.tabbuilder.defaultCellStyle, TableCellStyleOpt{})})
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *TableRowBuilder) CellObject(cell TableCell) *TableRowBuilder {
|
||||
r.cells = append(r.cells, cell)
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *TableRowBuilder) CellObjects(cells ...TableCell) *TableRowBuilder {
|
||||
for _, cell := range cells {
|
||||
r.cells = append(r.cells, cell)
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *TableRowBuilder) CellWithStyle(cell string, style *TableCellStyleOpt) *TableRowBuilder {
|
||||
r.cells = append(r.cells, TableCell{Content: cell, Style: *style})
|
||||
return r
|
||||
}
|
||||
|
||||
func (r *TableRowBuilder) BuildRow() *TableBuilder {
|
||||
r.tabbuilder.AddRow(r.cells...)
|
||||
return r.tabbuilder
|
||||
}
|
||||
@@ -2,9 +2,11 @@ package wpdf
|
||||
|
||||
import (
|
||||
_ "embed"
|
||||
"fmt"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/imageext"
|
||||
"gogs.mikescher.com/BlackForestBytes/goext/langext"
|
||||
"os"
|
||||
"path"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -38,7 +40,7 @@ func TestPDFBuilder(t *testing.T) {
|
||||
|
||||
builder.Ln(4)
|
||||
|
||||
cellStyleHeader := TableCellStyleOpt{
|
||||
cellStyleHeader := &TableCellStyleOpt{
|
||||
PDFCellOpt: *NewPDFCellOpt().
|
||||
FontSize(float64(8)).
|
||||
BorderColorHex(uint32(0x666666)).
|
||||
@@ -48,12 +50,12 @@ func TestPDFBuilder(t *testing.T) {
|
||||
TextColorHex(uint32(0x000000)).
|
||||
Align(AlignHorzCenter).
|
||||
Bold(),
|
||||
MinWidth: langext.Ptr(float64(5)),
|
||||
Ellipsize: langext.PTrue,
|
||||
MultiCell: langext.PFalse,
|
||||
minWidth: langext.Ptr(float64(5)),
|
||||
ellipsize: langext.PTrue,
|
||||
multiCell: langext.PFalse,
|
||||
}
|
||||
|
||||
cellStyleMulti := TableCellStyleOpt{
|
||||
cellStyleMulti := &TableCellStyleOpt{
|
||||
PDFCellOpt: *NewPDFCellOpt().
|
||||
FontSize(float64(8)).
|
||||
BorderColorHex(uint32(0x666666)).
|
||||
@@ -61,9 +63,9 @@ func TestPDFBuilder(t *testing.T) {
|
||||
FillColorHex(uint32(0xC060C0)).
|
||||
FillBackground(true).
|
||||
TextColorHex(uint32(0x000000)),
|
||||
MinWidth: langext.Ptr(float64(5)),
|
||||
Ellipsize: langext.PFalse,
|
||||
MultiCell: langext.PTrue,
|
||||
minWidth: langext.Ptr(float64(5)),
|
||||
ellipsize: langext.PFalse,
|
||||
multiCell: langext.PTrue,
|
||||
}
|
||||
|
||||
builder.Table().
|
||||
@@ -74,7 +76,20 @@ func TestPDFBuilder(t *testing.T) {
|
||||
AddRowDefaultStyle("test", "hello", "123", "end").
|
||||
AddRowDefaultStyle("123", "helasdsalo", "a", "enwqad").
|
||||
AddRowDefaultStyle("123asd", "TrimMeTrimMeTrimMeTrimMe", "a", "enwqad").
|
||||
AddRowWithStyle(cellStyleMulti, "123", "helasdsalo", "a", "MultiCell: enwqad enw\nqad enwqad enwqad enwqad enwqad enwqad enwqad enwqad").
|
||||
AddRowWithStyle(cellStyleMulti, "123", "helasdsalo", "a", "MultiCell: enwqad enw\nqad enwqad enwqad enwqad enwqad").
|
||||
AddRowDefaultStyle("123", "helasdsalo", "a", "enwqad").
|
||||
Debug(false).
|
||||
Build()
|
||||
|
||||
builder.Ln(8)
|
||||
|
||||
builder.Table().
|
||||
Widths("auto", "20", "1fr", "20").
|
||||
PadX(2).
|
||||
PadY(2).
|
||||
BuildRow().RowStyle(cellStyleHeader).Cells("test", "hello", "123", "end").BuildRow().
|
||||
BuildRow().Cells("test", "hello", "123", "end").BuildRow().
|
||||
BuildRow().RowStyle(cellStyleMulti.FillHeight(true)).Cell("123").Cell("helasdsalo").Cell("a").Cell("MultiCell: enwqad enw\nqad enwqad enwqad enwqad enwqad").BuildRow().
|
||||
AddRowDefaultStyle("123", "helasdsalo", "a", "enwqad").
|
||||
Debug(false).
|
||||
Build()
|
||||
@@ -84,5 +99,7 @@ func TestPDFBuilder(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
_ = os.WriteFile("wpdf_test.pdf", bin, 0644)
|
||||
fn := "wpdf_test.pdf"
|
||||
_ = os.WriteFile(fn, bin, 0644)
|
||||
fmt.Println("file://" + path.Join(langext.Must(os.Getwd()), fn))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user