From d824a3b8194fe32a01b8bf688379d1ac2fc13f30 Mon Sep 17 00:00:00 2001 From: Sem van der Hoeven Date: Sun, 31 Mar 2019 19:28:29 +0200 Subject: [PATCH] EDIT::changed activities textfields to labels --- .../controller/CalculatorController.java | 18 ++-- .../controller/DashBoardController.java | 84 +++++++++++-------- .../src/main/resources/fxml/calculator.fxml | 20 ++--- .../src/main/resources/fxml/dashboard.fxml | 79 ++++++++--------- .../resources/stylesheets/dashboardStyle.css | 6 +- 5 files changed, 106 insertions(+), 101 deletions(-) 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 54f51de..02eb580 100644 --- a/src/Client/src/main/java/greenify/client/controller/CalculatorController.java +++ b/src/Client/src/main/java/greenify/client/controller/CalculatorController.java @@ -173,9 +173,9 @@ public class CalculatorController { } }); - addSliderListenerCarUsage(carTravelGasolineSlider, carTravelGasolineLabel, " km/L"); - addSliderListenerCarUsage(carTravelDieselSlider, carTravelDieselLabel, " km/L"); - addSliderListenerCarUsage(carTravelElectricSlider, carTravelElectricLabel, " km/Le"); + addSliderListenerCarUsage(carTravelGasolineSlider, carTravelGasolineLabel, " mpg"); + addSliderListenerCarUsage(carTravelDieselSlider, carTravelDieselLabel, " mpg"); + addSliderListenerCarUsage(carTravelElectricSlider, carTravelElectricLabel, " mpge"); cleanEnergyPurchasedSlider.valueProperty().addListener(new ChangeListener() { @Override @@ -379,30 +379,30 @@ public class CalculatorController { "input_footprint_transportation_miles1", carTravelGasolineField.getText()); } - if (!carTravelGasolineLabel.getText().replace(" km/L", "").equals("0")) { + if (!carTravelGasolineLabel.getText().replace(" mpg", "").equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_mpg1", - carTravelGasolineLabel.getText().replace(" km/L", "")); + carTravelGasolineLabel.getText().replace(" mpg", "")); } if (!carTravelDieselField.getText().equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_miles2", carTravelDieselField.getText()); } - if (!carTravelDieselLabel.getText().replace(" km/L", "").equals("0")) { + if (!carTravelDieselLabel.getText().replace(" mpg", "").equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_mpg2", - carTravelDieselLabel.getText().replace(" km/L", "")); + carTravelDieselLabel.getText().replace(" mpg", "")); } if (!carTravelElectricField.getText().equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_miles3", carTravelElectricField.getText()); } - if (!carTravelElectricLabel.getText().replace(" km/Le", "").equals("0")) { + if (!carTravelElectricLabel.getText().replace(" mpge", "").equals("0")) { userService.updateInput(userService.currentUser.getName(), "input_footprint_transportation_mpg3", - carTravelElectricLabel.getText().replace(" km/Le", "")); + carTravelElectricLabel.getText().replace(" mpge", "")); } if (!electricityField.getText().equals("0")) { userService.updateInput(userService.currentUser.getName(), diff --git a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java index edf21e0..21622c3 100644 --- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java +++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java @@ -15,7 +15,11 @@ import javafx.scene.Node; import javafx.scene.Parent; import javafx.scene.Scene; import javafx.scene.chart.PieChart; -import javafx.scene.control.*; +import javafx.scene.control.Button; +import javafx.scene.control.CheckBox; +import javafx.scene.control.Label; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.layout.AnchorPane; import javafx.scene.shape.Line; @@ -95,57 +99,64 @@ public class DashBoardController { @FXML private Label usernameLabel; @FXML - private TextField peopleNumber; + private Label peopleNumber; @FXML - private TextField income; + private Label income; @FXML - private TextField electricityUsage; + private Label electricityUsage; @FXML - private TextField cleanEnergy; + private Label cleanEnergy; @FXML - private TextField naturalGasUsage; + private Label naturalGasUsage; @FXML - private TextField heatingOilUsage; + private Label heatingOilUsage; @FXML - private TextField waterUsage; + private Label waterUsage; @FXML - private TextField livingSpace; + private Label livingSpace; @FXML - private TextField gasolineMiles; + private Label gasolineMiles; @FXML - private TextField gasolineMpg; + private Label gasolineMpg; @FXML - private TextField dieselMiles; + private Label dieselMiles; @FXML - private TextField dieselMpg; + private Label dieselMpg; @FXML - private TextField electricMiles; + private Label electricMiles; @FXML - private TextField electricMpg; + private Label electricMpg; @FXML - private TextField publicTransportation; + private Label publicTransportation; @FXML - private TextField airPlane; + private Label airPlane; @FXML - private TextField goodShopping; + private Label goodShopping; @FXML - private TextField serviceShopping; + private Label serviceShopping; @FXML - private TextField meat; + private Label meat; @FXML - private TextField grains; + private Label grains; @FXML - private TextField dairy; + private Label dairy; @FXML - private TextField fruits; + private Label fruits; @FXML - private TextField snacks; + private Label snacks; + + //these need to be public because they are used by the calculatorController + //suppressing the checkstyle warnings because the fields have to be public + @SuppressWarnings("CheckStyle") @FXML public CheckBox localProduce; + @SuppressWarnings("CheckStyle") @FXML public CheckBox loweringTemp; + @SuppressWarnings("CheckStyle") @FXML public CheckBox bike; + @SuppressWarnings("CheckStyle") @FXML public CheckBox solarPanels; @@ -254,28 +265,33 @@ public class DashBoardController { friendsPane.setVisible(false); Map inputMap = userService.getInputs(userService.currentUser.getName()); peopleNumber.setText(inputMap.get("input_size")); - income.setText(inputMap.get("input_income")); - electricityUsage.setText(inputMap.get("input_footprint_housing_electricity_dollars")); + income.setText(inputMap.get("input_income") + " €/yr"); + electricityUsage.setText(inputMap.get("input_footprint_housing_electricity_dollars") + + " €/yr"); cleanEnergy.setText(inputMap.get("input_footprint_housing_gco2_per_kwh")); - naturalGasUsage.setText(inputMap.get("input_footprint_housing_naturalgas_dollars")); - heatingOilUsage.setText(inputMap.get("input_footprint_housing_heatingoil_dollars")); - waterUsage.setText(inputMap.get("input_footprint_housing_watersewage")); - livingSpace.setText(inputMap.get("input_footprint_housing_squarefeet")); + naturalGasUsage.setText(inputMap.get("input_footprint_housing_naturalgas_dollars") + + " €/yr"); + heatingOilUsage.setText(inputMap.get("input_footprint_housing_heatingoil_dollars") + + " €/yr"); + waterUsage.setText(inputMap.get("input_footprint_housing_watersewage") + " €/yr"); + livingSpace.setText(inputMap.get("input_footprint_housing_squarefeet") + " m²"); gasolineMiles.setText(inputMap.get("input_footprint_transportation_miles1")); gasolineMpg.setText(inputMap.get("input_footprint_transportation_mpg1")); dieselMiles.setText(inputMap.get("input_footprint_transportation_miles2")); dieselMpg.setText(inputMap.get("input_footprint_transportation_mpg2")); electricMiles.setText(inputMap.get("input_footprint_transportation_miles3")); electricMpg.setText(inputMap.get("input_footprint_transportation_mpg3")); - publicTransportation.setText(inputMap.get("input_footprint_transportation_publictrans")); - airPlane.setText(inputMap.get("input_footprint_transportation_airtotal")); - goodShopping.setText(inputMap.get("input_footprint_shopping_goods_total")); - serviceShopping.setText(inputMap.get("input_footprint_shopping_services_total")); + publicTransportation.setText(inputMap.get("input_footprint_transportation_publictrans") + + " mi/yr"); + airPlane.setText(inputMap.get("input_footprint_transportation_airtotal") + " mi/yr"); + goodShopping.setText(inputMap.get("input_footprint_shopping_goods_total") + " €/mo"); + serviceShopping.setText(inputMap.get("input_footprint_shopping_services_total") + " €/mo"); meat.setText(inputMap.get("input_footprint_shopping_food_meatfisheggs")); grains.setText(inputMap.get("input_footprint_shopping_food_cereals")); dairy.setText(inputMap.get("input_footprint_shopping_food_dairy")); fruits.setText(inputMap.get("input_footprint_shopping_food_fruitvegetables")); snacks.setText(inputMap.get("input_footprint_shopping_food_otherfood")); + localProduce.setSelected(true); } /** diff --git a/src/Client/src/main/resources/fxml/calculator.fxml b/src/Client/src/main/resources/fxml/calculator.fxml index 29b3e0d..9a341a6 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 @@ - -