From a704522a631332327e627984d7d641e88701545f Mon Sep 17 00:00:00 2001 From: Mika Wauben Date: Tue, 9 Apr 2019 13:37:28 +0000 Subject: [PATCH] UPDATE:: activities pane (added all extra activities) --- .../controller/DashBoardController.java | 10 +++- .../src/main/resources/fxml/dashboard.fxml | 54 +++++++++++-------- 2 files changed, 41 insertions(+), 23 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 3707b24..5e9072b 100644 --- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java +++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java @@ -185,14 +185,18 @@ public class DashBoardController { @FXML private Label hintText; @FXML - private Label solarPanels; + private Label veganMeal; @FXML private Label localProduce; @FXML private Label bike; @FXML + private Label publicTrans; + @FXML private Label loweringTemp; @FXML + private Label solarPanels; + @FXML private Button achiev1Tip; @FXML private Button achiev2Tip; @@ -417,10 +421,12 @@ public class DashBoardController { snacks.setText(inputMap.get("input_footprint_shopping_food_otherfood")); Map extraMap = userService .getExtraInputs(userService.currentUser.getName()); + veganMeal.setText(extraMap.get("vegan")); localProduce.setText(extraMap.get("local_produce")); bike.setText(extraMap.get("bike")); - solarPanels.setText(extraMap.get("solar_panels")); + publicTrans.setText(extraMap.get("public_transport")); loweringTemp.setText(extraMap.get("temperature")); + solarPanels.setText(extraMap.get("solar_panels")); } /** diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml index 7ed3631..aedd381 100644 --- a/src/Client/src/main/resources/fxml/dashboard.fxml +++ b/src/Client/src/main/resources/fxml/dashboard.fxml @@ -241,71 +241,83 @@ - + - -