From 122c7fb91e4ca55a9371f7f405cf79b5f43ba158 Mon Sep 17 00:00:00 2001
From: JanPhilipp <janphilipp.desler@smail.inf.h-brs.de>
Date: Fri, 2 Jun 2017 11:47:58 +0200
Subject: [PATCH] =?UTF-8?q?So=20hier=20noch=20die=20eingef=C3=BCgte=20Kont?=
=?UTF-8?q?aktbest=C3=A4tigung=20und=20Kaufbest=C3=A4tigung=20mit=20der=20?=
=?UTF-8?q?M=C3=B6glichkeit=20weiter=20zu=20shoppen=20(also=20wieder=20auf?=
=?UTF-8?q?=20die=20Welcome=20page=20zu=20kommen).=20Von=20der=20Kaufseite?=
=?UTF-8?q?=20muss=20wie=20gesagt=20nur=20noch=20auf=20die=20Kaufbest?=
=?UTF-8?q?=C3=A4tigung=20weiter=20verwiesen=20werden.=20Den=20Klassenname?=
=?UTF-8?q?n=20k=C3=B6nnt=20ihr=20daf=C3=BCr=20in=20der=20Klasse=20sehen?=
=?UTF-8?q?=20wo=20alle=20Views=20drinne=20stehen=20oder=20im=20Package=20?=
=?UTF-8?q?mit=20den=20Views=20selber?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/org/s4s/gui/InitView.java | 1 +
.../java/org/s4s/gui/views/ContactView.java | 5 ++
.../s4s/gui/views/KaufbestaetigungView.java | 37 +++++++++++--
.../s4s/gui/views/Kontaktbestaetigung.java | 53 +++++++++++++++++++
.../java/org/s4s/services/util/Views.java | 3 +-
5 files changed, 94 insertions(+), 5 deletions(-)
create mode 100644 src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java
diff --git a/src/main/java/org/s4s/gui/InitView.java b/src/main/java/org/s4s/gui/InitView.java
index b819d9f..71f695a 100644
--- a/src/main/java/org/s4s/gui/InitView.java
+++ b/src/main/java/org/s4s/gui/InitView.java
@@ -44,6 +44,7 @@ public class InitView extends UI {
navi.addView(Views.SHOPERSTELLUNG, ShopErstellung.class);
navi.addView(Views.SHOPERSTELLUNGSBESTAETIGUNG, ShoperstellungsBestätigung.class);
navi.addView(Views.REGISTRIERUNGSBESTAETIGUNG, RegistrierungsBestaetigung.class);
+ navi.addView(Views.KONTAKTBESTAETIGUNG, Kontaktbestaetigung.class);
//Test der RegistrierungsView
UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
setHeight(100f,Unit.PERCENTAGE);
diff --git a/src/main/java/org/s4s/gui/views/ContactView.java b/src/main/java/org/s4s/gui/views/ContactView.java
index aa9afc0..486e59f 100644
--- a/src/main/java/org/s4s/gui/views/ContactView.java
+++ b/src/main/java/org/s4s/gui/views/ContactView.java
@@ -9,7 +9,9 @@ import com.vaadin.ui.Label;
import com.vaadin.ui.Panel;
import com.vaadin.ui.TextArea;
import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import org.s4s.services.util.Views;
/**
* Created by Max-Desktop on 16.05.2017.
@@ -39,6 +41,9 @@ public class ContactView extends TemplateView{
//this.addComponent(pKontakt);
//this.setComponentAlignment(pKontakt, Alignment.MIDDLE_CENTER);
+ bSenden.addClickListener(e ->
+ UI.getCurrent().getNavigator().navigateTo(Views.KONTAKTBESTAETIGUNG));
+
pKontakt.setContent(vLayout);
super.setUpFooterAndHeader(pKontakt);
diff --git a/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java b/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java
index 16d617d..d23c8ff 100644
--- a/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java
+++ b/src/main/java/org/s4s/gui/views/KaufbestaetigungView.java
@@ -7,17 +7,46 @@ package org.s4s.gui.views;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener;
+import com.vaadin.server.FontAwesome;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.UI;
import com.vaadin.ui.VerticalLayout;
+import org.s4s.services.util.Views;
/**
*
- * @author Holger
+ * @author JanPhilipp
*/
public class KaufbestaetigungView 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();
}
-
-}
+
+ private void setUp() {
+ Panel panel = new Panel();
+ panel.setSizeUndefined();
+
+ VerticalLayout content = new VerticalLayout();
+
+ Button button = new Button("Weiter shoppen");
+ button.setIcon(FontAwesome.BOOK);
+ button.addClickListener(e ->
+ UI.getCurrent().getNavigator().navigateTo(Views.WELCOME));
+
+ Label label = new Label("Vielen Dank für ihren Einkauf! Wenn sie weitershoppen wollen... :)");
+
+ content.addComponent(label);
+ content.addComponent(button);
+
+ content.setMargin(true);
+
+ panel.setContent(content);
+ //this.addComponent(panel);
+ //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
+
+ super.setUpFooterAndHeader(panel);
+}}
diff --git a/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java b/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java
new file mode 100644
index 0000000..2656c04
--- /dev/null
+++ b/src/main/java/org/s4s/gui/views/Kontaktbestaetigung.java
@@ -0,0 +1,53 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.s4s.gui.views;
+
+import com.vaadin.navigator.ViewChangeListener;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+import org.s4s.services.util.Views;
+
+/**
+ *
+ * @author JanPhilipp
+ */
+public class Kontaktbestaetigung extends TemplateView {
+
+ @Override
+ public void enter(ViewChangeListener.ViewChangeEvent event) {
+ this.setUp();
+ }
+
+ private void setUp() {
+ Panel panel = new Panel();
+ panel.setSizeUndefined();
+
+ VerticalLayout content = new VerticalLayout();
+
+ Button button = new Button("Zurück zur Startseite");
+ button.addClickListener(e ->
+ UI.getCurrent().getNavigator().navigateTo(Views.WELCOME));
+
+ Label label = new Label("Vielen Dank für ihre Kontaktanfrage, Wir werden diese in Kürze beantworten und so schnell wie möglich beantworten");
+
+ content.addComponent(label);
+ content.addComponent(button);
+
+ content.setMargin(true);
+
+ panel.setContent(content);
+ //this.addComponent(panel);
+ //this.setComponentAlignment(panel, Alignment.MIDDLE_CENTER);
+
+ super.setUpFooterAndHeader(panel);
+}}
+
+
+
+
diff --git a/src/main/java/org/s4s/services/util/Views.java b/src/main/java/org/s4s/services/util/Views.java
index ecba275..1612019 100644
--- a/src/main/java/org/s4s/services/util/Views.java
+++ b/src/main/java/org/s4s/services/util/Views.java
@@ -27,7 +27,8 @@ public final class Views {
public final static String SHOPERSTELLUNG = "shoperstellung";
public final static String SHOPERSTELLUNGSBESTAETIGUNG = "shoperstellungsbestaetigung";
public final static String REGISTRIERUNGSBESTAETIGUNG = "registrierungsbestaetigung";
-
+ public final static String KONTAKTBESTAETIGUNG = "kontaktbestaetigung";
+
private Views(){
}
--
GitLab