diff --git a/src/Client/src/main/java/greenify/client/Friend.java b/src/Client/src/main/java/greenify/client/Friend.java index d0e65e5..b0282f3 100644 --- a/src/Client/src/main/java/greenify/client/Friend.java +++ b/src/Client/src/main/java/greenify/client/Friend.java @@ -1,7 +1,6 @@ package greenify.client; import javafx.beans.property.SimpleDoubleProperty; -import javafx.beans.property.SimpleFloatProperty; import javafx.beans.property.SimpleStringProperty; public class Friend { diff --git a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java index 39c92fb..3323d86 100644 --- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java +++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java @@ -39,6 +39,9 @@ public class CalculatorController { @Autowired DashBoardController controller; + @Autowired + ExtraActivityController extraActivityController; + //navigation panes @FXML private AnchorPane getStartedPane; @@ -395,11 +398,12 @@ public class CalculatorController { "input_footprint_shopping_services_total", servicesLabel.getText().replace("€ / month", "")); } + extraActivityController.updateExtras(); Float footprint = userService.saveFootprint(userService.currentUser.getName()); Window owner = saveButton.getScene().getWindow(); - Stage current = (Stage) owner; controller.updateLeaderboard(); controller.updateAchievements(); + Stage current = (Stage) owner; UserController.AlertHelper.showAlert(Alert.AlertType.CONFIRMATION, owner, "Footprint saved!", "Your footprint is saved!"); current.close();