Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch

.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>

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

@@ -27,6 +27,7 @@ public class LoginController {
         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");
             alert.showAndWait();

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

@@ -7,6 +7,8 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.input.MouseEvent;
 
+import java.util.HashMap;
+
 public class MenueController {
 
     @FXML
@@ -80,19 +82,13 @@ public class MenueController {
 
     public ObservableList<Node> buttons = FXCollections.observableArrayList();
 
-    public void setButtonActive(){
 
-    }
+    public void setButtonActive(ActionEvent event) {
+        Button b = (Button) event.getSource();
 
-    public ObservableList<Node> getSiblings(Button b) {
         javafx.scene.Parent p = b.getParent();
         buttons = p.getChildrenUnmodifiable();
-        return buttons;
-    }
 
-
-    public void setButtonActive(Button b) {
-        getSiblings(b);
         for(Node button : buttons){
             b.getStyleClass().remove("active");
             System.out.println(b.getStyleClass());
@@ -102,155 +98,4 @@ public class MenueController {
             }
         }
     }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtSecondMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btSecondMealMon);
-    }
-
-    @FXML
-    public void onBtNoMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btNoMealMon);
-    }
-
-    @FXML
-    public void onBtFirstDessertMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstDessertMon);
-    }
-
-    @FXML
-    public void onBtSecondDessertMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btSecondDessertMon);
-    }
-
-    @FXML
-    public void onBtNoDessertMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btNoDessertMon);
-    }
-
-    @FXML
-    public void onBtFirstMealTueClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealTue);
-    }
-
-    @FXML
-    public void onBtSecondMealTueClick(MouseEvent mouseEvent) {
-        setButtonActive(btSecondMealTue);
-    }
-
-    @FXML
-    public void onBtNoMealTueClick(MouseEvent mouseEvent) {
-        setButtonActive(btNoMealTue);
-    }
-
-    @FXML
-    public void onBtFirstDessertTueClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstDessertTue);
-    }
-
-    @FXML
-    public void onBtSecondDessertTueClick(MouseEvent mouseEvent) {
-        setButtonActive(btSecondDessertTue);
-    }
-
-    @FXML
-    public void onBtNoDessertTueClick(MouseEvent mouseEvent) {
-        setButtonActive(btNoDessertTue);
-    }
-
-    @FXML
-    public void onBtFirstMealWedClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealWed);
-    }
-
-    @FXML
-    public void onBtSecondMealWedClick(MouseEvent mouseEvent) {
-        setButtonActive(btSecondMealWed);
-    }
-    /*
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-
-    @FXML
-    public void onBtFirstMealMonClick(MouseEvent mouseEvent) {
-        setButtonActive(btFirstMealMon);
-    }
-     */
 }

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

@@ -24,8 +24,6 @@ public class StartViewApplication extends Application {
         stage.setTitle("Essen Bestellung im Kindergarten");
         stage.setScene(scene);
         stage.show();
-
-
     }
 
     public static void main(String[] args) {