sem/Greenify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix calculator bugs

Browse Source
This commit is contained in:
cugurlu
2019-03-31 00:45:50 +01:00
parent ebaeff9fad
commit a41b697510
3 changed files with 62 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Client/src/main/java/greenify/client/Friend.java
View File

@@ -6,11 +6,11 @@ import javafx.beans.property.SimpleStringProperty;
public class Friend { public class Friend {
private SimpleStringProperty friend; private SimpleStringProperty friend;
private SimpleFloatProperty friendScore; private SimpleFloatProperty score;
public Friend(String friend, Float friendScore) { public Friend(String friend, Float friendScore) {
this.friend = new SimpleStringProperty(friend); 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); this.friend = new SimpleStringProperty(name);
} }
public Float getFriendScore() { public Float getScore() {
return friendScore.get(); return score.get();
} }
public void setScore(Float score) { public void setScore(Float score) {
this.friendScore = new SimpleFloatProperty(score); this.score = new SimpleFloatProperty(score);
} }
} }

52
src/Client/src/main/java/greenify/client/controller/CalculatorController.java
View File

@@ -16,6 +16,7 @@ import javafx.scene.control.ScrollPane;
import javafx.scene.control.Slider; import javafx.scene.control.Slider;
import javafx.scene.control.TextField; import javafx.scene.control.TextField;
import javafx.scene.layout.AnchorPane; import javafx.scene.layout.AnchorPane;
import javafx.scene.text.Text;
import javafx.stage.Stage; import javafx.stage.Stage;
import javafx.stage.Window; import javafx.stage.Window;
import javafx.util.Duration; import javafx.util.Duration;
@@ -29,6 +30,9 @@ public class CalculatorController {
@Autowired @Autowired
UserService userService; UserService userService;
@Autowired
DashBoardController controller;
//navigation panes //navigation panes
@FXML @FXML
private AnchorPane getStartedPane; private AnchorPane getStartedPane;
@@ -119,6 +123,10 @@ public class CalculatorController {
//shopping pane //shopping pane
@FXML @FXML
private Text goodsField;
@FXML
private Text servicesField;
@FXML
private Slider goodsSlider; private Slider goodsSlider;
@FXML @FXML
private Label goodsLabel; private Label goodsLabel;
@@ -303,8 +311,7 @@ public class CalculatorController {
* The method saves the calculation. * The method saves the calculation.
* @param event user clicks to button * @param event user clicks to button
*/ */
public void saveCalc(ActionEvent event) { public void saveCalc(ActionEvent event) throws InterruptedException {
Window owner = saveButton.getScene().getWindow();
getStartedPane.setVisible(false); getStartedPane.setVisible(false);
travelPane.setVisible(false); travelPane.setVisible(false);
homePane.setVisible(false); homePane.setVisible(false);
@@ -336,7 +343,7 @@ public class CalculatorController {
if (!carTravelGasolineLabel.getText().replace(" km/L", "").equals("0")) { if (!carTravelGasolineLabel.getText().replace(" km/L", "").equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_transportation_mpg1", "input_footprint_transportation_mpg1",
carTravelGasolineLabel.getText()); carTravelGasolineLabel.getText().replace(" km/L", ""));
} }
if (!carTravelDieselField.getText().equals("0")) { if (!carTravelDieselField.getText().equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
@@ -346,36 +353,36 @@ public class CalculatorController {
if (!carTravelDieselLabel.getText().replace(" km/L", "").equals("0")) { if (!carTravelDieselLabel.getText().replace(" km/L", "").equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_transportation_mpg2", "input_footprint_transportation_mpg2",
carTravelDieselLabel.getText()); carTravelDieselLabel.getText().replace(" km/L", ""));
} }
if (!carTravelElectricField.getText().equals("0")) { if (!carTravelElectricField.getText().equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_transportation_miles3", "input_footprint_transportation_miles3",
peopleInHouseHoldLabel.getText()); carTravelElectricField.getText());
} }
if (!carTravelElectricLabel.getText().replace(" km/Le", "").equals("0")) { if (!carTravelElectricLabel.getText().replace(" km/Le", "").equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_transportation_mpg3", "input_footprint_transportation_mpg3",
carTravelElectricLabel.getText()); carTravelElectricLabel.getText().replace(" km/Le", ""));
} }
if (!electricityField.getText().equals("0")) { if (!electricityField.getText().equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_electricity_dollars", "input_footprint_housing_electricity_dollars",
electricityField.getText()); electricityField.getText());
} }
if (!cleanEnergyPurchasedLabel.getText().replace(" %", "").equals("0")) { if (!cleanEnergyPurchasedLabel.getText().replace(" %", "").equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_housing_gco2_per_kwh", "input_footprint_housing_gco2_per_kwh",
cleanEnergyPurchasedLabel.getText()); cleanEnergyPurchasedLabel.getText().replace(" %", ""));
} }
if (!naturalGasField.getText().equals("0")) { if (!naturalGasField.getText().equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_naturalgas_dollars", "input_footprint_housing_naturalgas_dollars",
naturalGasField.getText()); naturalGasField.getText());
} }
if (!heatingOilField.getText().equals("0")) { if (!heatingOilField.getText().equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_heatingoil_dollars", "input_footprint_housing_heatingoil_dollars",
heatingOilField.getText()); heatingOilField.getText());
} }
if (!livingSpaceField.getText().equals("0")) { if (!livingSpaceField.getText().equals("0")) {
@@ -386,44 +393,49 @@ public class CalculatorController {
if (!waterUsageLabel.getText().replace("% of similar households", "").equals("0")) { if (!waterUsageLabel.getText().replace("% of similar households", "").equals("0")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_housing_watersewage", "input_footprint_housing_watersewage",
waterUsageLabel.getText()); waterUsageLabel.getText().replace("% of similar households", ""));
} }
if (!meatFishEggsLabel.getText().replace(" daily servings per person", "").equals("2.6")) { if (!meatFishEggsLabel.getText().replace(" daily servings per person", "").equals("2.6")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_shopping_food_meatfisheggs", "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(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_shopping_food_cereals", "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")) { if (!dairyLabel.getText().replace(" daily servings per person", "").equals("2.4")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_shopping_food_dairy", "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(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_shopping_food_fruitvegetables", "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")) { if (!snacksDrinksLabel.getText().replace(" daily servings per person", "").equals("3.7")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_shopping_food_otherfood", "input_footprint_shopping_food_otherfood",
snacksDrinksLabel.getText()); snacksDrinksLabel.getText().replace(" daily servings per person", ""));
} }
if (!goodsLabel.getText().replace(" € / month", "").equals("1520")) { if (!goodsLabel.getText().replace(" € / month", "").equals("1520")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_shopping_goods_total", "input_footprint_shopping_goods_total",
snacksDrinksLabel.getText()); goodsLabel.getText().replace("€ / month", ""));
} }
if (!servicesLabel.getText().replace(" € / month", "").equals("3428")) { if (!servicesLabel.getText().replace(" € / month", "").equals("3428")) {
userService.updateInput(userService.currentUser.getName(), userService.updateInput(userService.currentUser.getName(),
"input_footprint_shopping_services_total", "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; Stage current = (Stage) owner;
current.close(); current.close();
controller.updateLeaderboard();
} }
} }

