diff --git a/src/main/java/com/example/vpr_javafx/Data.java b/src/main/java/com/example/vpr_javafx/Data.java index 88cfd5c..f9319f9 100644 --- a/src/main/java/com/example/vpr_javafx/Data.java +++ b/src/main/java/com/example/vpr_javafx/Data.java @@ -262,7 +262,7 @@ public class Data { * The method validates the user input * * @return boolean inputValid - * @author Kevin Maier + * @author Kevin Maier, Kevin Pfannenstiel */ public boolean validateData(TextField tfPhone, PasswordField pfPassword) { diff --git a/src/main/java/com/example/vpr_javafx/HelloController.java b/src/main/java/com/example/vpr_javafx/HelloController.java index 3b83fce..ff06b9d 100644 --- a/src/main/java/com/example/vpr_javafx/HelloController.java +++ b/src/main/java/com/example/vpr_javafx/HelloController.java @@ -138,7 +138,7 @@ public class HelloController { imageUrl=veganUrl; } - Image image = new Image("C:/Unterricht/VPR_Projekt/target/classes/com/example/vpr_javafx/" + imageUrl); + Image image = new Image("C:/VPR_Projekt_Java/target/classes/com/example/vpr_javafx/" + imageUrl); switch (i) { case 0: diff --git a/src/main/java/com/example/vpr_javafx/Menu.java b/src/main/java/com/example/vpr_javafx/Menu.java index 47296bd..d4e58d9 100644 --- a/src/main/java/com/example/vpr_javafx/Menu.java +++ b/src/main/java/com/example/vpr_javafx/Menu.java @@ -71,6 +71,7 @@ public class Menu { /** * The method toString() returns fomated dishdata + * * @return a String with dish, sideDish, list of ingredients and the typ of the menu * @author Madeleine Vigier */ @@ -81,3 +82,4 @@ public class Menu { + type + '\n' + ingredients; } +} diff --git a/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml b/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml index 9b6e622..29f3851 100644 --- a/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml +++ b/src/main/resources/com/example/vpr_javafx/MenuOverview-view.fxml @@ -1,18 +1,13 @@ - - - - - - - - - - - + + + + + + - + diff --git a/target/classes/com/example/vpr_javafx/HelloController.class b/target/classes/com/example/vpr_javafx/HelloController.class index bde1386..bb2cb28 100644 Binary files a/target/classes/com/example/vpr_javafx/HelloController.class and b/target/classes/com/example/vpr_javafx/HelloController.class differ diff --git a/target/classes/com/example/vpr_javafx/Menu.class b/target/classes/com/example/vpr_javafx/Menu.class index 1316271..e1c7843 100644 Binary files a/target/classes/com/example/vpr_javafx/Menu.class and b/target/classes/com/example/vpr_javafx/Menu.class differ diff --git a/target/classes/com/example/vpr_javafx/MenuOverview-view.fxml b/target/classes/com/example/vpr_javafx/MenuOverview-view.fxml index 6a5cd21..29f3851 100644 --- a/target/classes/com/example/vpr_javafx/MenuOverview-view.fxml +++ b/target/classes/com/example/vpr_javafx/MenuOverview-view.fxml @@ -8,7 +8,7 @@ -