From 3c5bc0a651dd67e70c91fb8938fe8f0081c9dbf1 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sun, 17 Mar 2019 22:14:27 +0100 Subject: [PATCH] FIX::fixed the fxml Label names there were exceptions when trying to add a vegetarian meal, this was caused by the method not accessing the right label to change --- .../controller/DashBoardController.java | 4 +- .../src/main/resources/fxml/dashboard.fxml | 245 +++++++++++------- 2 files changed, 159 insertions(+), 90 deletions(-) diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java index 77cbfc6..af82ca0 100644 --- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java +++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java @@ -38,6 +38,8 @@ public class DashBoardController { private Label counter; @FXML private Label scoreField; + @FXML + private Label veganMealCounter; /** * displays the dashboard pane. @@ -78,7 +80,7 @@ public class DashBoardController { */ public void addVeganMeal(ActionEvent event) { count++; - counter.setText("Count: " + count); + veganMealCounter.setText("Count: " + count); System.out.println(userService); userService.addVeganMeal(userService.currentUser.getId(), userService.currentUser.getName()); diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml index 1627774..ce4cc9e 100644 --- a/src/Client/src/main/resources/fxml/dashboard.fxml +++ b/src/Client/src/main/resources/fxml/dashboard.fxml @@ -1,99 +1,166 @@ + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +