From 00e2dde8920c2ffafab45ee63a85d5b6b0a45631 Mon Sep 17 00:00:00 2001 From: Ralph Soika Date: Mon, 23 Sep 2024 20:10:33 +0200 Subject: [PATCH] =?UTF-8?q?erweiterung=20der=20Spalten=20f=C3=BCr=20KW=20E?= =?UTF-8?q?xcel=20-=20wegen=20neuer=20Abteilungen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OPListExportAdapterByWeek.java | 9 +++++---- templates/op-liste_kw_template.xlsx | Bin 42137 -> 42191 bytes 2 files changed, 5 insertions(+), 4 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 6add295..a64fbbe 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 @@ -19,6 +19,7 @@ import org.apache.poi.ss.usermodel.CellCopyPolicy; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.Row.MissingCellPolicy; import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFRow; import org.apache.poi.xssf.usermodel.XSSFSheet; @@ -289,21 +290,21 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter { XSSFCell cell = null; // column++; // Space currency EUR - cell = referenceRowSpacesCurrencies.getCell(column); + cell = referenceRowSpacesCurrencies.getCell(column, MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy()); cell.setCellValue(currency1); - cell = rowSpacesLabels.getCell(column); + cell = rowSpacesLabels.getCell(column, MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy()); cell.setCellValue(""); // Space currency USD column++; - cell = referenceRowSpacesCurrencies.getCell(column); + cell = referenceRowSpacesCurrencies.getCell(column, MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy()); cell.setCellValue(currency2); // Space Label - cell = rowSpacesLabels.getCell(column); + cell = rowSpacesLabels.getCell(column, MissingCellPolicy.CREATE_NULL_AS_BLANK); cell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy()); cell.setCellValue("Total"); diff --git a/templates/op-liste_kw_template.xlsx b/templates/op-liste_kw_template.xlsx index 71427d1590b52bf7fe22e588bbfd2a1381def2b7..1397b3a6de64a13b069f7eff8476cfd752adaf2e 100644 GIT binary patch delta 3450 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