NutzerEinstellung: passwort akuelliseren, Adressse aktuelliseren

Variablen und Attributen auf englisch umbennent
Merge remote-tracking branch 'origin/main'
2023-02-06 03:23:27 +01:00 · 2023-02-05 15:17:51 +01:00 · 2023-02-05 15:12:48 +01:00 · 2023-02-05 15:12:21 +01:00 · 2023-02-05 15:11:42 +01:00 · 2023-02-05 15:11:32 +01:00
53 changed files with 2309 additions and 868 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ target/
 .idea/jarRepositories.xml
 .idea/compiler.xml
 .idea/libraries/
+.idea
 *.iws
 *.iml
 *.ipr
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK" />
+</project>
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]/shelved.patch
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]/shelved.patch
--- a/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48__Changes_.xml
+++ b/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48__Changes_.xml
@@ -0,0 +1,4 @@
+<changelist name="Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]" date="1675086496793" recycled="true" deleted="true">
+  <option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_30_01_2023_14_48_[Changes]/shelved.patch" />
+  <option name="DESCRIPTION" value="Uncommitted changes before Update at 30.01.2023 14:48 [Changes]" />
+</changelist>
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="be8f30d3-089d-4d1c-bba3-da21b0466111" name="Changes" comment="Variablen und Attributen auf englisch umbennent">
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/database.db" beforeDir="false" afterPath="$PROJECT_DIR$/database.db" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/AccountMgr.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/AccountMgr.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/bib/essensbestellungsverwaltung/User.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/hello-view.fxml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="Richards_Branch" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$PROJECT_DIR$/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml" root0="FORCE_HIGHLIGHTING" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="MavenImportPreferences">
+    <option name="generalSettings">
+      <MavenGeneralSettings>
+        <option name="mavenHome" value="Use Maven wrapper" />
+        <option name="useMavenConfig" value="true" />
+      </MavenGeneralSettings>
+    </option>
+  </component>
+  <component name="ProjectId" id="2L2y55tSt0XlzQa7s1gkzyAgxgu" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;ASKED_ADD_EXTERNAL_FILES&quot;: &quot;true&quot;,
+    &quot;ASKED_SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;
+  }
+}</component>
+  <component name="RunManager">
+    <configuration name="SuperMain" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.bib.essensbestellungsverwaltung.SuperMain" />
+      <module name="Essensbestellungsverwaltung" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.bib.essensbestellungsverwaltung.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.SuperMain" />
+        <item itemvalue="Application.SuperMain" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="be8f30d3-089d-4d1c-bba3-da21b0466111" name="Changes" comment="" />
+      <created>1675083287293</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1675083287293</updated>
+    </task>
+    <task id="LOCAL-00001" summary="StartViewApplication ist die Startpunkt des Projekt">
+      <created>1675083679870</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1675083679870</updated>
+    </task>
+    <task id="LOCAL-00002" summary="StartViewApplication ist die Startpunkt des Projekt">
+      <created>1675083693484</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1675083693484</updated>
+    </task>
+    <task id="LOCAL-00003" summary="singup mit Datebase verbunden und new Adresse">
+      <created>1675241335793</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1675241335793</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Variablen und Attributen auf englisch umbennent">
+      <created>1675606671743</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1675606671743</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
+    <servers />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="StartViewApplication ist die Startpunkt des Projekt" />
+    <MESSAGE value="singup mit Datebase verbunden" />
+    <MESSAGE value="singup mit Datebase verbunden und new Adresse" />
+    <MESSAGE value="Variablen und Attributen auf englisch umbennent" />
+    <option name="LAST_COMMIT_MESSAGE" value="Variablen und Attributen auf englisch umbennent" />
+  </component>
+</project>
--- a/database.db
+++ b/database.db
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,3 @@
 # Essensbestellungsverwaltung

-test
+stable ist der neue main
--- a/src/main/java/com/bib/essensbestellungsverwaltung/AccountMgr.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/AccountMgr.java
@@ -1,7 +1,4 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
@@ -13,12 +10,20 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;

