diff --git a/src/main/java/org/s4s/gui/views/CheckoutView.java b/src/main/java/org/s4s/gui/views/CheckoutView.java index 46e4b14438a65d8bc708f8e8ed9a437173d61f11..07da476aba06c15dcffbd6f965bd08641d552a21 100644 --- a/src/main/java/org/s4s/gui/views/CheckoutView.java +++ b/src/main/java/org/s4s/gui/views/CheckoutView.java @@ -10,7 +10,11 @@ public class CheckoutView extends TemplateView { @Override public void enter(ViewChangeListener.ViewChangeEvent event) { - throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates. + this.setUp(); + } + + public void setUp() { + } } diff --git a/src/main/java/org/s4s/gui/views/WarenkorbView.java b/src/main/java/org/s4s/gui/views/WarenkorbView.java index 3964888cc5f2dbea8d035b9c72ec3fc8f1f15b93..bbe3279e89163375eb975dd8c80a17aecbf72755 100644 --- a/src/main/java/org/s4s/gui/views/WarenkorbView.java +++ b/src/main/java/org/s4s/gui/views/WarenkorbView.java @@ -99,6 +99,7 @@ public class WarenkorbView extends TemplateView { TransactionControl t = new TransactionControl(); try { t.createTransactions(); + UI.getCurrent().getNavigator().navigateTo(Views.CHECKOUT); } catch (DAOException ex) { Logger.getLogger(WarenkorbView.class.getName()).log(Level.SEVERE, null, ex); } catch (SQLException ex) { diff --git a/src/main/java/org/s4s/modell/dto/Transaction.java b/src/main/java/org/s4s/modell/dto/Transaction.java index ddfb78350217c5fc4c2245435aa755fe6fbb9902..5716ff0237214d194f1524617dbeddaaee3b708c 100644 --- a/src/main/java/org/s4s/modell/dto/Transaction.java +++ b/src/main/java/org/s4s/modell/dto/Transaction.java @@ -21,6 +21,10 @@ public class Transaction { this.produkt = produkt; } + public Transaction() { + + } + public Integer getVerkaeufer() { return verkaeufer; } diff --git a/src/main/java/org/s4s/process/control/ProductSearch.java b/src/main/java/org/s4s/process/control/ProductSearch.java index 87c7fd39f7e354169e28a4439397443ac48e68ab..86192c68d789b4bfa8e80947cf7cac93417fe43b 100644 --- a/src/main/java/org/s4s/process/control/ProductSearch.java +++ b/src/main/java/org/s4s/process/control/ProductSearch.java @@ -102,7 +102,6 @@ public class ProductSearch extends AbstractDatabaseClass implements ProductDAO { return p; } - // Noch fertig zu stellen!!!!!!!!! @Override public Shop getProductOwner(Product product) throws DAOException { Shop s = new Shop(); diff --git a/src/main/java/org/s4s/process/control/TransactionControl.java b/src/main/java/org/s4s/process/control/TransactionControl.java index 51c16ea0a249b34d3a15a993fc70b216ef14d02f..902368f337184907ef8425db8507cb633db1dc74 100644 --- a/src/main/java/org/s4s/process/control/TransactionControl.java +++ b/src/main/java/org/s4s/process/control/TransactionControl.java @@ -19,13 +19,17 @@ import org.s4s.services.util.Roles; */ public class TransactionControl extends AbstractDatabaseClass { - Transaction transaktion; + private final Transaction transaktion = new Transaction(); private final Statement statement = JDBCConnection.getInstance().getStatement(); //String kaeuferString = (String) UI.getCurrent().getSession().getAttribute(Roles.CURRENTUSER); public void createTransactions() throws DAOException, SQLException { + User u = (User) UI.getCurrent().getSession().getAttribute(Roles.CURRENTUSER); + String name = u.getBenutzername(); + int id = u.getUserId(); + User user = new User(name, id); + transaktion.setKaeufer(user); for (Product p : Warenkorb.getInstance().inhalt()) { - transaktion.setKaeufer((User) UI.getCurrent().getSession().getAttribute(Roles.CURRENTUSER)); transaktion.setVerkaeufer(kaeuferinDB(p.getId())); transaktion.setProdukt(p); createTransactionInDB(transaktion); @@ -37,7 +41,7 @@ public class TransactionControl extends AbstractDatabaseClass { Integer verkaeufer; try (ResultSet rs = executeQuery("SELECT u.\"besitzer\"" + " FROM \"ERR\".\"shop\" u , \"ERR\".\"artikel\" s" + " WHERE u.shopid = s.shopid AND " - + "s.artikelid'" + transaktion.getProdukt().getId() + "';");) { + + "s.artikelid = '" + transaktion.getProdukt().getId() + "';");) { verkaeufer = rs.getInt("besitzer"); } catch (SQLException ex) {