Compare commits

..

No commits in common. "c7d0514c4389c58c201570b277519b4653011503" and "27710e92afb227cfb0e5662d3ebef53d022dbe48" have entirely different histories.

2 changed files with 13 additions and 4 deletions

View File

@ -18,7 +18,7 @@ public class HelloApplication extends Application {
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("login-view.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("login-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 950,480); Scene scene = new Scene(fxmlLoader.load(), 950,480);
primary = stage; //stage = primary;
stage.setTitle("Essen Bestellung im Kindergarten"); stage.setTitle("Essen Bestellung im Kindergarten");
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();

View File

@ -1,4 +1,4 @@
/*Reshad Meher*/ /*Richard Reiswich*/
package com.bib.essensbestellungsverwaltung; package com.bib.essensbestellungsverwaltung;
import javafx.beans.NamedArg; import javafx.beans.NamedArg;
@ -17,6 +17,7 @@ import java.util.HashMap;
public class LoginController { public class LoginController {
@FXML @FXML
private TextField tfEmail; private TextField tfEmail;
@FXML @FXML
private PasswordField pfPassword; private PasswordField pfPassword;
@ -29,11 +30,15 @@ public class LoginController {
if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){ if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("menue-view.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("menue-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 950,480); Scene scene = new Scene(fxmlLoader.load(), 950,480);
HelloApplication.primary.setScene(scene); Stage stage = new Stage();
stage.setTitle("Essen Bestellung im Kindergarten");
stage.setScene(scene);
stage.show();
}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();
} }
tfEmail.setText(""); tfEmail.setText("");
pfPassword.setText(""); pfPassword.setText("");
} }
@ -41,6 +46,10 @@ public class LoginController {
protected void changeToSignUp() throws IOException { protected void changeToSignUp() throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("signUp-view.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("signUp-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 950,480); Scene scene = new Scene(fxmlLoader.load(), 950,480);
HelloApplication.primary.setScene(scene); Stage stage = new Stage();
stage.setTitle("Essen Bestellung im Kindergarten");
stage.setScene(scene);
stage.show();
} }
} }