Merge pull request #377 from maximAtanasov/release_1.1.1

Changed SHEET_INDEX in the UBWworkRecordsImporter
adessoSE · Nov 5, 2019 · 156ec54 · 156ec54
2 parents 73c7cc5 + 64dbbc6
commit 156ec54
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 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
@@ -12,9 +12,9 @@
 
 public class UBWWorkRecordsImporter implements WorkRecordsImporter {
 
-    private static final int SHEET_INDEX = 2;
+    private static final int SHEET_INDEX = 6;
 
-    private static final int COLUMN_INVOICABLE = 11;
+    private static final int COLUMN_INVOICEABLE = 11;
 
     private static final int COLUMN_DATE = 3;
 
@@ -96,11 +96,11 @@ public ExampleFile getExampleFile() {
             Calendar maxCalendar = Calendar.getInstance();
             Calendar maxineCalendar = Calendar.getInstance();
             XSSFWorkbook workbook = new XSSFWorkbook(getClass().getResourceAsStream("/example_ubw_report.xlsx"));
-            XSSFSheet sheet = workbook.getSheetAt(2);
+            XSSFSheet sheet = workbook.getSheetAt(SHEET_INDEX);
             XSSFRow row;
             XSSFCell cell;
             int col = 3;
-            int i = sheet.getLastRowNum();
+            int i = sheet.getLastRowNum()-2;
 
             XSSFCellStyle style = workbook.createCellStyle();
             style.setBorderBottom(BorderStyle.THIN);
@@ -178,7 +178,7 @@ boolean checkValidity(Workbook workbook) {
                             r.getCell(COLUMN_DATE).getStringCellValue().equals("Tag") &&
                             r.getCell(COLUMN_BUDGET).getStringCellValue().equals("Subgruppe") &&
                             r.getCell(COLUMN_HOURS).getStringCellValue().equals("Aufwand [h]") &&
-                            r.getCell(COLUMN_INVOICABLE).getStringCellValue().equals("KV");
+                            r.getCell(COLUMN_INVOICEABLE).getStringCellValue().equals("KV");
                 } catch (Exception e) {
                     isValid = false;
                 }
@@ -229,7 +229,7 @@ private ImportedWorkRecord parseRow(Row row, ImportFile file) throws ImportExcep
     }
 
     private boolean isImportable(Row row) {
-        return row != null && ("ja".equalsIgnoreCase(row.getCell(COLUMN_INVOICABLE).getStringCellValue()))
+        return row != null && ("ja".equalsIgnoreCase(row.getCell(COLUMN_INVOICEABLE).getStringCellValue()))
                 && (row.getCell(COLUMN_BUDGET).getStringCellValue() != null)
                 && (!"".equals(row.getCell(COLUMN_BUDGET).getStringCellValue().trim()))
                 && (row.getCell(COLUMN_PERSON).getStringCellValue() != null)

diff --git a/budgeteer-ubw-importer/src/main/resources/example_ubw_report.xlsx b/budgeteer-ubw-importer/src/main/resources/example_ubw_report.xlsx
diff --git a/...ter/src/test/java/org/wickedsource/budgeteer/importer/ubw/UBWWorkRecordsImporterTest.java b/...ter/src/test/java/org/wickedsource/budgeteer/importer/ubw/UBWWorkRecordsImporterTest.java
@@ -38,7 +38,7 @@ void testGetSkippedDataSets() throws Exception {
         UBWWorkRecordsImporter importer = new UBWWorkRecordsImporter();
         importer.importFile(new ImportFile("file.xslx", importer.getExampleFile().getInputStream()));
         List<List<String>> skippedRecords = importer.getSkippedRecords();
-        assertEquals(37, skippedRecords.size());
+        assertEquals(38, skippedRecords.size());
 
         assertEquals("file.xslx", skippedRecords.get(1).get(0));
     }

diff --git a/budgeteer-ubw-importer/src/test/resources/demo_ubw_report.xlsx b/budgeteer-ubw-importer/src/test/resources/demo_ubw_report.xlsx
diff --git a/budgeteer-web-interface/build.gradle b/budgeteer-web-interface/build.gradle
@@ -170,7 +170,7 @@ bootRun {
             //'-Dspring.datasource.url=jdbc:hsqldb:file:../../database/budgeteer;shutdown=true;hsqldb.write_delay=false;',
             '-Dspring.datasource.url=jdbc:hsqldb:mem:budgeteer',
             //'-Dspring.datasource.url=jdbc:hsqldb:hsql://localhost/budgeteer',
-            //'-Dspring.datasource.driverClassName=org.hsqldb.jdbcDriver',
+            '-Dspring.datasource.driverClassName=org.hsqldb.jdbcDriver',
             '-Dspring.datasource.username=sa',
             '-Dspring.datasource.password=',
             '-Dflyway.enabled=false',

diff --git a/budgeteer-web-interface/src/main/resources/application.properties b/budgeteer-web-interface/src/main/resources/application.properties
@@ -103,7 +103,7 @@ spring.jpa.properties.hibernate.id.new_generator_mappings=false
 
 # FLYWAY (FlywayProperties)
 flyway.baseline-on-migrate=true
-flyway.baseline-version=1_0_9
+flyway.baseline-version=1_1_0
 flyway.check-location=true
 flyway.enabled=true
 flyway.locations=classpath:db/migration

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ file('gradle.d').listFiles().sort().each {
 }
 
 allprojects {
-    version = '1.1.0.BETA'
+    version = '1.1.1.BETA'
 }
 
 buildscript {