+/**
+ * A collection of functions loosely related to account management
+ * Acts as an abstraction layer to the database
+ * @author Malte Schulze Hobeling
+ */
 public class AccountMgr {
-    protected static double price = 5.0;
+
+    static User currentUser = null;

    /**
     * creates a user with createUser(...) and adds its id to the 'worker' table
+     * @param worker the worker to be created
     * @return userid or -1
+     * @author Malte Schulze Hobeling
     */
    protected static long createWorker(Worker worker){
        long id = createUser(worker);
@@ -29,7 +34,9 @@ public class AccountMgr {

    /**
     * creates a user with createUser(...) and adds its id to the 'parent' table
+     * @param parent the parent to be created
     * @return userid or -1
+     * @author Malte Schulze Hobeling
     */
    protected static long createParent(Parent parent){
        long id = createUser(parent);
@@ -40,7 +47,9 @@ public class AccountMgr {

    /**
     * adds a user to the database
+     * @param user the user to be created
     * @return userid or -1
+     * @author Malte Schulze Hobeling
     */
    protected static long createUser(User user) {
        String[] userH = {"name", "firstname", "addressid", "password", "email"};
@@ -56,6 +65,12 @@ public class AccountMgr {
        return Database.insert("user", userH, userD);
    }

+    /**
+     * adds an address to the database
+     * @param address the address to be created
+     * @return id or -1
+     * @author Malte Schulze Hobeling
+     */
    protected static long createAddress(Address address){
        String[] addressH = {"street", "number", "plz", "city"};
        String[] addressD = {address.getStreet(),address.getNumber(),address.getPlz(),address.getCity()};
@@ -64,7 +79,9 @@ public class AccountMgr {

    /**
     * adds a child and allergies to the database
+     * @param child the child to be created
     * @return id of child or -1
+     * @author Malte Schulze Hobeling
     */
    protected static long createChild(Child child){
        String[] childH = {"name","firstname","addressid"};
@@ -81,8 +98,17 @@ public class AccountMgr {
        return id;
    }

+    /**
+     * returns a User(Worker | Parent) for a given id or null if no unique id was found
+     * @param id id of the User
+     * @return User(Worker | Parent) or null
+     * @author Malte Schulze Hobeling
+     */
    protected static User getUserById(long id){
        List<String> entry = Database.getEntryById("user",id);
+        if(entry.size() != 1){
+            return null;
+        }
        String[] parts = entry.get(0).split(":");
        Address address = getAddressById(id);
        if(isWorker(String.valueOf(id))){
@@ -100,8 +126,17 @@ public class AccountMgr {
        }
    }

+    /**
+     * returns a Child for a given id or null if no unique id was found
+     * @param id id of child
+     * @return Child or null
+     * @author Malte Schulze Hobeling
+     */
    protected static Child getChildById(long id){
        List<String> entry = Database.getEntryById("child",id);
+        if(entry.size() != 1){
+            return null;
+        }
        String[] parts = entry.get(0).split(":");
        String[] child_allergyH = {"childid"};
        String[] child_allergyD = {String.valueOf(id)};
@@ -117,8 +152,17 @@ public class AccountMgr {
        return new Child(id,parts[1],parts[2],getAddressById(Long.parseLong(parts[3])),allergySeverities);
    }

+    /**
+     * returns an Address for a given id or null if no unique id was found
+     * @param id id of the address
+     * @return Address or null
+     * @author Malte Schulze Hobeling
+     */
    protected static Address getAddressById(long id){
        List<String> entry = Database.getEntryById("address",id);
+        if(entry.size() != 1){
+            return null;
+        }
        String[] parts = entry.get(0).split(":");
        return new Address(Long.parseLong(parts[0]),parts[1],parts[2],parts[3],parts[4]);
    }
@@ -128,6 +172,7 @@ public class AccountMgr {
     * @param parentId id of parent
     * @param childId id of child
     * @return id of parent_child or -1
+     * @author Malte Schulze Hobeling
     */
    protected static long matchParentChild(String parentId, String childId){
        String[] parent_childH = {"parentuserid","childid"};
@@ -140,6 +185,7 @@ public class AccountMgr {
     * @param email email
     * @param pw password
     * @return id or -1
+     * @author Malte Schulze Hobeling
     */
    protected static long login(String email, String pw){
        String[] pwH = {"email"};
@@ -158,11 +204,38 @@ public class AccountMgr {
        String[] userD = {email,hashAndSalt(pw,salt)};
        return Database.getSingleId("user",userH,userD);
    }
+    /**
+     * update password in User table
+     * @param password User
+     * @return update password
+     * @author Reshad Meher
+     */
+    protected static long updatePassword( User password) {
+
+        String[] pwH = {"password"};
+        String[] pwD = {password.getPassword()};
+        long updates = Database.update("user",pwH,pwD);
+        return updates;
+    }
+    /**
+     * update adress in User table
+     * @param address Adresss
+     * @return update Adrssse
+     * @author Reshad Meher
+     */
+    protected static long updateAdreess(Address address ){
+        String[] adH = {"stree","numbrt","plz","city"};
+        String[] adD = {address.getStreet(),address.getNumber(),address.getPlz(),address.getCity()};
+        long updates = Database.update("user",adH,adD);
+        return updates;
+    }
+

    /**
     * checks if id is in worker table
     * @param id userid
     * @return true if id is in worker table
+     * @author Malte Schulze Hobeling
     */
    protected static boolean isWorker(String id){
        String[] workerH = {"userid"};
@@ -175,6 +248,7 @@ public class AccountMgr {
     * checks if id is in parent table
     * @param id userid
     * @return true if id is in parent table
+     * @author Malte Schulze Hobeling
     */
    protected static boolean isParent(String id){
        String[] parentH = {"userid"};
@@ -187,6 +261,7 @@ public class AccountMgr {
     * returns a hashed and salted password
     * @param pw the password to hash
     * @return hashed and salted password
+     * @author Malte Schulze Hobeling
     */
    private static String hashAndSalt(String pw, String salt){
        Base64.Decoder dec = Base64.getDecoder();
@@ -205,6 +280,11 @@ public class AccountMgr {
        return hashedPw;
    }

+    /**
+     * generates a secure random salt, Base64 encoded
+     * @return String Base64 encoded
+     * @author Malte Schulze Hobeling
+     */
    private static String getSalt(){
        SecureRandom sec = new SecureRandom();
        byte[] salt = new byte[16];
@@ -218,11 +298,15 @@ public class AccountMgr {
     * @param date YYYY-MM the month
     * @param childId id of child
     * @return the invoice as a List
+     * @author Malte Schulze Hobeling
     */
    protected static List<String> getInvoice(String date, String childId){
        List<String> invoice = new ArrayList<>();
-        invoice.add("Monatsabrechnung " + date);
        List<String> child = Database.getEntryById("child", Long.parseLong(childId));
+        if(child.size() != 1){
+            return invoice;
+        }
+        invoice.add("Monatsabrechnung " + date);
        String[] childParts = child.get(0).split(":");
        invoice.add(childParts[1] + ", " + childParts[2]);
        String[] food_planH = {"date"};
@@ -241,18 +325,29 @@ public class AccountMgr {
                invoice.add(line);
            }
        }
+        double price = getPrice();
        invoice.add("Total: " + (invoice.size()-2) + " X " + price + "€ = " + ((invoice.size()-2)*price) + "€");
        return invoice;
    }

-    protected static void getPriceFromDb(){
+    /**
+     * gets the price per meal from the database and converts it to double
+     * @return double price
+     * @author Malte Schulze Hobeling
+     */
+    protected static double getPrice(){
        List<String> priceEntry = Database.getEntryById("price",1);
-        price = Double.parseDouble(priceEntry.get(0).split(":")[1])/100.0;
+        return Double.parseDouble(priceEntry.get(0).split(":")[1])/100.0;
    }

-    protected static void setPriceInDb(){
+    /**
+     * converts the price per meal to integer and updates it in the database
+     * @param price double
+     * @author Malte Schulze Hobeling
+     */
+    protected static void setPrice(double price){
        String[] priceH = {"id","price"};
-        String[] priceD = {"1", String.valueOf(price*100)};
+        String[] priceD = {"1", String.valueOf((int)(price*100))};
        Database.update("price",priceH,priceD);
    }
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/Address.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/Address.java
@@ -1,8 +1,10 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

+/**
+ * An Address, used by User and Child and intended as a way to identify a child if you want to match it to another parent
+ * one constructor is used for creating new addresses the other is used to create existing addresses from database
+ * @author Malte Schulze Hobeling
+ */
 public class Address {
    private long id;
    private String street;
@@ -44,4 +46,5 @@ public class Address {
        this.plz = plz;
        this.city = city;
    }
+
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/AdminController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/AdminController.java
@@ -1,4 +1,81 @@
 package com.bib.essensbestellungsverwaltung;

+import javafx.fxml.FXML;
+import javafx.scene.control.Alert;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
 public class AdminController {
+
+    @FXML
+    TextField lastname;
+    @FXML
+    TextField firstname;
+    @FXML
+    TextField street;
+    @FXML
+    TextField number;
+    @FXML
+    TextField city;
+    @FXML
+    TextField plz;
+    @FXML
+    TextField email;
+    @FXML
+    PasswordField password;
+
+
+
+    @FXML
+    protected void onBtSignUp(){
+
+
+
+
+        String ln = lastname.getText();
+        String fn = firstname.getText();
+        String st = street.getText();
+        String nr = number.getText();
+        String cityString = city.getText();
+        String plzString = plz.getText();
+        String emailString = email.getText();
+        String pw = password.getText();
+
+
+
+        if(!pw.matches("^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=])(?=\\S+$).{8,}$")){
+
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("Passwort");
+            alert.setHeaderText("Ungültiges Passwort");
+            alert.setContentText("Das Passwort benötigt mindestens: \n-8 Zeichen\n-einen Kleinbuchstaben\n-einen Großbuchstaben\n-ein Sonderzeichen\n-kein Leerzeichen");
+            password.setText("");
        }
+
+        if(!emailString.matches("^(?=.{1,64}@)[A-Za-z0-9_-]+(\\\\.[A-Za-z0-9_-]+)*@[^-][A-Za-z0-9-]+(\\\\.[A-Za-z0-9-]+)*(\\\\.[A-Za-z]{2,})$")){
+            Alert alert = new Alert(Alert.AlertType.ERROR);
+            alert.setTitle("E-Mail");
+            alert.setHeaderText("Ungültige E-Mail Adresse");
+            alert.setContentText("Bitte geben sie eine gültige E-Mail Adresse an");
+            email.setText("");
+        }
+
+        //String[] userData = new String[]{ln,fn,pw,emailString};
+        //String[] addressData = new String[]{st,nr,plzString,cityString};
+
+        Address address = new Address(st,nr,plzString,cityString);
+
+        Worker worker = new Worker(ln,fn,pw,emailString,address);
+
+        AccountMgr.createWorker(worker);
+
+    }
+
+    @FXML
+    protected void onBtCancel(){
+
+    }
+
+
+}
+
--- a/src/main/java/com/bib/essensbestellungsverwaltung/Allergy.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/Allergy.java
@@ -1,8 +1,9 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

+/**
+ * An Allergy, used by Food and AllergySeverity, not intended to be changed
+ * @author Malte Schulze Hobeling
+ */
 public class Allergy {
    private final long id;
    private final String name;
@@ -25,4 +26,5 @@ public class Allergy {
    public String getHandle() {
        return handle;
    }
+
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/AllergySeverity.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/AllergySeverity.java
@@ -1,8 +1,9 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

+/**
+ * Matching an Allergy to a Severity, used by Child
+ * @author Malte Schulze Hobeling
+ */
 public class AllergySeverity {
    private Allergy allergy;
    private long severityId;
--- a/src/main/java/com/bib/essensbestellungsverwaltung/Child.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/Child.java
@@ -1,10 +1,12 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

 import java.util.List;

+/**
+ * A Child, used by Parent
+ * one constructor is used to create new children the other is used to create existing children from database
+ * @author Malte Schulze Hobeling
+ */
 public class Child {
    private long id;
    private String name;
--- a/src/main/java/com/bib/essensbestellungsverwaltung/ConsoleLib.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/ConsoleLib.java
@@ -1,12 +1,13 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

 import java.util.ArrayList;
 import java.util.List;
 import java.util.Scanner;

+/**
+ * library for cli functions
+ * @author Malte Schulze Hobeling
+ */
 public class ConsoleLib {
    public static void createWorkerPrompt(){
        Scanner sc = new Scanner(System.in);
@@ -320,7 +321,6 @@ public class ConsoleLib {
        Scanner sc = new Scanner(System.in);
        double price = sc.nextDouble();
        sc.nextLine();
-        AccountMgr.price = price;
-        AccountMgr.setPriceInDb();
+        AccountMgr.setPrice(price);
    }
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/ConsoleMain.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/ConsoleMain.java
@@ -1,10 +1,11 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

 import java.util.Scanner;

+/**
+ * simple cli showcase of the implemented functionality
+ * @author Malte Schulze Hobeling
+ */
 public class ConsoleMain {
    static User currentUser = null;
    static boolean running = true;
@@ -15,7 +16,7 @@ public class ConsoleMain {
            Database.fillDb();
            ConsoleLib.createWorkerPrompt();
        }
-        AccountMgr.getPriceFromDb();
+        AccountMgr.getPrice();
        while (running){
            if(currentUser == null){
                defaultMenu();
--- a/src/main/java/com/bib/essensbestellungsverwaltung/Database.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/Database.java
@@ -1,7 +1,4 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

 import java.io.File;
 import java.io.IOException;
@@ -10,13 +7,19 @@ import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;

-
+/**
+ * Basic operations on the database
+ * Use init() -> createDb() -> fillDb() to create the skeleton with some default values
+ * Provides select, insert, update, delete, count operations and more
+ * @author Malte Schulze Hobeling
+ */
 public class Database {
    private static final String dbLocation = "jdbc:sqlite:"+Path.of("").toAbsolutePath()+"/database.db";

    /**
     * creates new database.db if it doesn't exist
     * @return true if a new database has been created
+     * @author Malte Schulze Hobeling
     */
    protected static boolean init(){
        File db = new File(Path.of("").toAbsolutePath()+"/database.db");
@@ -30,6 +33,7 @@ public class Database {
    /**
     * connects to the database
     * @return Connection to the database
+     * @author Malte Schulze Hobeling
     */
    protected static Connection connect(){
        Connection conn = null;
@@ -43,6 +47,7 @@ public class Database {

    /**
     * creates the initial structure of the db
+     * @author Malte Schulze Hobeling
     */
    protected static void createDb(){
        String[] sql = new String[15];
@@ -173,6 +178,7 @@ public class Database {

    /**
     * inserts fixed values into the database
+     * @author Malte Schulze Hobeling
     */
    protected static void fillDb(){
        List<String> sqls = new ArrayList<>();
@@ -274,11 +280,12 @@ public class Database {

    /**
     * inserts data into table and returns its id
-     * does not insert if the exact set already exists
+     * simple duplication check
     * @param table name of the database table
     * @param header String[] order should match with values
     * @param values String[] order should match with header
     * @return id of dataset or -1
+     * @author Malte Schulze Hobeling
     */
    protected static long insert(String table, String[] header, String[] values){
        long id = -1;
@@ -320,6 +327,7 @@ public class Database {
     * @param header the header of the table, order should match with values
     * @param values the data you want the id of, order should match witch values
     * @return one id matching the given data or -1 if no match has been found
+     * @author Malte Schulze Hobeling
     */
    protected static long getSingleId(String table, String[] header, String[] values){
        long id = -1;
@@ -372,6 +380,7 @@ public class Database {
     * deletes an entry from table with matching id
     * @param table the table that contains the entry you want to delete
     * @param id the id of the entry you want to delete
+     * @author Malte Schulze Hobeling
     */
    protected static void delete(String table, long id){
        String sql = "DELETE FROM " + table + " WHERE id = ?;";
@@ -383,6 +392,21 @@ public class Database {
        }
    }

+    /**
+     * its a query builder it builds queries
+     * exists:       checks if an entry with the given parameters exists in table
+     * selectMatch:  returns all matching rows from table
+     * insert:       inserts or ignores into table
+     * count:        counts exact matches from table
+     * update:       updates table, header/values[0] is used as WHERE, using id is recommended header/values[1+] are used
+     *               as SET
+     * @param type exists, selectMatch, insert, count, update
+     * @param table table
+     * @param header header
+     * @param values values
+     * @return sql statement as String
+     * @author Malte Schulze Hobeling
+     */
    private static String queryBuilder(String type,String table, String[] header, String[] values){
        String sql;
        StringBuilder sb = new StringBuilder();
@@ -479,6 +503,7 @@ public class Database {
     * returns a list of all entries
     * @param table the table you want
     * @return a list of all entries as String with the fields separated by ":"
+     * @author Malte Schulze Hobeling
     */
    protected static List<String> getTable(String table){
        List<String> data = new ArrayList<>();
@@ -510,6 +535,7 @@ public class Database {
     * @param header header for the WHERE portion, order should match with values
     * @param values values for the WHERE portion, order should match with header
     * @return a list of the matching data as String separated by ":"
+     * @author Malte Schulze Hobeling
     */
    protected static List<String> select(String table,String[] header, String[] values){
        List<String> data = new ArrayList<>();
@@ -541,6 +567,7 @@ public class Database {
     * @param table the table you want the entry from
     * @param id the id of the entry you want
     * @return a list of String separated by ":"
+     * @author Malte Schulze Hobeling
     */
    protected static List<String> getEntryById(String table, long id){
        List<String> data = new ArrayList<>();
@@ -574,6 +601,7 @@ public class Database {
     * @param header the properties you want to count on
     * @param values the values for the properties
     * @return the number of found rows
+     * @author Malte Schulze Hobeling
     */
    protected static int count(String table,String[] header,String[] values){
        String sql = queryBuilder("count",table,header,values);
@@ -592,6 +620,7 @@ public class Database {
     * @param header [0] is used as WHERE, everything else in SET
     * @param values [0] is used as WHERE, everything else in SET
     * @return number of rows affected or -1 on error
+     * @author Malte Schulze Hobeling
     */
    protected static int update(String table,String[] header,String[] values){
        try(Connection conn = connect()) {
--- a/src/main/java/com/bib/essensbestellungsverwaltung/Food.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/Food.java
@@ -1,10 +1,12 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

 import java.util.List;

+/**
+ * Food, used by FoodPlan
+ * one constructor is used to create new foods the other is used to create existing foods from database
+ * @author Malte Schulze Hobeling
+ */
 public class Food {
    private long id;
    private String name;
--- a/src/main/java/com/bib/essensbestellungsverwaltung/FoodMgr.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/FoodMgr.java
@@ -1,16 +1,19 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

 import java.util.ArrayList;
 import java.util.List;

-
+/**
+ * A collection of functions loosely related to food management
+ * Acts as an abstraction layer to the database
+ * @author Malte Schulze Hobeling
+ */
 public class FoodMgr {
    /**
     * inserts a food int to the database and creates the food_restriction entries
+     * @param food the food to be created
     * @return id of food or -1
+     * @author Malte Schulze Hobeling
     */
    public static long createFood(Food food){
        String[] foodH = {"name","description","isDessert","food_typeid"};
@@ -29,7 +32,9 @@ public class FoodMgr {

    /**
     * inserts a food_plan into the database
+     * @param foodPlan the foodPlan to be created
     * @return id of food_plan or -1
+     * @author Malte Schulze Hobeling
     */
    public static long createFood_plan(FoodPlan foodPlan){
        String[] food_planH = {"date","food1","food2","dessert1","dessert2"};
@@ -45,6 +50,7 @@ public class FoodMgr {
     * returns all non desserts or all desserts
     * @param isDessert true for only desserts false for non desserts
     * @return a list of all non desserts or all desserts
+     * @author Malte Schulze Hobeling
     */
    public static List<Food> getFood(boolean isDessert){
        String[] foodH = {"isDessert"};
@@ -62,6 +68,7 @@ public class FoodMgr {
     * getFood but returns only vegan food
     * @param isDessert true for only desserts false for non desserts
     * @return a list of all vegan non desserts or all vegan desserts
+     * @author Malte Schulze Hobeling
     */
    public static List<Food> getVeganFood(boolean isDessert){
        String[] foodH = {"isDessert","food_typeid"};
@@ -79,6 +86,7 @@ public class FoodMgr {
     * returns a food_plan for a day
     * @param date YYYY-MM-DD one day
     * @return food_plan for date
+     * @author Malte Schulze Hobeling
     */
    public static FoodPlan getFoodPlan(String date){
        String[] food_planH = {"date"};
@@ -93,8 +101,17 @@ public class FoodMgr {
        return new FoodPlan(Long.parseLong(parts[0]),date,foodVegan,foodSecond,dessertVegan,dessertSecond,isSent);
    }

+    /**
+     * returns a FoodPlan for a given id or null if no unique id was found
+     * @param id id of the FoodPlan
+     * @return FoodPlan or null
+     * @author Malte Schulze Hobeling
+     */
    public static FoodPlan getFoodPlanById(long id){
        List<String> entry = Database.getEntryById("food_plan",id);
+        if(entry.size() != 1){
+            return null;
+        }
        String[] parts = entry.get(0).split(":");
        Food foodVegan = getFoodById(Long.parseLong(parts[2]));
        Food foodSecond = getFoodById(Long.parseLong(parts[3]));
@@ -104,8 +121,17 @@ public class FoodMgr {
        return new FoodPlan(id,parts[1], foodVegan,foodSecond,dessertVegan,dessertSecond,isSent);
    }

+    /**
+     * returns a Food for a given id or null if no unique id was found
+     * @param id id of the Food
+     * @return Food or null
+     * @author Malte Schulze Hobeling
+     */
    public static Food getFoodById(long id){
        List<String> entry = Database.getEntryById("food",id);
+        if(entry.size() != 1){
+            return null;
+        }
        String[] parts = entry.get(0).split(":");
        String name = parts[1];
        String description = parts[2];
@@ -116,20 +142,44 @@ public class FoodMgr {
        return new Food(id,name,description,isDessert,foodType,allergies);
    }

+    /**
+     * returns a FoodType for a given id or null if no unique id was found
+     * @param id id of the FoodType
+     * @return FoodType or null
+     * @author Malte Schulze Hobeling
+     */
    public static FoodType getFoodTypeById(long id){
        List<String> entry = Database.getEntryById("food_type",id);
+        if(entry.size() != 1){
+            return null;
+        }
        String[] typeParts = entry.get(0).split(":");
        return new FoodType(Long.parseLong(typeParts[0]),typeParts[1]);
    }

+    /**
+     * returns an Allergy for a given id or null if no unique id was found
+     * @param id id of the Allergy
+     * @return Allergy or null
+     * @author Malte Schulze Hobeling
+     */
    public static Allergy getAllergyById(long id){
        String[] allergyH = {"id"};
        String[] allergyD = {String.valueOf(id)};
-        List<String> allergies = Database.select("allergy",allergyH,allergyD);
-        String[] allergyParts = allergies.get(0).split(":");
+        List<String> entry = Database.select("allergy",allergyH,allergyD);
+        if(entry.size() != 1){
+            return null;
+        }
+        String[] allergyParts = entry.get(0).split(":");
        return new Allergy(id,allergyParts[1],allergyParts[2]);
    }

+    /**
+     * returns all Allergies for a given foodId
+     * @param foodId the foodId you want the allergies from
+     * @return a List of Allergy, can be empty
+     * @author Malte Schulze Hobeling
+     */
    public static List<Allergy> getAllergies(long foodId){
        List<Allergy> allergies = new ArrayList<>();
        String[] restrictionsH = {"foodid"};
@@ -146,11 +196,12 @@ public class FoodMgr {
     * inserts the selected food into food_Selection if the food_plan has not been sent
     * @param food_selectionData childid, food_planid, foodid
     * @return id or -1
+     * @author Malte Schulze Hobeling
     */
    public static long createFood_selection(String[] food_selectionData){
        String[] food_selectionH = {"childid","food_planid","foodid"};
        FoodPlan food_plan = getFoodPlanById(Long.parseLong(food_selectionData[1]));
-        if(!food_plan.isSent()){
+        if(food_plan != null && !food_plan.isSent()){
            return Database.insert("food_selection",food_selectionH,food_selectionData);
        }else {
            return -1;
@@ -161,6 +212,7 @@ public class FoodMgr {
     * accumulates the selected food for a given day and locks the corresponding food_plan
     * @param date YYYY-MM-DD day
     * @return the accumulated orders
+     * @author Malte Schulze Hobeling
     */
    public static List<String> getDayOrder(String date){
        List<String> orders = new ArrayList<>();
--- a/src/main/java/com/bib/essensbestellungsverwaltung/FoodPlan.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/FoodPlan.java
@@ -1,5 +1,10 @@
 package com.bib.essensbestellungsverwaltung;

+/**
+ * FoodPlan
+ * one constructor is used to create new foodPlans the other is used to create existing foodPlans from database
+ * @author Malte Schulze Hobeling
+ */
 public class FoodPlan {
    private long id;
    private String date;
--- a/src/main/java/com/bib/essensbestellungsverwaltung/FoodType.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/FoodType.java
@@ -1,8 +1,9 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

+/**
+ * FoodType used by Food, not intended to be changed
+ * @author Malte Schulze Hobeling
+ */
 public class FoodType {
    private long id;
    private String name;
@@ -19,4 +20,5 @@ public class FoodType {
    public String getName() {
        return name;
    }
+
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/HelloController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/HelloController.java
@@ -1,34 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-
-public class HelloController {
-    /**
-     * @autor: Reshad Meher
-     * Username, Passwort , login
-     */
-
-    @FXML
-    private TextField unsernameEingabe;
-    @FXML
-    private TextField passwortEingabe;
-    @FXML
-    private Label lblAusgabe;
-    @FXML
-    protected void onLoginButtonClick() {
-        String benutzerEingabe = unsernameEingabe.getText();
-        String kennwortEingabe = passwortEingabe.getText();
-        if(benutzerEingabe.contains("Reshad") && kennwortEingabe.contains("test123")){
-            lblAusgabe.setText("Herzlich Willkommen, " + benutzerEingabe + "!");
-        }else {
-            Alert alert = new Alert(Alert.AlertType.ERROR,
-                    "Die Benutzername oder Passwort ist falsch");
-            alert.showAndWait();
-        }
-        unsernameEingabe.setText("");
-        passwortEingabe.setText("");
-    }
-}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
@@ -1,4 +1,4 @@
-/*Richard Reiswich*/
+/*Reshad Meher*/
 package com.bib.essensbestellungsverwaltung;

 import javafx.fxml.FXML;
@@ -7,10 +7,8 @@ import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
-import javafx.stage.Stage;
-
 import java.io.IOException;
-import java.util.HashMap;
+

 public class LoginController {
    @FXML
@@ -18,36 +16,27 @@ public class LoginController {

    @FXML
    private PasswordField pfPassword;
-
-    HashMap<String,String> benutzerMap = new HashMap<String,String>();
    @FXML
    protected void  onBtLoginClick() throws IOException {
-        benutzerMap.put("Reshad","1234");
        String email = tfEmail.getText();
        String password = pfPassword.getText();
-        if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
+        long loginPruefen = AccountMgr.login(email,password);
+        if(loginPruefen > 0){
            FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("menue-view.fxml"));
-            Scene scene = new Scene(fxmlLoader.load(), 950,480);
-            Stage stage = new Stage();
-            stage.setTitle("Essen Bestellung im Kindergarten");
-            stage.setScene(scene);
-            stage.show();
+            Scene scene = new Scene(fxmlLoader.load(), 950,700);
+            StartViewApplication.primary.setScene(scene);
        }else {
            Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");
            alert.showAndWait();
        }
-
        tfEmail.setText("");
        pfPassword.setText("");
    }
    @FXML
-    protected void changeToSignUp() throws IOException {
+    protected void onBtSingnupClick() throws IOException {
        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("signUp-view.fxml"));
-        Scene scene = new Scene(fxmlLoader.load(), 950,480);
-        Stage stage = new Stage();
-        stage.setTitle("Essen Bestellung im Kindergarten");
-        stage.setScene(scene);
-        stage.show();
+        Scene scene = new Scene(fxmlLoader.load(), 950,700);
+        StartViewApplication.primary.setScene(scene);

    }
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
@@ -1,25 +1,100 @@
-/**
- * Author: Reshad Meher
- *  Startseite
- * fxml: menue-view.fxml
- */
-
 package com.bib.essensbestellungsverwaltung;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.control.Alert;
-import javafx.stage.Stage;
-
-import java.io.IOException;
+import javafx.scene.Node;
+import javafx.scene.control.*;

 public class MenueController {

    @FXML
-    private void onBtLoginClick(){
-        Alert alert = new Alert(Alert.AlertType.ERROR, "Hi");
-        alert.showAndWait();
+    Button btFirstMealMon;
+    @FXML
+    Button btSecondMealMon;
+    @FXML
+    Button btNoMealMon;
+    @FXML
+    Button btFirstDessertMon;
+    @FXML
+    Button btSecondDessertMon;
+    @FXML
+    Button btNoDessertMon;
+    @FXML
+    Button btFirstMealTue;
+    @FXML
+    Button btSecondMealTue;
+    @FXML
+    Button btNoMealTue;
+    @FXML
+    Button btFirstDessertTue;
+    @FXML
+    Button btSecondDessertTue;
+    @FXML
+    Button btNoDessertTue;
+    @FXML
+    Button btFirstMealWed;
+    @FXML
+    Button btSecondMealWed;
+    @FXML
+    Button btNoMealWed;
+    @FXML
+    Button btFirstDessertWed;
+    @FXML
+    Button btSecondDessertWed;
+    @FXML
+    Button btNoDessertWed;
+    @FXML
+    Button btFirstMealThu;
+    @FXML
+    Button btSecondMealThu;
+    @FXML
+    Button btNoMealThu;
+    @FXML
+    Button btFirstDessertThu;
+    @FXML
+    Button btSecondDessertThu;
+    @FXML
+    Button btNoDessertThu;
+    @FXML
+    Button btFirstMealFri;
+    @FXML
+    Button btSecondMealFri;
+    @FXML
+    Button btNoMealFri;
+    @FXML
+    Button btFirstDessertFri;
+    @FXML
+    Button btSecondDessertFri;
+    @FXML
+    Button btNoDessertFri;
+    @FXML
+    ComboBox<String> cbPickChild;
+    @FXML
+    Button btLogin;
+    @FXML
+    Button btSaveOrder;
+    @FXML
+    ListView<String> lvFoodInfo;
+
+    public ObservableList<Node> buttons = FXCollections.observableArrayList();
+
+
+    public void setButtonActive(ActionEvent event) {
+        Button b = (Button) event.getSource();
+
+        javafx.scene.Parent p = b.getParent();
+        buttons = p.getChildrenUnmodifiable();
+
+        for(Node button : buttons){
+            System.out.println(b.getStyleClass());
+            /*
+            b.getStyleClass().remove("active");
+
+            if (button.equals(b)){
+                b.getStyleClass().add("active");;
+            }
+             */
+        }
    }
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/Parent.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/Parent.java
@@ -1,11 +1,12 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

 import java.util.ArrayList;
 import java.util.List;

+/**
+ * one constructor is used to create new parents the other is used to create existing parents from database
+ * @author Malte Schulze Hobeling
+ */
 public class Parent extends User{
    List<Child> children;

--- a/src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java
@@ -1,4 +1,78 @@
 package com.bib.essensbestellungsverwaltung;

+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.Button;
+import javafx.scene.layout.BorderPane;
+import org.w3c.dom.events.MouseEvent;
+
+import java.io.IOException;
+
 public class ParentController{
+
+    @FXML
+    BorderPane contentView;
+    @FXML
+    Button essensplanButton;
+    @FXML
+    Button kinderButton;
+    @FXML
+    Button bestellungButton;
+    @FXML
+    Button einstellungenButton;
+
+    @FXML
+    public void initialize() {
+        changePage("menue-view.fxml");
+        setButtonActive(essensplanButton);
+    }
+
+
+    @FXML
+    public void onEssensplanClick(MouseEvent mouseEvent) {
+        setButtonActive(essensplanButton);
+        changePage("menue-view.fxml");
+    }
+
+    @FXML
+    public void onKinderClick(MouseEvent mouseEvent) {
+        setButtonActive(kinderButton);
+        changePage("child-view.fxml");
+    }
+
+    @FXML
+    public void onBestellungClick(MouseEvent mouseEvent) {
+        setButtonActive(bestellungButton);
+        changePage("orderHistory-view.fxml");
+    }
+
+    @FXML
+    public void onEinstellungenClick(MouseEvent mouseEvent) {
+        setButtonActive(einstellungenButton);
+        changePage("SettingsMenue.fxml");
+    }
+
+    @FXML
+    public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
+        AccountMgr.currentUser = null;
+        StartViewApplication.changeScene("login-view.fxml");
+    }
+
+    private void changePage(String page) {
+        try {
+            Parent root = FXMLLoader.load(getClass().getResource(page));
+            //contentView.setCenter(root);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void setButtonActive(Button b) {
+        einstellungenButton.getStyleClass().remove("active");
+        kinderButton.getStyleClass().remove("active");
+        bestellungButton.getStyleClass().remove("active");
+        essensplanButton.getStyleClass().remove("active");
+        b.getStyleClass().add("active");
+    }
+
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/SceneController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/SceneController.java
@@ -1,12 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-
-import java.io.IOException;
-import java.util.Objects;
-
-public class SceneController {
-
-}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java
@@ -0,0 +1,144 @@
+package com.bib.essensbestellungsverwaltung;
+/**
+ * @autor Reshad Meher
+ */
+
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.control.TextField;
+
+import java.io.IOException;
+
+public class SettingsController {
+
+    @FXML
+    private TextField tfOldPassword;
+    @FXML
+    private TextField tfNewPassword;
+    @FXML
+    private TextField tfConfirmNewPasword;
+    @FXML
+    private TextField tfPostCode;
+    @FXML
+    private TextField tfStreet;
+    @FXML
+    private TextField tfCity;
+    @FXML
+    private TextField tfHousNumber;
+
+    Alert alert;
+    @FXML
+    private void onPasswordChangClick(){
+        String oldPassword = tfOldPassword.getText();
+        String newPassword = tfNewPassword.getText();
+        String confirmNewPassword = tfConfirmNewPasword.getText();
+        if(!oldPassword.isEmpty() && !newPassword.isEmpty() && !confirmNewPassword.isEmpty()){
+            if(!newPassword.equals(confirmNewPassword)){
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre  neue Passwort und Bestätigung passt nicht. Nochmal versuchen");
+                alert.showAndWait();
+            }else {
+                User userPassword = new User(newPassword);
+                long UpdateUserPassword = AccountMgr.updatePassword(userPassword);
+                if (UpdateUserPassword > 0){
+                    alert.setTitle("Passwort");
+                    alert.setHeaderText("Ihre Passwort erfolgreich geändert");
+                    alert.showAndWait();
+                }
+                else {
+                    alert.setTitle("Passwort");
+                    alert.setHeaderText("nei");
+                    alert.showAndWait();
+                }
+            }
+
+            tfOldPassword.setText("");
+            tfNewPassword.setText("");
+            tfConfirmNewPasword.setText("");
+        }
+        else {
+            if(oldPassword.isEmpty()){
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre aktuelles Passwort ist leer.");
+                alert.showAndWait();
+            }else if(newPassword.isEmpty()){
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre neues Passwort ist leer.");
+                alert.showAndWait();
+            }if(confirmNewPassword.isEmpty()){
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre neue Passwort Bestätigung ist leer.");
+                alert.showAndWait();
+            }else{
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre Passwort wurde nicht geändert");
+                alert.showAndWait();
+            }
+
+        }
+    }
+
+    @FXML
+    private void onChangAdressClick(){
+        String postCode = tfPostCode.getText();
+        String street = tfStreet.getText();
+        String city = tfCity.getText();
+        String housNumber = tfHousNumber.getText();
+        if (!postCode.isEmpty() && !street.isEmpty() && !city.isEmpty() && !housNumber.isEmpty()) {
+            Address userAdress = new Address(street,housNumber,postCode,city);
+            long UpdateUserAdress = AccountMgr.updateAdreess(userAdress);
+            if (UpdateUserAdress > 0) {
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Ihre Adresse erfolgreich geändert");
+                alert.showAndWait();
+
+                tfPostCode.setText("");
+                tfStreet.setText("");
+                tfCity.setText("");
+                tfHousNumber.setText("");
+            }
+
+        }else {
+            if (postCode.isEmpty()) {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Postleitzahl ist leer.");
+                alert.showAndWait();
+            } else if (street.isEmpty()) {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Straß ist leer.");
+                alert.showAndWait();
+            } else if (city.isEmpty()) {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Statd ist leer.");
+                alert.showAndWait();
+            } else if (housNumber.isEmpty()) {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Hausnumer  ist leer.");
+                alert.showAndWait();
+            } else {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Ihre Adresse wurde nicht geändert");
+                alert.showAndWait();
+            }
+        }
+    }
+    @FXML
+    private void onLogOutBtClick() throws IOException{
+
+        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 950,700);
+        StartViewApplication.primary.setScene(scene);
+    }
+}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
@@ -0,0 +1,95 @@
+package com.bib.essensbestellungsverwaltung;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+
+import java.io.IOException;
+
+public class SingUpController {
+    @FXML
+    private TextField tfLastName;
+    @FXML
+    private TextField tfFirstName;
+    @FXML
+    private TextField tfEmail;
+    @FXML
+    private PasswordField pfPassword;
+    @FXML
+    private TextField tfPostCode;
+    @FXML
+    private TextField tfCity;
+
+    @FXML
+    private TextField tfStreet;
+    @FXML
+    private TextField tfHousNumber;
+    @FXML
+    private void onKontoErstellenBtClick(){
+        String lastName = tfLastName.getText();
+        String firstNanme = tfFirstName.getText();
+        String email = tfEmail.getText();
+        String password = pfPassword.getText();
+        String postCode = tfPostCode.getText();
+        String city = tfCity.getText();
+        String street = tfStreet.getText();
+        String housNumber = tfHousNumber.getText();
+        Alert alert;
+        if(lastName.isEmpty() || firstNanme.isEmpty() || email.isEmpty() || password.isEmpty() || postCode.isEmpty() ||
+                city.isEmpty() || street.isEmpty() || housNumber.isEmpty()){
+
+            if(lastName.isEmpty()){
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Name'  ist leer.");
+                alert.showAndWait();
+            } else if (firstNanme.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld  'Vorname' ist leer.");
+                alert.showAndWait();
+            } else if (email.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'E-Mail' ist leer.");
+                alert.showAndWait();
+            } else if (password.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Passwort' ist leer.");
+                alert.showAndWait();
+            } else if (postCode.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Postleitzahl' ist leer.");
+                alert.showAndWait();
+            } else if (city.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Stadt' ist leer.");
+                alert.showAndWait();
+            } else if (street.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld  'Straße' ist leer.");
+                alert.showAndWait();
+            }else {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld  'Hausnummer' ist leer.");
+                alert.showAndWait();
+            }
+
+        }else {
+            Address newAdresse = new Address(street,housNumber,postCode,city);
+            User newUser = new User(lastName,firstNanme,password,email,newAdresse);
+            long creatNewUser = AccountMgr.createUser(newUser);
+            if (creatNewUser > 0){
+                alert = new Alert(Alert.AlertType.CONFIRMATION,"Ihrer Daten wurde gespeichert.");
+                alert.showAndWait();
+            }
+            tfLastName.setText("");
+            tfFirstName.setText("");
+            tfEmail.setText("");
+            pfPassword.setText("");
+            tfPostCode.setText("");
+            tfCity.setText("");
+            tfStreet.setText("");
+            tfHousNumber.setText("");
+        }
+
+    }
+
+    @FXML
+    private void onAnmeldenBtClick() throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 950,700);
+        StartViewApplication.primary.setScene(scene);
+    }
+}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/StartPageController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/StartPageController.java
@@ -1,4 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-public class StartPageController {
-}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
@@ -7,6 +7,7 @@ package com.bib.essensbestellungsverwaltung;

 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;

@@ -14,19 +15,20 @@ import java.io.IOException;

 public class StartViewApplication extends Application {
    public static Stage primary;
+    public static boolean firstLaunch;
    @Override
    public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
-        Scene scene = new Scene(fxmlLoader.load(), 950,480);
-        //stage = primary;
+        //FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource((firstLaunch) ? "signUp-view.fxml" : "login-view.fxml"));
+        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource((firstLaunch) ? "settingsMenue.fxml" : "settingsMenue.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 1220, 790);
+        primary = stage;
        stage.setTitle("Essen Bestellung im Kindergarten");
        stage.setScene(scene);
        stage.show();
-
-
    }

    public static void main(String[] args) {
+        firstLaunch = Database.init();
        Database.init();
        Database.createDb();
        Database.fillDb();
@@ -34,4 +36,9 @@ public class StartViewApplication extends Application {
        //Database.deleteSample();
        launch();
    }
+
+    public static void changeScene(String scene) throws IOException{
+        Parent p = FXMLLoader.load(StartViewApplication.class.getResource(scene));
+        primary.getScene().setRoot(p);
+    }
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/SuperMain.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/SuperMain.java
@@ -1,5 +1,10 @@
 package com.bib.essensbestellungsverwaltung;

+/**
+ * Acts as a launcher required to make it a .jar
+ * It is also used to select either the cli or the gui depending on starting arguments
+ * @author Malte Schulze Hobeling
+ */
 public class SuperMain {
    public static void main(String[] args) {
        if(args.length > 0){
--- a/src/main/java/com/bib/essensbestellungsverwaltung/User.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/User.java
@@ -1,8 +1,9 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

+/**
+ * one constructor is used to create new users the other is used to create existing users from database
+ * @author Malte Schulze Hobeling
+ */
 public class User {
    private long id;
    private String name;
@@ -27,6 +28,9 @@ public class User {
        this.email = email;
        this.address = address;
    }
+    public User (String password){
+        this.password = password;
+    }

    public long getId() {
        return id;
--- a/src/main/java/com/bib/essensbestellungsverwaltung/Worker.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/Worker.java
@@ -1,8 +1,9 @@
 package com.bib.essensbestellungsverwaltung;
-/*
-    @author Malte Schulze Hobeling
- */

+/**
+ * one constructor is used to create new worker the other is used to create existing worker from database
+ * @author Malte Schulze Hobeling
+ */
 public class Worker extends User{
    public Worker(long id, String name, String firstname, String password, String email, Address address) {
        super(id, name, firstname, password, email, address);
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/Neues
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/Neues
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/Neues
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/Neues
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue-view.fxml
@@ -2,8 +2,6 @@

 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Tab?>
-<?import javafx.scene.control.TabPane?>
 <?import javafx.scene.image.Image?>
 <?import javafx.scene.image.ImageView?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -11,9 +9,9 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<AnchorPane prefHeight="400.0" prefWidth="600.0" stylesheets="@adminMenue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.AdminController">
+<AnchorPane prefHeight="625.0" prefWidth="600.0" stylesheets="@adminMenue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.AdminController">
   <children>
-      <VBox id="optionsContainer" layoutY="25.0" prefHeight="400.0" prefWidth="175.0">
+      <VBox id="optionsContainer" layoutY="25.0" prefHeight="600.0" prefWidth="300.0" stylesheets="@adminMenue.css">
         <children>
            <HBox alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="179.0">
               <children>
@@ -22,9 +20,9 @@
                        <Image url="@pics/to-do-list.png" />
                     </image>
                  </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Tagesbestellungen" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Tagesbestellungen" textFill="WHITE">
                     <font>
-                        <Font size="14.0" />
+                        <Font size="23.0" />
                     </font>
                  </Button>
               </children>
@@ -39,9 +37,9 @@
                        <Image url="@pics/spreadsheet.png" />
                     </image>
                  </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Monatsabrechnung" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Monatsabrechnung" textFill="WHITE">
                     <font>
-                        <Font size="14.0" />
+                        <Font size="23.0" />
                     </font>
                  </Button>
               </children>
@@ -56,9 +54,9 @@
                        <Image url="@pics/calendar.png" />
                     </image>
                  </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Wochenplan" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Wochenplan" textFill="WHITE">
                     <font>
-                        <Font size="14.0" />
+                        <Font size="23.0" />
                     </font>
                  </Button>
               </children>
@@ -73,9 +71,9 @@
                        <Image url="@pics/lunch.png" />
                     </image>
                  </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Mahlzeit" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Mahlzeit" textFill="WHITE">
                     <font>
-                        <Font size="14.0" />
+                        <Font size="23.0" />
                     </font>
                  </Button>
               </children>
@@ -90,9 +88,9 @@
                        <Image url="@pics/teamwork.png" />
                     </image>
                  </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Mitarbeiter" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Mitarbeiter" textFill="WHITE">
                     <font>
-                        <Font size="14.0" />
+                        <Font size="23.0" />
                     </font>
                  </Button>
               </children>
@@ -102,23 +100,10 @@
            </HBox>
         </children>
      </VBox>
-      <HBox id="optionsContainer" alignment="TOP_RIGHT" prefHeight="25.0" prefWidth="600.0" style="-fx-background-color: lightblue;">
+      <HBox id="optionsContainer" alignment="TOP_RIGHT" prefHeight="25.0" prefWidth="1200.0" style="-fx-background-color: lightblue;">
         <children>
            <Button mnemonicParsing="false" style="-fx-background-color: transparent;" text="Hallo, [Nutzername]" textFill="WHITE" />
-         </children></HBox>
-      <TabPane layoutX="183.0" layoutY="31.0" prefHeight="378.0" prefWidth="408.0" tabClosingPolicy="UNAVAILABLE">
-        <tabs>
-          <Tab text="Untitled Tab 1">
-            <content>
-              <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-            </content>
-          </Tab>
-          <Tab text="Untitled Tab 2">
-            <content>
-              <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
-            </content>
-          </Tab>
-        </tabs>
-      </TabPane>
+         </children>
+      </HBox>
   </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue.css
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue.css
@@ -3,10 +3,10 @@
    -fx-background-color: rgba(85, 103, 136, 0.64);
 }

-#optionsContainer{
-    -fx-background-color: lightblue;
+#buttons:pressed{
+    -fx-background-color: #748d96;
 }

 #optionsContainer{
-    -fx-background-color: darkblue;
+    -fx-background-color: lightblue;
 }
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml
@@ -2,7 +2,9 @@

 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.ChoiceBox?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
@@ -10,7 +12,6 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>

-
 <AnchorPane prefHeight="760.0" prefWidth="867.0" stylesheets="@child.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.ParentController">
    <children>
        <Text layoutX="51.0" layoutY="90.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Kinder">
@@ -18,26 +19,16 @@
                <Font size="58.0" />
            </font>
        </Text>
-      <HBox id="contentContainer" alignment="CENTER" layoutX="49.0" layoutY="170.0" prefHeight="250.0" prefWidth="770.0">
+        <HBox id="contentContainer" alignment="CENTER" layoutX="8.0" layoutY="165.0" prefHeight="127.0" prefWidth="937.0">
            <children>
                <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
                    <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Alter">
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Vorname">
                            <VBox.margin>
                                <Insets bottom="15.0" top="15.0" />
                            </VBox.margin>
                        </Text>
-                  <TextField prefWidth="97.0">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </TextField>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Gruppe">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </Text>
-                  <TextField>
+                        <TextField fx:id="firstName" prefWidth="97.0">
                            <VBox.margin>
                                <Insets bottom="15.0" top="15.0" />
                            </VBox.margin>
@@ -49,44 +40,16 @@
                </VBox>
                <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
                    <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Geburtsdatum">
+                        <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Nachname">
                            <VBox.margin>
                                <Insets bottom="15.0" top="15.0" />
                            </VBox.margin>
                        </Text>
-                  <TextField prefWidth="97.0">
+                        <TextField fx:id="lastName" prefWidth="97.0">
                            <VBox.margin>
                                <Insets bottom="15.0" top="15.0" />
                            </VBox.margin>
                        </TextField>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sonstiges">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </Text>
-                  <TextField>
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </TextField>
-               </children>
-               <HBox.margin>
-                  <Insets left="15.0" right="15.0" />
-               </HBox.margin>
-            </VBox>
-            <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Alergien">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </Text>
-                  <ListView prefHeight="144.0" prefWidth="227.0" />
-                  <TextField id="tfAddAllergy" promptText="Allergie hinzufügen">
-                     <VBox.margin>
-                        <Insets top="15.0" />
-                     </VBox.margin>
-                  </TextField>
                    </children>
                    <HBox.margin>
                        <Insets left="15.0" right="15.0" />
@@ -94,84 +57,19 @@
                </VBox>
            </children>
        </HBox>
-      <Text layoutX="49.0" layoutY="152.0" strokeType="OUTSIDE" strokeWidth="0.0" text="[Name des Kindes]" wrappingWidth="99.03515625" />
-      <HBox id="contentContainer" alignment="CENTER" layoutX="49.0" layoutY="464.0" prefHeight="250.0" prefWidth="770.0">
-         <children>
-            <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Alter">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </Text>
-                  <TextField prefWidth="97.0">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </TextField>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Gruppe">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </Text>
-                  <TextField>
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </TextField>
-               </children>
-               <HBox.margin>
-                  <Insets left="15.0" right="15.0" />
-               </HBox.margin>
-            </VBox>
-            <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Geburtsdatum">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </Text>
-                  <TextField prefWidth="97.0">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </TextField>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Sonstiges">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </Text>
-                  <TextField>
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </TextField>
-               </children>
-               <HBox.margin>
-                  <Insets left="15.0" right="15.0" />
-               </HBox.margin>
-            </VBox>
-            <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
+        <Button id="btAddChild" fx:id="kindHinzufügenButton" layoutX="779.0" layoutY="646.0" mnemonicParsing="false" onAction="#onKindHinzufügen" prefHeight="26.0" prefWidth="125.0" text="Kind hinzufügen" />
+        <ChoiceBox fx:id="childChoiceBox" layoutX="704.0" layoutY="62.0" onAction="#onSelectChild" prefWidth="150.0" />
+        <Label layoutX="704.0" layoutY="44.0" text="Kind" />
+        <VBox id="contentContainer" layoutX="493.0" layoutY="330.0" prefHeight="250.0" prefWidth="256.0" spacing="20.0">
            <children>
                <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Allergien">
                    <VBox.margin>
                        <Insets bottom="15.0" top="15.0" />
                    </VBox.margin>
                </Text>
-                  <ListView prefHeight="200.0" prefWidth="200.0" />
-                  <TextField id="tfAddAllergy" promptText="Allergie hinzufügen">
-                     <VBox.margin>
-                        <Insets top="15.0" />
-                     </VBox.margin>
-                  </TextField>
+                <CheckBox fx:id="allergienComboBox" prefHeight="18.0" prefWidth="200.0" />
            </children>
-               <HBox.margin>
-                  <Insets left="15.0" right="15.0" />
-               </HBox.margin>
        </VBox>
-         </children>
-      </HBox>
-      <Text layoutX="49.0" layoutY="433.0" strokeType="OUTSIDE" strokeWidth="0.0" text="[Name des Kindes]" wrappingWidth="99.03515625" />
-      <Button id="btAddChild" layoutX="382.0" layoutY="721.0" mnemonicParsing="false" text="Kind hinzufügen" />
+        <Button id="btAddChild" fx:id="kindLoeschenButton" layoutX="621.0" layoutY="646.0" mnemonicParsing="false" onAction="#onKindLoeschen" prefHeight="26.0" prefWidth="125.0" text="Kind löschen" />
    </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml
@@ -3,21 +3,22 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="479.0" prefWidth="719.0" stylesheets="@createCoworker.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="860.0" prefWidth="850.0" stylesheets="@createCoworker.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.AdminController">
   <children>
      <Label layoutX="301.0" layoutY="49.0" />
-      <Label layoutX="230.0" layoutY="30.0" prefHeight="28.0" prefWidth="220.0" text="Mitarbeiter hinzufügen">
+      <Label layoutX="223.0" layoutY="76.0" prefHeight="28.0" prefWidth="220.0" text="Mitarbeiter hinzufügen">
         <font>
            <Font size="18.0" />
         </font>
      </Label>
-      <VBox layoutX="119.0" layoutY="95.0" prefHeight="317.0" prefWidth="331.0">
+      <VBox layoutX="223.0" layoutY="149.0" prefHeight="317.0" prefWidth="514.0">
         <children>
            <HBox prefHeight="43.0" prefWidth="331.0">
               <children>
@@ -26,7 +27,7 @@
                        <Font size="16.0" />
                     </font>
                  </Label>
-                  <TextField prefHeight="25.0" prefWidth="194.0" />
+                  <TextField id="lastname" prefHeight="25.0" prefWidth="194.0" />
               </children>
            </HBox>
            <HBox prefHeight="60.0" prefWidth="331.0">
@@ -39,7 +40,7 @@
                        <Font size="16.0" />
                     </font>
                  </Label>
-                  <TextField prefHeight="25.0" prefWidth="193.0">
+                  <TextField id="firstname" prefHeight="25.0" prefWidth="193.0">
                     <HBox.margin>
                        <Insets top="10.0" />
                     </HBox.margin>
@@ -56,7 +57,7 @@
                        <Insets top="10.0" />
                     </padding>
                  </Label>
-                  <TextField prefHeight="25.0" prefWidth="195.0">
+                  <TextField id="street" prefHeight="25.0" prefWidth="195.0">
                     <HBox.margin>
                        <Insets top="10.0" />
                     </HBox.margin>
@@ -73,7 +74,7 @@
                        <Insets top="10.0" />
                     </padding>
                  </Label>
-                  <TextField prefHeight="25.0" prefWidth="87.0">
+                  <TextField id="number" prefHeight="25.0" prefWidth="87.0">
                     <HBox.margin>
                        <Insets top="10.0" />
                     </HBox.margin>
@@ -87,7 +88,7 @@
                        <Font size="16.0" />
                     </font>
                  </Label>
-                  <TextField prefHeight="25.0" prefWidth="87.0">
+                  <TextField id="plz" prefHeight="25.0" prefWidth="87.0">
                     <HBox.margin>
                        <Insets />
                     </HBox.margin>
@@ -104,7 +105,7 @@
                        <Font size="16.0" />
                     </font>
                  </Label>
-                  <TextField prefHeight="13.0" prefWidth="194.0">
+                  <TextField id="city" prefHeight="13.0" prefWidth="194.0">
                     <HBox.margin>
                        <Insets top="5.0" />
                     </HBox.margin>
@@ -124,14 +125,14 @@
                        <Insets top="10.0" />
                     </padding>
                  </Label>
-                  <TextField prefHeight="25.0" prefWidth="196.0">
+                  <TextField id="email" prefHeight="25.0" prefWidth="196.0">
                     <HBox.margin>
                        <Insets top="10.0" />
                     </HBox.margin>
                  </TextField>
               </children>
            </HBox>
-            <HBox prefHeight="100.0" prefWidth="200.0">
+            <HBox prefHeight="100.0" prefWidth="471.0">
               <children>
                  <Label prefHeight="35.0" prefWidth="122.0" text="Passwort">
                     <font>
@@ -141,16 +142,16 @@
                        <Insets top="10.0" />
                     </padding>
                  </Label>
-                  <TextField prefHeight="25.0" prefWidth="194.0">
+                  <PasswordField id="password" accessibleRole="PASSWORD_FIELD" prefHeight="25.0" prefWidth="194.0">
                     <HBox.margin>
                        <Insets top="10.0" />
                     </HBox.margin>
-                  </TextField>
+                  </PasswordField>
               </children>
            </HBox>
         </children>
      </VBox>
-      <Button id="btCreateCoworker" layoutX="119.0" layoutY="412.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="158.0" text="Mitarbeiter hinzufügen" />
-      <Button id="btCancelCoworker" layoutX="357.0" layoutY="412.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="158.0" text="Abbrechen" />
+      <Button id="btCreateCoworker" fx:id="btCreateCoworker" layoutX="216.0" layoutY="533.0" mnemonicParsing="false" onAction="#onBtSignUp" prefHeight="44.0" prefWidth="158.0" text="Mitarbeiter hinzufügen" />
+      <Button id="btCancelCoworker" fx:id="btCancelCoworker" layoutX="443.0" layoutY="533.0" mnemonicParsing="false" onAction="#onBtCancel" prefHeight="44.0" prefWidth="158.0" text="Abbrechen" />
   </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/createFood-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/createFood-view.fxml
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.RadioButton?>
-<?import javafx.scene.control.TextArea?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>

-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="521.0" prefWidth="731.0" stylesheets="@createFood.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="521.0" prefWidth="731.0" stylesheets="@createFood.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1">
   <children>
-      <Label alignment="CENTER" layoutX="234.0" layoutY="29.0" prefHeight="44.0" prefWidth="237.0" text="Gericht hinzufügen">
+      <Label alignment="CENTER" layoutX="247.0" layoutY="29.0" prefHeight="44.0" prefWidth="237.0" text="Gericht hinzufügen">
         <font>
            <Font size="18.0" />
         </font>
      </Label>
-      <VBox layoutX="112.0" layoutY="73.0" prefHeight="389.0" prefWidth="459.0">
+      <VBox layoutX="136.0" layoutY="73.0" prefHeight="389.0" prefWidth="459.0">
         <children>
            <HBox prefHeight="75.0" prefWidth="459.0">
               <children>
@@ -46,12 +40,12 @@
                        <Insets top="20.0" />
                     </HBox.margin>
                  </Label>
-                  <RadioButton mnemonicParsing="false" text="Dessert">
+                  <RadioButton mnemonicParsing="false" text="Hauptgericht">
                     <HBox.margin>
                        <Insets left="35.0" top="20.0" />
                     </HBox.margin>
                  </RadioButton>
-                  <RadioButton mnemonicParsing="false" text="Kein Dessert">
+                  <RadioButton mnemonicParsing="false" text="Dessert">
                     <HBox.margin>
                        <Insets left="50.0" top="20.0" />
                     </HBox.margin>
@@ -96,7 +90,7 @@
            </HBox>
         </children>
      </VBox>
-      <Button id="btCreateFood" layoutX="106.0" layoutY="457.0" mnemonicParsing="false" prefHeight="50.0" prefWidth="145.0" text="Hinzufügen" />
-      <Button id="btCancelFood" layoutX="366.0" layoutY="457.0" mnemonicParsing="false" prefHeight="50.0" prefWidth="162.0" text="Abbrechen" />
+      <Button id="btCreateFood" layoutX="485.0" layoutY="464.0" mnemonicParsing="false" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
+      <Button id="btCancelFood" layoutX="102.0" layoutY="456.0" mnemonicParsing="false" prefHeight="50.0" prefWidth="162.0" text="Abbrechen" />
   </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/deleteChild-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/deleteChild-view.fxml
@@ -23,4 +23,5 @@
        <Button id="btDeletConfim" layoutX="390.0" layoutY="315.0" mnemonicParsing="false" prefHeight="53.0" prefWidth="141.0" text="Bestätigen" />
        <Button id="btDeleteDeny" layoutX="71.0" layoutY="315.0" mnemonicParsing="false" prefHeight="53.0" prefWidth="141.0" text="zurück" />
    </children>
+
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/hello-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/hello-view.fxml
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.control.PasswordField?>
-<GridPane hgap="10.0" vgap="10.0"
-          xmlns:fx="http://javafx.com/fxml/1"
-          xmlns="http://javafx.com/javafx/11.0.2"
-          fx:controller="com.bib.essensbestellungsverwaltung.HelloController">
-    <padding>
-        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
-    </padding>
-    <Label text="Bitte geben Sie Ihre Anmeldedaten ein."
-           GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0" />
-    <Label text="Benutzername:"
-           GridPane.columnIndex="0" GridPane.rowIndex="1" />
-    <TextField fx:id="unsernameEingabe"
-               GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-    <Label text="Passwort:"
-            GridPane.columnIndex="0" GridPane.rowIndex="2" />
-    <PasswordField fx:id="passwortEingabe"
-                   GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-    <Button text="LOGIN" onAction="#onLoginButtonClick"
-            GridPane.columnIndex="1" GridPane.rowIndex="3" />
-    <Label fx:id="lblAusgabe"
-           GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="4"/>
-</GridPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/launch-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/launch-view.fxml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane prefHeight="536.0" prefWidth="929.0" style="-fx-background-color: lightblue;" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.MenueController">
+    <children>
+        <Label alignment="CENTER" layoutX="14.0" layoutY="14.0" prefHeight="35.0" prefWidth="895.0" text="Essenbestellung">
+            <font>
+                <Font size="28.0"/>
+            </font>
+        </Label>
+        <Button alignment="CENTER" layoutX="868.0" layoutY="61.0" mnemonicParsing="false" style="-fx-background-color: white;" text="Login" />
+        <VBox layoutX="14.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+            <children>
+                <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Montag" textAlignment="CENTER">
+                    <VBox.margin>
+                        <Insets bottom="10.0" />
+                    </VBox.margin>
+                    <font>
+                        <Font size="18.0" />
+                    </font>
+                </Label>
+                <Label prefHeight="18.0" prefWidth="180.0" text="Hauptgericht" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Button">
+                    <VBox.margin>
+                        <Insets />
+                    </VBox.margin>
+                </Button>
+                <Label prefHeight="18.0" prefWidth="174.0" text="Dessert">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Button" />
+            </children>
+        </VBox>
+        <VBox layoutX="194.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+            <children>
+                <Label alignment="CENTER" prefHeight="18.0" prefWidth="210.0" text="Dienstag">
+                    <font>
+                        <Font size="18.0" />
+                    </font>
+                </Label>
+                <Label prefHeight="18.0" prefWidth="182.0" text="Hauptgericht">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Button" />
+                <Label prefHeight="18.0" prefWidth="183.0" text="Dessert">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Button" />
+            </children>
+        </VBox>
+        <VBox layoutX="554.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+            <children>
+                <Label alignment="CENTER" prefHeight="18.0" prefWidth="214.0" text="Donnerstag">
+                    <font>
+                        <Font size="18.0" />
+                    </font>
+                </Label>
+                <Label prefHeight="18.0" prefWidth="178.0" text="Hauptgericht">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+                <Label prefHeight="18.0" prefWidth="186.0" text="Dessert">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+            </children>
+        </VBox>
+        <VBox layoutX="374.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+            <children>
+                <Label alignment="CENTER" prefHeight="18.0" prefWidth="212.0" text="Mittwoch">
+                    <font>
+                        <Font size="18.0" />
+                    </font>
+                </Label>
+                <Label prefHeight="18.0" prefWidth="176.0" text="Hauptgericht">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+                <Label prefHeight="18.0" prefWidth="177.0" text="Dessert">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+            </children>
+        </VBox>
+        <VBox layoutX="734.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+            <children>
+                <Label alignment="CENTER" prefHeight="18.0" prefWidth="200.0" text="Freitag">
+                    <font>
+                        <Font size="18.0" />
+                    </font>
+                </Label>
+                <Label prefHeight="18.0" prefWidth="190.0" text="Hauptgericht">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+                <Label prefHeight="18.0" prefWidth="190.0" text="Dessert">
+                    <VBox.margin>
+                        <Insets top="10.0" />
+                    </VBox.margin>
+                </Label>
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+                <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+            </children>
+        </VBox>
+    </children>
+</AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/login-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/login-view.fxml
@@ -56,7 +56,7 @@
                     <font>
                        <Font name="Microsoft Tai Le Bold" size="12.0" />
                     </font></Button>
-                  <Button id="btSignUp" mnemonicParsing="false" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Sign up" textFill="#7c7b7b" underline="true" onAction="#changeToSignUp" />
+                  <Button id="btSignUp" mnemonicParsing="false" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Sign up" textFill="#7c7b7b" underline="true" onAction="#onBtSingnupClick" />
               </children>
            </HBox>
         </children>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml
@@ -3,324 +3,177 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.ComboBox?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ListView?>
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>

-<AnchorPane prefHeight="760.0" prefWidth="867.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.MenueController">
+<AnchorPane prefHeight="600.0" prefWidth="900.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.MenueController">
    <children>
-      <HBox alignment="CENTER" layoutX="50.0" layoutY="27.0" prefHeight="648.0" prefWidth="791.0">
+        <Label alignment="CENTER" layoutX="14.0" layoutY="14.0" prefHeight="35.0" prefWidth="895.0" text="Essenbestellung">
+            <font>
+                <Font size="28.0" />
+            </font>
+        </Label>
+        <Button id="btLogin" fx:id="btLogin" alignment="CENTER" layoutX="848.0" layoutY="34.0" mnemonicParsing="false" text="Login" />
+        <HBox layoutX="220.0" layoutY="87.0" prefHeight="414.0" prefWidth="688.0">
            <children>
-            <VBox alignment="CENTER" prefHeight="200.0" prefWidth="135.0">
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
                    <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Montag" textAlignment="CENTER" wrappingWidth="120.0">
+                        <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Montag" textAlignment="CENTER">
                            <VBox.margin>
-                        <Insets />
+                                <Insets bottom="10.0" />
                            </VBox.margin>
                            <font>
-                        <Font size="23.0" />
+                                <Font size="18.0" />
                            </font>
-                  </Text>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 1">
+                        </Label>
+                        <VBox prefHeight="200.0" prefWidth="100.0">
+                            <children>
+                                <Button id="btFoodChoice" fx:id="btFirstMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="Keine Mahlzeit">
                                    <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                                        <Insets bottom="20.0" />
                                    </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <VBox.margin>
-                        <Insets bottom="55.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
                                </Button>
                            </children>
-               <HBox.margin>
-                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-               </HBox.margin>
                        </VBox>
-            <VBox alignment="CENTER" prefHeight="200.0" prefWidth="135.0">
+                        <VBox prefHeight="200.0" prefWidth="100.0">
                            <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Dienstag" textAlignment="CENTER" wrappingWidth="120.0">
-                     <VBox.margin>
-                        <Insets />
-                     </VBox.margin>
-                     <font>
-                        <Font size="23.0" />
-                     </font>
-                  </Text>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 1">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <VBox.margin>
-                        <Insets bottom="55.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
-                  </Button>
+                                <Button id="btFoodChoice" fx:id="btFirstDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
                            </children>
-               <HBox.margin>
-                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-               </HBox.margin>
                        </VBox>
-            <VBox alignment="CENTER" prefHeight="200.0" prefWidth="135.0">
-               <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Mittwoch" textAlignment="CENTER" wrappingWidth="120.0">
-                     <VBox.margin>
-                        <Insets />
-                     </VBox.margin>
-                     <font>
-                        <Font size="23.0" />
-                     </font>
-                  </Text>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 1">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <VBox.margin>
-                        <Insets bottom="55.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
-                  </Button>
                    </children>
-               <HBox.margin>
-                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-               </HBox.margin>
                </VBox>
-            <VBox alignment="CENTER" prefHeight="200.0" prefWidth="135.0">
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
                    <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Donnerstag" textAlignment="CENTER" wrappingWidth="120.0">
+                        <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Dienstag" textAlignment="CENTER">
                            <VBox.margin>
-                        <Insets />
+                                <Insets bottom="10.0" />
                            </VBox.margin>
                            <font>
-                        <Font size="23.0" />
+                                <Font size="18.0" />
                            </font>
-                  </Text>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 1">
+                        </Label>
+                        <VBox prefHeight="200.0" prefWidth="100.0">
+                            <children>
+                                <Button id="btFoodChoice" fx:id="btFirstMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
                                    <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                                        <Insets bottom="20.0" />
                                    </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <VBox.margin>
-                        <Insets bottom="55.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
                                </Button>
                            </children>
-               <HBox.margin>
-                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-               </HBox.margin>
                        </VBox>
-            <VBox alignment="CENTER" prefHeight="200.0" prefWidth="135.0">
+                        <VBox prefHeight="200.0" prefWidth="100.0">
                            <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Freitag" textAlignment="CENTER" wrappingWidth="120.0">
+                                <Button id="btFoodChoice" fx:id="btFirstDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                            </children>
+                        </VBox>
+                    </children>
+                </VBox>
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+                    <children>
+                        <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Mittwoch" textAlignment="CENTER">
                            <VBox.margin>
-                        <Insets />
+                                <Insets bottom="10.0" />
                            </VBox.margin>
                            <font>
-                        <Font size="23.0" />
+                                <Font size="18.0" />
                            </font>
-                  </Text>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 1">
+                        </Label>
+                        <VBox prefHeight="200.0" prefWidth="100.0">
+                            <children>
+                                <Button id="btFoodChoice" fx:id="btFirstMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
                                    <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                                        <Insets bottom="20.0" />
                                    </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Gericht 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <VBox.margin>
-                        <Insets bottom="55.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-                     </VBox.margin>
-                     <padding>
-                        <Insets bottom="25.0" left="20.0" right="20.0" top="25.0" />
-                     </padding>
-                  </Button>
-                  <Button id="btFoodChoice" mnemonicParsing="false" text="ablehen">
-                     <padding>
-                        <Insets left="25.0" right="25.0" />
-                     </padding>
                                </Button>
                            </children>
-               <HBox.margin>
-                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
-               </HBox.margin>
+                        </VBox>
+                        <VBox prefHeight="200.0" prefWidth="100.0">
+                            <children>
+                                <Button id="btFoodChoice" fx:id="btFirstDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                            </children>
+                        </VBox>
+                    </children>
+                </VBox>
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+                    <children>
+                        <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Donnerstag" textAlignment="CENTER">
+                            <VBox.margin>
+                                <Insets bottom="10.0" />
+                            </VBox.margin>
+                            <font>
+                                <Font size="18.0" />
+                            </font>
+                        </Label>
+                        <VBox prefHeight="200.0" prefWidth="100.0">
+                            <children>
+                                <Button id="btFoodChoice" fx:id="btFirstMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
+                                    <VBox.margin>
+                                        <Insets bottom="20.0" />
+                                    </VBox.margin>
+                                </Button>
+                            </children>
+                        </VBox>
+                        <VBox prefHeight="200.0" prefWidth="100.0">
+                            <children>
+                                <Button id="btFoodChoice" fx:id="btFirstDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                            </children>
+                        </VBox>
+                    </children>
+                </VBox>
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+                    <children>
+                        <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Freitag" textAlignment="CENTER">
+                            <VBox.margin>
+                                <Insets bottom="10.0" />
+                            </VBox.margin>
+                            <font>
+                                <Font size="18.0" />
+                            </font>
+                        </Label>
+                        <VBox prefHeight="200.0" prefWidth="100.0">
+                            <children>
+                                <Button id="btFoodChoice" fx:id="btFirstMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
+                                    <VBox.margin>
+                                        <Insets bottom="20.0" />
+                                    </VBox.margin>
+                                </Button>
+                            </children>
+                        </VBox>
+                        <VBox prefHeight="200.0" prefWidth="100.0">
+                            <children>
+                                <Button id="btFoodChoice" fx:id="btFirstDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                            </children>
+                        </VBox>
+                    </children>
                </VBox>
            </children>
        </HBox>
-      <Button id="btPlaceOrder" layoutX="378.0" layoutY="675.0" mnemonicParsing="false" prefHeight="53.0" prefWidth="134.0" text="Jetzt Bestellen" />
-      <ComboBox id="cbChooseChild" layoutX="63.0" layoutY="689.0" prefWidth="150.0" promptText="Kind auswählen" />
-      <Text layoutX="650.0" layoutY="711.0" strokeType="OUTSIDE" strokeWidth="0.0" text="[Gesambetrag]" wrappingWidth="168.0">
-         <font>
-            <Font size="24.0" />
-         </font>
-      </Text>
+        <Button id="btPlaceOrder" fx:id="btSaveOrder" layoutX="379.0" layoutY="527.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Bestellung abschicken" />
+        <ComboBox id="cbChooseChild" fx:id="cbPickChild" layoutX="29.0" layoutY="34.0" prefWidth="150.0" promptText="Wähle Kind" stylesheets="@menue.css" />
+        <ListView id="lvShowDescription" fx:id="lvFoodInfo" layoutX="20.0" layoutY="115.0" prefHeight="370.0" prefWidth="200.0" />
    </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/menue.css
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/menue.css
@@ -23,3 +23,11 @@
 #cbChooseChild{
    -fx-background-color: lightgray;
 }
+.btFood{
+    -fx-background-color: transparent;
+}
+
+.btFood.active{
+    -fx-background-color: rgba(97, 97, 232, 0.3);
+    -fx-background-radius: 25;
+}
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml
@@ -9,74 +9,93 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" stylesheets="parentMenue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.Region?>
+<BorderPane fx:id="contentView" prefHeight="750.0" prefWidth="1200.0" stylesheets="@menue.css"
+            xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1"
+            fx:controller="com.bib.essensbestellungsverwaltung.ParentMenuController">
+    <left>
+        <VBox alignment="TOP_CENTER" prefHeight="750.0" prefWidth="350.0" spacing="10.0"
+              style="-fx-background-color: #69b6ff; -fx-padding: 20;" BorderPane.alignment="CENTER">
            <children>
-      <VBox id="contentContainer" layoutY="-14.0" prefHeight="814.0" prefWidth="333.0" stylesheets="@parentMenue.css">
-         <children>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="327.0">
-               <children>
-                  <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                <Button fx:id="essensplanButton" alignment="CENTER_LEFT" mnemonicParsing="false"
+                        onMouseClicked="#onEssensplanClick" prefHeight="60.0" prefWidth="250.0"
+                        styleClass="sidebar-nav_button" text="Essensplan">
+                    <font>
+                        <Font size="20.0"/>
+                    </font>
+                    <graphic>
+                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
                            <image>
                                <Image url="@pics/menu.png"/>
                            </image>
                        </ImageView>
-                  <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Essensplan">
-                     <font>
-                        <Font size="25.0" />
-                     </font>
+                    </graphic>
                </Button>
-               </children>
-            </HBox>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-               <children>
-                  <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                <Button fx:id="kinderButton" alignment="CENTER_LEFT" mnemonicParsing="false"
+                        onMouseClicked="#onKinderClick" prefHeight="60.0" prefWidth="250.0"
+                        styleClass="sidebar-nav_button" text="Kinder">
+                    <font>
+                        <Font size="20.0"/>
+                    </font>
+                    <graphic>
+                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
                            <image>
                                <Image url="@pics/little-kid.png"/>
                            </image>
                        </ImageView>
-                  <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Kind">
-                     <font>
-                        <Font size="25.0" />
-                     </font>
+                    </graphic>
                </Button>
-               </children>
-            </HBox>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-               <children>
-                  <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                <Button fx:id="bestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false"
+                        onMouseClicked="#onBestellungClick" prefHeight="60.0" prefWidth="250.0"
+                        styleClass="sidebar-nav_button" text="Bestellung">
+                    <font>
+                        <Font size="20.0"/>
+                    </font>
+                    <graphic>
+                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
                            <image>
                                <Image url="@pics/shopping-list.png"/>
                            </image>
                        </ImageView>
-                  <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="52.0" prefWidth="260.0" text="Bestellung">
-                     <font>
-                        <Font size="25.0" />
-                     </font>
+                    </graphic>
                </Button>
-               </children>
-            </HBox>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-               <children>
-                  <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                <Region VBox.vgrow="ALWAYS"/>
+                <Button fx:id="einstellungenButton" alignment="CENTER_LEFT" layoutX="10.0" layoutY="130.0"
+                        mnemonicParsing="false" onMouseClicked="#onEinstellungenClick" prefHeight="60.0"
+                        prefWidth="250.0" styleClass="sidebar-nav_button" text="Einstellungen">
+                    <font>
+                        <Font size="20.0"/>
+                    </font>
+                    <graphic>
+                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
                            <image>
                                <Image url="@pics/setting.png"/>
                            </image>
                        </ImageView>
-                  <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="52.0" prefWidth="260.0" text="Nutzereinstellungen">
-                     <font>
-                        <Font size="25.0" />
-                     </font>
+                    </graphic>
                </Button>
            </children>
-            </HBox>
+        </VBox>
+    </left>
+    <top>
+        <HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #69b6ff;"
+              BorderPane.alignment="CENTER">
+            <children>
+                <Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button"
+                        text="Ausloggen">
+                    <opaqueInsets>
+                        <Insets/>
+                    </opaqueInsets>
+                </Button>
            </children>
            <padding>
-            <Insets top="50.0" />
-         </padding></VBox>
-      <HBox id="contentContainer2" alignment="CENTER_RIGHT" prefHeight="40.0" prefWidth="1200.0" stylesheets="@parentMenue.css">
-         <children>
-            <Button id="btLogOut" mnemonicParsing="false" text="Abmelden" />
-         </children>
+                <Insets right="20.0"/>
+            </padding>
        </HBox>
-   </children>
-</AnchorPane>
+    </top>
+    <center>
+        <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"/>
+    </center>
+</BorderPane>
+
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane prefHeight="800.0" prefWidth="1205.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.SettingsController">
+    <children>
+        <VBox id="contentContainer" layoutY="-14.0" prefHeight="814.0" prefWidth="333.0" stylesheets="@parentMenue.css">
+            <children>
+                <HBox alignment="CENTER" prefHeight="100.0" prefWidth="327.0">
+                    <children>
+                        <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                            <image>
+                                <Image url="@pics/menu.png" />
+                            </image>
+                        </ImageView>
+                        <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Essensplan">
+                            <font>
+                                <Font size="25.0" />
+                            </font>
+                        </Button>
+                    </children>
+                </HBox>
+                <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+                    <children>
+                        <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                            <image>
+                                <Image url="@pics/little-kid.png" />
+                            </image>
+                        </ImageView>
+                        <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Kind">
+                            <font>
+                                <Font size="25.0" />
+                            </font>
+                        </Button>
+                    </children>
+                </HBox>
+                <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+                    <children>
+                        <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                            <image>
+                                <Image url="@pics/shopping-list.png" />
+                            </image>
+                        </ImageView>
+                        <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="52.0" prefWidth="260.0" text="Bestellung">
+                            <font>
+                                <Font size="25.0" />
+                            </font>
+                        </Button>
+                    </children>
+                </HBox>
+                <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+                    <children>
+                        <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                            <image>
+                                <Image url="@pics/setting.png" />
+                            </image>
+                        </ImageView>
+                        <Button fx:id="BtSetting" alignment="BASELINE_LEFT" mnemonicParsing="false" onAction="#onSettingBtClick" prefHeight="52.0" prefWidth="260.0" text="Nutzereinstellungen">
+                            <font>
+                                <Font size="25.0" />
+                            </font>
+                        </Button>
+                    </children>
+                </HBox>
+            </children>
+            <padding>
+                <Insets top="50.0" />
+            </padding></VBox>
+        <HBox id="contentContainer2" alignment="CENTER_RIGHT" prefHeight="40.0" prefWidth="1200.0" stylesheets="@parentMenue.css">
+            <children>
+                <Button mnemonicParsing="false" onAction="#onLogOutBtClick" text="Abmelden" />
+            </children>
+        </HBox>
+      <HBox fx:id="UserSetting" layoutX="343.0" layoutY="48.0" prefHeight="355.0" prefWidth="856.0" style="-fx-border-width: 1 1 1 1; -fx-border-color: lightblue;" AnchorPane.topAnchor="230.0">
+         <children>
+            <VBox prefHeight="353.0" prefWidth="260.0">
+               <children>
+                  <Label text="Elterndaten">
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="24.0" />
+                     </font>
+                     <VBox.margin>
+                        <Insets bottom="25.0" left="25.0" right="25.0" top="10.0" />
+                     </VBox.margin>
+                  </Label>
+                  <TextField prefHeight="36.0" prefWidth="274.0" promptText="aktuelles Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <VBox.margin>
+                        <Insets bottom="25.0" left="20.0" right="25.0" top="5.0" />
+                     </VBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.0" />
+                     </font>
+                  </TextField>
+                  <TextField promptText="neues Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <VBox.margin>
+                        <Insets left="20.0" right="25.0" top="5.0" />
+                     </VBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                     </font>
+                  </TextField>
+                  <TextField promptText="passwort bestätigen " style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <VBox.margin>
+                        <Insets bottom="25.0" left="20.0" right="25.0" top="25.0" />
+                     </VBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                     </font>
+                  </TextField>
+                  <Button alignment="BASELINE_LEFT" contentDisplay="TOP" mnemonicParsing="false" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Passowrt ändern" textFill="WHITE">
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                     </font>
+                     <VBox.margin>
+                        <Insets left="80.0" top="25.0" />
+                     </VBox.margin>
+                  </Button>
+               </children>
+            </VBox>
+            <VBox prefHeight="353.0" prefWidth="245.0">
+               <children>
+                  <TextField prefHeight="35.0" prefWidth="102.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <VBox.margin>
+                        <Insets bottom="25.0" left="20.0" right="25.0" top="75.0" />
+                     </VBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.0" />
+                     </font>
+                  </TextField>
+                  <TextField promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                     </font>
+                     <VBox.margin>
+                        <Insets bottom="25.0" left="20.0" right="25.0" top="5.0" />
+                     </VBox.margin>
+                  </TextField>
+               </children>
+               <HBox.margin>
+                  <Insets left="80.0" />
+               </HBox.margin>
+            </VBox>
+            <VBox prefHeight="411.0" prefWidth="225.0">
+               <children>
+                  <TextField promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <VBox.margin>
+                        <Insets left="20.0" right="25.0" top="75.0" />
+                     </VBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                     </font>
+                  </TextField>
+                  <TextField promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                     </font>
+                     <VBox.margin>
+                        <Insets left="25.0" right="25.0" top="25.0" />
+                     </VBox.margin>
+                  </TextField>
+                  <Button alignment="BASELINE_LEFT" contentDisplay="TOP" mnemonicParsing="false" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Adresse ändern" textFill="WHITE">
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                     </font>
+                     <VBox.margin>
+                        <Insets left="60.0" top="120.0" />
+                     </VBox.margin>
+                  </Button>
+               </children>
+            </VBox>
+         </children>
+      </HBox>
+    </children>
+</AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml
@@ -29,9 +29,9 @@
        <Circle fill="#67b5ff2e" layoutX="-23.0" layoutY="368.0" radius="100.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
        <Circle fill="#69b6ffb0" layoutX="235.0" layoutY="310.0" radius="158.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
        <Circle fill="#93c4f23d" layoutY="258.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
-        <VBox alignment="CENTER" layoutX="263.0" prefHeight="400.0" prefWidth="338.0" style="-fx-background-color: white;">
+        <VBox layoutX="262.0" prefHeight="400.0" prefWidth="364.0" style="-fx-background-color: white;">
            <children>
-            <TextField promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="tfEmail">
+                <TextField fx:id="tfLastName" alignment="TOP_LEFT" prefHeight="26.0" prefWidth="282.0" promptText="Name" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
                    <effect>
                        <Blend />
                    </effect>
@@ -42,7 +42,7 @@
                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                    </VBox.margin>
                </TextField>
-            <TextField promptText="Email bestätigen" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="tfBestätigungEmail">
+                <TextField fx:id="tfFirstName" promptText="Vorname" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
                    <effect>
                        <Blend />
                    </effect>
@@ -53,7 +53,18 @@
                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                    </VBox.margin>
                </TextField>
-            <PasswordField promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfPasswort">
+                <TextField fx:id="tfEmail" promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                    <effect>
+                        <Blend />
+                    </effect>
+                    <font>
+                        <Font name="Microsoft Tai Le Bold" size="12.0" />
+                    </font>
+                    <VBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                    </VBox.margin>
+                </TextField>
+                <PasswordField fx:id="pfPassword" accessibleRole="TEXT_FIELD" promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
                    <font>
                        <Font name="Microsoft Tai Le Bold" size="12.0" />
                    </font>
@@ -67,27 +78,53 @@
                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                    </VBox.margin>
                </PasswordField>
-            <PasswordField promptText="Passwort bestätigen" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfBestätigungPassowrt">
+                <HBox prefHeight="100.0" prefWidth="200.0">
+                    <children>
+                        <TextField  fx:id="tfPostCode" prefHeight="35.0" prefWidth="92.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <HBox.margin>
+                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                            </HBox.margin>
                            <font>
                                <Font name="Microsoft Tai Le Bold" size="12.0" />
                            </font>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
-               <effect>
-                  <Blend />
-               </effect>
-               <VBox.margin>
+                        </TextField>
+                        <TextField fx:id="tfCity" prefHeight="35.0" prefWidth="182.0" promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <HBox.margin>
                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-               </VBox.margin>
-            </PasswordField>
+                            </HBox.margin>
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="12.0" />
+                            </font>
+                        </TextField>
+                    </children>
+                </HBox>
+                <HBox prefHeight="100.0" prefWidth="200.0">
+                    <children>
+                        <TextField  fx:id="tfStreet" prefHeight="27.0" prefWidth="134.0" promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <HBox.margin>
+                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                            </HBox.margin>
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="12.0" />
+                            </font>
+                        </TextField>
+                        <TextField  fx:id="tfHousNumber" prefHeight="27.0" prefWidth="99.0" promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <HBox.margin>
+                                <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                            </HBox.margin>
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="12.0" />
+                            </font>
+                        </TextField>
+                    </children>
+                </HBox>
                <HBox alignment="CENTER" prefHeight="30.0" prefWidth="238.0">
                    <children>
-                        <Button mnemonicParsing="false" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE" onAction="#onKontoErstellenBtClick">
+                        <Button mnemonicParsing="false" onAction="#onKontoErstellenBtClick" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE">
                            <font>
                                <Font name="Microsoft Tai Le Bold" size="12.0" />
                            </font></Button>
-                        <Button id="btSignUp" mnemonicParsing="false" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true"  onAction="#onAnmeldenBtClick"/>
+                        <Button id="btSignUp" mnemonicParsing="false" onAction="#onAnmeldenBtClick" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true" />
                    </children>
                    <opaqueInsets>
                        <Insets top="15.0" />
Author	SHA1	Message	Date
Reshad Meher	c46eff1dda	NutzerEinstellung: passwort akuelliseren, Adressse aktuelliseren	2023-02-06 03:23:27 +01:00
Reshad Meher	20a39be10b	Variablen und Attributen auf englisch umbennent	2023-02-05 15:17:51 +01:00
Reshad Meher	d457b20f15	Merge remote-tracking branch 'origin/main' # Conflicts: # src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java # src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java # src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java # src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java # src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml # src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml	2023-02-05 15:12:48 +01:00
Reshad Meher	634d1ce805	test	2023-02-05 15:12:21 +01:00
Reshad Meher	a9dede0974	Variablen und Attributen auf englisch umbennent	2023-02-05 15:11:42 +01:00
Reshad Meher	7932c7e896	Variablen und Attributen auf englisch umbennent	2023-02-05 15:11:32 +01:00
Malte Schulze Hobeling	a23a1695ad	„readme.md“ ändern	2023-02-03 14:51:01 +01:00
Malte Schulze Hobeling	ba70f484a7	Kommentare 2: electric boogaloo	2023-02-01 21:33:53 +01:00
Richard	9d7b981c22	MenueController Button highlight	2023-02-01 18:32:56 +01:00
Richard	28dcd4a7ab	MenueController Button highlight	2023-02-01 18:23:19 +01:00
Richard	0a7f941d61	Merge remote-tracking branch 'origin/main' # Conflicts: # src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java	2023-02-01 18:18:39 +01:00
Richard	6e60fb1517	MenueController Button highlight	2023-02-01 18:17:44 +01:00
Johannes Kantz	6c13cb1873	fix: remove db	2023-02-01 12:03:21 +01:00
Johannes Kantz	289617b9b7	fix: remove .idea folder	2023-02-01 11:55:54 +01:00
Reshad Meher	cd395d1982	test	2023-02-01 10:14:17 +01:00
Johannes Kantz	ea8beb9de5	fix: remove debug print	2023-02-01 10:14:00 +01:00
Johannes Kantz	b74a983d9a	fix: changed window size to prevent essensplan overflow	2023-02-01 10:14:00 +01:00
Johannes Kantz	20700448af	add: createFoodplan	2023-02-01 10:14:00 +01:00
Johannes Kantz	5978a079bf	add: createFood	2023-02-01 10:13:57 +01:00
Johannes Kantz	56f359a63a	add: database.db to gitignore	2023-02-01 10:13:54 +01:00
Johannes Kantz	d02acb89a4	add: change Scenes	2023-02-01 10:13:38 +01:00
Johannes Kantz	c08b0aece5	fix: refactor	2023-02-01 10:13:29 +01:00
Johannes Kantz	4d6c2043d7	fix: changed window size	2023-02-01 10:13:21 +01:00
Johannes Kantz	6555f8f8bc	add: Rechnung View	2023-02-01 10:13:03 +01:00
Johannes Kantz	4559ad5036	add: workerMenu	2023-02-01 10:12:52 +01:00
Johannes Kantz	63d1030c7f	add: parent menu	2023-02-01 10:12:44 +01:00
Reshad Meher	846c2c392a	singup mit Datebase verbunden und new Adresse	2023-02-01 10:12:26 +01:00
Reshad Meher	40cc2b002a	test	2023-02-01 10:04:35 +01:00
Reshad Meher	e87bae35bc	test	2023-02-01 10:04:20 +01:00
Reshad Meher	0b02c1c661	Merge remote-tracking branch 'origin/main' # Conflicts: # src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java # src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java # src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java	2023-02-01 09:53:51 +01:00
Reshad Meher	b15b94e579	singup mit Datebase verbunden und new Adresse	2023-02-01 09:48:55 +01:00
Malte Schulze Hobeling	0d36d7718e	Merge pull request 'feat/essensplanErstellen' (#8 ) from feat/essensplanErstellen into main Reviewed-on: #8	2023-02-01 09:38:30 +01:00
Richard	3613e246c9	MenueController Button highlight	2023-02-01 09:27:34 +01:00
Richard	b7bc440a4f	MenueController Button highlight	2023-02-01 09:25:40 +01:00
Johannes Kantz	9b6d60a571	fix: remove debug print	2023-02-01 07:27:12 +01:00
Johannes Kantz	f567320ec3	fix: changed window size to prevent essensplan overflow	2023-02-01 07:23:43 +01:00
Johannes Kantz	324ce53bd4	add: createFoodplan	2023-02-01 07:22:09 +01:00
Johannes Kantz	f71aba3505	add: createFood	2023-02-01 07:21:59 +01:00
Johannes Kantz	5ee0288736	add: database.db to gitignore	2023-02-01 07:21:37 +01:00
Richard	b456b6d1d8	MenueController Button highlight	2023-01-31 21:26:41 +01:00
Richard	3f3875fd78	signup	2023-01-31 17:53:01 +01:00
Richard	f09d63dd21	aus main stuff kopiert	2023-01-31 17:51:37 +01:00
richard	72c2e9da16	Childview & Elternmenue hinzugefügt	2023-01-31 15:38:08 +01:00
pbs2h21asc	8927755462	Admin Controller	2023-01-31 14:34:37 +01:00
pbs2h21asc	2814244d29	Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch # Conflicts: # src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml	2023-01-31 12:27:59 +01:00
pbs2h21asc	1a9f13581e	Admin Controller bearbeitet	2023-01-31 12:27:14 +01:00
Johannes Kantz	636ac5ed3a	Merge pull request 'feat/menus' (#7 ) from feat/menus into main Reviewed-on: #7	2023-01-31 10:31:15 +01:00
richard	6747188668	settingsview & Controller erstellt	2023-01-31 10:22:48 +01:00
Johannes Kantz	1c85261c7b	add: change Scenes	2023-01-31 07:41:21 +01:00
Johannes Kantz	c57e65fadb	fix: refactor	2023-01-31 07:18:37 +01:00
Johannes Kantz	c890819be7	fix: changed window size	2023-01-31 07:03:11 +01:00
Johannes Kantz	c981fbca19	add: Rechnung View	2023-01-31 06:01:53 +01:00
Johannes Kantz	2b5839f0ea	add: workerMenu	2023-01-31 04:30:25 +01:00
Johannes Kantz	1a4d45aed4	add: parent menu	2023-01-31 04:30:09 +01:00
pbs2h21asc	0550482a6b	View überarbeitet Controller AdminController anfangen	2023-01-30 15:03:54 +01:00
pbs2h21asc	6cb48af976	Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch	2023-01-30 14:58:43 +01:00
pbs2h21asc	9e4db23e7a	View überarbeitet Controller AdminController anfangen	2023-01-30 14:57:57 +01:00
Malte Schulze Hobeling	a039bb09fc	„.idea/vcs.xml“ löschen	2023-01-30 14:22:23 +01:00
Malte Schulze Hobeling	97af9f3792	„.idea/misc.xml“ löschen	2023-01-30 14:22:17 +01:00
Malte Schulze Hobeling	2b1223b3b7	„.idea/encodings.xml“ löschen	2023-01-30 14:22:12 +01:00
Malte Schulze Hobeling	7e6b1aedf3	„.idea/.gitignore“ löschen	2023-01-30 14:22:07 +01:00
Malte Schulze Hobeling	464285dcbf	„database.db“ löschen	2023-01-30 14:21:50 +01:00
Malte Schulze Hobeling	49575add8a	Merge branch 'main' into Richards_Branch	2023-01-30 14:21:09 +01:00
Reshad Meher	3c0edbc431	new Regisiteren View	2023-01-27 15:17:17 +01:00
Reshad Meher	981169d578	Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch	2023-01-27 15:11:38 +01:00
Reshad Meher	9b73f91f5c	new Regisiteren View	2023-01-27 15:11:25 +01:00
richard	67b3637505	Views & Controller erstellt	2023-01-27 14:36:10 +01:00
Reshad Meher	c7d0514c43	Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch	2023-01-23 09:08:32 +01:00
Reshad Meher	702677b65b	neue Zustand 23.01.23	2023-01-23 09:08:03 +01:00