diff --git a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileReader.java b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileReader.java index e6ec16c..88e91f2 100644 --- a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileReader.java +++ b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileReader.java @@ -38,6 +38,7 @@ public class FileReader { while (cellIt.hasNext()) { Cell c = cellIt.next(); keys.put(c.toString(), index); + index+=1; } rowIt.remove(); diff --git a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java index 2231212..d2d00b0 100644 --- a/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java +++ b/buisnesslogic/src/main/java/com/plannaplan/configutils/FileToDatabaseMigrator.java @@ -6,6 +6,7 @@ import com.plannaplan.entities.Lecturer; import com.plannaplan.models.FileData; import com.plannaplan.services.LecturerService; +import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; public class FileToDatabaseMigrator { @@ -28,12 +29,28 @@ public class FileToDatabaseMigrator { while (rows.hasNext()) { Row row = rows.next(); - Lecturer newLecturer = new Lecturer(row.getCell(title_index).toString(), row.getCell(name_index).toString(), - row.getCell(surname_index).toString()); - System.out.println(newLecturer.getSurname()); - System.out.println(newLecturer.getName()); - System.out.println(newLecturer.getTitle()); + + Cell title_cell = row.getCell(title_index); + Cell name_cell = row.getCell(name_index); + Cell surname_cell = row.getCell(surname_index); + + String lecturer_title = ""; + String lecturer_surname = ""; + String lecturer_name = ""; + + if (title_cell != null) { + lecturer_title = title_cell.toString(); + } + if (name_cell != null) { + lecturer_name = name_cell.toString(); + } + if (surname_cell != null) { + lecturer_surname = surname_cell.toString(); + } + + Lecturer newLecturer = new Lecturer(lecturer_title, lecturer_name, lecturer_surname); lecturerService.save(newLecturer); + } } diff --git a/buisnesslogic/src/test/resources/Zajecia.xlsx b/buisnesslogic/src/test/resources/Zajecia.xlsx index ade4cad..57c8e9c 100644 Binary files a/buisnesslogic/src/test/resources/Zajecia.xlsx and b/buisnesslogic/src/test/resources/Zajecia.xlsx differ