Mercurial > gemma
changeset 5346:72469b713705 extented-report
XLSX templater: Cosmetics
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sun, 20 Jun 2021 14:10:32 +0200 |
| parents | 95dafb72a288 |
| children | 1fc454da7ee8 |
| files | pkg/xlsx/templater.go |
| diffstat | 1 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/xlsx/templater.go Sun Jun 20 04:17:53 2021 +0200 +++ b/pkg/xlsx/templater.go Sun Jun 20 14:10:32 2021 +0200 @@ -66,13 +66,11 @@ } func mergeCellToArea(mc excelize.MergeCell) (area, error) { - sa := mc.GetStartAxis() - x1, y1, err := excelize.CellNameToCoordinates(sa) + x1, y1, err := excelize.CellNameToCoordinates(mc.GetStartAxis()) if err != nil { return area{}, err } - ea := mc.GetEndAxis() - x2, y2, err := excelize.CellNameToCoordinates(ea) + x2, y2, err := excelize.CellNameToCoordinates(mc.GetEndAxis()) if err != nil { return area{}, err } @@ -86,7 +84,7 @@ } func (a *area) contains(x, y int) bool { - return x >= a.x1 && x <= a.x2 && y >= a.y1 && y <= a.y2 + return a.x1 <= x && x <= a.x2 && a.y1 <= y && y <= a.y2 } func ActionFromFile(filename string) (*Action, error) {