„readme.md“ ändern

# Conflicts:
#	src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java

.gitignore

@@ -8,6 +8,7 @@ target/
 .idea/jarRepositories.xml
 .idea/compiler.xml
 .idea/libraries/
+.idea
 *.iws
 *.iml
 *.ipr

.idea/misc_.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="openjdk-19" project-jdk-type="JavaSDK" />
-</project>

.idea/vcs_.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

readme.md

@@ -1,3 +1,3 @@
 # Essensbestellungsverwaltung
 
-test
+stable ist der neue main

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,18 @@ 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;
+
-    
     /**
      * 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 +32,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 +45,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 +63,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 +77,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 +96,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 +124,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 +150,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 +170,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 +183,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"};
@@ -163,6 +207,7 @@ public class AccountMgr {
      * 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 +220,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 +233,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 +252,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 +270,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 +297,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);
     }
 }

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;

src/main/java/com/bib/essensbestellungsverwaltung/AdminController.java

@@ -1,81 +1,4 @@
 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(){
-
-    }
-
-
 }
-

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;

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;

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;

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.setPrice(price);
-        AccountMgr.setPriceInDb();
     }
 }

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();

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()) {

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;

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);
+        List<String> entry = Database.select("allergy",allergyH,allergyD);
-        String[] allergyParts = allergies.get(0).split(":");
+        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<>();

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;

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;

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("");
-    }
-}

src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java

@@ -1,3 +1,4 @@
+/*Reshad Meher*/
 package com.bib.essensbestellungsverwaltung;
 
 import javafx.fxml.FXML;
@@ -6,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
@@ -17,27 +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 user is worker: StartViewApplication.changeScene("workerMenu-view.fxml");
+        if(loginPruefen > 0){
-            StartViewApplication.changeScene("parentMenu-view.fxml");
+            FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("menue-view.fxml"));
-
+            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 {
-        StartViewApplication.changeScene("signUp-view.fxml");
+        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("signUp-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 950,700);
+        StartViewApplication.primary.setScene(scene);
+
     }
 }

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;
 

src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java

@@ -1,6 +1,4 @@
 package com.bib.essensbestellungsverwaltung;
 
 public class ParentController{
-
-
         }

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 {
-
-}

src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java

@@ -1,4 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-public class SettingsController {
-}

src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java

@@ -1,4 +1,6 @@
-/** Reshad Meher*/
+/**
+ * @autor: Reshad Meher
+ */
 package com.bib.essensbestellungsverwaltung;
 
 import javafx.fxml.FXML;
@@ -7,21 +9,92 @@ 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 SingUpController {
+    @FXML
+    private TextField tfName;
+    @FXML
+    private TextField tfVorname;
+    @FXML
+    private TextField tfEmail;
+    @FXML
+    private PasswordField pfPasswort;
+    @FXML
+    private TextField tfPLZ;
+    @FXML
+    private TextField tfStadt;
 
+    @FXML
+    private TextField tfStrasse;
+    @FXML
+    private TextField tfHausnummer;
     @FXML
     private void onKontoErstellenBtClick(){
+        String name = tfName.getText();
+        String vorname = tfVorname.getText();
+        String email = tfEmail.getText();
+        String passwort = pfPasswort.getText();
+        String plz = tfPLZ.getText();
+        String stadt = tfStadt.getText();
+        String strasse = tfStrasse.getText();
+        String hausnummer = tfHausnummer.getText();
+        Alert alert;
+        if(name.isEmpty() || vorname.isEmpty() || email.isEmpty() || passwort.isEmpty() || plz.isEmpty() ||
+                stadt.isEmpty() || strasse.isEmpty() || hausnummer.isEmpty()){
+
+            if(name.isEmpty()){
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Name'  ist leer.");
+                alert.showAndWait();
+            } else if (vorname.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 (passwort.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Passwort' ist leer.");
+                alert.showAndWait();
+            } else if (plz.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Postleitzahl' ist leer.");
+                alert.showAndWait();
+            } else if (stadt.isEmpty()) {
+                alert = new Alert(Alert.AlertType.ERROR," Die Eingabefeld 'Stadt' ist leer.");
+                alert.showAndWait();
+            } else if (strasse.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(strasse,hausnummer,plz,stadt);
+            User newUser = new User(name,vorname,passwort,email,newAdresse);
+            long creatNewUser = AccountMgr.createUser(newUser);
+            if (creatNewUser > 0){
+                alert = new Alert(Alert.AlertType.CONFIRMATION,"Ihrer Daten wurde gespeichert.");
+                alert.showAndWait();
+            }
+            tfName.setText("");
+            tfVorname.setText("");
+            tfEmail.setText("");
+            pfPasswort.setText("");
+            tfPLZ.setText("");
+            tfStadt.setText("");
+            tfStrasse.setText("");
+            tfHausnummer.setText("");
+        }
 
     }
 
     @FXML
     private void onAnmeldenBtClick() throws IOException {
-
+        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 950,480);
+        StartViewApplication.primary.setScene(scene);
     }
-
 }

src/main/java/com/bib/essensbestellungsverwaltung/StartPageController.java

@@ -1,4 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-public class StartPageController {
-}

src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java

@@ -7,7 +7,6 @@ package com.bib.essensbestellungsverwaltung;
 
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
@@ -15,11 +14,10 @@ import java.io.IOException;
 
 public class StartViewApplication extends Application {
     public static Stage primary;
-
     @Override
     public void start(Stage stage) throws IOException {
         FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
-        Scene scene = new Scene(fxmlLoader.load(), 1200, 750);
+        Scene scene = new Scene(fxmlLoader.load(), 950,700);
         primary = stage;
         stage.setTitle("Essen Bestellung im Kindergarten");
         stage.setScene(scene);
@@ -34,9 +32,4 @@ 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);
-    }
 }

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){

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;

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);

