From a41b697510cac764c8b0d0daa3ce774e1dd9ee96 Mon Sep 17 00:00:00 2001 From: cugurlu Date: Sun, 31 Mar 2019 00:45:50 +0100 Subject: [PATCH] Fix calculator bugs --- .../src/main/java/greenify/client/Friend.java | 10 ++-- .../controller/CalculatorController.java | 52 +++++++++------- .../src/main/resources/fxml/calculator.fxml | 60 ++++++++----------- 3 files changed, 62 insertions(+), 60 deletions(-) diff --git a/src/Client/src/main/java/greenify/client/Friend.java b/src/Client/src/main/java/greenify/client/Friend.java index 87ec3cd..64d38bc 100644 --- a/src/Client/src/main/java/greenify/client/Friend.java +++ b/src/Client/src/main/java/greenify/client/Friend.java @@ -6,11 +6,11 @@ import javafx.beans.property.SimpleStringProperty; public class Friend { private SimpleStringProperty friend; - private SimpleFloatProperty friendScore; + private SimpleFloatProperty score; public Friend(String friend, Float friendScore) { this.friend = new SimpleStringProperty(friend); - this.friendScore = new SimpleFloatProperty(friendScore); + this.score = new SimpleFloatProperty(friendScore); } @@ -22,11 +22,11 @@ public class Friend { this.friend = new SimpleStringProperty(name); } - public Float getFriendScore() { - return friendScore.get(); + public Float getScore() { + return score.get(); } public void setScore(Float score) { - this.friendScore = new SimpleFloatProperty(score); + this.score = new SimpleFloatProperty(score); } } \ No newline at end of file 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 241d1c0..b7105c3 100644 --- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java +++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java @@ -16,6 +16,7 @@ import javafx.scene.control.ScrollPane; import javafx.scene.control.Slider; import javafx.scene.control.TextField; import javafx.scene.layout.AnchorPane; +import javafx.scene.text.Text; import javafx.stage.Stage; import javafx.stage.Window; import javafx.util.Duration; @@ -29,6 +30,9 @@ public class CalculatorController { @Autowired UserService userService; + @Autowired + DashBoardController controller; + //navigation panes @FXML private AnchorPane getStartedPane; @@ -119,6 +123,10 @@ public class CalculatorController { //shopping pane @FXML + private Text goodsField; + @FXML + private Text servicesField; + @FXML private Slider goodsSlider; @FXML private Label goodsLabel; @@ -303,8 +311,7 @@ public class CalculatorController { * The method saves the calculation. * @param event user clicks to button */ - public void saveCalc(ActionEvent event) { - Window owner = saveButton.getScene().getWindow(); + public void saveCalc(ActionEvent event) throws InterruptedException { getStartedPane.setVisible(false); travelPane.setVisible(false); homePane.setVisible(false); @@ -336,7 +343,7 @@ public class CalculatorController { if (!carTravelGasolineLabel.getText().replace(" km/L", "").equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_mpg1", - carTravelGasolineLabel.getText()); + carTravelGasolineLabel.getText().replace(" km/L", "")); } if (!carTravelDieselField.getText().equals("0")) { userService.updateInput(userService.currentUser.getName(), @@ -346,36 +353,36 @@ public class CalculatorController { if (!carTravelDieselLabel.getText().replace(" km/L", "").equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_mpg2", - carTravelDieselLabel.getText()); + carTravelDieselLabel.getText().replace(" km/L", "")); } if (!carTravelElectricField.getText().equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_miles3", - peopleInHouseHoldLabel.getText()); + carTravelElectricField.getText()); } if (!carTravelElectricLabel.getText().replace(" km/Le", "").equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_mpg3", - carTravelElectricLabel.getText()); + carTravelElectricLabel.getText().replace(" km/Le", "")); } if (!electricityField.getText().equals("0")) { userService.updateInput(userService.currentUser.getName(), - "input_footprint_electricity_dollars", + "input_footprint_housing_electricity_dollars", electricityField.getText()); } if (!cleanEnergyPurchasedLabel.getText().replace(" %", "").equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_housing_gco2_per_kwh", - cleanEnergyPurchasedLabel.getText()); + cleanEnergyPurchasedLabel.getText().replace(" %", "")); } if (!naturalGasField.getText().equals("0")) { userService.updateInput(userService.currentUser.getName(), - "input_footprint_naturalgas_dollars", + "input_footprint_housing_naturalgas_dollars", naturalGasField.getText()); } if (!heatingOilField.getText().equals("0")) { userService.updateInput(userService.currentUser.getName(), - "input_footprint_heatingoil_dollars", + "input_footprint_housing_heatingoil_dollars", heatingOilField.getText()); } if (!livingSpaceField.getText().equals("0")) { @@ -386,44 +393,49 @@ public class CalculatorController { if (!waterUsageLabel.getText().replace("% of similar households", "").equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_housing_watersewage", - waterUsageLabel.getText()); + waterUsageLabel.getText().replace("% of similar households", "")); } if (!meatFishEggsLabel.getText().replace(" daily servings per person", "").equals("2.6")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_shopping_food_meatfisheggs", - meatFishEggsLabel.getText()); + meatFishEggsLabel.getText().replace(" daily servings per person", "")); } - if (!grainsBakedGoodsLabel.getText().replace(" daily servings per person", "").equals("4.4")) { + if (!grainsBakedGoodsLabel.getText() + .replace(" daily servings per person", "").equals("4.4")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_shopping_food_cereals", - grainsBakedGoodsLabel.getText()); + grainsBakedGoodsLabel.getText().replace(" daily servings per person", "")); } if (!dairyLabel.getText().replace(" daily servings per person", "").equals("2.4")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_shopping_food_dairy", - dairyLabel.getText()); + dairyLabel.getText().replace(" daily servings per person", "")); } - if (!fruitsVegetablesLabel.getText().replace(" daily servings per person", "").equals("3.9")) { + if (!fruitsVegetablesLabel.getText() + .replace(" daily servings per person", "").equals("3.9")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_shopping_food_fruitvegetables", - fruitsVegetablesLabel.getText()); + fruitsVegetablesLabel.getText().replace(" daily servings per person", "")); } if (!snacksDrinksLabel.getText().replace(" daily servings per person", "").equals("3.7")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_shopping_food_otherfood", - snacksDrinksLabel.getText()); + snacksDrinksLabel.getText().replace(" daily servings per person", "")); } if (!goodsLabel.getText().replace(" € / month", "").equals("1520")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_shopping_goods_total", - snacksDrinksLabel.getText()); + goodsLabel.getText().replace("€ / month", "")); } if (!servicesLabel.getText().replace(" € / month", "").equals("3428")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_shopping_services_total", - snacksDrinksLabel.getText()); + servicesLabel.getText().replace("€ / month", "")); } + Float footprint = userService.saveFootprint(userService.currentUser.getName()); + Window owner = saveButton.getScene().getWindow(); Stage current = (Stage) owner; current.close(); + controller.updateLeaderboard(); } } \ No newline at end of file diff --git a/src/Client/src/main/resources/fxml/calculator.fxml b/src/Client/src/main/resources/fxml/calculator.fxml index 412d1fc..8543d3f 100644 --- a/src/Client/src/main/resources/fxml/calculator.fxml +++ b/src/Client/src/main/resources/fxml/calculator.fxml @@ -1,12 +1,5 @@ - - - - - - - @@ -50,9 +43,9 @@ + from https://www.flaticon.com/ + flaticon is licenced by http://creativecommons.org/licenses/by/3.0/ Creative Commons BY 3.0 + --> @@ -108,7 +101,7 @@ - @@ -146,9 +139,8 @@