diff --git a/.idea/misc_.xml b/.idea/misc_.xml
new file mode 100644
index 0000000..0e04cb5
--- /dev/null
+++ b/.idea/misc_.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs_.xml b/.idea/vcs_.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs_.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java b/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
index 6cc85e1..0a8ab36 100644
--- a/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
+++ b/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();
diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java b/src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
index eb818d9..6ce335c 100644
--- a/src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
@@ -5,7 +5,6 @@ import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.*;
-import javafx.scene.input.MouseEvent;
public class MenueController {
@@ -80,177 +79,22 @@ public class MenueController {
public ObservableList buttons = FXCollections.observableArrayList();
- public void setButtonActive(){
- }
+ public void setButtonActive(ActionEvent event) {
+ Button b = (Button) event.getSource();
- public ObservableList 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());
+ /*
+ b.getStyleClass().remove("active");
if (button.equals(b)){
b.getStyleClass().add("active");;
}
+ */
}
}
-
- @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);
- }
- */
}
diff --git a/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java b/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
index ffc7b5a..9ff8693 100644
--- a/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
+++ b/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) {
diff --git a/src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml b/src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml
index 7e273bd..7b70ae0 100644
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml
@@ -32,9 +32,9 @@
-
-
-