src/main/java/com/bib/essensbestellungsverwaltung/WorkerMenuController.java

@@ -1,95 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.control.Button;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.BorderPane;
-
-import java.io.IOException;
-
-public class WorkerMenuController {
-    @FXML
-    public BorderPane contentView;
-
-    @FXML
-    Button tagesbestellungButton;
-    @FXML
-    Button wochenplanButton;
-    @FXML
-    Button monatsabrechnungButton;
-    @FXML
-    Button mitarbeiterButton;
-    @FXML
-    Button mahlzeitButton;
-    @FXML
-    Button einstellungenButton;
-
-    @FXML
-    public void initialize() {
-        changePage("menue-view.fxml");
-        setButtonActive(tagesbestellungButton);
-    }
-
-    @FXML
-    public void onTagesbestellungenClick(MouseEvent mouseEvent) {
-        changePage("menue-view.fxml");
-        setButtonActive(tagesbestellungButton);
-    }
-
-    @FXML
-    public void onWochenplanClick(MouseEvent mouseEvent) {
-        changePage("createFoodplan-view.fxml");
-        setButtonActive(wochenplanButton);
-    }
-
-    @FXML
-    public void onMonatsabrechnungClick(MouseEvent mouseEvent) {
-        changePage("invoice-view.fxml");
-        setButtonActive(monatsabrechnungButton);
-    }
-
-
-    @FXML
-    public void onMitarbeiterClick(MouseEvent mouseEvent) {
-        changePage("createCoworker-view.fxml");
-        setButtonActive(mitarbeiterButton);
-    }
-
-
-    @FXML
-    public void onMahlzeitClick(MouseEvent mouseEvent) {
-        changePage("createFood-view.fxml");
-        setButtonActive(mahlzeitButton);
-    }
-
-
-    public void onEinstellungenClick(MouseEvent mouseEvent) {
-        setButtonActive(einstellungenButton);
-    }
-
-    @FXML
-    public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
-        StartViewApplication.changeScene("parentMenu-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) {
-        tagesbestellungButton.getStyleClass().remove("active");
-        monatsabrechnungButton.getStyleClass().remove("active");
-        wochenplanButton.getStyleClass().remove("active");
-        mahlzeitButton.getStyleClass().remove("active");
-        mitarbeiterButton.getStyleClass().remove("active");
-        einstellungenButton.getStyleClass().remove("active");
-        b.getStyleClass().add("active");
-    }
-}

src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue-view.fxml

@@ -2,6 +2,8 @@
 
 <?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?>
@@ -9,9 +11,9 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<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">
+<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">
    <children>
