From 54d0537f95cfd7ec3fbf7b5872afc325318ae6c1 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Wed, 3 Apr 2019 11:52:03 +0200 Subject: [PATCH] EDIT::changed miles to kilometres in calculator --- .../controller/CalculatorController.java | 16 +++++++++++---- .../src/main/resources/fxml/calculator.fxml | 16 +++++++-------- .../main/resources/fxml/extraActivities.fxml | 20 +++++++++++++++++++ 3 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 src/Client/src/main/resources/fxml/extraActivities.fxml 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 164df99..5098636 100644 --- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java +++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java @@ -9,7 +9,9 @@ import javafx.beans.value.ChangeListener; import javafx.beans.value.ObservableValue; import javafx.event.ActionEvent; import javafx.fxml.FXML; +import javafx.fxml.FXMLLoader; import javafx.scene.Node; +import javafx.scene.Parent; import javafx.scene.control.Button; import javafx.scene.control.CheckBox; import javafx.scene.control.Label; @@ -24,6 +26,7 @@ import javafx.util.Duration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import java.io.IOException; import java.text.DecimalFormat; @Controller @@ -153,6 +156,7 @@ public class CalculatorController { * it sets the sliders to snap to the ticks. * it adds listeners to all the sliders for updating the label they are associated with. */ + @SuppressWarnings("Duplicates") public void initialize() { peopleInHouseholdSlider.setSnapToTicks(true); //add listener to slider for amount of people in household @@ -173,9 +177,9 @@ public class CalculatorController { } }); - addSliderListenerCarUsage(carTravelGasolineSlider, carTravelGasolineLabel, " mpg"); - addSliderListenerCarUsage(carTravelDieselSlider, carTravelDieselLabel, " mpg"); - addSliderListenerCarUsage(carTravelElectricSlider, carTravelElectricLabel, " mpge"); + addSliderListenerCarUsage(carTravelGasolineSlider, carTravelGasolineLabel, " km/L"); + addSliderListenerCarUsage(carTravelDieselSlider, carTravelDieselLabel, " km/L"); + addSliderListenerCarUsage(carTravelElectricSlider, carTravelElectricLabel, " km/Le"); cleanEnergyPurchasedSlider.valueProperty().addListener(new ChangeListener() { @Override @@ -218,6 +222,7 @@ public class CalculatorController { }); } + @SuppressWarnings("Duplicates") private void addSliderListenerDailyServing(Slider slider, Label label) { DecimalFormat df = new DecimalFormat("0.0"); slider.valueProperty().addListener(new ChangeListener() { @@ -331,7 +336,10 @@ public class CalculatorController { * @param event the click of the designated button */ @SuppressWarnings("Duplicates") - public void displayExtra(ActionEvent event) { + public void displayExtra(ActionEvent event) throws IOException { + + // Parent extra = FXMLLoader.load(getClass().getClassLoader().getResource("fxml/extraActivities.fxml")); + // extraPane.getChildren().setAll(extra); getStartedPane.setVisible(false); travelPane.setVisible(false); homePane.setVisible(false); diff --git a/src/Client/src/main/resources/fxml/calculator.fxml b/src/Client/src/main/resources/fxml/calculator.fxml index 9a341a6..46f86a4 100644 --- a/src/Client/src/main/resources/fxml/calculator.fxml +++ b/src/Client/src/main/resources/fxml/calculator.fxml @@ -178,7 +178,7 @@ - + @@ -188,7 +188,7 @@ - -