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

DELETE::deleted the confirm methods for the extra activities

Browse Source 
this should fix the build failing
This commit is contained in:
Sem van der Hoeven
2019-04-07 17:55:57 +02:00
parent e9efdf5f24
commit b05b0ecaf7
2 changed files with 14 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 {

14
src/Client/src/main/resources/fxml/extraActivities.fxml
View File

@@ -1,5 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.shape.*?>
<?import javafx.scene.text.*?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.Slider?>
@@ -11,7 +17,7 @@
<?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?>
<AnchorPane prefHeight="611.0" prefWidth="820.0" stylesheets="@../stylesheets/extraActivitiesStyle.css" xmlns="http://javafx.com/javafx/10.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="greenify.client.controller.ExtraActivityController">
<AnchorPane prefHeight="611.0" prefWidth="820.0" stylesheets="@../stylesheets/extraActivitiesStyle.css" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="greenify.client.controller.ExtraActivityController">
<children>
<AnchorPane prefHeight="611.0" prefWidth="107.0">
<children>
@@ -189,7 +195,7 @@
</children>
</HBox>
<Slider fx:id="solarPanelsSlider" blockIncrement="1.0" layoutX="187.0" layoutY="274.0" majorTickUnit="1.0" max="10.0" min="1.0" minorTickCount="0" prefHeight="24.0" prefWidth="338.0" showTickLabels="true" showTickMarks="true" />
<Button fx:id="addSolarPanelsButton" contentDisplay="TOP" layoutX="267.0" layoutY="378.0" mnemonicParsing="false" onAction="#confirmSolarPanels" prefHeight="150.0" prefWidth="180.0" style="-fx-background-color: transparent;" text="Add activity!" textFill="#23652b">
<Button fx:id="addSolarPanelsButton" contentDisplay="TOP" layoutX="267.0" layoutY="378.0" mnemonicParsing="false" onAction="#updateExtras" prefHeight="150.0" prefWidth="180.0" style="-fx-background-color: transparent;" text="Add activity!" textFill="#23652b">
<font>
<Font name="System Bold Italic" size="18.0" />
</font>
@@ -211,7 +217,7 @@
<Font size="20.0" />
</font>
</Text>
<Button fx:id="addLocalProduceButton" contentDisplay="TOP" layoutX="267.0" layoutY="226.0" mnemonicParsing="false" onAction="#confirmLocalProduce" prefHeight="150.0" prefWidth="180.0" style="-fx-background-color: transparent;" text="Add activity!" textFill="#23652b">
<Button fx:id="addLocalProduceButton" contentDisplay="TOP" layoutX="267.0" layoutY="226.0" mnemonicParsing="false" onAction="#updateExtras" prefHeight="150.0" prefWidth="180.0" style="-fx-background-color: transparent;" text="Add activity!" textFill="#23652b">
<font>
<Font name="System Bold Italic" size="18.0" />
</font>
@@ -239,7 +245,7 @@
<Font size="18.0" />
</font>
</Text>
<Button fx:id="addPublicTransportButton" contentDisplay="TOP" layoutX="267.0" layoutY="351.0" mnemonicParsing="false" onAction="#confirmPublicTransport" prefHeight="150.0" prefWidth="180.0" style="-fx-background-color: transparent;" text="Add activity!" textFill="#23652b">
<Button fx:id="addPublicTransportButton" contentDisplay="TOP" layoutX="267.0" layoutY="351.0" mnemonicParsing="false" onAction="#updateExtras" prefHeight="150.0" prefWidth="180.0" style="-fx-background-color: transparent;" text="Add activity!" textFill="#23652b">
<font>
<Font name="System Bold Italic" size="18.0" />
</font>