-      <VBox id="optionsContainer" layoutY="25.0" prefHeight="600.0" prefWidth="300.0" stylesheets="@adminMenue.css">
+      <VBox id="optionsContainer" layoutY="25.0" prefHeight="400.0" prefWidth="175.0">
          <children>
             <HBox alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="179.0">
                <children>
@@ -20,9 +22,9 @@
                         <Image url="@pics/to-do-list.png" />
                      </image>
                   </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Tagesbestellungen" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Tagesbestellungen" textFill="WHITE">
                      <font>
-                        <Font size="23.0" />
+                        <Font size="14.0" />
                      </font>
                   </Button>
                </children>
@@ -37,9 +39,9 @@
                         <Image url="@pics/spreadsheet.png" />
                      </image>
                   </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Monatsabrechnung" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Monatsabrechnung" textFill="WHITE">
                      <font>
-                        <Font size="23.0" />
+                        <Font size="14.0" />
                      </font>
                   </Button>
                </children>
@@ -54,9 +56,9 @@
                         <Image url="@pics/calendar.png" />
                      </image>
                   </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Wochenplan" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Wochenplan" textFill="WHITE">
                      <font>
-                        <Font size="23.0" />
+                        <Font size="14.0" />
                      </font>
                   </Button>
                </children>
@@ -71,9 +73,9 @@
                         <Image url="@pics/lunch.png" />
                      </image>
                   </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Mahlzeit" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Mahlzeit" textFill="WHITE">
                      <font>
-                        <Font size="23.0" />
+                        <Font size="14.0" />
                      </font>
                   </Button>
                </children>
@@ -88,9 +90,9 @@
                         <Image url="@pics/teamwork.png" />
                      </image>
                   </ImageView>
-                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Mitarbeiter" textFill="WHITE">
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="145.0" style="-fx-background-color: transparent;" text="Mitarbeiter" textFill="WHITE">
                      <font>
-                        <Font size="23.0" />
+                        <Font size="14.0" />
                      </font>
                   </Button>
                </children>
@@ -100,10 +102,23 @@
             </HBox>
          </children>
       </VBox>
-      <HBox id="optionsContainer" alignment="TOP_RIGHT" prefHeight="25.0" prefWidth="1200.0" style="-fx-background-color: lightblue;">
+      <HBox id="optionsContainer" alignment="TOP_RIGHT" prefHeight="25.0" prefWidth="600.0" style="-fx-background-color: lightblue;">
          <children>
             <Button mnemonicParsing="false" style="-fx-background-color: transparent;" text="Hallo, [Nutzername]" textFill="WHITE" />
-         </children>
+         </children></HBox>
-      </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>
 </AnchorPane>

src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue.css

@@ -3,10 +3,10 @@
     -fx-background-color: rgba(85, 103, 136, 0.64);
 }
 
-#buttons:pressed{
+#optionsContainer{
-    -fx-background-color: #748d96;
+    -fx-background-color: lightblue;
 }
 
 #optionsContainer{
-    -fx-background-color: lightblue;
+    -fx-background-color: darkblue;
 }

src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml

@@ -2,8 +2,6 @@
 
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
-<?import javafx.scene.control.ComboBox?>
-<?import javafx.scene.control.DatePicker?>
 <?import javafx.scene.control.ListView?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.AnchorPane?>
@@ -12,6 +10,7 @@
 <?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">
@@ -19,35 +18,8 @@
             <Font size="58.0" />
          </font>
       </Text>
-      <HBox id="contentContainer" alignment="CENTER" layoutX="48.0" layoutY="244.0" prefHeight="250.0" prefWidth="770.0">
+      <HBox id="contentContainer" alignment="CENTER" layoutX="49.0" layoutY="170.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="Name">
-                     <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="Geburtsdatum">
-                     <VBox.margin>
-                        <Insets bottom="15.0" top="15.0" />
-                     </VBox.margin>
-                  </Text>
-                  <DatePicker prefHeight="26.0" prefWidth="226.0">
-                     <VBox.margin>
-                        <Insets top="13.0" />
-                     </VBox.margin>
-                  </DatePicker>
-               </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="Alter">
@@ -65,11 +37,11 @@
                         <Insets bottom="15.0" top="15.0" />
                      </VBox.margin>
                   </Text>
