From 8868ce61feded9da9a8bfa1c490a5608e4cbb9ec Mon Sep 17 00:00:00 2001
From: Maximilian Leopold <max.leopold2111@gmail.com>
Date: Fri, 24 May 2019 21:46:21 +0200
Subject: [PATCH] If your are not top 10, your rank is now correctly displayed
 in top 10

---
 frontend/src/pages/ranking.vue                       |  6 +++---
 .../labsw/bugageocaching/controller/Controller.java  |  6 ++++--
 .../bugageocaching/helper/RankingListHelper.java     | 12 +++++++++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/frontend/src/pages/ranking.vue b/frontend/src/pages/ranking.vue
index 4a335f4..7af923f 100644
--- a/frontend/src/pages/ranking.vue
+++ b/frontend/src/pages/ranking.vue
@@ -21,11 +21,11 @@
       <q-tab-panels v-model="tab" animated swipeable class="col">
         <q-tab-panel name="solo" class="q-pa-md fit">
           <q-list>
-            <q-card class="q-mb-md" v-for="(user, index) in rankinglist" :key="user.id">
+            <q-card class="q-mb-md" v-for="(user) in rankinglist" :key="user.id">
               <q-item class="q-pr-sm ">
                 <q-item-section>
-                  <q-item-label v-if="username === user.username"><a class="text-green" style="text-decoration: none"><span>{{index+1}}. {{user.username}}</span></a></q-item-label>
-                  <q-item-label v-if="username !== user.username"><a class="text-black" style="text-decoration: none"><span>{{index+1}}. {{user.username}}</span></a></q-item-label>
+                  <q-item-label v-if="username === user.username"><a class="text-green" style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a></q-item-label>
+                  <q-item-label v-if="username !== user.username"><a class="text-black" style="text-decoration: none"><span>{{user.rank}}. {{user.username}}</span></a></q-item-label>
                </q-item-section>
                 <q-item-section side>
                   <span class="text-grey">{{user.rankingPointsSum}} Punkte </span>
diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 4d95783..42bbfd3 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -392,9 +392,11 @@ public class Controller {
     logger.debug("/api/getRankingList create sendBackUsers");
     List<Object[]> rankingUsers = userRepository.getRankingList();
     logger.debug("/api/getRankingList got Object[] from DB");
+    int rank = 1;
     for (Object[] obj : rankingUsers) {
-      RankingListHelper tmp = new RankingListHelper((String) obj[1], (Integer) obj[2]);
+      RankingListHelper tmp = new RankingListHelper((String) obj[1], (Integer) obj[2], rank);
       sendBackUsers.add(tmp);
+      rank++;
     }
     logger.debug("/api/getRankingList Converted Objects to RankingListHelper");
     logger.debug("/api/getRankingList RankingList: " + new GsonBuilder().setPrettyPrinting().create().toJson(sendBackUsers));
@@ -433,7 +435,7 @@ public class Controller {
         ResponseEntity singlePlace = getRankingPlace(user.getEmail());
 
         if (singlePlace.getStatusCodeValue() == 200) {
-          RankingListHelper rankingListHelper = new RankingListHelper(user.getUsername(), (Integer) user_infoRepository.findUser_InfoByUser(user).getRankingPointsSum());
+          RankingListHelper rankingListHelper = new RankingListHelper(user.getUsername(), (Integer) user_infoRepository.findUser_InfoByUser(user).getRankingPointsSum(), (Integer) getRankingPlace(user.getEmail()).getBody());
           logger.debug(String.valueOf((Integer) singlePlace.getBody()));
           sendBackUsers.add(rankingListHelper);
         }
diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java b/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java
index 9e3b2b2..6b7d1a0 100644
--- a/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java
+++ b/src/main/java/hhn/labsw/bugageocaching/helper/RankingListHelper.java
@@ -4,10 +4,12 @@ public class RankingListHelper {
 
   private String username;
   private int rankingPointsSum;
+  private int rank;
 
-  public RankingListHelper(String username, int ranking_Points) {
+  public RankingListHelper(String username, int ranking_Points, int rank) {
     this.username = username;
     this.rankingPointsSum = ranking_Points;
+    this.rank = rank;
   }
 
   public String getUsername() {
@@ -26,6 +28,14 @@ public class RankingListHelper {
     this.rankingPointsSum = ranking_Points;
   }
 
+  public int getRank() {
+    return rank;
+  }
+
+  public void setRank(int rank) {
+    this.rank = rank;
+  }
+
   @Override
   public String toString() {
     return "( " + username + " | " + rankingPointsSum + " )";