MenueController Button highlight

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

.gitignore

@@ -36,6 +36,3 @@ build/
 
 ### Mac OS ###
 .DS_Store
-
-/database.db
-/Rechnungen/**

.idea/misc_.xml

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

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

pom.xml

@@ -45,11 +45,6 @@
             <artifactId>sqlite-jdbc</artifactId>
             <version>3.40.0.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.controlsfx</groupId>
-            <artifactId>controlsfx</artifactId>
-            <version>11.1.2</version>
-        </dependency>
 
     </dependencies>
 

readme.md

@@ -1,13 +1,3 @@
 # Essensbestellungsverwaltung
 
----
-
-### Anleitung zum Benutzen
-Beim ersten Start des Programms wird die Datenbank erstellt und der erste Benutzer der angelegt wird, ist ein Mitarbeiter Account. Danach sind alle weiteren User für Eltern. Weitere Mitarbeiter können über das Mitarbeiter Menu erstellt werden.
-
-##### Desweitern werden Folgende Beispiel Accounts erstellt:
-Ein Eltern Account mit Kindern: 
-testparent@test.de/test
-
-Ein Mitarbeiter Account: 
-testworker@test.de/test
+test

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

@@ -1,4 +1,7 @@
 package com.bib.essensbestellungsverwaltung;
+/*
+    @author Malte Schulze Hobeling
+ */
 
 import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
@@ -10,22 +13,12 @@ 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 {
-
-    static User currentUser = null;
+    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);
@@ -36,10 +29,7 @@ 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);
@@ -50,10 +40,7 @@ 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"};
@@ -69,13 +56,6 @@ 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()};
@@ -84,10 +64,7 @@ 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"};
@@ -104,61 +81,8 @@ public class AccountMgr {
         return id;
     }
 