60
src/Client/src/main/resources/fxml/calculator.fxml
View File

@@ -1,12 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.shape.*?>
<?import java.lang.*?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
@@ -50,9 +43,9 @@
<Image url="@../icons/world.png" /> <Image url="@../icons/world.png" />
<!--image credits: <!--image credits:
made by prettycons https://www.flaticon.com/authors/prettycons made by prettycons https://www.flaticon.com/authors/prettycons
from https://www.flaticon.com/ from https://www.flaticon.com/
flaticon is licenced by http://creativecommons.org/licenses/by/3.0/ Creative Commons BY 3.0 flaticon is licenced by http://creativecommons.org/licenses/by/3.0/ Creative Commons BY 3.0
--> -->
</image> </image>
</ImageView> </ImageView>
</graphic> </graphic>
@@ -108,7 +101,7 @@
</ImageView> </ImageView>
</graphic> </graphic>
</Button> </Button>
<Button fx:id="saveButton" layoutX="702.0" layoutY="24.0" mnemonicParsing="false" onAction="#saveCalculation" text="Save"> <Button fx:id="saveButton" layoutX="702.0" layoutY="24.0" onAction="#saveCalc" mnemonicParsing="false" text="Save">
<font> <font>
<Font size="17.0" /> <Font size="17.0" />
</font></Button> </font></Button>
@@ -146,9 +139,8 @@
</opaqueInsets> </opaqueInsets>
</Label> </Label>
<Button fx:id="getStartedNextButton" layoutX="383.0" layoutY="406.0" mnemonicParsing="false" onAction="#displayTravel" styleClass="nextButton" text="Next" /> <Button fx:id="getStartedNextButton" layoutX="383.0" layoutY="406.0" mnemonicParsing="false" onAction="#displayTravel" styleClass="nextButton" text="Next" />
<Line endX="79.0" layoutX="188.0" layoutY="14.0" stroke="#38573e" />
</children></AnchorPane> </children></AnchorPane>
<AnchorPane fx:id="travelPane" layoutY="92.0" prefHeight="611.0" prefWidth="820.0" visible="false"> <AnchorPane fx:id="travelPane" layoutY="85.0" prefHeight="618.0" prefWidth="820.0" visible="false">
<children> <children>
<ScrollPane layoutX="158.0" layoutY="109.0" prefHeight="215.0" prefWidth="499.0"> <ScrollPane layoutX="158.0" layoutY="109.0" prefHeight="215.0" prefWidth="499.0">
<content> <content>
@@ -159,7 +151,7 @@
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
</Text> </Text>
<TextField fx:id="carTravelGasolineField" layoutX="14.0" layoutY="38.0" prefHeight="31.0" prefWidth="405.0" promptText="16.400"> <TextField fx:id="carTravelGasolineField" layoutX="14.0" layoutY="38.0" prefHeight="31.0" prefWidth="405.0" promptText="16.400" text="0">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -202,7 +194,7 @@
</Text> </Text>
</children> </children>
</HBox> </HBox>
<TextField fx:id="carTravelDieselField" layoutX="14.0" layoutY="200.0" prefHeight="31.0" prefWidth="405.0" promptText="15.400"> <TextField fx:id="carTravelDieselField" layoutX="14.0" layoutY="200.0" prefHeight="31.0" prefWidth="405.0" promptText="15.400" text="0">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -217,7 +209,7 @@
<Font size="16.0" /> <Font size="16.0" />
</font> </font>
</Text> </Text>
<TextField fx:id="carTravelElectricField" layoutX="14.0" layoutY="365.0" prefHeight="31.0" prefWidth="405.0" promptText="14.900"> <TextField fx:id="carTravelElectricField" layoutX="14.0" layoutY="365.0" prefHeight="31.0" prefWidth="405.0" promptText="14.900" text="0">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -258,7 +250,7 @@
<Font size="18.0" /> <Font size="18.0" />
</font> </font>
</Text> </Text>
<TextField fx:id="publicTransitField" alignment="CENTER_RIGHT" layoutX="158.0" layoutY="394.0" prefHeight="31.0" prefWidth="499.0" promptText="0"> <TextField fx:id="publicTransitField" alignment="CENTER_RIGHT" layoutX="158.0" layoutY="394.0" prefHeight="31.0" prefWidth="499.0" promptText="0" text="0">
<font> <font>
<Font size="18.0" /> <Font size="18.0" />
</font></TextField> </font></TextField>
@@ -267,7 +259,7 @@
<Font size="18.0" /> <Font size="18.0" />
</font> </font>
</Text> </Text>
<TextField fx:id="airplaneTravelField" alignment="CENTER_RIGHT" layoutX="158.0" layoutY="495.0" prefHeight="31.0" prefWidth="499.0" promptText="0"> <TextField fx:id="airplaneTravelField" alignment="CENTER_RIGHT" layoutX="158.0" layoutY="495.0" prefHeight="31.0" prefWidth="499.0" promptText="0" text="0">
<font> <font>
<Font size="18.0" /> <Font size="18.0" />
</font></TextField> </font></TextField>
@@ -290,10 +282,9 @@
</children> </children>
</HBox> </HBox>
<Button fx:id="travelNextButton" layoutX="383.0" layoutY="559.0" mnemonicParsing="false" onAction="#displayHome" styleClass="nextButton" text="Next" /> <Button fx:id="travelNextButton" layoutX="383.0" layoutY="559.0" mnemonicParsing="false" onAction="#displayHome" styleClass="nextButton" text="Next" />
<Line endX="79.0" layoutX="273.0" layoutY="7.0" stroke="#38573e" />
</children> </children>
</AnchorPane> </AnchorPane>
<AnchorPane fx:id="homePane" layoutY="92.0" prefHeight="611.0" prefWidth="820.0" visible="false"> <AnchorPane fx:id="homePane" layoutY="85.0" prefHeight="618.0" prefWidth="820.0" visible="false">
<children> <children>
<Text layoutX="245.0" layoutY="36.0" strokeType="OUTSIDE" strokeWidth="0.0" text="How much do you use in your home?"> <Text layoutX="245.0" layoutY="36.0" strokeType="OUTSIDE" strokeWidth="0.0" text="How much do you use in your home?">
<font> <font>
@@ -305,7 +296,7 @@
<Font size="18.0" /> <Font size="18.0" />
</font> </font>
</Text> </Text>
<TextField layoutX="177.0" layoutY="105.0" prefHeight="31.0" prefWidth="434.0" promptText="1,570"> <TextField fx:id="electricityField" layoutX="177.0" layoutY="105.0" prefHeight="31.0" prefWidth="434.0" promptText="1,570" text="0">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -356,7 +347,7 @@
</Text> </Text>
</children> </children>
</HBox> </HBox>
<TextField layoutX="177.0" layoutY="262.0" prefHeight="31.0" prefWidth="434.0" promptText="2,000"> <TextField fx:id="naturalGasField" layoutX="177.0" layoutY="262.0" prefHeight="31.0" prefWidth="434.0" promptText="2,000" text="0">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -373,7 +364,7 @@
</Text> </Text>
</children> </children>
</HBox> </HBox>
<TextField layoutX="177.0" layoutY="325.0" prefHeight="31.0" prefWidth="434.0" promptText="3,100"> <TextField fx:id="heatingOilField" layoutX="177.0" layoutY="325.0" prefHeight="31.0" prefWidth="434.0" promptText="3,100" text="0">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -388,7 +379,7 @@
<Font size="18.0" /> <Font size="18.0" />
</font> </font>
</Text> </Text>
<TextField layoutX="177.0" layoutY="390.0" prefHeight="31.0" prefWidth="434.0" promptText="1,570"> <TextField fx:id="livingSpaceField" layoutX="177.0" layoutY="390.0" prefHeight="31.0" prefWidth="434.0" promptText="1,570" text="0">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -419,9 +410,8 @@
</Label> </Label>
</children> </children>
</HBox> </HBox>
<Line endX="79.0" layoutX="358.0" layoutY="7.0" stroke="#38573e" />
</children></AnchorPane> </children></AnchorPane>
<ScrollPane fx:id="foodPane" layoutY="92.0" pannable="true" prefHeight="611.0" prefWidth="820.0" visible="false"> <ScrollPane fx:id="foodPane" layoutY="85.0" prefHeight="618.0" prefWidth="820.0" visible="false">
<content> <content>
<AnchorPane prefHeight="1000.0" prefWidth="817.0"> <AnchorPane prefHeight="1000.0" prefWidth="817.0">
<children> <children>
@@ -457,7 +447,7 @@
</Text> </Text>
<HBox alignment="CENTER" layoutX="299.0" layoutY="310.0" prefHeight="31.0" prefWidth="220.0" styleClass="km-indicator"> <HBox alignment="CENTER" layoutX="299.0" layoutY="310.0" prefHeight="31.0" prefWidth="220.0" styleClass="km-indicator">
<children> <children>
<Label fx:id="grainsBakedGoodsLabel" text="4,4 daily servings per person"> <Label fx:id="grainsBakedGoodsLabel" text="4.4 daily servings per person">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -478,7 +468,7 @@
<Slider fx:id="dairySlider" blockIncrement="2.5" layoutX="146.0" layoutY="527.0" majorTickUnit="2.5" max="7.5" minorTickCount="0" prefHeight="24.0" prefWidth="517.0" showTickLabels="true" showTickMarks="true" /> <Slider fx:id="dairySlider" blockIncrement="2.5" layoutX="146.0" layoutY="527.0" majorTickUnit="2.5" max="7.5" minorTickCount="0" prefHeight="24.0" prefWidth="517.0" showTickLabels="true" showTickMarks="true" />
<HBox alignment="CENTER" layoutX="299.0" layoutY="471.0" prefHeight="31.0" prefWidth="220.0" styleClass="km-indicator"> <HBox alignment="CENTER" layoutX="299.0" layoutY="471.0" prefHeight="31.0" prefWidth="220.0" styleClass="km-indicator">
<children> <children>
<Label fx:id="dairyLabel" text="2,4 daily servings per person"> <Label fx:id="dairyLabel" text="2.4 daily servings per person">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -497,7 +487,7 @@
</Text> </Text>
<HBox alignment="CENTER" layoutX="304.0" layoutY="810.0" prefHeight="31.0" prefWidth="220.0" styleClass="km-indicator"> <HBox alignment="CENTER" layoutX="304.0" layoutY="810.0" prefHeight="31.0" prefWidth="220.0" styleClass="km-indicator">
<children> <children>
<Label fx:id="snacksDrinksLabel" text="3,7 daily servings per person"> <Label fx:id="snacksDrinksLabel" text="3.7 daily servings per person">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -518,7 +508,7 @@
<Slider fx:id="fruitsVegetablesSlider" blockIncrement="3.9" layoutX="151.0" layoutY="705.0" majorTickUnit="3.9" max="11.6" minorTickCount="0" prefHeight="24.0" prefWidth="517.0" showTickLabels="true" showTickMarks="true" /> <Slider fx:id="fruitsVegetablesSlider" blockIncrement="3.9" layoutX="151.0" layoutY="705.0" majorTickUnit="3.9" max="11.6" minorTickCount="0" prefHeight="24.0" prefWidth="517.0" showTickLabels="true" showTickMarks="true" />
<HBox alignment="CENTER" layoutX="304.0" layoutY="649.0" prefHeight="31.0" prefWidth="220.0" styleClass="km-indicator"> <HBox alignment="CENTER" layoutX="304.0" layoutY="649.0" prefHeight="31.0" prefWidth="220.0" styleClass="km-indicator">
<children> <children>
<Label fx:id="fruitsVegetablesLabel" text="3,9 daily servings per person"> <Label fx:id="fruitsVegetablesLabel" text="3.9 daily servings per person">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -531,12 +521,11 @@
</font> </font>
</Text> </Text>
<Button layoutX="378.0" layoutY="926.0" mnemonicParsing="false" onAction="#displayShopping" styleClass="nextButton" text="Next" /> <Button layoutX="378.0" layoutY="926.0" mnemonicParsing="false" onAction="#displayShopping" styleClass="nextButton" text="Next" />
<Line endX="79.0" layoutX="443.0" layoutY="7.0" stroke="#38573e" />
</children> </children>
</AnchorPane> </AnchorPane>
</content> </content>
</ScrollPane> </ScrollPane>
<AnchorPane fx:id="shoppingPane" layoutY="92.0" prefHeight="611.0" prefWidth="820.0" visible="false"> <AnchorPane fx:id="shoppingPane" layoutY="85.0" prefHeight="618.0" prefWidth="820.0" visible="false">
<children> <children>
<Text layoutX="133.0" layoutY="50.0" strokeType="OUTSIDE" strokeWidth="0.0" text="How much do you spend on each of the following?"> <Text layoutX="133.0" layoutY="50.0" strokeType="OUTSIDE" strokeWidth="0.0" text="How much do you spend on each of the following?">
<font> <font>
@@ -566,7 +555,7 @@
<Slider fx:id="goodsSlider" blockIncrement="1520.0" layoutX="133.0" layoutY="209.0" majorTickUnit="1520.0" max="4560.0" minorTickCount="0" prefHeight="24.0" prefWidth="554.0" showTickLabels="true" showTickMarks="true" /> <Slider fx:id="goodsSlider" blockIncrement="1520.0" layoutX="133.0" layoutY="209.0" majorTickUnit="1520.0" max="4560.0" minorTickCount="0" prefHeight="24.0" prefWidth="554.0" showTickLabels="true" showTickMarks="true" />
<HBox alignment="CENTER" layoutX="335.0" layoutY="145.0" prefHeight="31.0" prefWidth="150.0" styleClass="km-indicator"> <HBox alignment="CENTER" layoutX="335.0" layoutY="145.0" prefHeight="31.0" prefWidth="150.0" styleClass="km-indicator">
<children> <children>
<Label fx:id="goodsLabel" text="1.520 € / month"> <Label fx:id="goodsLabel" text="1520 € / month">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -575,7 +564,7 @@
</HBox> </HBox>
<HBox alignment="CENTER" layoutX="335.0" layoutY="348.0" prefHeight="31.0" prefWidth="150.0" styleClass="km-indicator"> <HBox alignment="CENTER" layoutX="335.0" layoutY="348.0" prefHeight="31.0" prefWidth="150.0" styleClass="km-indicator">
<children> <children>
<Label fx:id="servicesLabel" text="3.428 € / month"> <Label fx:id="servicesLabel" text="3428 € / month">
<font> <font>
<Font size="15.0" /> <Font size="15.0" />
</font> </font>
@@ -583,7 +572,8 @@
</children> </children>
</HBox> </HBox>
<Slider fx:id="servicesSlider" blockIncrement="3428.0" layoutX="133.0" layoutY="418.0" majorTickUnit="3428.0" max="10284.0" minorTickCount="0" prefHeight="24.0" prefWidth="554.0" showTickLabels="true" showTickMarks="true" /> <Slider fx:id="servicesSlider" blockIncrement="3428.0" layoutX="133.0" layoutY="418.0" majorTickUnit="3428.0" max="10284.0" minorTickCount="0" prefHeight="24.0" prefWidth="554.0" showTickLabels="true" showTickMarks="true" />
<Line endX="79.0" layoutX="528.0" layoutY="7.0" stroke="#38573e" />
</children></AnchorPane> </children></AnchorPane>
</children> </children>
</AnchorPane> </AnchorPane>