diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6e926c6b4d0107edbbec91821491ec831e4aa01f..717a81f8b6cb6d0b6c3e8ced0e14eb51db395667 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="5f36371d-de5c-44ce-a12c-613727d95355" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/shopInShop_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/shopInShop_war_exploded.xml" />
+ <change type="MOVED" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopwithProducts.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/ShopwithProducts.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/shopInShop.iml" afterPath="$PROJECT_DIR$/shopInShop.iml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java" afterPath="$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java" afterPath="$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java" />
</list>
<ignored path="shopInShop.iws" />
<ignored path=".idea/workspace.xml" />
@@ -28,55 +28,46 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="600">
- <file leaf-file-name="ShopControlTest.java" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java">
+ <file leaf-file-name="LandingPageControl.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="287">
- <caret line="55" column="10" lean-forward="false" selection-start-line="55" selection-start-column="10" selection-end-line="55" selection-end-column="10" />
+ <state relative-caret-position="2002">
+ <caret line="98" column="0" lean-forward="false" selection-start-line="98" selection-start-column="0" selection-end-line="98" selection-end-column="0" />
<folding>
- <element signature="imports" expanded="true" />
- <marker date="1498209467000" expanded="true" signature="2099:2181" ph="SELECT name shop" />
- <marker date="1498209467000" expanded="true" signature="2794:2866" ph="DELETE FROM " />
+ <element signature="e#930#948#0" expanded="true" />
+ <element signature="e#1965#1974#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="JDBCConnection.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="708">
- <caret line="54" column="0" lean-forward="false" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="KundenDAOimpl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java">
+ <file leaf-file-name="ShopwithProducts.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/ShopwithProducts.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="62" column="54" lean-forward="true" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
- <folding />
+ <state relative-caret-position="396">
+ <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
+ <folding>
+ <element signature="imports" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ShopDAOimpl.java" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ShopDAOimpl.java">
+ <file leaf-file-name="WelcomeView.java" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
- <caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
+ <state relative-caret-position="218">
+ <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pom.xml">
+ <file leaf-file-name="ArtikelerstellungsView.java" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikelerstellungsView.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="464">
- <caret line="126" column="27" lean-forward="false" selection-start-line="126" selection-start-column="27" selection-end-line="126" selection-end-column="27" />
+ <state relative-caret-position="44">
+ <caret line="182" column="46" lean-forward="true" selection-start-line="182" selection-start-column="0" selection-end-line="183" selection-end-column="0" />
<folding />
</state>
</provider>
@@ -162,8 +153,6 @@
<option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/RegistrationDAO.java" />
<option value="$PROJECT_DIR$/src/test/java/org/s4s/dao/impl/RegistrationControl_Test.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopwithProducts.java" />
- <option value="$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java" />
- <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikeldetailsView.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopErstellung.java" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java" />
@@ -178,6 +167,9 @@
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java" />
<option value="$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/ShopwithProducts.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java" />
+ <option value="$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java" />
</list>
</option>
</component>
@@ -231,8 +223,10 @@
</treeState>
</component>
<component name="ProjectFrameBounds">
- <option name="width" value="1280" />
- <option name="height" value="800" />
+ <option name="x" value="-8" />
+ <option name="y" value="-8" />
+ <option name="width" value="1936" />
+ <option name="height" value="1056" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -249,6 +243,8 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scope" />
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -274,78 +270,6 @@
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="shopInShop" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="control" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="shopInShop" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="test" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="java" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="s4s" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="impl" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -439,7 +363,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="services" />
+ <option name="myItemId" value="control" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -469,11 +393,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="services" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="db" />
+ <option name="myItemId" value="dto" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -503,7 +423,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="control" />
+ <option name="myItemId" value="gui" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -536,6 +456,10 @@
<option name="myItemId" value="gui" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="views" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -603,15 +527,13 @@
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
<pane id="PackagesPane" />
- <pane id="Scratches" />
<pane id="AndroidView" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$USER_HOME$" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
@@ -626,6 +548,9 @@
<recent name="org.s4s.services.db" />
<recent name="org.s4s.dao.impl" />
</key>
+ <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+ <recent name="org.s4s.modell.dto" />
+ </key>
<key name="CreateTestDialog.Recents.Supers">
<recent name="" />
</key>
@@ -859,6 +784,65 @@
<envs />
<method />
</configuration>
+ <configuration default="true" type="ArquillianJUnit" factoryName="" nameIsGenerated="true">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="arquillianRunConfiguration">
+ <value>
+ <option name="containerStateName" value="" />
+ </value>
+ </option>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <envs />
+ <patterns />
+ <method />
+ </configuration>
+ <configuration default="true" type="ArquillianTestNG" factoryName="">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="arquillianRunConfiguration">
+ <value>
+ <option name="containerStateName" value="" />
+ </value>
+ </option>
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
+ <envs />
+ <properties />
+ <listeners />
+ <method />
+ </configuration>
<configuration default="true" type="Cold Fusion runner description" factoryName="Cold Fusion" custom_browser="" web_path="">
<method />
</configuration>
@@ -946,6 +930,14 @@
</ExternalSystemSettings>
<method />
</configuration>
+ <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
+ <setting name="vmparams" value="" />
+ <setting name="cmdLine" value="run-app" />
+ <setting name="passParentEnv" value="true" />
+ <setting name="launchBrowser" value="true" />
+ <setting name="launchBrowserUrl" value="" />
+ <method />
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -1059,6 +1051,12 @@
<option name="PORT" value="5005" />
<method />
</configuration>
+ <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <envs />
+ <method />
+ </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -1103,6 +1101,12 @@
<envs />
<method />
</configuration>
+ <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
+ <method />
+ </configuration>
+ <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
+ <method />
+ </configuration>
<configuration default="false" name="JDBCConnectionTest" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma" />
<module name="shopInShop" />
@@ -1248,6 +1252,7 @@
<workItem from="1498119950625" duration="3876000" />
<workItem from="1498159493584" duration="1831000" />
<workItem from="1498207046533" duration="2128000" />
+ <workItem from="1498243101774" duration="964000" />
</task>
<servers />
</component>
@@ -1284,37 +1289,36 @@
</history-entry>
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="99563000" />
+ <option name="totallyTimeSpent" value="100527000" />
</component>
<component name="ToolWindowManager">
- <frame x="0" y="0" width="1280" height="800" extended-state="0" />
+ <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Nl-Palette" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
+ <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4189189" sideWeight="0.35819936" order="11" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17427653" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3203125" sideWeight="0.64180064" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
+ <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1970999" sideWeight="0.49272728" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3804453" sideWeight="0.7270833" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802126" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
- <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
- <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3930943" sideWeight="0.64180064" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19453125" sideWeight="0.49272728" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Theme Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18093699" sideWeight="0.5072727" order="4" side_tool="true" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3794643" sideWeight="0.7270833" order="4" side_tool="false" content_ui="tabs" />
<window_info id="PlantUML" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -1323,6 +1327,7 @@
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32972974" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="com.vaadin.designer.intellij.outline.toolWindow" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3296875" sideWeight="0.6486486" order="12" side_tool="true" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32802126" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
</layout>
@@ -1367,19 +1372,19 @@
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java</url>
- <line>100</line>
+ <line>99</line>
<properties />
<option name="timeStamp" value="10" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java</url>
- <line>105</line>
+ <line>104</line>
<properties />
<option name="timeStamp" value="14" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java</url>
- <line>52</line>
+ <line>53</line>
<properties />
<option name="timeStamp" value="15" />
</line-breakpoint>
@@ -1404,7 +1409,6 @@
<option name="serverPort" value="52118" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/LoginControl.java" />
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/RegistrationControl.java" />
<entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/services/db/JDBCConnectionTest.java">
<provider selected="true" editor-type-id="text-editor">
@@ -1480,13 +1484,6 @@
</provider>
</entry>
<entry file="file://$USER_HOME$/javaClassDiagram.uml" />
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="16" column="0" lean-forward="true" selection-start-line="12" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ShopErstellung.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-866">
@@ -1494,16 +1491,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="555">
- <caret line="37" column="32" lean-forward="false" selection-start-line="37" selection-start-column="32" selection-end-line="37" selection-end-column="32" />
- <folding>
- <element signature="imports" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/util/Views.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
@@ -1526,13 +1513,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopSearch.java" />
- <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/ShopwithProducts.java">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="17" column="1" lean-forward="false" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/InitView.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
@@ -1656,7 +1636,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1601">
<caret line="24" column="17" lean-forward="false" selection-start-line="24" selection-start-column="12" selection-end-line="24" selection-end-column="17" />
- <folding />
</state>
</provider>
</entry>
@@ -1674,7 +1653,6 @@
<caret line="24" column="4" lean-forward="false" selection-start-line="24" selection-start-column="4" selection-end-line="24" selection-end-column="4" />
<folding>
<element signature="imports" expanded="true" />
- <element signature="e#621#622#0" expanded="true" />
</folding>
</state>
</provider>
@@ -1683,10 +1661,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="529">
<caret line="47" column="23" lean-forward="false" selection-start-line="47" selection-start-column="23" selection-end-line="47" selection-end-column="23" />
- <folding>
- <element signature="imports" expanded="true" />
- <marker date="1498161242000" expanded="true" signature="2074:2149" ph="DELETE FROM " />
- </folding>
</state>
</provider>
</entry>
@@ -1694,15 +1668,17 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="26" column="1" lean-forward="true" selection-start-line="26" selection-start-column="1" selection-end-line="26" selection-end-column="1" />
- <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/services/db/JDBCConnection.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="708">
- <caret line="54" column="0" lean-forward="false" selection-start-line="54" selection-start-column="0" selection-end-line="54" selection-end-column="0" />
- <folding />
+ <state relative-caret-position="1078">
+ <caret line="49" column="0" lean-forward="false" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
+ <folding>
+ <marker date="1498231478266" expanded="true" signature="1383:1706" ph="{...}" />
+ <marker date="1498231478266" expanded="true" signature="1742:1925" ph="{...}" />
+ </folding>
</state>
</provider>
</entry>
@@ -1710,32 +1686,28 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="55" column="8" lean-forward="false" selection-start-line="55" selection-start-column="8" selection-end-line="59" selection-end-column="13" />
- <folding>
- <marker date="1498159345000" expanded="true" signature="1429:1515" ph="SELECT * FRO... user" />
- <marker date="1498159345000" expanded="true" signature="2414:2492" ph="DELETE FROM " />
- </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/KundenDAOimpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
- <caret line="62" column="54" lean-forward="true" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
+ <state relative-caret-position="1034">
+ <caret line="62" column="54" lean-forward="false" selection-start-line="62" selection-start-column="54" selection-end-line="62" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="464">
- <caret line="126" column="27" lean-forward="false" selection-start-line="126" selection-start-column="27" selection-end-line="126" selection-end-column="27" />
+ <state relative-caret-position="2860">
+ <caret line="130" column="0" lean-forward="false" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/dao/impl/ShopDAOimpl.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="135">
+ <state relative-caret-position="242">
<caret line="29" column="0" lean-forward="false" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
<folding />
</state>
@@ -1743,15 +1715,50 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/test/java/org/s4s/process/control/ShopControlTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="287">
- <caret line="55" column="10" lean-forward="false" selection-start-line="55" selection-start-column="10" selection-end-line="55" selection-end-column="10" />
+ <state relative-caret-position="639">
+ <caret line="71" column="41" lean-forward="true" selection-start-line="71" selection-start-column="41" selection-end-line="71" selection-end-column="41" />
+ <folding>
+ <marker date="1498231478271" expanded="true" signature="2429:2501" ph="DELETE FROM " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/process/control/LandingPageControl.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="2002">
+ <caret line="98" column="0" lean-forward="false" selection-start-line="98" selection-start-column="0" selection-end-line="98" selection-end-column="0" />
+ <folding>
+ <element signature="e#930#948#0" expanded="true" />
+ <element signature="e#1965#1974#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/modell/dto/ShopwithProducts.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="396">
+ <caret line="18" column="0" lean-forward="false" selection-start-line="18" selection-start-column="0" selection-end-line="18" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
- <marker date="1498209467000" expanded="true" signature="2099:2181" ph="SELECT name shop" />
- <marker date="1498209467000" expanded="true" signature="2794:2866" ph="DELETE FROM " />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/WelcomeView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="218">
+ <caret line="21" column="8" lean-forward="false" selection-start-line="21" selection-start-column="8" selection-end-line="21" selection-end-column="8" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/main/java/org/s4s/gui/views/ArtikelerstellungsView.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="44">
+ <caret line="182" column="46" lean-forward="true" selection-start-line="182" selection-start-column="0" selection-end-line="183" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/shopInShop.iml b/shopInShop.iml
index fd7a3da2b39da6365e531b16852ef8ccc9f4c1da..eac4a1b375b4fc434a10a4d64d0710e628174bef 100644
--- a/shopInShop.iml
+++ b/shopInShop.iml
@@ -11,6 +11,9 @@
</facet>
<facet type="web" name="Web">
<configuration>
+ <descriptors>
+ <deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/main/webapp/META-INF/context.xml" />
+ </descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
diff --git a/src/main/java/org/s4s/gui/views/SucheView.java b/src/main/java/org/s4s/gui/views/SucheView.java
index f0ed1c9bb83c292d8727e489f10c6952405c5e97..34042477478b742c1d1b76a438c4bc72f75a24fb 100644
--- a/src/main/java/org/s4s/gui/views/SucheView.java
+++ b/src/main/java/org/s4s/gui/views/SucheView.java
@@ -4,12 +4,8 @@ import com.vaadin.data.util.BeanContainer;
import com.vaadin.data.util.BeanItem;
import com.vaadin.event.ItemClickEvent;
import com.vaadin.navigator.ViewChangeListener;
-import com.vaadin.ui.Alignment;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Notification;
-import com.vaadin.ui.Table;
-import com.vaadin.ui.UI;
-import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.*;
+
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@@ -52,32 +48,30 @@ public class SucheView extends TemplateView {
public void setUp() {
- final VerticalLayout contentLayout = new VerticalLayout();
+ final HorizontalLayout contentLayout = new HorizontalLayout();
+
+
+
- super.setUpFooterAndHeader(contentLayout);
- setSizeFull();
- addComponent(contentLayout);
- final VerticalLayout layout = new VerticalLayout();
- layout.addComponent(tableShops);
- layout.setComponentAlignment(tableShops, Alignment.TOP_LEFT);
-
- layout.addComponent(tableProducts);
- layout.setComponentAlignment(tableProducts, Alignment.TOP_LEFT);
- contentLayout.addComponent(layout);
- contentLayout.setComponentAlignment(layout, Alignment.TOP_LEFT);
- tableProducts.setSizeFull();
tableProducts.setSelectable(true);
- tableProducts.setWidth("100%");
- tableProducts.setColumnWidth("price", 100);
- tableProducts.setPageLength(tableProducts.size());
+ //tableProducts.setColumnWidth("price", 100);
+ //tableProducts.setColumnWidth("name", 800);
+
tableProducts.setVisibleColumns(new Object[]{"name", "price"});
tableProducts.setColumnHeader("name", "Name");
tableProducts.setColumnHeader("price", "Preis in €");
+ tableProducts.setPageLength(tableProducts.size());
+ tableProducts.setStyleName("newTableBody");
tableShops.setSelectable(true);
+ //tableShops.setColumnWidth("name", 200);
+
tableShops.setPageLength(tableShops.size());
tableShops.setVisibleColumns(new Object[]{"name"});
- tableShops.setSizeFull();
+ tableShops.setColumnHeader("name", "Name");
+
+ tableShops.setPageLength(tableShops.size());
+ tableShops.setStyleName("newTableBody");
// this.addComponent(contentLayout);
Button detailButton = new Button("Artikeldetails");
@@ -109,7 +103,6 @@ public class SucheView extends TemplateView {
UI.getCurrent().getNavigator().navigateTo(Views.ARTIKELDETAILS + "/" + product.getId());
}
});
-
tableShops.addItemClickListener((ItemClickEvent event) -> {
BeanItem<Shop> shopBean = dataShops.getItem(event.getItemId());
shop = shopBean.getBean();
@@ -128,6 +121,11 @@ public class SucheView extends TemplateView {
}
}
});
+ contentLayout.setSpacing(false);
+ contentLayout.addComponent(tableProducts);
+ contentLayout.addComponent(tableShops);
+ super.setUpFooterAndHeader(contentLayout);
+
}
private void productsSearch(String str) {
diff --git a/src/main/java/org/s4s/gui/views/WelcomeView.java b/src/main/java/org/s4s/gui/views/WelcomeView.java
index c79a9a41b54e9c862adf46b0a809804260a98d20..7cce0c9e5e19c507dbfdccde68b0bcb4bfcddaeb 100644
--- a/src/main/java/org/s4s/gui/views/WelcomeView.java
+++ b/src/main/java/org/s4s/gui/views/WelcomeView.java
@@ -1,8 +1,16 @@
package org.s4s.gui.views;
+import com.vaadin.data.Item;
import com.vaadin.navigator.ViewChangeListener;
+import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.*;
+import org.s4s.modell.dto.Product;
+import org.s4s.modell.dto.Shop;
+import org.s4s.modell.dto.ShopwithProducts;
import org.s4s.process.control.LandingPageControl;
+import org.s4s.services.util.Views;
+
+import java.util.ArrayList;
/**
*
@@ -19,9 +27,125 @@ public class WelcomeView extends TemplateView {
//CONTENT goes here
final VerticalLayout contentLayout = new VerticalLayout();
LandingPageControl controller = new LandingPageControl();
- //controller.getShopWithProduct();
+ ArrayList<ShopwithProducts> shopProdArray = controller.getShopWithProduct();
+
+ for (int i = 0; i< shopProdArray.size();i++){
+ Shop shop = shopProdArray.get(i).getShopfromArray();
+ ArrayList<Product> productsArray =shopProdArray.get(i).getProducts();
+
+ String name = shop.getName();
+ int shopID = shop.getShopId();
+ Table tempTable = new Table("Shop von: "+name);
+
+// Define two columns for the built-in container
+ tempTable.addContainerProperty("Name", String.class, null);
+ tempTable.setColumnWidth("Name", 400);
+ tempTable.addContainerProperty("Beschreibung", String.class, null);
+ tempTable.setColumnWidth("Beschreibung", 1000);
+ tempTable.addContainerProperty("Preis", Double.class, null);
+ tempTable.setColumnWidth("Preis", 200);
+ tempTable.addContainerProperty("Details", Button.class, null);
+
+// Add a row the hard way
+
+
+
+ for (int k = 0; k < productsArray.size();k++) {
+ Product tempProd = productsArray.get(k);
+ String strProdName = tempProd.getName();
+ String strProdDescription = tempProd.getDescription();
+ double strProdPrice = tempProd.getPrice();
+
+ Button detailsField = new Button("show details");
+ detailsField.setData(tempProd);
+ detailsField.addClickListener(new Button.ClickListener() {
+ @Override
+ public void buttonClick(Button.ClickEvent event) {
+ Product tempProduct = (Product) event.getButton().getData();
+ Notification.show("Link " +
+ tempProduct.getId() + " clicked.");
+
+
+
+ UI.getCurrent().getNavigator().navigateTo(Views.ARTIKELDETAILS + "/" + tempProduct.getId());
+ }
+ });
+
+ Object newItemId = tempTable.addItem();
+ Item row1 = tempTable.getItem(newItemId);
+ row1.getItemProperty("Name").setValue(strProdName);
+ row1.getItemProperty("Beschreibung").setValue(strProdDescription);
+ row1.getItemProperty("Preis").setValue(strProdPrice);
+ row1.getItemProperty("Details").setValue(detailsField);
+
+
+ }
+ tempTable.setStyleName("newTableBody");
+ tempTable.setPageLength(tempTable.size());
+
+ contentLayout.addComponent(tempTable);
+
+ }
+
+
+// Create the tree nodes and set the hierarchy
+/* ttable.addItem(new Object[]{"Menu", null}, 0);
+
+ ttable.addItem(new Object[]{"Beverages", null}, 1);
+ ttable.setParent(1, 0);
+
+ ttable.addItem(new Object[]{"Foods", null}, 2);
+ ttable.setParent(2, 0);
+
+ ttable.addItem(new Object[]{"Coffee", 23}, 3);
+ ttable.addItem(new Object[]{"Tea", 42}, 4);
+ ttable.setParent(3, 1);
+ ttable.setParent(4, 1);
+
+ ttable.addItem(new Object[]{"Bread", 13}, 5);
+ ttable.addItem(new Object[]{"Cake", 11}, 6);
+ ttable.setParent(5, 2);
+ ttable.setParent(6, 2)
+;*/
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
super.setUpFooterAndHeader(contentLayout);
+
+
+
+
+
+
+
+
+
+
+
/* setSizeFull();
setMargin(true);
final HorizontalLayout horizontalLayout = new HorizontalLayout();
diff --git a/src/main/java/org/s4s/process/control/ShopwithProducts.java b/src/main/java/org/s4s/modell/dto/ShopwithProducts.java
similarity index 65%
rename from src/main/java/org/s4s/process/control/ShopwithProducts.java
rename to src/main/java/org/s4s/modell/dto/ShopwithProducts.java
index a4545faf29203e381bd68a54761be4ae972d0cf1..0bb647faa5136d060a9b95efcf9ceee1655f0dc8 100644
--- a/src/main/java/org/s4s/process/control/ShopwithProducts.java
+++ b/src/main/java/org/s4s/modell/dto/ShopwithProducts.java
@@ -1,4 +1,4 @@
-package org.s4s.process.control;
+package org.s4s.modell.dto;
import org.s4s.modell.dto.Product;
import org.s4s.modell.dto.Shop;
@@ -15,4 +15,11 @@ public class ShopwithProducts {
this.shop = shop;
this.products = products;
}
+
+ public Shop getShopfromArray (){
+ return shop;
+ }
+ public ArrayList<Product> getProducts(){
+ return products;
+ }
}
diff --git a/src/main/java/org/s4s/process/control/LandingPageControl.java b/src/main/java/org/s4s/process/control/LandingPageControl.java
index f03411a860b163465ee50e7e97fa7d0d46994df3..aab56096f84c0f558c4ec0d8de07d3a9269acf93 100644
--- a/src/main/java/org/s4s/process/control/LandingPageControl.java
+++ b/src/main/java/org/s4s/process/control/LandingPageControl.java
@@ -4,6 +4,7 @@ import org.s4s.dao.impl.AbstractDatabaseClass;
import org.s4s.exceptions.WrongInputException;
import org.s4s.modell.dto.Product;
import org.s4s.modell.dto.Shop;
+import org.s4s.modell.dto.ShopwithProducts;
import java.sql.ResultSet;
import java.util.ArrayList;
@@ -28,26 +29,27 @@ FROM "ERR".artikel as artikel, "ERR".shop as shop
WHERE artikel.shopid = shop.shopid
ORDER By shopName ASC ;
*/
-/*
+
public ArrayList getShopWithProduct() {
ArrayList<ShopwithProducts> shopProdArray = new ArrayList<ShopwithProducts>();
String sql_query = "SELECT shop.name as shopName,\n" +
" shop.shopid as shopID,\n" +
- " artikel.name,\n" +
- " artikel.beschreibung,\n" +
- " artikel.datum_von,\n" +
- " artikel.preis,\n" +
- " artikel.datum_bis,\n" +
- " artikel.foto,\n" +
- " artikel.artikelid,\n" +
+ " artikel.name as articleName,\n" +
+ " artikel.beschreibung as description,\n" +
+ " artikel.datum_von as datefrom,\n" +
+ " artikel.preis as price,\n" +
+ " artikel.datum_bis dateTo,\n" +
+ " artikel.foto as photo,\n" +
+ " artikel.artikelid as articleID,\n" +
" artikel.shopid,\n" +
- " artikel.gekauft,\n" +
- " artikel.modulid,\n" +
- " artikel.kategorie\n" +
+ " artikel.gekauft as buyed,\n" +
+ " artikel.modulid as modulid,\n" +
+ " artikel.kategorie as category\n" +
" FROM \"ERR\".\"artikel\" artikel, \"ERR\".\"shop\" shop\n" +
" WHERE artikel.shopid = shop.shopid\n" +
+ " AND artikel.gekauft = 'false'\n" +
" ORDER By shopName ASC";
System.out.println(sql_query);
try (ResultSet set = executeQuery(sql_query);){
@@ -62,52 +64,42 @@ public ArrayList getShopWithProduct() {
prodArray = new ArrayList<Product>();
tempShopID = set.getInt("shopID");
}
-
+ System.out.println(set.getInt("shopID"));
if (set.getInt("shopID") == tempShopID) {
tempShop.setShopId(set.getInt("shopID"));
tempShop.setName(set.getString("shopName"));
Product tempPrd = new Product();
- tempPrd.setDescription();
- tempPrd.setId();
- tempPrd.setName();
- prodArray.add();
+ tempPrd.setDescription(set.getString("description"));
+ tempPrd.setId(set.getInt("articleID"));
+ tempPrd.setName(set.getString("articleName"));
+ tempPrd.setPrice(set.getDouble("price"));
+
+ prodArray.add(tempPrd);
+ counter++;
} else {
ShopwithProducts tempShopProduct = new ShopwithProducts(tempShop,prodArray);
-
+ shopProdArray.add(tempShopProduct);
tempShop = new Shop();
tempShop.setShopId(set.getInt("shopID"));
+ tempShopID = set.getInt("shopID");
tempShop.setName(set.getString("shopName"));
prodArray = new ArrayList<Product>();
+ Product tempPrd = new Product();
+ tempPrd.setDescription(set.getString("description"));
+ tempPrd.setId(set.getInt("articleID"));
+ tempPrd.setName(set.getString("articleName"));
+ tempPrd.setPrice(set.getDouble("price"));
+ prodArray.add(tempPrd);
+ counter++;
}
-
-
-
-
-
-
- String coffeeName = rs.getString("COF_NAME");
- int supplierID = rs.getInt("SUP_ID");
- float price = rs.getFloat("PRICE");
- int sales = rs.getInt("SALES");
- int total = rs.getInt("TOTAL");
- System.out.println(coffeeName + "\t" + supplierID +
- "\t" + price + "\t" + sales +
- "\t" + total);
}
-
-
-
-
- if(!set.next()){
- throw new WrongInputException("Wrong Input");
- }
- System.out.print(set);
+ System.out.print("du hast so viele Einträge gefunden: " +shopProdArray.size() );
} catch (Exception e) {
e.printStackTrace();
System.out.println("Exception occur: " + e);
}
return shopProdArray;
-}*/
+}
}
diff --git a/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss b/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
index fa5664da5e268b65724e37947787b6ca6aabb4e7..e73c947e6e33d218ffc2e539b36711a0a9c01f8d 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
+++ b/src/main/webapp/VAADIN/themes/mytheme/mytheme.scss
@@ -59,6 +59,8 @@
background: -ms-linear-gradient(top, rgba(140,140,140,1) 0%, rgba(68,74,79,1) 53%, rgba(27,36,45,1) 83%, rgba(27,36,45,1) 100%);
background: linear-gradient(to bottom, rgba(140,140,140,1) 0%, rgba(68,74,79,1) 53%, rgba(27,36,45,1) 83%, rgba(27,36,45,1) 100%);
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#8c8c8c', endColorstr='#1b242d', GradientType=0 );
+ z-index: 50;
+
}
.navbarGardient {
@@ -78,7 +80,22 @@
.v-button-link{
color: #EA5507;
}
-
+ .newTableBody{
+ position: relative;
+ z-index: 0;
+ height: auto;
+ }
+ .newTableBody > div{
+ position: relative;
+ z-index: 0;
+ height: auto;
+ }
+ .v-captiontext {
+ display: inline-block;
+ line-height: inherit;
+ font-size: x-large;
+ text-decoration: underline;
+ }
.v-button-link:hover{
color: dimgrey;
}
diff --git a/src/main/webapp/VAADIN/themes/mytheme/styles.css b/src/main/webapp/VAADIN/themes/mytheme/styles.css
index 72ec58e23ee08f7970a124df621f0078116d486f..a05821c563a65431a040c559cc87a9321fae047b 100644
--- a/src/main/webapp/VAADIN/themes/mytheme/styles.css
+++ b/src/main/webapp/VAADIN/themes/mytheme/styles.css
@@ -13009,6 +13009,7 @@ div.v-layout.v-horizontal.v-widget {
background: -ms-linear-gradient(top, #8c8c8c 0%, #444a4f 53%, #1b242d 83%, #1b242d 100%);
background: linear, to bottom, #8c8c8c 0%, #444a4f 53%, #1b242d 83%, #1b242d 100%;
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#8c8c8c', endColorstr='#1b242d', GradientType=0 );
+ z-index: 50;
}
.mytheme .navbarGardient {
@@ -13028,6 +13029,25 @@ div.v-layout.v-horizontal.v-widget {
color: #EA5507;
}
+.mytheme .newTableBody {
+ position: relative;
+ z-index: 0;
+ height: auto;
+}
+
+.mytheme .newTableBody > div {
+ position: relative;
+ z-index: 0;
+ height: auto;
+}
+
+.mytheme .v-captiontext {
+ display: inline-block;
+ line-height: inherit;
+ font-size: x-large;
+ text-decoration: underline;
+}
+
.mytheme .v-button-link:hover {
color: dimgrey;
}