-    /**
-     * update Child
-     *
-     * @param child the child to be updated
-     * @return id of child
-     * @author Johannes Kantz
-     */
-    protected static long updateChild(Child child) {
-        String[] childH = { "id", "name", "firstname", "addressid" };
-        String[] childD = { String.valueOf(child.getId()), child.getName(), child.getFirstname(),
-                String.valueOf(child.getAddress().getId()) };
-        long updates = Database.update("child", childH, childD);
-        String[] child_allergyH = { "childid", "allergyid", "severityid" };
-        Database.select("child_allergy", new String[] { "childid" }, new String[] { String.valueOf(child.getId()) })
-                .stream().forEach(row -> {
-                    String allergyId = row.split(":")[0];
-                    Database.delete("child_allergy", Integer.parseInt(allergyId));
-                });
-        for (AllergySeverity allergy : child.getAllergies()) {
-            String sId = String.valueOf(child.getId());
-            String sAllergyId = String.valueOf(allergy.getAllergy().getId());
-            String sSeverityId = String.valueOf(allergy.getSeverityId());
-            String[] child_allergyD = { sId, sAllergyId, sSeverityId };
-            Database.insert("child_allergy", child_allergyH, child_allergyD);
-        }
-        return updates;
-    }
-
-    /**
-     * delete Child
-     * 
-     * @author Johannes Kantz
-     */
-    protected static void deleteChildWithId(long id) {
-        Database.delete("child", id);
-        Database.select("child_allergy", new String[] { "childid" }, new String[] { String.valueOf(id) }).stream()
-                .forEach(row -> {
-                    String allergyId = row.split(":")[0];
-                    Database.delete("child_allergy", Integer.parseInt(allergyId));
-                });
-    }
-
-    /**
-     * 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))){
@@ -176,18 +100,8 @@ 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)};
@@ -198,106 +112,22 @@ public class AccountMgr {
             List<String> severity = Database.getEntryById("severity", Long.parseLong(allergyParts[3]));
             String sSeverity = severity.get(0).split(":")[1];
             long lSeverity = Long.parseLong(severity.get(0).split(":")[0]);
-            allergySeverities.add(
-                    new AllergySeverity(FoodMgr.getAllergyById(Long.parseLong(allergyParts[2])), lSeverity, sSeverity));
+            allergySeverities.add(new AllergySeverity(FoodMgr.getAllergyById(Long.parseLong(allergyParts[2])),lSeverity,sSeverity));
         }
         return new Child(id,parts[1],parts[2],getAddressById(Long.parseLong(parts[3])),allergySeverities);
     }
 
-    /**
-     * returns all Children
-     * 
-     * @return {List<Child} List with Childen or empty List
-     * @author Johannes Kantz
-     */
-    protected static List<Child> getAllChildren() {
-        List<String> entry = Database.getTable("child");
-        if (entry.size() < 1) {
-            return new ArrayList<>();
-        }
-        List<Child> children = new ArrayList<>();
-        for (String s : entry) {
-            String[] parts = s.split(":");
-            String[] child_allergyH = { "childid" };
-            String[] child_allergyD = { String.valueOf(parts[0]) };
-            List<String> entriesAllergy = Database.select("child_allergy", child_allergyH, child_allergyD);
-            List<AllergySeverity> allergySeverities = new ArrayList<>();
-            for (String entryAllergy : entriesAllergy) {
-                String[] allergyParts = entryAllergy.split(":");
-                List<String> severity = Database.getEntryById("severity", Long.parseLong(allergyParts[3]));
-                String sSeverity = severity.get(0).split(":")[1];
-                long lSeverity = Long.parseLong(severity.get(0).split(":")[0]);
-                allergySeverities.add(new AllergySeverity(FoodMgr.getAllergyById(Long.parseLong(allergyParts[2])),
-                        lSeverity, sSeverity));
-            }
-            children.add(new Child(Long.parseLong(parts[0]), parts[1], parts[2],
-                    getAddressById(Long.parseLong(parts[3])), allergySeverities));
-        }
-        return children;
-    }
-
-    /**
-     * returns all Children from parent
-     * @param id parentid
-     * @return {List<Child} List with Childen or empty List
-     * @author Johannes Kantz
-     */
-    protected static List<Child> getAllChildrenFromParentWithId(long id) {
-        List<String> entry = Database.select("parent_child", new String[] { "parentuserid" },
-                new String[] { String.valueOf(id) });
-        if (entry.size() < 1) {
-            return new ArrayList<>();
-        }
-        List<String> childIds = new ArrayList<>();
-        for (String s : entry) {
-            String[] parts = s.split(":");
-            childIds.add(parts[2]);
-        }
-        List<Child> children = new ArrayList<>();
-        for (String s : childIds) {
-            List<String> child = Database.getEntryById("child", Long.parseLong(s));
-            String[] parts = child.get(0).split(":");
-            String[] child_allergyH = { "childid" };
-            String[] child_allergyD = { String.valueOf(parts[0]) };
-            List<String> entriesAllergy = Database.select("child_allergy", child_allergyH, child_allergyD);
-            List<AllergySeverity> allergySeverities = new ArrayList<>();
-            for (String entryAllergy : entriesAllergy) {
-                String[] allergyParts = entryAllergy.split(":");
-                List<String> severity = Database.getEntryById("severity", Long.parseLong(allergyParts[3]));
-                String sSeverity = severity.get(0).split(":")[1];
-                long lSeverity = Long.parseLong(severity.get(0).split(":")[0]);
-                allergySeverities.add(new AllergySeverity(FoodMgr.getAllergyById(Long.parseLong(allergyParts[2])),
-                        lSeverity, sSeverity));
-            }
-            children.add(new Child(Long.parseLong(parts[0]), parts[1], parts[2],
-                    getAddressById(Long.parseLong(parts[3])), allergySeverities));
-        }
-        return children;
-    }
-
-    /**
-     * 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]);
     }
 
     /**
      * creates entries in the database to match parent to child
-     * 
      * @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"};
@@ -307,11 +137,9 @@ public class AccountMgr {
 
     /**
      * a simple login to check if a given email matches a password
-     * 
      * @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"};
@@ -333,10 +161,8 @@ 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"};
@@ -347,10 +173,8 @@ 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"};
@@ -361,10 +185,8 @@ 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();
@@ -383,12 +205,6 @@ 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];
@@ -399,19 +215,14 @@ public class AccountMgr {
 
     /**
      * gives the invoice for one month and one child
-     * 
      * @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<>();
-        List<String> child = Database.getEntryById("child", Long.parseLong(childId));
-        if (child.size() != 1) {
-            return invoice;
-        }
         invoice.add("Monatsabrechnung " + date);
+        List<String> child = Database.getEntryById("child", Long.parseLong(childId));
         String[] childParts = child.get(0).split(":");
         invoice.add(childParts[1] + ", " + childParts[2]);
         String[] food_planH = {"date"};
@@ -430,31 +241,18 @@ public class AccountMgr {
                 invoice.add(line);
             }
         }
-        double price = getPrice();
         invoice.add("Total: " + (invoice.size()-2) + " X " + price + "€ = " + ((invoice.size()-2)*price) + "€");
         return invoice;
     }
 
-    /**
-     * gets the price per meal from the database and converts it to double
-     * 
-     * @return double price
-     * @author Malte Schulze Hobeling
-     */
-    protected static double getPrice() {
+    protected static void getPriceFromDb(){
         List<String> priceEntry = Database.getEntryById("price",1);
-        return Double.parseDouble(priceEntry.get(0).split(":")[1]) / 100.0;
+        price = Double.parseDouble(priceEntry.get(0).split(":")[1])/100.0;
     }
 
-    /**
-     * 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) {
+    protected static void setPriceInDb(){
         String[] priceH = {"id","price"};
-        String[] priceD = { "1", String.valueOf((int) (price * 100)) };
+        String[] priceD = {"1", String.valueOf(price*100)};
         Database.update("price",priceH,priceD);
     }
 }

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

@@ -1,10 +1,8 @@
 package com.bib.essensbestellungsverwaltung;
-
-/**
- * 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
+/*
+    @author Malte Schulze Hobeling
  */
+
 public class Address {
     private long id;
     private String street;

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

@@ -1,5 +1,3 @@
-/*Schulte*/
-
 package com.bib.essensbestellungsverwaltung;
 
 import javafx.fxml.FXML;
@@ -31,6 +29,9 @@ public class AdminController {
     @FXML
     protected void onBtSignUp(){
 
+
+
+
         String ln = lastname.getText();
         String fn = firstname.getText();
         String st = street.getText();
@@ -40,21 +41,6 @@ public class AdminController {
         String emailString = email.getText();
         String pw = password.getText();
 
-        boolean userData = false;
-        boolean pwCorrect = false;
-        boolean emailCorrect = false;
-
-
-        if(ln.isEmpty() || fn.isEmpty() || st.isEmpty() ||nr.isEmpty() || cityString.isEmpty() || plzString.isEmpty()){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Felder");
-            alert.setHeaderText("Felder nicht ausgefüllt");
-            alert.setContentText("Bitte füllen sie alle Felder aus");
-            alert.showAndWait();
-        }
-        else {
-            userData = true;
-        }
 
 
         if(!pw.matches("^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=])(?=\\S+$).{8,}$")){
@@ -64,57 +50,32 @@ public class AdminController {
             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("");
-            alert.showAndWait();
-        }
-        else {
-            pwCorrect = true;
         }
 
-        if(!emailString.matches("^(.+)@(\\S+)$")){
+        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("");
-            alert.showAndWait();
-        }
-        else{
-            emailCorrect = true;
         }
 
         //String[] userData = new String[]{ln,fn,pw,emailString};
         //String[] addressData = new String[]{st,nr,plzString,cityString};
 
-
-        if(emailCorrect && pwCorrect && userData) {
         Address address = new Address(st,nr,plzString,cityString);
+
         Worker worker = new Worker(ln,fn,pw,emailString,address);
 
-
-            System.out.println(AccountMgr.createWorker(worker));
-
-            Alert alert = new Alert(Alert.AlertType.INFORMATION);
-            alert.setTitle("Bestätigung");
-            alert.setHeaderText("Bestätigung");
-            alert.setContentText("Mitarbeiter " + fn + " " + ln + " wurde Erfolgreich angelegt");
-            alert.showAndWait();
-        }
+        AccountMgr.createWorker(worker);
 
     }
 
     @FXML
     protected void onBtCancel(){
 
-        lastname.setText("");
-        firstname.setText("");
-        street.setText("");
-        number.setText("");
-        city.setText("");
-        plz.setText("");
-        email.setText("");
-        password.setText("");
-
     }
 
 
 }
+

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

@@ -1,9 +1,8 @@
 package com.bib.essensbestellungsverwaltung;
-
-/**
- * An Allergy, used by Food and AllergySeverity, not intended to be changed
- * @author Malte Schulze Hobeling
+/*
+    @author Malte Schulze Hobeling
  */
+
 public class Allergy {
     private final long id;
     private final String name;

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

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

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

@@ -1,12 +1,10 @@
 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/ChildController.java

@@ -1,141 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import org.controlsfx.control.CheckComboBox;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class ChildController {
-    public TextField firstName;
-    public ChoiceBox childChoiceBox;
-    public TextField lastName;
-    public Button kindHinzufügenButton;
-    public CheckComboBox allergienComboBox;
-    public Button kindLoeschenButton;
-
-    private Child currentChild = null;
-
-    private long selectedChildId;
-
-    @FXML
-    public void initialize() {
-        kindLoeschenButton.setDisable(true);
-        updateChildChoiceBoxItems();
-
-        List<String> a = Database.getTable("allergy");
-        ObservableList<String> allergies = FXCollections.observableArrayList();
-        for (String allergie : a) {
-            allergies.add(allergie.split(":")[0] + ": " + allergie.split(":")[1]);
-        }
-        allergienComboBox.getItems().addAll(allergies);
-    }
-
-    public void onSelectChild(ActionEvent mouseEvent) {
-        selectedChildId = Integer.parseInt(childChoiceBox.getValue().toString().split(":")[0]);
-        System.out.println("Selected Child: " + selectedChildId);
-
-        clearInputs();
-
-        if(selectedChildId == 0) {
-            kindHinzufügenButton.setText("Kind Hinzufügen");
-            kindLoeschenButton.setDisable(true);
-            return;
-        }
-
-        // Get selected child and update fields
-        currentChild = AccountMgr.getChildById(selectedChildId);
-        firstName.setText(currentChild.getFirstname());
-        lastName.setText(currentChild.getName());
-        for (AllergySeverity a : currentChild.getAllergies()){
-            allergienComboBox.getCheckModel().check((int) a.getAllergy().getId() - 1);
-        }
-        kindHinzufügenButton.setText("Kind updaten");
-        kindLoeschenButton.setDisable(false);
-    }
-
-    public void onKindHinzufügen(ActionEvent actionEvent) {
-        if(childChoiceBox.getValue() == null){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText("Sie müssen ein Kind auswählen");
-            alert.showAndWait();
-            return;
-        }
-
-        if(lastName.getText().isBlank() || firstName.getText().isBlank()){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText("Es wurden nicht alle Felder ausgefüllt");
-            alert.showAndWait();
-            return;
-        }
-
-        Address adress = AccountMgr.currentUser.getAddress();
-        List<AllergySeverity> allergies = new ArrayList<>();
-        allergienComboBox.getCheckModel().getCheckedItems().stream().forEach(a -> {
-            long id = Integer.parseInt(a.toString().split(":")[0]);
-            String name = a.toString().split(":")[1].trim();
-            // TODO: Allergy Severity
-            allergies.add(new AllergySeverity(new Allergy(id, name, ""), 2, null));
-        });
-
-        if(selectedChildId == 0){
-            long id = AccountMgr.createChild(new Child(lastName.getText(), firstName.getText(), adress, allergies));
-            System.out.println("Child created: " + id);
-
-            if(id <= 0){
-                Alert alert = new Alert(Alert.AlertType.ERROR);
-                alert.setTitle("Es ist ein fehler beim erstellen des Kinds aufgetreten");
-                alert.showAndWait();
-                return;
-            }
-            AccountMgr.matchParentChild(String.valueOf(AccountMgr.currentUser.getId()), String.valueOf(id));
-
-            childChoiceBox.getItems().add(id + ": " + firstName.getText() + " " + lastName.getText());
-            childChoiceBox.setValue(childChoiceBox.getItems().get(childChoiceBox.getItems().size() - 1));
-            clearInputs();
-            onSelectChild(null);
-
-            Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-            alert.setTitle("Kind erstellt");
-            alert.setHeaderText("Es wurde ein Kind erstellt");
-            alert.showAndWait();
-        }else {
-            long id = AccountMgr.updateChild(new Child(currentChild.getId(), lastName.getText(), firstName.getText(), adress, allergies));
-            System.out.println("Updated Child: " + id);
-        }
-    }
-
-    private void clearInputs(){
-        firstName.setText("");
-        lastName.setText("");
-        allergienComboBox.getCheckModel().clearChecks();
-    }
-
-    public void updateChildChoiceBoxItems(){
-        List<Child> childList = AccountMgr.getAllChildrenFromParentWithId(AccountMgr.currentUser.getId());
-
-        ObservableList<Object> childOptions = FXCollections.observableArrayList(childList.stream().map(c -> c.getId() + ": " + c.getFirstname() + " " + c.getName()).toList().toArray(new String[0]));
-        childOptions.add(0, "0: neues Kind erstellen");
-        childChoiceBox.setItems(childOptions);
-    }
-
-    public void onKindLoeschen(ActionEvent actionEvent) {
-        AccountMgr.deleteChildWithId(currentChild.getId());
-        System.out.println("Deleted Child: " + currentChild.getId());
-
-        childChoiceBox.getItems().remove(childChoiceBox.getItems().stream().filter(v -> v.equals(currentChild.getId() + ": " + currentChild.getFirstname() + " " + currentChild.getName())).findFirst().get());
-        childChoiceBox.setValue(childChoiceBox.getItems().get(1));
-
-        onSelectChild(null);
-
-        Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
-        alert.setTitle("Kind wurde gelöscht");
-        alert.showAndWait();
-    }
-}

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

@@ -1,13 +1,12 @@
 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);
@@ -321,6 +320,7 @@ public class ConsoleLib {
         Scanner sc = new Scanner(System.in);
         double price = sc.nextDouble();
         sc.nextLine();
-        AccountMgr.setPrice(price);
+        AccountMgr.price = price;
+        AccountMgr.setPriceInDb();
     }
 }

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

@@ -1,13 +1,12 @@
 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 User currentUser = null;
     static boolean running = true;
     public static void main(String[] args) {
         boolean firstRun = Database.init();
@@ -16,14 +15,14 @@ public class ConsoleMain {
             Database.fillDb();
             ConsoleLib.createWorkerPrompt();
         }
-        AccountMgr.getPrice();
+        AccountMgr.getPriceFromDb();
         while (running){
-            if(AccountMgr.currentUser == null){
+            if(currentUser == null){
                 defaultMenu();
             }else{
-                if(AccountMgr.currentUser.getClass().getSimpleName().equals("Worker")){
+                if(currentUser.getClass().getSimpleName().equals("Worker")){
                     adminMenu();
-                }else if(AccountMgr.currentUser.getClass().getSimpleName().equals("Parent")){
+                }else if(currentUser.getClass().getSimpleName().equals("Parent")){
                     parentMenu();
                 }
             }
@@ -41,7 +40,9 @@ public class ConsoleMain {
         String selection = sc.nextLine();
         switch (selection) {
             case "0" -> running = false;
-            case "1" -> AccountMgr.currentUser = ConsoleLib.loginPrompt();
+            case "1" -> {
+                currentUser = ConsoleLib.loginPrompt();
+            }
             case "2" -> ConsoleLib.showFood_planPrompt();
             case "3" -> ConsoleLib.createParentPrompt();
         }
@@ -68,11 +69,13 @@ public class ConsoleMain {
         Scanner sc = new Scanner(System.in);
         String selection = sc.nextLine();
         switch (selection) {
-            case "0" -> AccountMgr.currentUser = null;
+            case "0" -> {
+                currentUser = null;
+            }
             case "1" -> ConsoleLib.createWorkerPrompt();
             case "2" -> ConsoleLib.createParentPrompt();
-            case "3" -> ConsoleLib.createChildPrompt(String.valueOf(AccountMgr.currentUser.getId()));
-            case "4" -> ConsoleLib.matchParentChildPrompt(String.valueOf(AccountMgr.currentUser.getId()));
+            case "3" -> ConsoleLib.createChildPrompt(String.valueOf(currentUser.getId()));
+            case "4" -> ConsoleLib.matchParentChildPrompt(String.valueOf(currentUser.getId()));
             case "5" -> ConsoleLib.createFoodPrompt();
             case "6" -> ConsoleLib.createFood_planPrompt();
             case "7" -> ConsoleLib.showFood_planPrompt();
@@ -97,9 +100,11 @@ public class ConsoleMain {
         Scanner sc = new Scanner(System.in);
         String selection = sc.nextLine();
         switch (selection) {
-            case "0" -> AccountMgr.currentUser = null;
-            case "3" -> ConsoleLib.createChildPrompt(String.valueOf(AccountMgr.currentUser.getId()));
-            case "x1" -> ConsoleLib.tablePrompt();
+            case "0" -> {
+                currentUser = null;
+            }
+            case "3" -> ConsoleLib.createChildPrompt(String.valueOf(currentUser.getId()));
+            case "6" -> ConsoleLib.tablePrompt();
             case "7" -> ConsoleLib.showFood_planPrompt();
             case "8" -> ConsoleLib.createFood_selectionPrompt();
         }

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

@@ -1,124 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.text.Text;
-import org.controlsfx.control.CheckComboBox;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CreateFoodController {
-    @FXML
-    public TextField name;
-    @FXML
-    public TextArea description;
-    @FXML
-    public RadioButton isHauptgerichtRadio;
-    @FXML
-    public RadioButton isDessertRadio;
-    @FXML
-    public RadioButton isVegetarischRadio;
-    @FXML
-    public RadioButton isVeganRadio;
-    @FXML
-    public RadioButton isFleischRadio;
-    @FXML
-    public Text responseText;
-    public CheckComboBox allergienComboBox;
-
-    @FXML
-    public void initialize() {
-        List<String> a = Database.getTable("allergy");
-        ObservableList<String> allergies = FXCollections.observableArrayList();
-        for (String allergie : a) {
-            allergies.add(allergie.split(":")[0] + ": " + allergie.split(":")[1]);
-        }
-        allergienComboBox.getItems().addAll(allergies);
-    }
-
-    @FXML
-    public void onAbbrechen(ActionEvent actionEvent) {
-        clearInputs();
-    }
-
-    @FXML
-    public void onHinzufuegen(ActionEvent actionEvent) {
-        String gerichtName = name.getText();
-        String beschreibung = description.getText();
-
-        if(gerichtName.isBlank()){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText("Es wurden nicht alle Felder ausgefüllt");
-            alert.setContentText("Das Feld 'Name' ist nicht ausgefüllt");
-            alert.showAndWait();
-            return;
-        }
-        if(beschreibung.isBlank()){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText("Es wurden nicht alle Felder ausgefüllt");
-            alert.setContentText("Das Feld 'Beschreibung' ist nicht ausgefüllt");
-            alert.showAndWait();
-            return;
-        }
-
-        if(!isHauptgerichtRadio.isSelected() && !isDessertRadio.isSelected()){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText("Es wurden nicht alle Felder ausgefüllt");
-            alert.setContentText("Das Feld 'Art' ist nicht ausgefüllt");
-            alert.showAndWait();
-            return;
-        }
-        boolean isNachtisch = !isHauptgerichtRadio.isSelected();
-        if(!isVegetarischRadio.isSelected() && !isVeganRadio.isSelected() && !isFleischRadio.isSelected()){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText("Es wurden nicht alle Felder ausgefüllt");
-            alert.setContentText("Das Feld 'Typ' ist nicht ausgefüllt");
-            alert.showAndWait();
-            return;
-        }
-        int ft = isVeganRadio.isSelected() ? 1 : isVeganRadio.isSelected() ? 2 : 3;
-        FoodType foodType = new FoodType(ft, "Vegan");
-        List<Allergy> allergies = new ArrayList<>();
-        allergienComboBox.getCheckModel().getCheckedItems().stream().forEach(a -> {
-            long id = Integer.parseInt(a.toString().split(":")[0]);
-            String name = a.toString().split(":")[1].trim();
-            allergies.add((new Allergy(id, name, "")));
-        });
-        System.out.println(allergies.get(0).getName());
-
-        long id = FoodMgr.createFood(new Food(gerichtName, beschreibung, isNachtisch, foodType, allergies));
-        if(id <= 0){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Es ist ein Problem beim Erstellen des Gerichts aufgetreten");
-            alert.setHeaderText("Bitte überprüfen Sie ihre Eingabe");
-            alert.setContentText("Es besteht die Möglichkeit, dass dieses Gericht bereits existiert");
-            alert.showAndWait();
-            return;
-        }
-        System.out.println("Food created with id: " + id);
-        responseText.setText("New Food Created");
-        clearInputs();
-    }
-
-    private void clearInputs(){
-        name.setText("");
-        description.setText("");
-        isHauptgerichtRadio.setSelected(false);
-        isDessertRadio.setSelected(false);
-        isVeganRadio.setSelected(false);
-        isVegetarischRadio.setSelected(false);
-        isFleischRadio.setSelected(false);
-        allergienComboBox.getCheckModel().clearChecks();
-    }
-}

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

@@ -1,127 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.DatePicker;
-
-import java.time.LocalDate;
-import java.util.List;
-
-public class CreateFoodplanController {
-    @FXML
-    Button erstellenButton;
-    @FXML
-    DatePicker date;
-
-    @FXML
-    ChoiceBox firstMeal;
-
-    @FXML
-    ChoiceBox secondMeal;
-
-    @FXML
-    ChoiceBox firstDessert;
-
-    @FXML
-    ChoiceBox secondDessert;
-
-    private List<Food> foods;
-    private List<Food> veganFoods;
-    private List<Food> desserts;
-    private List<Food> veganDesserts;
-    private FoodPlan currentPlan;
-
-
-    @FXML
-    public void initialize() {
-        veganFoods = FoodMgr.getVeganFood(false);
-        foods = FoodMgr.getFood(false);
-        veganDesserts = FoodMgr.getVeganFood(true);
-        desserts = FoodMgr.getFood(true);
-
-        ObservableList<Object> foodOptions = FXCollections.observableArrayList(foods.stream().map(food -> food.getId() + ": " + food.getName()).toList().toArray(new String[0]));
-        ObservableList<Object> veganFoodOptions = FXCollections.observableArrayList(veganFoods.stream().map(food -> food.getId() + ": " + food.getName()).toList().toArray(new String[0]));
-        ObservableList<Object> veganDessertOptions = FXCollections.observableArrayList(veganDesserts.stream().map(dessert -> dessert.getId() + ": " + dessert.getName()).toList().toArray(new String[0]));
-        ObservableList<Object> dessertOptions = FXCollections.observableArrayList(desserts.stream().map(dessert -> dessert.getId() + ": " + dessert.getName()).toList().toArray(new String[0]));
-        firstMeal.setItems(veganFoodOptions);
-        secondMeal.setItems(foodOptions);
-
-
-        firstDessert.setItems(veganDessertOptions);
-        secondDessert.setItems(dessertOptions);
-
-        date.setValue(LocalDate.now());
-        onDateChange(null);
-    }
-
-    @FXML
-    public void onPlanErstellen(ActionEvent actionEvent) {
-        if (date.getValue() == null ||
-                firstMeal.getValue().toString().isBlank() ||
-                secondMeal.getValue().toString().isBlank() ||
-                firstDessert.getValue().toString().isBlank() ||
-                secondDessert.getValue().toString().isBlank()
-        ) {
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText("Es wurden nicht alle Felder ausgefüllt");
-            alert.setContentText("Es kann sein, dass Sie erst Gerichte erstellen müssen, um alle Felder auszufüllen");
-            alert.showAndWait();
-            return;
-        }
-
-
-        int firstMealId = Integer.parseInt(firstMeal.getValue().toString().split(":")[0]);
-        int secondMealId = Integer.parseInt(secondMeal.getValue().toString().split(":")[0]);
-        int firstDessertId = Integer.parseInt(firstDessert.getValue().toString().split(":")[0]);
-        int secondDessertId = Integer.parseInt(secondDessert.getValue().toString().split(":")[0]);
-
-
-
-        Food f1 = foods.stream().filter(food -> food.getId() == firstMealId).findFirst().get();
-        Food f2 = foods.stream().filter(food -> food.getId() == secondMealId).findFirst().get();
-        Food d1 = desserts.stream().filter(dessert -> dessert.getId() == firstDessertId).findFirst().get();
-        Food d2 = desserts.stream().filter(dessert -> dessert.getId() == secondDessertId).findFirst().get();
-
-        String d = date.getValue().toString();
-
-        if (currentPlan != null) { // update Foodplan
-            long id = currentPlan.getId();
-            FoodPlan plan = new FoodPlan(id, d, f1, f2, d1, d2, false);
-            long i = FoodMgr.updateFood_plan(plan);
-            System.out.println("Foodplan updated: " + i);
-        } else { // create new Foodplan
-            FoodPlan plan = new FoodPlan(d, f1, f2, d1, d2);
-            long id = FoodMgr.createFood_plan(plan);
-            System.out.println("Foodplan created with id: " + id);
-        }
-    }
-
-    @FXML
-    public void onAbbrechen(ActionEvent actionEvent) {
-    }
-
-    @FXML
-    public void onDateChange(ActionEvent actionEvent) {
-        currentPlan = FoodMgr.getFoodPlan(date.getValue().toString());
-        if (currentPlan != null) {  // current FoodPlan already exists and can be edited
-            firstMeal.setValue(currentPlan.getFoodVegan().getId() + ": " + currentPlan.getFoodVegan().getName());
-            secondMeal.setValue(currentPlan.getFoodSecond().getId() + ": " + currentPlan.getFoodSecond().getName());
-            firstDessert.setValue(currentPlan.getDessertVegan().getId() + ": " + currentPlan.getDessertVegan().getName());
-            secondDessert.setValue(currentPlan.getDessertSecond().getId() + ": " + currentPlan.getDessertSecond().getName());
-            erstellenButton.setText("Plan updaten");
-        } else { // current Foodplan does not exist
-            erstellenButton.setText("Plan erstellen");
-            firstMeal.setValue(null);
-            secondMeal.setValue(null);
-            firstDessert.setValue(null);
-            secondDessert.setValue(null);
-        }
-
-    }
-}

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

@@ -1,76 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import javafx.scene.control.DatePicker;
-import javafx.scene.control.ListView;
-
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
-public class DailyOrderController {
-    public ListView listView;
-    public DatePicker datePicker;
-    public Button sendButton;
-
-
-    @FXML
-    public void initialize() {
-        datePicker.setValue(LocalDate.now());
-        updatePlan(datePicker.getValue().toString());
-    }
-
-    public void onChangeDate(ActionEvent actionEvent) {
-        updatePlan(datePicker.getValue().toString());
-    }
-
-
-    private void updatePlan(String date){
-        listView.getItems().clear();
-        System.out.print("Orders from " + date + " : ");
-        List<String> orders = new ArrayList<>();
-        FoodPlan food_plan = FoodMgr.getFoodPlan(date);
-        if(food_plan == null){
-            sendButton.setVisible(false);
-            return;
-        }
-        sendButton.setVisible(true);
-        if(food_plan.isSent()){
-            sendButton.setDisable(true);
-            sendButton.setText("Bestellung wurde Gesendet");
-        }else {
-            sendButton.setDisable(false);
-            sendButton.setText("Bestellung senden");
-        }
-        String sId = String.valueOf(food_plan.getId());
-        String[] food_selectionH = {"food_planid","foodid"};
-        Food[] foodArray = {
-                food_plan.getFoodVegan(),
-                food_plan.getFoodSecond(),
-                food_plan.getDessertVegan(),
-                food_plan.getDessertSecond()
-        };
-        for(int i = 0; i < 4; i++){
-            String foodName = foodArray[i].getName();
-            String[] food_selectionD = {sId, String.valueOf(foodArray[i].getId())};
-            int count = Database.count("food_selection",food_selectionH,food_selectionD);
-            orders.add(count+" X "+foodName);
-        }
-
-        System.out.println(orders);
-
-
-        for(String order : orders){
-            listView.getItems().add(order);
-        }
-    }
-
-    public void onSendButton(ActionEvent actionEvent) {
-        FoodMgr.getDayOrder(datePicker.getValue().toString());
-        sendButton.setDisable(true);
-        sendButton.setText("Bestellung wurde Gesendet");
-    }
-}

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

@@ -1,4 +1,7 @@
 package com.bib.essensbestellungsverwaltung;
+/*
+    @author Malte Schulze Hobeling
+ */
 
 import java.io.File;
 import java.io.IOException;
@@ -7,22 +10,13 @@ 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");
@@ -35,9 +29,7 @@ public class Database {
 
     /**
      * connects to the database
-     * 
      * @return Connection to the database
-     * @author Malte Schulze Hobeling
      */
     protected static Connection connect(){
         Connection conn = null;
@@ -51,8 +43,6 @@ public class Database {
 
     /**
      * creates the initial structure of the db
-     * 
-     * @author Malte Schulze Hobeling
      */
     protected static void createDb(){
         String[] sql = new String[15];
@@ -183,12 +173,9 @@ public class Database {
 
     /**
      * inserts fixed values into the database
-     * 
-     * @author Malte Schulze Hobeling
      */
     protected static void fillDb(){
         List<String> sqls = new ArrayList<>();
-        // food_type
         sqls.add("""
                 INSERT OR IGNORE INTO food_type (id,name)
                 VALUES ('1','Vegan');""");
@@ -198,7 +185,6 @@ public class Database {
         sqls.add("""
                 INSERT OR IGNORE INTO food_type (id,name)
                 VALUES ('3','Fleischhaltig');""");
-        // allergy
         sqls.add("""
                 INSERT OR IGNORE INTO allergy (id,name,handle)
                 VALUES('1','Eier','a');""");
@@ -265,7 +251,6 @@ public class Database {
         sqls.add("""
                 INSERT OR IGNORE INTO allergy (id,name,handle)
                 VALUES('22','Konservierungsstoff','8');""");
-        // severity
         sqls.add("""
                 INSERT OR IGNORE INTO severity (id,name)
                 VALUES('1','Harmlos');""");
@@ -278,150 +263,6 @@ public class Database {
         sqls.add("""
                 INSERT OR IGNORE INTO price (id,price)
                 VALUES('1','500');""");
-        // user
-        sqls.add("""
-                INSERT OR IGNORE INTO address (id,street,number,plz,city)
-                VALUES('1','teststreet','69','1337','Mond');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO user (id,name,firstname,addressid,password,email)
-                VALUES('1','testparent','testparent','1','YOD+TB0twF2SrueBj26t5OjEJK/Al4G6/hq+IMRyBz4=.f4zL2UJW4POrf/xgJdNaiw==','testparent@test.de');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO parent (userid)
-                VALUES('1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO user (id,name,firstname,addressid,password,email)
-                VALUES('2','testworker','testworker','1','YOD+TB0twF2SrueBj26t5OjEJK/Al4G6/hq+IMRyBz4=.f4zL2UJW4POrf/xgJdNaiw==','testworker@test.de');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO worker (userid)
-                VALUES('2');""");
-        // food
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('1','Steak','69','0','3');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('2','Schnitzel','69','0','3');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('3','Hamburger','69','0','3');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('4','Nudeln','69','0','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('5','Salat','69','0','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('6','Pudding','69','1','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('7','Eis','69','1','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('8','Wackelpudding','69','1','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('9','Kuchen','69','1','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('10','Apfel','69','1','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('11','Banane','69','1','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('12','Nudelauflauf','69','0','3');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('13','Reibekuchen','69','0','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('14','Gefüllte Paprika','69','0','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('15','Suishi','69','0','2');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food (id,name,description,isdessert,food_typeid)
-                VALUES('16','Champignons','69','0','2');""");
-        // child
-        sqls.add("""
-                INSERT OR IGNORE INTO child (id,name,firstname,addressid)
-                VALUES('1','Lustig','Peter','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO child (id,name,firstname,addressid)
-                VALUES('2','Wahnsinn','Rainer','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO parent_child ('id',parentuserid,childid)
-                VALUES('1','1','1');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO parent_child ('id',parentuserid,childid)
-                VALUES('2','1','2');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO child_allergy (childid,allergyid,severityid)
-                VALUES('1','1','2');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO child_allergy (childid,allergyid,severityid)
-                VALUES('1','3','2');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO child_allergy (childid,allergyid,severityid)
-                VALUES('1','4','2');""");
-        // foodplan
-        sqls.add("""
-                INSERT OR IGNORE INTO food_plan ('id',date,food1,food2,dessert1,dessert2)
-                VALUES('1','2023-02-06','4','1','8','7');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_plan ('id',date,food1,food2,dessert1,dessert2)
-                VALUES('2','2023-02-07','5','2','6','7');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_plan ('id',date,food1,food2,dessert1,dessert2)
-                VALUES('3','2023-02-08','4','3','8','6');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_plan ('id',date,food1,food2,dessert1,dessert2)
-                VALUES('4','2023-02-09','16','1','11','10');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_plan ('id',date,food1,food2,dessert1,dessert2)
-                VALUES('5','2023-02-09','14','13','7','9');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_plan ('id',date,food1,food2,dessert1,dessert2)
-                VALUES('6','2023-02-10','13','15','8','6');""");
-        // food_selection
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('1','1','1','4');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('2','1','1','8');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('3','2','1','4');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('4','2','1','8');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('5','1','2','5');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('6','1','2','7');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('7','2','2','5');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('8','2','2','7');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('9','1','3','4');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('10','1','3','8');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('11','2','3','4');""");
-        sqls.add("""
-                INSERT OR IGNORE INTO food_selection ('id',childid,food_planid,foodid)
-                VALUES('12','2','3','6');""");
-
         try(Connection conn = connect(); Statement stmt = conn.createStatement()){
             for (String sql : sqls) {
                 stmt.execute(sql);
@@ -433,13 +274,11 @@ public class Database {
 
     /**
      * inserts data into table and returns its id
-     * simple duplication check
-     * 
+     * does not insert if the exact set already exists
      * @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;
@@ -477,12 +316,10 @@ public class Database {
 
     /**
      * returns a single id that matches the given data
-     * 
      * @param table the table that contains the searched entry
      * @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;
@@ -533,10 +370,8 @@ 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 = ?;";
@@ -548,23 +383,6 @@ 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();
@@ -640,12 +458,12 @@ public class Database {
                 sb.append(" SET ");
                 sb.append(header[1]);
                 sb.append(" = ");
-                sb.append("'" + values[1] + "'");
+                sb.append(values[1]);
                 for(int i = 2; i < header.length; i++){
                     sb.append(", ");
                     sb.append(header[i]);
                     sb.append(" = ");
-                    sb.append("'" + values[i] + "'");
+                    sb.append(values[i]);
                 }
                 sb.append(" WHERE ");
                 sb.append(header[0]);
@@ -659,10 +477,8 @@ 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<>();
@@ -689,14 +505,11 @@ public class Database {
     }
 
     /**
-     * issues a select query on the database for the given table and the given
-     * values checked with LIKE
-     * 
+     * issues a select query on the database for the given table and the given values checked with LIKE
      * @param table the table you want the data from
      * @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<>();
@@ -725,11 +538,9 @@ public class Database {
 
     /**
      * returns the entry from table with the given id
-     * 
      * @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<>();
@@ -759,12 +570,10 @@ public class Database {
 
     /**
      * counts the number of matching entries
-     * 
      * @param table the table you want to count
      * @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);
@@ -779,12 +588,10 @@ public class Database {
 
     /**
      * updates an entry in the database
-     * 
      * @param table the table you want to update
      * @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,12 +1,10 @@
 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,19 +1,16 @@
 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"};
@@ -32,9 +29,7 @@ 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"};
@@ -46,26 +41,10 @@ public class FoodMgr {
         return Database.insert("food_plan",food_planH,food_planD);
     }
 
-    /**
-     * updates a food_plan into the database
-     * @return number of rows affected or -1 on error
-     * @author Johannes Kantz
-     */
-    public static long updateFood_plan(FoodPlan foodPlan){
-        String[] food_planH = {"id","food1","food2","dessert1","dessert2"};
-        String[] food_planD = {String.valueOf(foodPlan.getId()),
-                String.valueOf(foodPlan.getFoodVegan().getId()),
-                String.valueOf(foodPlan.getFoodSecond().getId()),
-                String.valueOf(foodPlan.getDessertVegan().getId()),
-                String.valueOf(foodPlan.getDessertSecond().getId())};
-        return Database.update("food_plan",food_planH,food_planD);
-    }
-
     /**
      * 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"};
@@ -83,7 +62,6 @@ 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"};
@@ -101,15 +79,11 @@ 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"};
         String[] food_planD = {date};
         List<String> entry = Database.select("food_plan",food_planH,food_planD);
-        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]));
@@ -119,17 +93,8 @@ 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]));
@@ -139,17 +104,8 @@ 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];
@@ -160,44 +116,20 @@ 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> entry = Database.select("allergy",allergyH,allergyD);
-        if(entry.size() != 1){
-            return null;
-        }
-        String[] allergyParts = entry.get(0).split(":");
+        List<String> allergies = Database.select("allergy",allergyH,allergyD);
+        String[] allergyParts = allergies.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"};
@@ -214,12 +146,11 @@ 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 != null && !food_plan.isSent()){
+        if(!food_plan.isSent()){
             return Database.insert("food_selection",food_selectionH,food_selectionData);
         }else {
             return -1;
@@ -230,14 +161,10 @@ 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<>();
         FoodPlan food_plan = getFoodPlan(date);
-        if(food_plan == null){
-            return orders;
-        }
         String sId = String.valueOf(food_plan.getId());
         String[] food_selectionH = {"food_planid","foodid"};
         Food[] foodArray = {

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

@@ -1,10 +1,5 @@
 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,9 +1,8 @@
 package com.bib.essensbestellungsverwaltung;
-
-/**
- * FoodType used by Food, not intended to be changed
- * @author Malte Schulze Hobeling
+/*
+    @author Malte Schulze Hobeling
  */
+
 public class FoodType {
     private long id;
     private String name;

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

@@ -5,13 +5,12 @@ import javafx.scene.control.Alert;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 
+public class HelloController {
     /**
- * @author Reshad Meher
+     * @autor: Reshad Meher
      * Username, Passwort , login
      */
 
-public class HelloController {
-
     @FXML
     private TextField unsernameEingabe;
     @FXML

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

@@ -1,118 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.Spinner;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.text.Text;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Calendar;
-import java.util.List;
-
-public class InvoiceController {
-    @FXML
-    Text responseText;
-    @FXML
-    ChoiceBox monatChoiceBox;
-
-    @FXML
-    ChoiceBox childChoiceBox;
-
-    @FXML
-    Spinner jahrSpinner;
-
-    @FXML
-    public void initialize() {
-        monatChoiceBox.setValue(intToMonth(Calendar.getInstance().get(Calendar.MONTH) + 1));
-        jahrSpinner.getValueFactory().setValue(Calendar.getInstance().get(Calendar.YEAR));
-
-        List<Child> childList = AccountMgr.getAllChildren();
-        ObservableList<Object> childOptions = FXCollections.observableArrayList(childList.stream()
-                .map(c -> c.getId() + ": " + c.getFirstname() + " " + c.getName()).toList().toArray(new String[0]));
-        childChoiceBox.setItems(childOptions);
-    }
-
-    @FXML
-    void onRechnungErstellenClick(MouseEvent mouseEvent) {
-        if (childChoiceBox.getValue() == null) {
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Es wurde kein Kind ausgewählt");
-            alert.setHeaderText("Bitte wählen sie ein Kind aus");
-            alert.showAndWait();
-        }
-
-        String childId = childChoiceBox.getValue().toString().split(":")[0];
-        String date = String.format("%d-%02d", Integer.parseInt(jahrSpinner.getValue().toString()),
-                monthToInt(monatChoiceBox.getValue().toString()));
-
-        System.out.println("Invoice (" + date + ") from child: " + childId);
-
-        List<String> invoice = AccountMgr.getInvoice(date, childId);
-
-        responseText.setText(invoice.get(invoice.size() - 1));
-
-        // TODO: show invoice
-        Child child = AccountMgr.getChildById(Long.parseLong(childId));
-        exportInvoice("Rechnung_" + date + "_" + childId + "_" + child.getName() +"_" + child.getFirstname(), invoice);
-    }
-
-    private int monthToInt(String month) {
-        return switch (month) {
-            case "Januar" -> 1;
-            case "Februar" -> 2;
-            case "März" -> 3;
-            case "April" -> 4;
-            case "Mai" -> 5;
-            case "Juni" -> 6;
-            case "Juli" -> 7;
-            case "August" -> 8;
-            case "September" -> 9;
-            case "Oktober" -> 10;
-            case "November" -> 11;
-            case "Dezember" -> 12;
-            default -> -1;
-        };
-    }
-
-    private String intToMonth(int month) {
-        return switch (month) {
-            case 1 -> "Januar";
-            case 2 -> "Februar";
-            case 3 -> "März";
-            case 4 -> "April";
-            case 5 -> "Mai";
-            case 6 -> "Juni";
-            case 7 -> "Juli";
-            case 8 -> "August";
-            case 9 -> "September";
-            case 10 -> "Oktober";
-            case 11 -> "November";
-            case 12 -> "Dezember";
-            default -> "";
-        };
-    }
-
-    private void exportInvoice(String filename, List<String> invoice) {
-        try {
-            Files.createDirectories(Path.of(Path.of("").toAbsolutePath() + "/Rechnungen"));
-
-            // TODO: save invoice to pdf or word
-            File file = new File(Path.of("").toAbsolutePath() + "/Rechnungen/" + filename + ".txt");
-            if (file.createNewFile()) {
-                System.out.println("File created: " + file.getName());
-            } else {
-                System.out.println("File already exists.");
-            }
-            Files.write(Path.of(file.getAbsolutePath()), invoice);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

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

@@ -1,4 +1,3 @@
-/*Richard Reiswich*/
 package com.bib.essensbestellungsverwaltung;
 
 import javafx.fxml.FXML;
@@ -19,18 +18,15 @@ 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();
-        long loginPruefen = AccountMgr.login(email,password);
-        if(loginPruefen > 0){
-            AccountMgr.currentUser = AccountMgr.getUserById(loginPruefen);
-            if(AccountMgr.currentUser.getClass().getSimpleName().equals("Worker")){
-                StartViewApplication.changeScene("workerMenu-view.fxml");
-            }else{
+        if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
+            // if user is worker: StartViewApplication.changeScene("workerMenu-view.fxml");
             StartViewApplication.changeScene("parentMenu-view.fxml");
-            }
 
         }else {
             Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");

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

@@ -1,37 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.ListView;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class OrderHistoryController {
-    public ListView listView;
-
-    @FXML
-    public void initialize() {
-        List<Child> children = AccountMgr.getAllChildrenFromParentWithId(AccountMgr.currentUser.getId());
-
-        List<String> orders = new ArrayList<>();
-
-        for (Child child : children) {
-            List<String> selections = Database.select("food_selection", new String[] { "childid" }, new String[] { String.valueOf(child.getId()) });
-            for (String selection : selections) {
-                String[] selectionParts = selection.split(":");
-                String foodplanid = selectionParts[2];
-                String foodid = selectionParts[3];
-                String foodName = FoodMgr.getFoodById(Long.parseLong(foodid)).getName();
-                String date = FoodMgr.getFoodPlanById(Long.parseLong(foodplanid)).getDate();
-                orders.add(String.format("%s\t %s \t %s", date, child.getFirstname(), foodName));
-            }
-        }
-
-        Collections.sort(orders);
-        Collections.reverse(orders);
-        for(String order : orders){
-            listView.getItems().add(order);
-        }
-    }
-}

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

@@ -1,33 +1,23 @@
 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;
 
-    public Parent(long id, String name, String firstname, String password, String email, Address address,
-            List<Child> children) {
+    public Parent(long id, String name, String firstname, String password, String email, Address address, List<Child> children) {
         super(id, name, firstname, password, email, address);
         this.children = children;
     }
-
     public Parent(String name, String firstname, String password, String email, Address address) {
         super(name, firstname, password, email, address);
         this.children = new ArrayList<>();
     }
 
-    public Parent(User user) {
-        super(user.getId(), user.getName(), user.getFirstname(), user.getPassword(), user.getEmail(), user.getAddress());
-        this.children = new ArrayList<>();
-    }
-
     public List<Child> getChildren() {
         return children;
     }

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

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

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

@@ -1,78 +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 ParentMenuController {
-
-    @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("menue-view.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");
-    }
-}

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

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

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

@@ -1,110 +1,27 @@
-/**
- * @autor: Reshad Meher
- */
+/** Reshad Meher*/
 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 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);
-            if(StartViewApplication.firstLaunch){
-                long id = AccountMgr.createWorker(new Worker(newUser));
-                if(id < 1) {
-                    Alert a = new Alert(Alert.AlertType.ERROR,"Es ist ein Fehler bei der Erstellung Ihres Accounts aufgetreten.");
-                    a.showAndWait();
-                    return;
-                }
-                alert = new Alert(Alert.AlertType.CONFIRMATION,"Mitarbeiter Account erfolgreich erstellt");
-                alert.showAndWait();
-                StartViewApplication.firstLaunch = false;
-            }else {
-                long id = AccountMgr.createParent(new Parent(newUser));
-                if(id < 1) {
-                    Alert a = new Alert(Alert.AlertType.ERROR,"Es ist ein Fehler bei der Erstellung Ihres Accounts aufgetreten.");
-                    a.showAndWait();
-                    return;
-                }
-                alert = new Alert(Alert.AlertType.CONFIRMATION,"Eltern Account erfolgreich erstellt");
-                alert.showAndWait();
-            }
-            tfName.setText("");
-            tfVorname.setText("");
-            tfEmail.setText("");
-            pfPasswort.setText("");
-            tfPLZ.setText("");
-            tfStadt.setText("");
-            tfStrasse.setText("");
-            tfHausnummer.setText("");
-        }
 
     }
 
     @FXML
     private void onAnmeldenBtClick() throws IOException {
-        StartViewApplication.changeScene("login-view.fxml");
+
     }
+
 }

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

@@ -15,22 +15,19 @@ 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((firstLaunch) ? "signUp-view.fxml" : "login-view.fxml"));
-        Scene scene = new Scene(fxmlLoader.load(), 1300, 750);
+        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 1200, 750);
         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();
         //Database.printSampleQuery();

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

@@ -1,13 +1,8 @@
 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 && args[0].equals("Here be dragons")){
+        if(args.length > 0){
             ConsoleMain.main(args);
         }else {
             StartViewApplication.main(args);

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

@@ -1,9 +1,8 @@
 package com.bib.essensbestellungsverwaltung;
-
-/**
- * one constructor is used to create new users the other is used to create existing users from database
- * @author Malte Schulze Hobeling
+/*
+    @author Malte Schulze Hobeling
  */
+
 public class User {
     private long id;
     private String name;

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

@@ -1,21 +1,13 @@
 package com.bib.essensbestellungsverwaltung;
-
-/**
- * one constructor is used to create new worker the other is used to create
- * existing worker from database
- * 
- * @author Malte Schulze Hobeling
+/*
+    @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);
     }
-
     public Worker(String name, String firstname, String password, String email, Address address) {
         super(name, firstname, password, email, address);
     }
-
-    public Worker(User user) {
-        super(user.getId(), user.getName(), user.getFirstname(), user.getPassword(), user.getEmail(), user.getAddress());
-    }
 }

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

@@ -12,6 +12,7 @@ import java.io.IOException;
 public class WorkerMenuController {
     @FXML
     public BorderPane contentView;
+
     @FXML
     Button tagesbestellungButton;
     @FXML
@@ -27,13 +28,13 @@ public class WorkerMenuController {
 
     @FXML
     public void initialize() {
-        changePage("dailyOrder-view.fxml");
+        changePage("menue-view.fxml");
         setButtonActive(tagesbestellungButton);
     }
 
     @FXML
     public void onTagesbestellungenClick(MouseEvent mouseEvent) {
-        changePage("dailyOrder-view.fxml");
+        changePage("menue-view.fxml");
         setButtonActive(tagesbestellungButton);
     }
 
@@ -70,8 +71,7 @@ public class WorkerMenuController {
 
     @FXML
     public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
-        AccountMgr.currentUser = null;
-        StartViewApplication.changeScene("login-view.fxml");
+        StartViewApplication.changeScene("parentMenu-view.fxml");
     }
 
     private void changePage(String page) {

src/main/java/module-info.java

@@ -3,7 +3,6 @@ module com.bib.essensbestellungsverwaltung {
     requires javafx.fxml;
     requires java.sql;
     requires org.xerial.sqlitejdbc;
-    requires org.controlsfx.controls;
 
 
     opens com.bib.essensbestellungsverwaltung to javafx.fxml;

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

@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?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="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="600.0" prefWidth="300.0" stylesheets="@adminMenue.css">
+         <children>
+            <HBox alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="179.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <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">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" prefHeight="35.0" prefWidth="175.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <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">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" prefHeight="23.0" prefWidth="175.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <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">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" prefHeight="0.0" prefWidth="175.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <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">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" prefHeight="26.0" prefWidth="175.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <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">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+         </children>
+      </VBox>
+      <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>
+   </children>
+</AnchorPane>

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

@@ -0,0 +1,12 @@
+#buttons:hover{
+    -fx-underline: true;
+    -fx-background-color: rgba(85, 103, 136, 0.64);
+}
+
+#buttons:pressed{
+    -fx-background-color: #748d96;
+}
+
+#optionsContainer{
+    -fx-background-color: lightblue;
+}

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

@@ -1,32 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-<?import org.controlsfx.control.*?>
+<?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?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
 
-<AnchorPane prefHeight="700.0" prefWidth="950.0" stylesheets="@child.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.ChildController">
+<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">
          <font>
             <Font size="58.0" />
          </font>
       </Text>
-      <HBox id="contentContainer" alignment="CENTER" layoutX="8.0" layoutY="165.0" prefHeight="127.0" prefWidth="937.0">
+      <HBox id="contentContainer" alignment="CENTER" layoutX="48.0" layoutY="244.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="Vorname">
+                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Name">
                      <VBox.margin>
                         <Insets bottom="15.0" top="15.0" />
                      </VBox.margin>
                   </Text>
-                  <TextField fx:id="firstName" prefWidth="97.0">
+                  <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" />
@@ -34,16 +50,44 @@
             </VBox>
             <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
                <children>
-                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Nachname">
+                  <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Alter">
                      <VBox.margin>
                         <Insets bottom="15.0" top="15.0" />
                      </VBox.margin>
                   </Text>
-                  <TextField fx:id="lastName" prefWidth="97.0">
+                  <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>
+                  <ComboBox prefHeight="26.0" prefWidth="230.0">
+                     <VBox.margin>
+                        <Insets top="13.0" />
+                     </VBox.margin>
+                  </ComboBox>
+               </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="101.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" />
@@ -51,19 +95,6 @@
             </VBox>
          </children>
       </HBox>
-      <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>
-            <CheckComboBox fx:id="allergienComboBox" prefHeight="25.0" prefWidth="200.0" />
-         </children>
-      </VBox>
-      <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" />
+      <Button id="btAddChild" layoutX="360.0" layoutY="592.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="146.0" text="Kind hinzufügen" />
    </children>
 </AnchorPane>

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

@@ -27,7 +27,7 @@
                         <Font size="16.0" />
                      </font>
                   </Label>
-                        <TextField fx:id="lastname" prefHeight="25.0" prefWidth="194.0" />
+                  <TextField id="lastname" prefHeight="25.0" prefWidth="194.0" />
                </children>
             </HBox>
             <HBox prefHeight="60.0" prefWidth="331.0">
@@ -40,7 +40,7 @@
                         <Font size="16.0" />
                      </font>
                   </Label>
-                        <TextField fx:id="firstname" prefHeight="25.0" prefWidth="193.0">
+                  <TextField id="firstname" prefHeight="25.0" prefWidth="193.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
@@ -57,7 +57,7 @@
                         <Insets top="10.0" />
                      </padding>
                   </Label>
-                        <TextField fx:id="street" prefHeight="25.0" prefWidth="195.0">
+                  <TextField id="street" prefHeight="25.0" prefWidth="195.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
@@ -74,7 +74,7 @@
                         <Insets top="10.0" />
                      </padding>
                   </Label>
-                        <TextField fx:id="number" prefHeight="25.0" prefWidth="87.0">
+                  <TextField id="number" prefHeight="25.0" prefWidth="87.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
@@ -88,7 +88,7 @@
                         <Font size="16.0" />
                      </font>
                   </Label>
-                        <TextField fx:id="plz" prefHeight="25.0" prefWidth="87.0">
+                  <TextField id="plz" prefHeight="25.0" prefWidth="87.0">
                      <HBox.margin>
                         <Insets />
                      </HBox.margin>
@@ -105,7 +105,7 @@
                         <Font size="16.0" />
                      </font>
                   </Label>
-                        <TextField fx:id="city" prefHeight="13.0" prefWidth="194.0">
+                  <TextField id="city" prefHeight="13.0" prefWidth="194.0">
                      <HBox.margin>
                         <Insets top="5.0" />
                      </HBox.margin>
@@ -125,7 +125,7 @@
                         <Insets top="10.0" />
                      </padding>
                   </Label>
-                        <TextField fx:id="email" prefHeight="25.0" prefWidth="196.0">
+                  <TextField id="email" prefHeight="25.0" prefWidth="196.0">
                      <HBox.margin>
                         <Insets top="10.0" />
                      </HBox.margin>
@@ -142,7 +142,7 @@
                         <Insets top="10.0" />
                      </padding>
                   </Label>
-                        <PasswordField fx:id="password" accessibleRole="PASSWORD_FIELD" 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>

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

@@ -4,21 +4,20 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<?import org.controlsfx.control.*?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="731.0" stylesheets="@createFood.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.CreateFoodController">
+<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="247.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="388.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>
                   <Label prefHeight="33.0" prefWidth="121.0" text="Name des Gerichts" />
-                        <TextField fx:id="name" prefHeight="25.0" prefWidth="290.0">
+                  <TextField prefHeight="25.0" prefWidth="290.0">
                      <HBox.margin>
                         <Insets top="5.0" />
                      </HBox.margin>
@@ -28,7 +27,7 @@
             <HBox prefHeight="75.0" prefWidth="459.0">
                <children>
                   <Label prefHeight="33.0" prefWidth="121.0" text="Beschreibung" />
-                        <TextArea fx:id="description" prefHeight="75.0" prefWidth="290.0" />
+                  <TextArea prefHeight="75.0" prefWidth="290.0" />
                </children>
                <padding>
                   <Insets top="5.0" />
@@ -41,15 +40,12 @@
                         <Insets top="20.0" />
                      </HBox.margin>
                   </Label>
-                        <RadioButton fx:id="isHauptgerichtRadio" mnemonicParsing="false" text="Hauptgericht">
+                  <RadioButton mnemonicParsing="false" text="Hauptgericht">
                      <HBox.margin>
                         <Insets left="35.0" top="20.0" />
                      </HBox.margin>
-                     <toggleGroup>
-                        <ToggleGroup fx:id="art" />
-                     </toggleGroup>
                   </RadioButton>
-                        <RadioButton fx:id="isDessertRadio" mnemonicParsing="false" text="Dessert" toggleGroup="$art">
+                  <RadioButton mnemonicParsing="false" text="Dessert">
                      <HBox.margin>
                         <Insets left="50.0" top="20.0" />
                      </HBox.margin>
@@ -69,20 +65,17 @@
                         <Insets top="20.0" />
                      </HBox.margin>
                   </Label>
-                        <RadioButton fx:id="isVegetarischRadio" mnemonicParsing="false" prefHeight="17.0" prefWidth="91.0" text="Vegetarisch">
+                  <RadioButton mnemonicParsing="false" prefHeight="17.0" prefWidth="91.0" text="Vegetarisch">
                      <HBox.margin>
                         <Insets left="100.0" top="20.0" />
                      </HBox.margin>
-                     <toggleGroup>
-                        <ToggleGroup fx:id="typ" />
-                     </toggleGroup>
                   </RadioButton>
-                        <RadioButton fx:id="isVeganRadio" mnemonicParsing="false" text="Vegan" toggleGroup="$typ">
+                  <RadioButton mnemonicParsing="false" text="Vegan">
                      <HBox.margin>
                         <Insets left="20.0" top="20.0" />
                      </HBox.margin>
                   </RadioButton>
-                        <RadioButton fx:id="isFleischRadio" mnemonicParsing="false" text="Fleisch" toggleGroup="$typ">
+                  <RadioButton mnemonicParsing="false" text="Fleisch">
                      <HBox.margin>
                         <Insets left="40.0" top="20.0" />
                      </HBox.margin>
@@ -91,18 +84,13 @@
             </HBox>
             <HBox prefHeight="76.0" prefWidth="459.0">
                <children>
-                        <Label prefHeight="25.0" prefWidth="171.0" text="Allergien" />
-                        <CheckComboBox fx:id="allergienComboBox" prefHeight="25.0" prefWidth="200.0" />
+                  <Label prefHeight="41.0" prefWidth="171.0" text="Allergien mit Komma getrennt" />
+                  <TextArea prefHeight="76.0" prefWidth="246.0" />
                </children>
             </HBox>
-            <Text fx:id="responseText" fill="RED" strokeType="OUTSIDE" strokeWidth="0.0" textAlignment="CENTER" wrappingWidth="459.13673400878906">
-               <VBox.margin>
-                  <Insets top="20.0" />
-               </VBox.margin>
-            </Text>
          </children>
       </VBox>
-        <Button id="btCreateFood" layoutX="484.0" layoutY="481.0" mnemonicParsing="false" onAction="#onHinzufuegen" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
-        <Button id="btCancelFood" layoutX="102.0" layoutY="473.0" mnemonicParsing="false" onAction="#onAbbrechen" 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>

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

@@ -1,20 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?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?>
 
-<HBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="700.0" prefWidth="950.0" stylesheets="@createFoodplan.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.CreateFoodplanController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="599.0" prefWidth="900.0" stylesheets="@createFoodplan.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-        <VBox alignment="CENTER" prefHeight="599.0" prefWidth="357.0" spacing="20.0">
-            <children>
-                <Label text="Essensplan erstellen">
+      <Label layoutX="359.0" layoutY="36.0" text="Essensplan erstellen">
          <font>
             <Font size="18.0" />
          </font>
       </Label>
-                <VBox prefHeight="285.0" prefWidth="358.0">
+      <VBox layoutX="134.0" layoutY="124.0" prefHeight="327.0" prefWidth="632.0">
          <children>
             <HBox prefHeight="50.0" prefWidth="632.0">
                <children>
@@ -23,7 +25,7 @@
                         <Insets top="5.0" />
                      </HBox.margin>
                   </Label>
-                                <DatePicker fx:id="date" onAction="#onDateChange" />
+                  <TextField />
                </children>
             </HBox>
             <HBox prefHeight="50.0" prefWidth="632.0">
@@ -33,7 +35,11 @@
                         <Insets top="5.0" />
                      </HBox.margin>
                   </Label>
-                                <ChoiceBox fx:id="firstMeal" prefWidth="150.0" />
+                  <TextField>
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                  </TextField>
                </children>
             </HBox>
             <HBox prefHeight="50.0" prefWidth="632.0">
@@ -43,7 +49,11 @@
                         <Insets top="5.0" />
                      </HBox.margin>
                   </Label>
-                                <ChoiceBox fx:id="secondMeal" prefWidth="150.0" />
+                  <TextField>
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                  </TextField>
                </children>
             </HBox>
             <HBox prefHeight="50.0" prefWidth="632.0">
@@ -56,7 +66,7 @@
                         <Insets top="5.0" />
                      </padding>
                   </Label>
-                                <ChoiceBox fx:id="firstDessert" prefWidth="150.0" />
+                  <TextField />
                </children>
             </HBox>
             <HBox prefHeight="50.0" prefWidth="632.0">
@@ -66,18 +76,12 @@
                         <Insets top="5.0" />
                      </padding>
                   </Label>
-                                <ChoiceBox fx:id="secondDessert" prefWidth="150.0" />
-                            </children>
-                        </HBox>
-                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-                            <children>
-                                <Button id="btCreateFoodplan" fx:id="erstellenButton" mnemonicParsing="false" onAction="#onPlanErstellen" prefHeight="68.0" prefWidth="133.0" text="Plan erstellen" />
-                                <Button id="btCancelFoodplan" mnemonicParsing="false" onAction="#onAbbrechen" prefHeight="68.0" prefWidth="133.0" text="Abbrechen" />
+                  <TextField />
                </children>
             </HBox>
          </children>
       </VBox>
+      <Button id="btCreateFoodplan" layoutX="112.0" layoutY="427.0" mnemonicParsing="false" prefHeight="68.0" prefWidth="133.0" text="Plan erstellen" />
+      <Button id="btCancelFoodplan" layoutX="299.0" layoutY="427.0" mnemonicParsing="false" prefHeight="68.0" prefWidth="133.0" text="Abbrechen" />
    </children>
-        </VBox>
-    </children>
-</HBox>
+</AnchorPane>

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

@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 
-<AnchorPane prefHeight="700.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.DailyOrderController">
-   <children>
-      <HBox alignment="CENTER" layoutX="58.0" layoutY="221.0" prefHeight="349.0" prefWidth="683.0">
-         <children>
-            <ListView fx:id="listView" prefHeight="349.0" prefWidth="300.0" />
-         </children>
-      </HBox>
-      <Text layoutX="88.0" layoutY="68.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Tagesbestellung">
-         <font>
-            <Font name="System Bold" size="25.0" />
-         </font>
-      </Text>
-      <DatePicker fx:id="datePicker" layoutX="88.0" layoutY="142.0" onAction="#onChangeDate" />
-      <Label layoutX="88.0" layoutY="121.0" text="Datum" />
-      <Button fx:id="sendButton" layoutX="374.0" layoutY="617.0" mnemonicParsing="false" onAction="#onSendButton" text="Bestellung senden" />
-   </children>
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="com.bib.essensbestellungsverwaltung.AdminController"
+            prefHeight="400.0" prefWidth="600.0">
+
 </AnchorPane>

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

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

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

@@ -1,70 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?import java.lang.*?>
-<?import javafx.collections.*?>
-<?import javafx.geometry.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
 
-<HBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="700.0" prefWidth="950.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.InvoiceController">
-   <children>
-      <VBox alignment="CENTER" prefHeight="860.0" prefWidth="500.0">
-         <children>
-            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Abrechnung erstellen">
-               <font>
-                  <Font name="System Bold" size="25.0" />
-               </font></Text>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="122.0" spacing="20.0">
-               <children>
-                  <VBox alignment="CENTER" layoutX="150.0" layoutY="10.0" prefHeight="200.0" prefWidth="100.0">
-                     <children>
-                        <Label text="Kind" />
-                        <ChoiceBox fx:id="childChoiceBox"></ChoiceBox>
-                     </children>
-                  </VBox>
-                  <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
-                     <children>
-                        <Label text="Monat" />
-                         <ChoiceBox fx:id="monatChoiceBox" value="Januar">
-                             <items>
-                                 <FXCollections fx:factory="observableArrayList">
-                                     <String fx:value="Januar" />
-                                     <String fx:value="Februar" />
-                                     <String fx:value="März" />
-                                     <String fx:value="April" />
-                                     <String fx:value="Mai" />
-                                     <String fx:value="Juni" />
-                                     <String fx:value="Juli" />
-                                     <String fx:value="August" />
-                                     <String fx:value="September" />
-                                     <String fx:value="Oktober" />
-                                     <String fx:value="November" />
-                                     <String fx:value="Dezember" />
-                                 </FXCollections>
-                             </items>
-                         </ChoiceBox>
-                     </children>
-                  </VBox>
-                  <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
-                     <children>
-                        <Label text="Jahr" />
-                         <Spinner fx:id="jahrSpinner">
-                             <valueFactory>
-                                 <SpinnerValueFactory.IntegerSpinnerValueFactory initialValue="2023" max="2100" min="2020" />
-                             </valueFactory>
-                         </Spinner>
-                     </children>
-                  </VBox>
-               </children>
-            </HBox>
-            <Button mnemonicParsing="false" onMouseClicked="#onRechnungErstellenClick" text="Rechnung erstellen" />
-            <Text fx:id="responseText" strokeType="OUTSIDE" strokeWidth="0.0">
-               <VBox.margin>
-                  <Insets top="100.0" />
-               </VBox.margin>
-            </Text>
-         </children>
-      </VBox>
-   </children>
-</HBox>
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="com.bib.essensbestellungsverwaltung.AdminController"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>

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>

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" 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">
+                                <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="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
                                     <VBox.margin>
                                         <Insets bottom="20.0" />
                                     </VBox.margin>

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

@@ -1,36 +1,10 @@
-#btFoodChoice{
-    -fx-background-color: transparent;
-
-}
-
-#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;
+.sidebar-nav_button {
+    -fx-background-color: #69b6ff;
+    -fx-text-fill: #123;
+    -fx-border-color: #000;
+    -fx-border-radius: 20;
 }
 .sidebar-nav_button.active {
     -fx-background-color: #4e92b4;
 }
+

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

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-
-
-<AnchorPane prefHeight="700.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.OrderHistoryController">
-   <children>
-      <Text layoutX="91.0" layoutY="84.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Bestellungen">
-         <font>
-            <Font name="System Bold" size="25.0" />
-         </font>
-      </Text>
-      <ListView fx:id="listView" layoutX="91.0" layoutY="135.0" prefHeight="428.0" prefWidth="499.0" />
-   </children>
-</AnchorPane>

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

@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.Font?>
-<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>
-                <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>
-                    </graphic>
-                </Button>
-                <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>
-                    </graphic>
-                </Button>
-                <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>
-                    </graphic>
-                </Button>
-                <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>
-                    </graphic>
-                </Button>
-            </children>
-        </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 right="20.0"/>
-            </padding>
-        </HBox>
-    </top>
-    <center>
-        <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"/>
-    </center>
-</BorderPane>

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

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?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 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">
+   <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 id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" 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 id="btLogOut" mnemonicParsing="false" stylesheets="@parentMenue.css" text="Abmelden" />
+         </children>
+      </HBox>
+   </children>
+</AnchorPane>

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

@@ -0,0 +1,26 @@
+#contentContainer{
+    -fx-background-color: #add8e6;
+}
+
+#contentContainer2{
+    -fx-background-color: lightblue;
+}
+
+#contentButton{
+    -fx-background-color: transparent;
+}
+
+#contentButton:hover{
+    -fx-underline: true;
+    -fx-background-color: #78939d;
+    -fx-text-fill: white;
+}
+
+#btLogOut{
+    -fx-background-color: transparent;
+    -fx-pref-height: 40px;
+}
+
+#btLogOut:hover{
+    -fx-underline: true;
+}

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

@@ -0,0 +1,14 @@
+<?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,7 +31,7 @@
         <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="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;">
+            <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;">
                <effect>
                   <Blend />
                </effect>
@@ -42,7 +42,7 @@
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </VBox.margin>
             </TextField>
-                <TextField fx:id="tfVorname" promptText="Vorname" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+            <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>
@@ -53,18 +53,21 @@
                   <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                </VBox.margin>
             </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>
+            <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>
-                </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;">
+            </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>
@@ -80,7 +83,7 @@
             </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;">
+                  <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>
@@ -88,7 +91,7 @@
                         <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;">
+                  <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>
@@ -100,7 +103,7 @@
             </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;">
+                  <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>
@@ -108,7 +111,7 @@
                         <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;">
+                  <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>

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

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-
-<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.WorkerMenuController">
-    <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>
-                <Button fx:id="tagesbestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onTagesbestellungenClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Tagesbestellung">
-                    <font>
-                        <Font size="20.0" />
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/to-do-list.png" />
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="monatsabrechnungButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onMonatsabrechnungClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Monatsabrechnung">
-                    <font>
-                        <Font size="20.0" />
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/spreadsheet.png" />
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="wochenplanButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onWochenplanClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Wochenplan">
-                    <font>
-                        <Font size="20.0" />
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/calendar.png" />
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="mahlzeitButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onMahlzeitClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Mahlzeit">
-                    <font>
-                        <Font size="20.0" />
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/lunch.png" />
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="mitarbeiterButton" alignment="CENTER_LEFT" mnemonicParsing="false" onMouseClicked="#onMitarbeiterClick" prefHeight="60.0" prefWidth="250.0" styleClass="sidebar-nav_button" text="Mitarbeiter">
-                    <font>
-                        <Font size="20.0" />
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/teamwork.png" />
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Region style="-fx-padding: 20;" VBox.vgrow="ALWAYS">
-                    <opaqueInsets>
-                        <Insets />
-                    </opaqueInsets>
-                </Region>
-                <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>
-                    </graphic>
-                </Button>
-            </children>
-            <opaqueInsets>
-                <Insets />
-            </opaqueInsets>
-        </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 right="20.0" />
-            </padding>
-        </HBox>
-    </top>
-    <center>
-        <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
-    </center>
-</BorderPane>