From b05b0ecaf7643035ed4f0221292d5bd33020bff3 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sun, 7 Apr 2019 17:55:57 +0200 Subject: [PATCH] DELETE::deleted the confirm methods for the extra activities this should fix the build failing --- .../controller/ExtraActivityController.java | 52 ++----------------- .../main/resources/fxml/extraActivities.fxml | 14 +++-- 2 files changed, 14 insertions(+), 52 deletions(-) diff --git a/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java b/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java index 3e7829a..283f7d2 100644 --- a/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java +++ b/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java @@ -83,6 +83,8 @@ public class ExtraActivityController { private Label publicTransportLabel; @FXML private Slider publicTransportSlider; + @FXML + private Button saveButton; /** @@ -214,56 +216,10 @@ public class ExtraActivityController { publicTransportPane.setVisible(true); } - public void confirmVeganMeal(ActionEvent event) { - System.out.println("confirm adding vegetarian meal"); - } + /** - * Adds the activity of buying local produce to the user's account. - * @param event the click of the 'add activity' button in the designated section - */ - public void confirmLocalProduce(ActionEvent event) { - System.out.println("confirm adding buying local produce"); - userService.updateExtraInput(userService.currentUser.getName(), - "local_produce", true); - } - - /** - * adds the activity of using your bike instead of your car to the user's account. - * @param event the click of the 'add activity' button in the designated section - */ - public void confirmBike(ActionEvent event) { - System.out.println("confirm adding using bike instead of car"); - userService.updateExtraInput(userService.currentUser.getName(), - "bike", true); - } - - public void confirmPublicTransport(ActionEvent event) { - System.out.println("confirm adding using public transport instead of car"); - } - - /** - * Adds the activity of lowering the home temperature to the user's account. - * @param event the click of the 'add activity' button in the designated section - */ - public void confirmTemperature(ActionEvent event) { - System.out.println("confirm adding lowering home temperature"); - userService.updateExtraInput(userService.currentUser.getName(), - "temperature", true); - } - - /** - * Adds the activity of buying solar panels to the user's account. - * @param event the click of the 'add activity' button in the designated section - */ - public void confirmSolarPanels(ActionEvent event) { - System.out.println("confirm adding buying solar panels"); - userService.updateExtraInput(userService.currentUser.getName(), - "solar_panels", true); - } - - /** - * The method updates the values + * The method updates the values. */ @SuppressWarnings("Duplicates") public void save(ActionEvent event) throws InterruptedException { diff --git a/src/Client/src/main/resources/fxml/extraActivities.fxml b/src/Client/src/main/resources/fxml/extraActivities.fxml index 2b57bef..657395e 100644 --- a/src/Client/src/main/resources/fxml/extraActivities.fxml +++ b/src/Client/src/main/resources/fxml/extraActivities.fxml @@ -1,5 +1,11 @@ + + + + + + @@ -11,7 +17,7 @@ - + @@ -189,7 +195,7 @@ -