diff options
| author | Martin <martin.weick@outlook.com> | 2018-05-04 15:30:58 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-04 20:37:04 +0200 |
| commit | c92959c3fe2d82be997d54581139c8c9ee7e946b (patch) | |
| tree | 2aea6d5af7961b44f12d8d671efaee5408d545fb /src/main/java/at/ac | |
| parent | a62919d43debaa0c6baf32de9658740dc929cba6 (diff) | |
| download | sepm-groupproject-c92959c3fe2d82be997d54581139c8c9ee7e946b.tar.gz sepm-groupproject-c92959c3fe2d82be997d54581139c8c9ee7e946b.tar.xz sepm-groupproject-c92959c3fe2d82be997d54581139c8c9ee7e946b.zip | |
UI Tests
Diffstat (limited to 'src/main/java/at/ac')
2 files changed, 13 insertions, 6 deletions
diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java index 66045a5..65933bd 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/dao/VehicleDBDAO.java @@ -6,6 +6,7 @@ import at.ac.tuwien.sepm.assignment.groupphase.exception.ElementNotFoundExceptio import at.ac.tuwien.sepm.assignment.groupphase.exception.PersistenceException; import at.ac.tuwien.sepm.assignment.groupphase.util.JDBCConnectionManager; import java.sql.PreparedStatement; + import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; @@ -30,7 +31,7 @@ public class VehicleDBDAO implements VehicleDAO { String name = ""; int id = -1; try { - p1 = jdbcConnectionManager.getConnection().prepareStatement(query1); + p1 = jdbcConnectionManager.getConnection().prepareStatement(query1,PreparedStatement.RETURN_GENERATED_KEYS); p1.setString(1, name); p1.setString(2, vehicle.constructionType().name()); if (vehicle.type() == VehicleType.KTW_B) { @@ -39,12 +40,14 @@ public class VehicleDBDAO implements VehicleDAO { p1.setString(3, vehicle.type().name()); } p1.executeUpdate(); - query1 = "UPDATE VehicleVersion SET name=? WHERE id=?"; - try (ResultSet keyResultSet = p1.getGeneratedKeys()) { - if (keyResultSet.next()) { - id = keyResultSet.getInt(1); - } + + + ResultSet keyResultSet = p1.getGeneratedKeys(); + + if (keyResultSet.next()) { + id = keyResultSet.getInt(1); } + name = vehicle.type().name() + "-" + id; } catch (SQLException e) { @@ -58,6 +61,7 @@ public class VehicleDBDAO implements VehicleDAO { } } try { + query1 = "UPDATE VehicleVersion SET name=? WHERE id=?"; p3 = jdbcConnectionManager.getConnection().prepareStatement(query1); p3.setString(1, name); p3.setInt(2, id); diff --git a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/uicontroller/CreateCarController.java b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/uicontroller/CreateCarController.java index 721cf6d..f826837 100644 --- a/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/uicontroller/CreateCarController.java +++ b/src/main/java/at/ac/tuwien/sepm/assignment/groupphase/einsatzverwaltung/uicontroller/CreateCarController.java @@ -2,6 +2,7 @@ package at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.uicontroller; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.ConstructionType; +import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.Status; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.dto.Vehicle.VehicleType; import at.ac.tuwien.sepm.assignment.groupphase.einsatzverwaltung.service.VehicleService; import at.ac.tuwien.sepm.assignment.groupphase.exception.InvalidVehicleException; @@ -74,6 +75,8 @@ public class CreateCarController { Vehicle.builder() .constructionType(parseConstructionType()) .type(parseType()) + .name("") + .status(Status.ABGEMELDET) .hasNef(cbx_NEF.isSelected()) .build(); try { |