-                  <ComboBox prefHeight="26.0" prefWidth="230.0">
+                  <TextField>
                      <VBox.margin>
-                        <Insets top="13.0" />
+                        <Insets bottom="15.0" top="15.0" />
                      </VBox.margin>
-                  </ComboBox>
+                  </TextField>
                </children>
                <HBox.margin>
                   <Insets left="15.0" right="15.0" />
@@ -77,12 +49,39 @@
             </VBox>
             <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
                <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Allergien">
+                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Geburtsdatum">
                      <VBox.margin>
                         <Insets bottom="15.0" top="15.0" />
                      </VBox.margin>
                   </Text>
-                  <ListView prefHeight="101.0" prefWidth="227.0" />
+                  <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">
+               <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" />
@@ -95,6 +94,84 @@
             </VBox>
          </children>
       </HBox>
-      <Button id="btAddChild" layoutX="360.0" layoutY="592.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="146.0" text="Kind hinzufügen" />
+      <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">
+               <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>
+               </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" />
    </children>
 </AnchorPane>

src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml

@@ -3,22 +3,21 @@
 <?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="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">
+<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">
    <children>
       <Label layoutX="301.0" layoutY="49.0" />
-      <Label layoutX="223.0" layoutY="76.0" prefHeight="28.0" prefWidth="220.0" text="Mitarbeiter hinzufügen">
+      <Label layoutX="230.0" layoutY="30.0" prefHeight="28.0" prefWidth="220.0" text="Mitarbeiter hinzufügen">
          <font>
             <Font size="18.0" />
          </font>
       </Label>
-      <VBox layoutX="223.0" layoutY="149.0" prefHeight="317.0" prefWidth="514.0">
+      <VBox layoutX="119.0" layoutY="95.0" prefHeight="317.0" prefWidth="331.0">
          <children>
             <HBox prefHeight="43.0" prefWidth="331.0">
                <children>
@@ -27,7 +26,7 @@
                         <Font size="16.0" />
                      </font>
                   </Label>
-                  <TextField id="lastname" prefHeight="25.0" prefWidth="194.0" />
+                  <TextField prefHeight="25.0" prefWidth="194.0" />
                </children>
             </HBox>
             <HBox prefHeight="60.0" prefWidth="331.0">
@@ -40,7 +39,7 @@
                         <Font size="16.0" />
                      </font>
                   </Label>
-                  <TextField id="firstname" prefHeight="25.0" prefWidth="193.0">
+                  <TextField prefHeight="25.0" prefWidth="193.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
@@ -57,7 +56,7 @@
                         <Insets top="10.0" />
                      </padding>
                   </Label>
-                  <TextField id="street" prefHeight="25.0" prefWidth="195.0">
+                  <TextField prefHeight="25.0" prefWidth="195.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
@@ -74,7 +73,7 @@
                         <Insets top="10.0" />
                      </padding>
                   </Label>
-                  <TextField id="number" prefHeight="25.0" prefWidth="87.0">
+                  <TextField prefHeight="25.0" prefWidth="87.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
@@ -88,7 +87,7 @@
                         <Font size="16.0" />
                      </font>
                   </Label>
-                  <TextField id="plz" prefHeight="25.0" prefWidth="87.0">
+                  <TextField prefHeight="25.0" prefWidth="87.0">
                      <HBox.margin>
                         <Insets />
                      </HBox.margin>
@@ -105,7 +104,7 @@
                         <Font size="16.0" />
                      </font>
                   </Label>
-                  <TextField id="city" prefHeight="13.0" prefWidth="194.0">
+                  <TextField prefHeight="13.0" prefWidth="194.0">
                      <HBox.margin>
                         <Insets top="5.0" />
                      </HBox.margin>
@@ -125,14 +124,14 @@
                         <Insets top="10.0" />
                      </padding>
                   </Label>
-                  <TextField id="email" prefHeight="25.0" prefWidth="196.0">
+                  <TextField prefHeight="25.0" prefWidth="196.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
                   </TextField>
                </children>
             </HBox>
-            <HBox prefHeight="100.0" prefWidth="471.0">
+            <HBox prefHeight="100.0" prefWidth="200.0">
                <children>
                   <Label prefHeight="35.0" prefWidth="122.0" text="Passwort">
                      <font>
