From 61a99d47d1b723e1fcbfe3d3ce54712e4409ffbb Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sat, 6 Apr 2019 20:20:01 +0200 Subject: [PATCH 1/2] ADD::added local produce and public transport sections to the extra activities section added the panes and designated buttons ADD::added placeholder methods for communicating adding the activities to the server --- .../controller/ExtraActivityController.java | 112 +++++++++++++++++- .../main/resources/fxml/extraActivities.fxml | 111 ++++++++++++++--- .../src/main/resources/icons/localProduce.png | Bin 0 -> 6632 bytes .../main/resources/icons/publicTransport.png | Bin 0 -> 9338 bytes 4 files changed, 202 insertions(+), 21 deletions(-) create mode 100644 src/Client/src/main/resources/icons/localProduce.png create mode 100644 src/Client/src/main/resources/icons/publicTransport.png 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 63d1d03..edf723d 100644 --- a/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java +++ b/src/Client/src/main/java/greenify/client/controller/ExtraActivityController.java @@ -31,6 +31,10 @@ public class ExtraActivityController { @FXML private AnchorPane solarPanelPane; @FXML + private AnchorPane localProducePane; + @FXML + private AnchorPane publicTransportPane; + @FXML private Button displayVeganMealButton; @FXML private Button displayBikeButton; @@ -38,6 +42,10 @@ public class ExtraActivityController { private Button displayTemperatureButton; @FXML private Button displaySolarPanelButton; + @FXML + private Button displayLocalProduceButton; + @FXML + private Button displayPublicTransportButton; @FXML private Button addVeganMealButton; @@ -48,6 +56,10 @@ public class ExtraActivityController { @FXML private Button addSolarPanelsButton; @FXML + private Button addLocalProduceButton; + @FXML + private Button addPublicTransportButton; + @FXML private Slider bikeSlider; @FXML private Label bikeLabel; @@ -59,6 +71,11 @@ public class ExtraActivityController { private Slider solarPanelsSlider; @FXML private Label solarPanelsLabel; + @FXML + private Label publicTransportLabel; + @FXML + private Slider publicTransportSlider; + /** * initializes the sliders and labels before loading. @@ -68,16 +85,21 @@ public class ExtraActivityController { coupleSliderToLabel(bikeSlider, bikeLabel, " km", false); coupleSliderToLabel(temperatureSlider, temperatureLabel, " Degrees", true); coupleSliderToLabel(solarPanelsSlider, solarPanelsLabel, "", true); + coupleSliderToLabel(publicTransportSlider, publicTransportLabel, " km", false); addVeganMealButton.setSkin(new ActivityButtonSkin(addVeganMealButton)); addBikeButton.setSkin(new ActivityButtonSkin(addBikeButton)); addTemperatureButton.setSkin(new ActivityButtonSkin(addTemperatureButton)); addSolarPanelsButton.setSkin(new ActivityButtonSkin(addSolarPanelsButton)); + addLocalProduceButton.setSkin(new ActivityButtonSkin(addLocalProduceButton)); + addPublicTransportButton.setSkin(new ActivityButtonSkin(addPublicTransportButton)); displayVeganMealButton.setSkin(new TranslateButtonSkin(displayVeganMealButton)); displayBikeButton.setSkin(new TranslateButtonSkin(displayBikeButton)); displayTemperatureButton.setSkin(new TranslateButtonSkin(displayTemperatureButton)); displaySolarPanelButton.setSkin(new TranslateButtonSkin(displaySolarPanelButton)); + displayLocalProduceButton.setSkin(new TranslateButtonSkin(displayLocalProduceButton)); + displayPublicTransportButton.setSkin(new TranslateButtonSkin(displayPublicTransportButton)); } @@ -90,7 +112,7 @@ public class ExtraActivityController { * @param string the string to be placed after the outputted value of the slider * @param snapToTicks whether the slider should snap to ticks or not */ - public void coupleSliderToLabel(Slider slider, Label label, String string, + private void coupleSliderToLabel(Slider slider, Label label, String string, boolean snapToTicks) { slider.setSnapToTicks(snapToTicks); slider.valueProperty().addListener(new ChangeListener() { @@ -112,6 +134,8 @@ public class ExtraActivityController { bikePane.setVisible(false); temperaturePane.setVisible(false); solarPanelPane.setVisible(false); + localProducePane.setVisible(false); + publicTransportPane.setVisible(false); } /** @@ -124,6 +148,8 @@ public class ExtraActivityController { bikePane.setVisible(true); temperaturePane.setVisible(false); solarPanelPane.setVisible(false); + localProducePane.setVisible(false); + publicTransportPane.setVisible(false); } /** @@ -136,6 +162,8 @@ public class ExtraActivityController { bikePane.setVisible(false); temperaturePane.setVisible(true); solarPanelPane.setVisible(false); + localProducePane.setVisible(false); + publicTransportPane.setVisible(false); } /** @@ -148,14 +176,90 @@ public class ExtraActivityController { bikePane.setVisible(false); temperaturePane.setVisible(false); solarPanelPane.setVisible(true); + localProducePane.setVisible(false); + publicTransportPane.setVisible(false); } - public class TranslateButtonSkin extends ButtonSkin { + /** + * displays the local produce section. + * @param event the click of the designated button + */ + public void displayLocalProduce(ActionEvent event) { + veganMealPane.setVisible(false); + bikePane.setVisible(false); + temperaturePane.setVisible(false); + solarPanelPane.setVisible(false); + localProducePane.setVisible(true); + publicTransportPane.setVisible(false); + } + + /** + * displays the public transport section. + * @param event the click of the designated button + */ + public void displayPublicTransport(ActionEvent event) { + veganMealPane.setVisible(false); + bikePane.setVisible(false); + temperaturePane.setVisible(false); + solarPanelPane.setVisible(false); + localProducePane.setVisible(false); + 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); + } + + private class TranslateButtonSkin extends ButtonSkin { /** * button skin that sets a translate animation on entering and exiting the button. * @param button the button to set the animation for */ - public TranslateButtonSkin(Button button) { + private TranslateButtonSkin(Button button) { super(button); TranslateTransition transEnter = new TranslateTransition(Duration.millis(50)); @@ -175,7 +279,7 @@ public class ExtraActivityController { private class ActivityButtonSkin extends ButtonSkin { /** * button skin for the 'add activity' buttons. - * adds scale animations on entering, clicking and extiting the button + * adds scale animations on entering, clicking and exiting the button * @param button the button to set the skin of */ private ActivityButtonSkin(Button button) { diff --git a/src/Client/src/main/resources/fxml/extraActivities.fxml b/src/Client/src/main/resources/fxml/extraActivities.fxml index d1ab289..12deb58 100644 --- a/src/Client/src/main/resources/fxml/extraActivities.fxml +++ b/src/Client/src/main/resources/fxml/extraActivities.fxml @@ -14,7 +14,7 @@ - + - - + + - + @@ -59,7 +77,7 @@ - - + @@ -170,7 +188,7 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Client/src/main/resources/icons/localProduce.png b/src/Client/src/main/resources/icons/localProduce.png new file mode 100644 index 0000000000000000000000000000000000000000..9383430edfd26512e806b2b5d0a01d9f93544cac GIT binary patch literal 6632 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 mh{noRvjJ;b)dFgL!1DzYL8ftdXRrML0000 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 literal 0 HcmV?d00001 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 2/2] 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 @@ -