From 2e66c68e4070b399fca07bc2f98d5eebf04c36bd Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Sun, 24 Nov 2024 15:14:32 +0100 Subject: [PATCH] op listen summenbildung --- .../OPListExportAdapterByWeek.java | 21 +++++++++++++----- templates/op-liste_kw_template.xlsx | Bin 40223 -> 40332 bytes 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java index 729ab18..7d4bf37 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/OPListExportAdapterByWeek.java @@ -201,13 +201,20 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter { private void addCurrencyColumns(XSSFWorkbook doc, XSSFSheet sheet, List currencyList, List spaces) { - // zusaetzliche spalten einfuegen... - int newColumns = (currencyList.size() * spaces.size()) - 0; + // zusaetzliche Abteilungs spalten einfuegen... + int newColumns = (currencyList.size() * (spaces.size())) - 1; for (int i = 0; i < newColumns; i++) { logger.fine(".. add currency column..."); POIUtil.insertColumn(sheet, 1, 2 + i); } + // Total spalten einfuegen + for (int i = 0; i < currencyList.size() - 1; i++) { + logger.fine(".. add total column..."); + POIUtil.insertColumn(sheet, 2 + newColumns, 3 + newColumns + i); + } + newColumns = newColumns + currencyList.size(); + // Beschriftungen eintragen int col = 1; XSSFCell cell = null; @@ -226,6 +233,11 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter { } // Add the total column spaceRow.getCell(col).setCellValue("Total"); + for (String currency : currencyList) { + cell = currencyRow.getCell(col); + cell.setCellValue(currency); + col++; + } } /** @@ -533,11 +545,10 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter { // totalCell.setCellValue(totalsUeberfaelligCurrency2.get("TOTAL") + // totalsFaelligCurrency2.get("TOTAL")); - // delete placeholder row + // delete placeholder rows sheet.shiftRows(_rowNo, _rowNo + 3, -1); - + sheet.shiftRows(_rowNo - 1, _rowNo - 1 + 3, -1); logger.finest("......invoices added"); - } /** diff --git a/templates/op-liste_kw_template.xlsx b/templates/op-liste_kw_template.xlsx index 1d54b99d2f327f3fd6d685962686ad8f010d65de..6ba86b29270b46365de317edf087e07a310dc909 100644 GIT binary patch delta 4556 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 delta 4441 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 lA3hZ+cxaZuKM0k^33?