From 4320bebbc5898dd4a2c2dc5b716bf02cc10e5e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcin=20Szczepa=C5=84ski?= <marszc13@st.amu.edu.pl>
Date: Sun, 8 Dec 2019 20:55:00 +0100
Subject: [PATCH] Fix: rankingi

---
 .../studycaverestservice/model/studyGroup/GroupService.java   | 4 ++++
 .../studycaverestservice/model/user/dto/LeaderboardDTO.java   | 2 ++
 FrontEnd/src/app/groups/ranking/ranking.component.ts          | 4 +++-
 .../tests-in-group-results.component.html                     | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java
index ee0caeb..c1880e6 100644
--- a/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java
+++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java
@@ -719,6 +719,8 @@ public class GroupService {
                     score += a.getPoints();
                 }
                 user.setUsername(m.getUser().getUsername());
+                user.setName(m.getUser().getName());
+                user.setSurname(m.getUser().getSurname());
                 if(userBadgeRepository.findByIdAndUser((long)8, m.getUser().getId()).isEmpty() && score > 100) {
                     UserBadge badgeAchieved = new UserBadge();
                     Badge badge = new Badge();
@@ -757,6 +759,8 @@ public class GroupService {
                         score += a.getPoints();
                 }
                 user.setUsername(m.getUser().getUsername());
+                user.setName(m.getUser().getName());
+                user.setSurname(m.getUser().getSurname());
                 user.setPoints(score);
                 leaderboard.add(user);
             }
diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/user/dto/LeaderboardDTO.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/user/dto/LeaderboardDTO.java
index 319aefd..6c11258 100644
--- a/BackEnd/src/main/java/studycave/studycaverestservice/model/user/dto/LeaderboardDTO.java
+++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/user/dto/LeaderboardDTO.java
@@ -11,6 +11,8 @@ import lombok.Setter;
 @NoArgsConstructor
 public class LeaderboardDTO implements Comparable {
     private String Username;
+    private String Name;
+    private String Surname;
     private float points;
 
 
diff --git a/FrontEnd/src/app/groups/ranking/ranking.component.ts b/FrontEnd/src/app/groups/ranking/ranking.component.ts
index a63cfd9..707babc 100644
--- a/FrontEnd/src/app/groups/ranking/ranking.component.ts
+++ b/FrontEnd/src/app/groups/ranking/ranking.component.ts
@@ -30,7 +30,9 @@ export class RankingComponent implements OnInit, OnDestroy {
   public chart;
   public localeText = localeText;
   public columnDefs = [
-    { headerName: 'Użytkownik', field: 'username', headerTooltip: 'Użytkownik' },
+    { headerName: 'Nazwa użytkownika', field: 'username', headerTooltip: 'Nazwa użytkownika' },
+    { headerName: 'Imię', field: 'name', headerTooltip: 'Imię' },
+    { headerName: 'Nazwisko', field: 'surname', headerTooltip: 'Nazwisko' },
     { headerName: 'Punkty', field: 'points', headerTooltip: 'Punkty' },
   ];
   public data = [];
diff --git a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html
index 3f8c094..55bf971 100644
--- a/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html
+++ b/FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html
@@ -4,7 +4,7 @@
       <button class="btn btn-study-cave float-right mr-1" [routerLink]="['/groups/', id]"><i class="fas fa-arrow-left"></i> Powrót</button>
       <div style="clear: both;"></div>
     </div>
-    <h1>{{group?.name}}</h1>
+    <h1>Wyniki za testy w grupie: {{group?.name}}</h1>
     <br />
     <div>
       <h2>Wybierz test aby zobaczyć wyniki:</h2>