don't merge Richards_Branch #6

Closed
PBS2H21ASH wants to merge 7 commits from Richards_Branch into main
6 changed files with 19 additions and 166 deletions

4
.idea/misc_.xml Normal file
View File

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

6
.idea/vcs_.xml Normal file
View File

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

View File

@ -27,6 +27,7 @@ public class LoginController {
if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){ if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
// if user is worker: StartViewApplication.changeScene("workerMenu-view.fxml"); // if user is worker: StartViewApplication.changeScene("workerMenu-view.fxml");
StartViewApplication.changeScene("parentMenu-view.fxml"); StartViewApplication.changeScene("parentMenu-view.fxml");
}else { }else {
Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch"); Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");
alert.showAndWait(); alert.showAndWait();

View File

@ -5,7 +5,6 @@ import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.input.MouseEvent;
public class MenueController { public class MenueController {
@ -80,177 +79,22 @@ public class MenueController {
public ObservableList<Node> buttons = FXCollections.observableArrayList(); 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(); javafx.scene.Parent p = b.getParent();
buttons = p.getChildrenUnmodifiable(); buttons = p.getChildrenUnmodifiable();
return buttons;
}
public void setButtonActive(Button b) {
getSiblings(b);
for(Node button : buttons){ for(Node button : buttons){
b.getStyleClass().remove("active");
System.out.println(b.getStyleClass()); System.out.println(b.getStyleClass());
/*
b.getStyleClass().remove("active");
if (button.equals(b)){ if (button.equals(b)){
b.getStyleClass().add("active");; 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);
}
*/ */
}
}
} }

View File

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

View File

@ -32,9 +32,9 @@
</Label> </Label>
<VBox prefHeight="200.0" prefWidth="100.0"> <VBox prefHeight="200.0" prefWidth="100.0">
<children> <children>
<Button id="btFoodChoice" fx:id="btFirstMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#onBtFirstMealMonClick" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" /> <Button id="btFoodChoice" fx:id="btFirstMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
<Button id="btFoodChoice" fx:id="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#onBtSecondMealMonClick" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" /> <Button id="btFoodChoice" fx:id="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
<Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#onBtNoMealMonClick" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit"> <Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
<VBox.margin> <VBox.margin>
<Insets bottom="20.0" /> <Insets bottom="20.0" />
</VBox.margin> </VBox.margin>