From 66c2b44be6c3e1cf29902f97dc129f0cb307ea41 Mon Sep 17 00:00:00 2001
From: Mika Wauben <m.l.wauben@student.tudelft.nl>
Date: Sat, 13 Apr 2019 10:38:58 +0000
Subject: [PATCH] Merge branch 'master' into 'Update/leaderBoards'

# Conflicts:
#   src/Client/src/main/java/greenify/client/controller/CalculatorController.java
#   src/Client/src/main/resources/fxml/dashboard.fxml
#   src/Server/src/main/java/greenify/server/service/CalculatorService.java
---
 .../src/main/java/greenify/client/Friend.java | 18 +++++++++++-
 .../controller/DashBoardController.java       | 23 +++++++++++----
 .../src/main/resources/fxml/dashboard.fxml    | 29 ++++++++++---------
 src/Client/src/test/java/FriendTest.java      |  4 ++-
 4 files changed, 54 insertions(+), 20 deletions(-)

diff --git a/src/Client/src/main/java/greenify/client/Friend.java b/src/Client/src/main/java/greenify/client/Friend.java
index b0282f3..0ec4bf4 100644
--- a/src/Client/src/main/java/greenify/client/Friend.java
+++ b/src/Client/src/main/java/greenify/client/Friend.java
@@ -1,18 +1,34 @@
 package greenify.client;
 
 import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleStringProperty;
 
 public class Friend {
 
+    private SimpleIntegerProperty place;
     private SimpleStringProperty friend;
     private SimpleDoubleProperty score;
 
-    public Friend(String friend, Double friendScore) {
+    /**
+     * Constructor for a friend.
+     * @param place place in the leaderboard
+     * @param friend name of the user
+     * @param friendScore score of the user
+     */
+    public Friend(Integer place, String friend, Double friendScore) {
+        this.place = new SimpleIntegerProperty(place);
         this.friend =  new SimpleStringProperty(friend);
         this.score =  new SimpleDoubleProperty(friendScore);
     }
 
+    public Integer getPlace() {
+        return place.get();
+    }
+
+    public void setPlace(Integer place) {
+        this.place = new SimpleIntegerProperty(place);
+    }
 
     public String getFriend() {
         return friend.get();
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 f8c744b..1565bf1 100644
--- a/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
+++ b/src/Client/src/main/java/greenify/client/controller/DashBoardController.java
@@ -109,18 +109,24 @@ public class DashBoardController {
     @FXML
     private TableView<Friend> globalLeaderboard;
     @FXML
+    private TableColumn<Friend, Integer> globalPlace;
+    @FXML
     private TableColumn<Friend, String> globalUser;
     @FXML
     private TableColumn<Friend, Float> globalScore;
     @FXML
     private TableView<Friend> developmentLeaderboard;
     @FXML
+    private TableColumn<Friend, Integer> developmentPlace;
+    @FXML
     private TableColumn<Friend, String> developmentUser;
     @FXML
     private TableColumn<Friend, Float> developmentScore;
     @FXML
     private TableView<Friend> friendLeaderboard;
     @FXML
+    private TableColumn<Friend, Integer> friendPlace;
+    @FXML
     private TableColumn<Friend, String> friendUser;
     @FXML
     private TableColumn<Friend, Float> friendScore;
@@ -239,15 +245,18 @@ public class DashBoardController {
         logOutButton.setSkin(new MyButtonSkin(logOutButton));
         friendsColumn.setCellValueFactory(new PropertyValueFactory<>("Friend"));
         scoreColumn.setCellValueFactory(new PropertyValueFactory<>("Score"));
+        globalPlace.setCellValueFactory(new PropertyValueFactory<>("Place"));
         globalUser.setCellValueFactory(new PropertyValueFactory<>("Friend"));
         globalScore.setCellValueFactory(new PropertyValueFactory<>("Score"));
         developmentUser.setCellValueFactory(new PropertyValueFactory<>("Friend"));
+        developmentPlace.setCellValueFactory(new PropertyValueFactory<>("Place"));
         developmentScore.setCellValueFactory(new PropertyValueFactory<>("Score"));
+        friendPlace.setCellValueFactory(new PropertyValueFactory<>("Place"));
         friendUser.setCellValueFactory(new PropertyValueFactory<>("Friend"));
         friendScore.setCellValueFactory(new PropertyValueFactory<>("Score"));
         List<String> friendList = userService.getFriendNames(userService.currentUser.getName());
         for (int i = 0; i < friendList.size(); i++) {
-            Friend friend = new Friend(friendList.get(i),
+            Friend friend = new Friend(i, friendList.get(i),
                     userService.getFootprint(friendList.get(i)));
             data.add(friend);
         }
@@ -490,6 +499,9 @@ public class DashBoardController {
         //development leaderboard
         developmentLeaderboard.getItems().clear();
         developmentData.removeAll();
+        //friends leaderboard
+        friendLeaderboard.getItems().clear();
+        friendLeaderData.removeAll();
 
         //load the fxml file
         Parent dash = Application.load(this.getClass().getClassLoader()
@@ -604,14 +616,15 @@ public class DashBoardController {
         List<String> userList = userService.getAllUsers();
         sortScores(userList);
         for (int i = userList.size() - 1; i >= 0; i--) {
-            Friend user = new Friend(userList.get(i), userService.getFootprint(userList.get(i)));
+            Friend user = new Friend(userList.size() - i, userList.get(i),
+                    userService.getFootprint(userList.get(i)));
             globalLeaderData.add(user);
         }
         List<String> secondList = sortDiffScores(userList);
         for (int j = 0; j < userList.size(); j++) {
             double diff = Math.round((userService.getFirstFootprint(secondList.get(j))
                     - userService.getFootprint(secondList.get(j))) * 10) / 10.0;
-            Friend diffUser = new Friend(secondList.get(j), diff);
+            Friend diffUser = new Friend(j + 1, secondList.get(j), diff);
             developmentData.add(diffUser);
         }
         globalLeaderboard.setItems(globalLeaderData);
@@ -662,14 +675,14 @@ public class DashBoardController {
         friendLeaderData.removeAll();
         sortDiffScores(wholeList);
         for (int i = friendList.size() - 1; i >= 0 ; i--) {
-            Friend user = new Friend(friendList.get(i), userService
+            Friend user = new Friend(i, friendList.get(i), userService
                     .getFootprint(friendList.get(i)));
             data.add(user);
         }
         for (int j = 0; j < wholeList.size(); j++) {
             double diff = Math.round((userService.getFirstFootprint(wholeList.get(j))
                     - userService.getFootprint(wholeList.get(j))) * 10) / 10.0;
-            Friend diffUser = new Friend(wholeList.get(j), diff);
+            Friend diffUser = new Friend(j + 1, wholeList.get(j), diff);
             friendLeaderData.add(diffUser);
         }
         friendsTable.setItems(data);
diff --git a/src/Client/src/main/resources/fxml/dashboard.fxml b/src/Client/src/main/resources/fxml/dashboard.fxml
index b8eba11..6a2345a 100644
--- a/src/Client/src/main/resources/fxml/dashboard.fxml
+++ b/src/Client/src/main/resources/fxml/dashboard.fxml
@@ -451,16 +451,11 @@
                   </ImageView>
                </graphic>
             </Button>
-            <TableView fx:id="globalLeaderboard" layoutX="56.0" layoutY="220.0" prefHeight="333.0" prefWidth="200.0">
+            <TableView fx:id="globalLeaderboard" layoutX="53.0" layoutY="220.0" prefHeight="334.0" prefWidth="207.0">
                <columns>
-                  <TableColumn fx:id="globalUser" prefWidth="121.0" text="User" />
-                  <TableColumn fx:id="globalScore" prefWidth="78.0" text="Score" />
-               </columns>
-            </TableView>
-            <TableView fx:id="developmentLeaderboard" layoutX="302.0" layoutY="220.0" prefHeight="333.0" prefWidth="200.0">
-               <columns>
-                  <TableColumn fx:id="developmentUser" prefWidth="126.0" text="User" />
-                  <TableColumn fx:id="developmentScore" prefWidth="73.0" text="Score" />
+                  <TableColumn fx:id="globalPlace" prefWidth="30.0" text="#" />
+                  <TableColumn fx:id="globalUser" prefWidth="75.0" text="User" />
+                  <TableColumn fx:id="globalScore" prefWidth="100.0" text="Score" />
                </columns>
             </TableView>
             <Label layoutX="69.0" layoutY="177.0" prefHeight="46.0" prefWidth="187.0" text="Global Leaderboard" textAlignment="CENTER" textFill="#5f1616">
@@ -562,6 +557,13 @@
                   </Button>
                </children>
             </GridPane>
+            <TableView fx:id="developmentLeaderboard" layoutX="292.0" layoutY="220.0" prefHeight="334.0" prefWidth="207.0">
+               <columns>
+                  <TableColumn fx:id="developmentPlace" prefWidth="30.0" text="#" />
+                  <TableColumn fx:id="developmentUser" prefWidth="75.0" text="User" />
+                  <TableColumn fx:id="developmentScore" prefWidth="100.0" text="Score" />
+               </columns>
+            </TableView>
          </children>
       </AnchorPane>
       <AnchorPane fx:id="friendsPane" layoutX="216.0" prefHeight="703.0" prefWidth="820.0" visible="false" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="214.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
@@ -576,7 +578,7 @@
                   <Font size="20.0" />
                </font>
             </Text>
-            <TableView fx:id="friendsTable" layoutX="60.0" layoutY="170.0" prefHeight="426.0" prefWidth="216.0" style="-fx-background-color: #e1fcd9;">
+            <TableView fx:id="friendsTable" layoutX="60.0" layoutY="170.0" prefHeight="426.0" prefWidth="214.0" style="-fx-background-color: #e1fcd9;">
                <columns>
                   <TableColumn fx:id="friendsColumn" prefWidth="107.0" text="Friend" />
                   <TableColumn fx:id="scoreColumn" prefWidth="108.0" text="Score" />
@@ -590,10 +592,11 @@
                   <Font size="20.0" />
                </font>
             </Text>
-            <TableView fx:id="friendLeaderboard" layoutX="300.0" layoutY="170.0" prefHeight="426.0" prefWidth="216.0" style="-fx-background-color: #e1fcd9;">
+            <TableView fx:id="friendLeaderboard" layoutX="300.0" layoutY="170.0" prefHeight="426.0" prefWidth="232.0" style="-fx-background-color: #e1fcd9;">
                <columns>
-                  <TableColumn fx:id="friendUser" prefWidth="107.0" text="Friend" />
-                  <TableColumn fx:id="friendScore" prefWidth="108.0" text="Score" />
+                  <TableColumn fx:id="friendPlace" prefWidth="30.0" resizable="false" text="#" />
+                  <TableColumn fx:id="friendUser" minWidth="30.0" prefWidth="100.0" resizable="false" text="Friend" />
+                  <TableColumn fx:id="friendScore" minWidth="30.0" prefWidth="100.0" resizable="false" text="Score" />
                </columns>
                <columnResizePolicy>
                   <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
diff --git a/src/Client/src/test/java/FriendTest.java b/src/Client/src/test/java/FriendTest.java
index 69490c6..15cd2f9 100644
--- a/src/Client/src/test/java/FriendTest.java
+++ b/src/Client/src/test/java/FriendTest.java
@@ -7,9 +7,11 @@ import org.junit.jupiter.api.Assertions;
 public class FriendTest {
     @Test
     public void setAndGetTest() {
-        Friend test = new Friend("ceren", 10.0);
+        Friend test = new Friend(1,"ceren", 10.0);
+        test.setPlace(1);
         test.setFriend("greenify");
         test.setScore(15.0);
+        Assertions.assertEquals(test.getPlace(), 1);
         assertEquals(test.getFriend(), "greenify");
         Assertions.assertEquals(test.getScore(), 15.0);
     }