From 9a6c7e0741252c4cc7c5a6c7f8a982e4e7e83c53 Mon Sep 17 00:00:00 2001
From: Ralph Soika <ralph.soika@imixs.com>
Date: Thu, 6 Jun 2024 11:39:36 +0200
Subject: [PATCH] neues OP Listen Template

---
 .../OPListExportAdapterByWeek.java            | 100 ++++++++++++++----
 templates/op-liste_kw_template.xlsx           | Bin 42198 -> 45035 bytes
 2 files changed, 81 insertions(+), 19 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 062dc82..a48fad0 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
@@ -159,8 +159,8 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
         double saldoEUR1 = 0;
         double saldoUSD2 = 0;
         double saldoEUR2 = 0;
-        double saldoUSD3 = 0;
-        double saldoEUR3 = 0;
+        // double saldoUSD3 = 0;
+        // double saldoEUR3 = 0;
         List<String> spaceNames = new ArrayList<String>();
 
         // compute all departments
@@ -203,6 +203,8 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
             XSSFRow referenceRowValues = sheet.getRow(11);
             XSSFRow referenceRowCurrentWeek = sheet.getRow(12);
 
+            XSSFRow referenceRowTotal = sheet.getRow(15);
+
             // Aktuelle KW berechnen
             calendar.setTime(new Date());
             int currentWeekNumber = calendar.get(Calendar.WEEK_OF_YEAR);
@@ -214,9 +216,16 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
                 currentWeekCategory = currentWeekCategory + currentWeekNumber;
             }
 
+            /*
+             * --- Phase 1 -------------------------------------------------------
+             * Im folgenden fügen wir erst einmal in der Kopfzeile zusätzlich
+             * Spaltenüberschriften für jede Abteilung ein
+             */
             XSSFCell cellSpaceLabelReference = rowSpacesLabels.getCell(2);
             XSSFCell cellSpaceCurrencyReference = referenceRowSpacesCurrencies.getCell(1);
-            int column = 1;
+            // XSSFCell cellKWTotalReference = referenceRowCurrentWeek.getCell(1);
+            XSSFCell cellKWTotalReference = referenceRowTotal.getCell(14);
+            int column = 1; // beginn in der 2. Spalte!
             for (ItemCollection space : spaces) {
                 XSSFCell cell = null;
                 String spaceName = space.getItemValueString("space.name");
@@ -251,12 +260,40 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
                 logger.info("...grouping invoices by week...");
                 // collect all invoices for this space grouped by week....
                 groupInvoicesByWeek(spaceID, spaceName, weekDataMap);
-
             }
 
-            // now build a new row for each week and print out the collected invoice data
-            // first iterate over all objects and collect all known weeks and sort them into
-            // a ordered list....
+            /*
+             * --- Phase 2 -------------------------------------------------------
+             * Nun bilden wir nochmal 2 weitere Spalten am Ende um eine Summenbildung in
+             * EUR/USD pro KW zu ermöglichen
+             */
+            XSSFCell cell = null;
+            // column++;
+            // Space currency EUR
+            cell = referenceRowSpacesCurrencies.getCell(column);
+            cell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy());
+            cell.setCellValue("EUR");
+            cell = rowSpacesLabels.getCell(column);
+            cell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy());
+            cell.setCellValue("");
+
+            // Space currency USD
+            column++;
+            cell = referenceRowSpacesCurrencies.getCell(column);
+            cell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy());
+            cell.setCellValue("USD");
+
+            // Space Label
+            cell = rowSpacesLabels.getCell(column);
+            cell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy());
+            cell.setCellValue("Gesamt");
+
+            /*
+             * --- Phase 3 -------------------------------------------------------
+             * now build a new row for each week and print out the collected invoice data
+             * first iterate over all objects and collect all known weeks and sort them into
+             * a ordered list....
+             */
             List<String> sortedWeekList = new ArrayList<String>();
             Iterator<Map.Entry<String, WeekInvoiceData>> iterator = weekDataMap.entrySet().iterator();
             while (iterator.hasNext()) {
@@ -268,18 +305,19 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
             }
             Collections.sort(sortedWeekList);
 
-            int rowPos = 11;
-
             /*
+             * --- Phase 4 -------------------------------------------------------
              * Nun müssen wir so viele Zeilen nach unten schieben wie wir gleich einfügen.
              * Dazu müssen wir kurz einen Probelauf machen um die geplante Anzahl zu
              * errechnen....
              */
