andreas.schroepfer/excelConverter
1
1
Fork 0
Code Issues 3 Pull Requests Projects 1 Releases Wiki Activity

matrix conf fixed

Browse Source
This commit is contained in:
Andreas Schröpfer
2021-03-02 20:27:31 +01:00
parent 72eb5c74d8
commit 664d7750a6
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/loader/conf/default.json
View File

@@ -271,22 +271,22 @@
"short_name": "2",
"name": "Solidarity",
"points_col": "G",
"percentage_reached_col": "I",
"max_points_col": "J"
"percentage_reached_col": "J",
"max_points_col": "I"
},
{
"short_name": "3",
"name": "Environment sustainability",
"points_col": "K",
"percentage_reached_col": "M",
"max_points_col": "N"
"percentage_reached_col": "N",
"max_points_col": "M"
},
{
"short_name": "4",
"name": "Transparency",
"points_col": "O",
"percentage_reached_col": "Q",
"max_points_col": "R"
"percentage_reached_col": "R",
"max_points_col": "Q"
}
]

1
pkg/loader/loader.go
View File

@@ -213,6 +213,7 @@ func XLSX(r io.Reader, conf *Conf) (*ecalc.Ecalc, error) {
case "PercentageReached":
mTopic.PercentageReached = int(f * 100)
}
// fmt.Println(axis, field, f, cellValue)
}
readCell(val.PointsCol, "Points")
readCell(val.MaxPointsCol, "MaxPoints")

9
pkg/loader/loader_test.go
View File

@@ -29,5 +29,14 @@ func TestXLSX(t *testing.T) {
is.Equal(got.Matrix.Topics[4].Points, 27)
is.Equal(got.Matrix.Topics[4].MaxPoints, 33)
is.Equal(got.Matrix.Topics[4].PercentageReached, 80)
is.Equal(got.Matrix.Topics[5].Points, 2) // points B2
is.Equal(got.Matrix.Topics[5].MaxPoints, 22) // maxPoints B2
is.Equal(got.Matrix.Topics[5].PercentageReached, 10) // percent B2
is.Equal(got.Matrix.Topics[6].Points, 10) // points B3
is.Equal(got.Matrix.Topics[6].MaxPoints, 33) // maxPoints B3
is.Equal(got.Matrix.Topics[6].PercentageReached, 30) // percent B3
is.Equal(got.Matrix.Topics[7].Points, 2) // points B4
is.Equal(got.Matrix.Topics[7].MaxPoints, 22) // maxPoints B4
is.Equal(got.Matrix.Topics[7].PercentageReached, 10) // percent B4
}