minor fixes and changes to the leaderboard

client/src/main/java/groupxii/client/connector/UserConnector.java

@@ -0,0 +1,17 @@
+package groupxii.client.connector;
+
+import static groupxii.client.connector.Connector.postRequest;
+
+public class UserConnector {
+
+    /**
+     * communicates with the target server, and updates the
+     * total co2 reduction of the user in the database.
+     * @param amount of CO2 the user has reduced
+     * @return JSON String
+     */
+    public static String updateReducedCo2(int amount) {
+        return postRequest("/increaseReducedCo2OfUser?amount="
+                + amount);
+    }
+}

client/src/main/java/groupxii/client/controllers/LeaderboardController.java

@@ -8,7 +8,6 @@
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
-import javafx.fxml.Initializable;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListView;
@@ -18,18 +17,16 @@
 import javafx.scene.text.Text;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.ResourceBundle;
 
-public class LeaderboardController implements Initializable {
+public class LeaderboardController {
 
     private static int userId = 1;
 
     @FXML
-    private static Text addedFriend = new Text();
+    private Text addedFriend = new Text();
 
     private String overallListStr = "";
     private String friendListStr = "";
@@ -41,7 +38,7 @@ public class LeaderboardController implements Initializable {
     @FXML
     private ListView friendsLeaderboard = new ListView();
 
-    public static class HBoxCell extends HBox {
+    public class HBoxCell extends HBox {
         Label label = new Label();
         Button button = new Button();
 
@@ -63,8 +60,7 @@ public void handle(ActionEvent event) {
         }
     }
 
-    @Override
-    public void initialize(URL location, ResourceBundle resources) {
+    public void initialize() {
 
         /*
         try {
@@ -119,13 +115,11 @@ public void initialize(URL location, ResourceBundle resources) {
         //friendsLeaderboard.setItems(friendsLeaderboardObservableList);
     }
 
-    public static void addFriend(int friendId) {
+    public String addFriend(int friendId) {
         LeaderboardConnector.addFriend(userId, friendId);
-        addedFriend.setText("Ädded new friend!");
-    }
-
-    public void setUserId(int userId) {
-        this.userId = userId;
+        addedFriend.setText("Added new friend!");
+        initialize();
+        return "Added new friend!";
     }
 
     @FXML

client/src/main/java/groupxii/client/controllers/LocalProductsController.java

@@ -4,6 +4,7 @@
 import groupxii.client.Main;
 import groupxii.client.connector.Connector;
 import groupxii.client.connector.LocalProductsConnector;
+import groupxii.client.connector.UserConnector;
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -92,8 +93,14 @@ public String getShopLocation() {
         }
     }
 
-    public void safeLocalProduct() throws IOException {
-        Connector.instance.postRequest("/increaseReducedCO2?Id=" + userId + "&ReducedCO2=300");
+    public void safeLocalProduct() {
+        if (localShops.getSelectionModel().getSelectedItem() == null) {
+            textfield.setText("Please choose a shop first");
+        } else{
+            UserConnector.updateReducedCo2(300);
+            textfield.setText("You saved 300 grams of CO2 emission!");
+        }
+        UserConnector.updateReducedCo2(300);
         textfield.setText("You saved 300 grams of CO2 emission!");
     }
 

server/src/main/java/groupxii/server/controllers/UserController.java

@@ -91,6 +91,18 @@ public int getReducedCo2OfUser(Principal principal) {
         int reducedCo2 = user.getReducedCo2();
         return reducedCo2;
     }
+
+    @RequestMapping(method = RequestMethod.POST, value = "/increaseReducedCo2OfUser")
+    public int increaserReducedCo2OfUser(Principal principal,
+                                         @RequestParam(value = "amount",
+                                                 defaultValue = "0") int amount){
+        String username = principal.getName();
+        //UserEntry user = Database.instance.findUserByName(username);
+        Database.instance.incrementReducedCo2(username, amount);
+        return amount;
+    }
+
+
 }