From 2511a2fcd33c914ed560e9d174cc7f6cea790bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Schr=C3=B6pfer?= Date: Mon, 1 Mar 2021 16:36:48 +0100 Subject: [PATCH] fixes #8 type and version added to json export --- pkg/loader/conf.go | 1 + pkg/loader/conf/default.json | 1 + pkg/loader/loader.go | 2 ++ 3 files changed, 4 insertions(+) diff --git a/pkg/loader/conf.go b/pkg/loader/conf.go index 0f83a01..3e0b836 100644 --- a/pkg/loader/conf.go +++ b/pkg/loader/conf.go @@ -28,6 +28,7 @@ func DefaultConf() *Conf { type Conf struct { Title string `json:"title"` Version string `json:"version"` + Type string `json:"type"` Values []Value `json:"values"` Areas []Area `json:"areas"` Rating Rating `json:"rating"` diff --git a/pkg/loader/conf/default.json b/pkg/loader/conf/default.json index f647536..e8917e9 100644 --- a/pkg/loader/conf/default.json +++ b/pkg/loader/conf/default.json @@ -1,6 +1,7 @@ { "title": "Good Balance Calculator", "version": "5.04", + "type": "Full", "values": [ { "sheet": 2, diff --git a/pkg/loader/loader.go b/pkg/loader/loader.go index 0a35848..ff9dc6d 100644 --- a/pkg/loader/loader.go +++ b/pkg/loader/loader.go @@ -18,6 +18,8 @@ func XLSX(r io.Reader, conf *Conf) (*ecalc.Ecalc, error) { if conf == nil { conf = DefaultConf() } + eBalance.Version = conf.Version + eBalance.Type = conf.Type xFile, err := excelize.OpenReader(r) if err != nil { return nil, fmt.Errorf("XLSX.OpenReader: %w", err)