Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch
This commit is contained in:
commit
646d63c6c0
4
.idea/misc_.xml
generated
Normal file
4
.idea/misc_.xml
generated
Normal 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
generated
Normal file
6
.idea/vcs_.xml
generated
Normal 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>
|
@ -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();
|
||||||
|
@ -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) {
|
||||||
|
Loading…
Reference in New Issue
Block a user