@@ -142,16 +141,16 @@
                         <Insets top="10.0" />
                      </padding>
                   </Label>
-                  <PasswordField id="password" accessibleRole="PASSWORD_FIELD" prefHeight="25.0" prefWidth="194.0">
+                  <TextField prefHeight="25.0" prefWidth="194.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
-                  </PasswordField>
+                  </TextField>
                </children>
             </HBox>
          </children>
       </VBox>
-      <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="btCreateCoworker" layoutX="119.0" layoutY="412.0" mnemonicParsing="false" 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" />
+      <Button id="btCancelCoworker" layoutX="357.0" layoutY="412.0" mnemonicParsing="false" prefHeight="44.0" prefWidth="158.0" text="Abbrechen" />
    </children>
 </AnchorPane>

src/main/resources/com/bib/essensbestellungsverwaltung/createFood-view.fxml

@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
+<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
+<?import javafx.scene.control.Button?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.control.Label?>
-<?import javafx.scene.text.*?>
+<?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?>
 
-<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">
+<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">
    <children>
-      <Label alignment="CENTER" layoutX="247.0" layoutY="29.0" prefHeight="44.0" prefWidth="237.0" text="Gericht hinzufügen">
+      <Label alignment="CENTER" layoutX="234.0" layoutY="29.0" prefHeight="44.0" prefWidth="237.0" text="Gericht hinzufügen">
          <font>
             <Font size="18.0" />
          </font>
       </Label>
-      <VBox layoutX="136.0" layoutY="73.0" prefHeight="389.0" prefWidth="459.0">
+      <VBox layoutX="112.0" layoutY="73.0" prefHeight="389.0" prefWidth="459.0">
          <children>
             <HBox prefHeight="75.0" prefWidth="459.0">
                <children>
@@ -40,12 +46,12 @@
                         <Insets top="20.0" />
                      </HBox.margin>
                   </Label>
-                  <RadioButton mnemonicParsing="false" text="Hauptgericht">
+                  <RadioButton mnemonicParsing="false" text="Dessert">
                      <HBox.margin>
                         <Insets left="35.0" top="20.0" />
                      </HBox.margin>
                   </RadioButton>
-                  <RadioButton mnemonicParsing="false" text="Dessert">
+                  <RadioButton mnemonicParsing="false" text="Kein Dessert">
                      <HBox.margin>
                         <Insets left="50.0" top="20.0" />
                      </HBox.margin>
@@ -90,7 +96,7 @@
             </HBox>
          </children>
       </VBox>
-      <Button id="btCreateFood" layoutX="485.0" layoutY="464.0" mnemonicParsing="false" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
+      <Button id="btCreateFood" layoutX="106.0" layoutY="457.0" mnemonicParsing="false" prefHeight="50.0" prefWidth="145.0" text="Hinzufügen" />
-      <Button id="btCancelFood" layoutX="102.0" layoutY="456.0" mnemonicParsing="false" prefHeight="50.0" prefWidth="162.0" text="Abbrechen" />
+      <Button id="btCancelFood" layoutX="366.0" layoutY="457.0" mnemonicParsing="false" prefHeight="50.0" prefWidth="162.0" text="Abbrechen" />
    </children>
 </AnchorPane>

src/main/resources/com/bib/essensbestellungsverwaltung/launch-view.fxml

@@ -1,147 +0,0 @@
-<?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>

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>

src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml

@@ -32,9 +32,9 @@
                         </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" text="Mahlzeit 1" />
+                                <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" text="Mahlzeit 2" />
+                                <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" text="Keine Mahlzeit">
+                                <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="20.0" />
                                     </VBox.margin>

src/main/resources/com/bib/essensbestellungsverwaltung/menue.css

@@ -1,10 +1,33 @@
-.sidebar-nav_button {
+#btFoodChoice{
-    -fx-background-color: #69b6ff;
+    -fx-background-color: transparent;
-    -fx-text-fill: #123;
+
-    -fx-border-color: #000;
-    -fx-border-radius: 20;
-}
-.sidebar-nav_button.active {
-    -fx-background-color: #4e92b4;
 }
 
