Merge pull request #400 from adessoAG/importer-fix

Adjust test file and importer logic
adessoSE · Jun 23, 2020 · 286dcd2 · 286dcd2
2 parents d458a34 + e4f54f9
commit 286dcd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...mporter/src/main/java/org/wickedsource/budgeteer/importer/ubw/UBWWorkRecordsImporter.java b/...mporter/src/main/java/org/wickedsource/budgeteer/importer/ubw/UBWWorkRecordsImporter.java
@@ -174,9 +174,13 @@ boolean checkValidityAndSetSheetAndColumnIndices(Workbook workbook) {
                 Row r = sheet.getRow(headerRowIndex);
                 try {
                     if(r.getCell(5).getStringCellValue().equals("AA-Nr")){
-                        columnBudget++;
-                        columnHours++;
-                        columnInvoiceable++;
+                        columnBudget = 9;
+                        columnHours = 11;
+                        columnInvoiceable = 12;
+                    } else {
+                        columnBudget = 8;
+                        columnHours = 10;
+                        columnInvoiceable = 11;
                     }
                     isValid = r.getCell(columnPerson).getStringCellValue().equals("Name") &&
                             r.getCell(columnDate).getStringCellValue().equals("Tag") &&

diff --git a/budgeteer-ubw-importer/src/main/resources/example_ubw_report.xlsx b/budgeteer-ubw-importer/src/main/resources/example_ubw_report.xlsx