Homeoffice/Essensbestellungsverwaltung
5
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't merge Richards_Branch #6

Closed
PBS2H21ASH wants to merge 7 commits from Richards_Branch into main
pull from: Richards_Branch
merge into: Homeoffice:main
Conversation 0 Commits 7 Files Changed 6 +1 -2
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c387cda0d - Show all commits

1
src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
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();

2
src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
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) {