+#btFoodChoice:hover{
+    -fx-underline: true;
+    -fx-text-fill: black;
+}
+#btPlaceOrder{
+    -fx-background-color: lightblue;
+    -fx-text-fill: white;
+    -fx-background-radius: 25;
+}
+
+
+#btPlaceOrder:hover{
+    -fx-border-width: 0;
+    -fx-text-fill: black;
+    -fx-underline: true;
+}
+
+#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;
+}

src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml

@@ -75,7 +75,7 @@
          </padding></VBox>
       <HBox id="contentContainer2" alignment="CENTER_RIGHT" prefHeight="40.0" prefWidth="1200.0" stylesheets="@parentMenue.css">
          <children>
-            <Button id="btLogOut" mnemonicParsing="false" stylesheets="@parentMenue.css" text="Abmelden" />
+            <Button id="btLogOut" mnemonicParsing="false" text="Abmelden" />
          </children>
       </HBox>
    </children>

src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="com.bib.essensbestellungsverwaltung.SettingsController"
-            prefHeight="400.0" prefWidth="600.0">
-
-</AnchorPane>

src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml

@@ -31,96 +31,93 @@
         <Circle fill="#93c4f23d" layoutY="258.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
         <VBox layoutX="262.0" prefHeight="400.0" prefWidth="364.0" style="-fx-background-color: white;">
             <children>
-            <TextField fx:id="tfEmail" 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;">
+                <TextField fx:id="tfName" 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>
+                    <effect>
-                  <Blend />
+                        <Blend />
-               </effect>
+                    </effect>
-               <font>
+                    <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>
-            <TextField fx:id="tfBestätigungEmail" promptText="Vorname" 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="pfPasswort" accessibleRole="TEXT_FIELD" promptText="Email" 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>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
-               <effect>
-                  <Blend />
-               </effect>
-               <VBox.margin>
-                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-               </VBox.margin>
-            </PasswordField>
-            <PasswordField fx:id="pfBestätigungPassowrt" 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>
-               <opaqueInsets>
-                  <Insets />
-               </opaqueInsets>
-               <effect>
-                  <Blend />
-               </effect>
-               <VBox.margin>
-                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-               </VBox.margin>
-            </PasswordField>
-            <HBox prefHeight="100.0" prefWidth="200.0">
-               <children>
-                  <TextField 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>
+                    </font>
-                  </TextField>
+                    <VBox.margin>
-                  <TextField 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" />
-                     </HBox.margin>
+                    </VBox.margin>
-                     <font>
+                </TextField>
+                <TextField fx:id="tfVorname" promptText="Vorname" 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>
+                    </font>
-                  </TextField>
+                    <VBox.margin>
-               </children>
-            </HBox>
-            <HBox prefHeight="100.0" prefWidth="200.0">
-               <children>
-                  <TextField 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>
+                    </VBox.margin>
-                     <font>
+                </TextField>
+                <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>
+                    </font>
-                  </TextField>
+                    <VBox.margin>
-                  <TextField 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>
+                    </VBox.margin>
-                     <font>
+                </TextField>
+                <PasswordField fx:id="pfPasswort" 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>
+                    </font>
-                  </TextField>
+                    <opaqueInsets>
-               </children>
+                        <Insets />
-            </HBox>
+                    </opaqueInsets>
+                    <effect>
+                        <Blend />
+                    </effect>
+                    <VBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                    </VBox.margin>
+                </PasswordField>
+                <HBox prefHeight="100.0" prefWidth="200.0">
+                    <children>
+                        <TextField  fx:id="tfPLZ" 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>
+                        </TextField>
+                        <TextField fx:id="tfStadt" 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" />
+                            </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="tfStrasse" 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="tfHausnummer" 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" onAction="#onKontoErstellenBtClick" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE">
@@ -129,12 +126,12 @@
                             </font></Button>
                         <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>
+                    <opaqueInsets>
-                  <Insets top="15.0" />
+                        <Insets top="15.0" />
-               </opaqueInsets>
+                    </opaqueInsets>
-               <VBox.margin>
+                    <VBox.margin>
-                  <Insets top="15.0" />
+                        <Insets top="15.0" />
-               </VBox.margin>
+                    </VBox.margin>
                 </HBox>
             </children>
             <padding>