+            int rowPos = 11;
             int insertCount = sortedWeekList.size();
             sheet.shiftRows(rowPos + 1, 2999, insertCount, true, true);
 
             /*
-             * Jetzt Zeile für Zeile einfügen....
+             * --- Phase 5 -------------------------------------------------------
+             * Jetzt Zahlen Zeile für Zeile einfügen....
              */
             boolean ueberFaellig = true;
             for (String week : sortedWeekList) {
@@ -301,6 +339,8 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
                 // iterate over all spaceNames and test if we have any data to put it into the
                 // row cells....
                 column = 1;
+                double kwTotalEUR = 0;
+                double kwTotalUSD = 0;
                 for (String name : spaceNames) {
                     String key = name + "/" + week;
                     logger.info("search WeekInvoiceData for " + key);
@@ -309,29 +349,48 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
                     if (weekData != null) {
                         logger.info("  EUR=" + weekData.totalEUR + "  USD=" + weekData.totalUSD);
                         row.getCell(column).setCellValue(weekData.totalEUR);
-
                         column++;
                         row.getCell(column).setCellValue(weekData.totalUSD);
-                        saldoUSD3 = InvoiceUtil.round(saldoUSD3 + weekData.totalUSD);
-
                         if (ueberFaellig) {
                             saldoEUR1 = InvoiceUtil.round(saldoEUR1 + weekData.totalEUR);
                             saldoUSD1 = InvoiceUtil.round(saldoUSD1 + weekData.totalUSD);
-
                         } else {
                             saldoEUR2 = InvoiceUtil.round(saldoEUR2 + weekData.totalEUR);
                             saldoUSD2 = InvoiceUtil.round(saldoUSD2 + weekData.totalUSD);
-
                         }
-
+                        kwTotalEUR = kwTotalEUR + weekData.totalEUR;
+                        kwTotalUSD = kwTotalUSD + weekData.totalUSD;
                         column++;
-
                     } else {
                         logger.info("...... NOT FOUND");
                         // skip columns
                         column = column + 2;
                     }
                 }
+                // KW Summe anzeigen
+                if (week.equals(currentWeekCategory)) {
+                    XSSFCell kwTotalCell = row.getCell(column);
+                    // kwTotalCell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy());
+                    kwTotalCell.setCellValue(kwTotalEUR);
+
+                    column++;
+                    // row.getCell(column).setCellValue(kwTotalUSD);
+                    kwTotalCell = row.getCell(column);
+                    // kwTotalCell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy());
+                    kwTotalCell.setCellValue(kwTotalUSD);
+
+                } else {
+                    XSSFCell kwTotalCell = row.getCell(column);
+                    kwTotalCell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy());
+                    kwTotalCell.setCellValue(kwTotalEUR);
+
+                    column++;
+                    // row.getCell(column).setCellValue(kwTotalUSD);
+                    kwTotalCell = row.getCell(column);
+                    kwTotalCell.copyCellFrom(cellKWTotalReference, new CellCopyPolicy());
+                    kwTotalCell.setCellValue(kwTotalUSD);
+
+                }
 
             }
             // delete reference rows
@@ -339,8 +398,11 @@ public class OPListExportAdapterByWeek extends POIFindReplaceAdapter {
             sheet.shiftRows(12, rowPos, -1, true, true);
             sheet.shiftRows(rowPos + 2, rowPos + 6, -3, true, true);
 
-            // now lets update the totals...
-            // Überfällig
+            /*
+             * --- Phase 6 -------------------------------------------------------
+             * now lets update the totals...
+             * Überfällig
+             */
             XSSFCell cTotalEUR1 = getCellByRef(doc, sheet, "TOTALEUR1");
             XSSFCell cTotalUSD1 = getCellByRef(doc, sheet, "TOTALUSD1");
             cTotalEUR1.setCellValue(saldoEUR1);
diff --git a/templates/op-liste_kw_template.xlsx b/templates/op-liste_kw_template.xlsx
index c20890209c95b645eed28d4ad0cdebd9cf886ccc..d8c8d56657723ec596c1dcdad113bd02039c0305 100644
GIT binary patch
delta 7746
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

delta 4914
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