From 8c28e55bec01ff0270a053d38314d4344489ba74 Mon Sep 17 00:00:00 2001
From: sknobl2s <sebastian.knoblauch@smail.inf.h-brs.de>
Date: Fri, 9 Jun 2017 10:57:21 +0200
Subject: [PATCH] Bearbeitung TransactionControl
---
.../org/s4s/dao/impl/RegistrationControl.java | 6 +--
.../org/s4s/dao/impl/TransactionControl.java | 44 ++++++++-----------
.../webapp/VAADIN/themes/mytheme/styles.css | 11 +----
3 files changed, 21 insertions(+), 40 deletions(-)
diff --git a/src/main/java/org/s4s/dao/impl/RegistrationControl.java b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
index aaf067c..a6926f2 100644
--- a/src/main/java/org/s4s/dao/impl/RegistrationControl.java
+++ b/src/main/java/org/s4s/dao/impl/RegistrationControl.java
@@ -37,12 +37,8 @@ public class RegistrationControl {
email = data[2];
passwort = data[4];
-<<<<<<< HEAD
+
if (!nameValidator(nachname)) {
-=======
-
- if (!nameValidator(surname)) {
->>>>>>> b9c731060515564cb15c225cca74afba8238a690
return false;
}
if (!nameValidator(vorname)) {
diff --git a/src/main/java/org/s4s/dao/impl/TransactionControl.java b/src/main/java/org/s4s/dao/impl/TransactionControl.java
index 3124f07..cf77e7e 100644
--- a/src/main/java/org/s4s/dao/impl/TransactionControl.java
+++ b/src/main/java/org/s4s/dao/impl/TransactionControl.java
@@ -5,43 +5,37 @@
*/
package org.s4s.dao.impl;
-import java.sql.Connection;
-import java.sql.DriverManager;
+import com.vaadin.ui.UI;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Statement;
import org.s4s.exceptions.DAOException;
-import org.s4s.exceptions.NoSuchUserOrPassword;
import org.s4s.modell.dto.Product;
import org.s4s.modell.dto.User;
-import java.sql.*;
+import org.s4s.services.util.Roles;
/**
*
* @author Sebastian
*/
-public class TransactionControl extends AbstractDatabaseClass{
-
- User verkaeufer;
+public class TransactionControl extends AbstractDatabaseClass {
+
+ String verkaeufer;
User kaeufer;
- Product a;
-
- ResultSet rs;
-
- public void createTransaction() throws DAOException{
- try
- {
- rs = executeQuery("SELECT u.\"artikelid\""
- + " FROM \"ERR\".\"artikel\" u "
- + " WHERE u.artikelid = '" + a.getId() + "';");
-
- } catch (SQLException ex)
- {
+ Product produkt;
+ //Warenkorb warenkorb = Warenkorb.getInstance();
+
+ String kaufer = (String) UI.getCurrent().getSession().getAttribute(Roles.CURRENTUSER);
+
+ public void createTransaction() throws DAOException, SQLException {
+ try (ResultSet rs = executeQuery("SELECT u.\"besitzer\"" + " FROM \"ERR\".\"shop\" u , \"ERR\".\"artikel\" s"
+ + " WHERE u.shopid = s.shopid AND "
+ + "s.artikelid'" + produkt.getId() + "';");) {
+
+ verkaeufer = rs.getString("besitzer");
+ } catch (SQLException ex) {
throw new DAOException(ex);
}
-
-
+
}
-
-
+
}
diff --git a/src/main/webapp/VAADIN/themes/mytheme/styles.css b/src/main/webapp/VAADIN/themes/mytheme/styles.css
index a4c1862..72ec58e 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/styles.css
+++ b/src/main/webapp/VAADIN/themes/mytheme/styles.css
@@ -12984,7 +12984,6 @@ div.v-layout.v-horizontal.v-widget {
width: 19px;
overflow: hidden;
}
-<<<<<<< HEAD
.mytheme .customShell {
width: 1024px;
@@ -13049,12 +13048,4 @@ div.v-layout.v-horizontal.v-widget {
.mytheme .LoginViewContainerTitelLayout {
padding-bottom: 15px;
-}
-=======
-/** Test
-h1 {
- background-color: red;
-
-}
-*/
->>>>>>> 47d7bfd324c39b8339db585da515957e5ac54bd3
+}
\ No newline at end of file
--
GitLab