s416178/Punktonerzy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix: rankingi

Browse Source
This commit is contained in:
Marcin Szczepański 2019-12-08 20:55:00 +01:00
parent f8d77069cc
commit 4320bebbc5
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java
View File

@ -719,6 +719,8 @@ public class GroupService {
score += a.getPoints(); score += a.getPoints();
} }
user.setUsername(m.getUser().getUsername()); 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) { if(userBadgeRepository.findByIdAndUser((long)8, m.getUser().getId()).isEmpty() && score > 100) {
UserBadge badgeAchieved = new UserBadge(); UserBadge badgeAchieved = new UserBadge();
Badge badge = new Badge(); Badge badge = new Badge();
@ -757,6 +759,8 @@ public class GroupService {
score += a.getPoints(); score += a.getPoints();
} }
user.setUsername(m.getUser().getUsername()); user.setUsername(m.getUser().getUsername());
user.setName(m.getUser().getName());
user.setSurname(m.getUser().getSurname());
user.setPoints(score); user.setPoints(score);
leaderboard.add(user); leaderboard.add(user);
} }

2
BackEnd/src/main/java/studycave/studycaverestservice/model/user/dto/LeaderboardDTO.java
View File

@ -11,6 +11,8 @@ import lombok.Setter;
@NoArgsConstructor @NoArgsConstructor
public class LeaderboardDTO implements Comparable { public class LeaderboardDTO implements Comparable {
private String Username; private String Username;
private String Name;
private String Surname;
private float points; private float points;

4
FrontEnd/src/app/groups/ranking/ranking.component.ts
View File

@ -30,7 +30,9 @@ export class RankingComponent implements OnInit, OnDestroy {
public chart; public chart;
public localeText = localeText; public localeText = localeText;
public columnDefs = [ 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' }, { headerName: 'Punkty', field: 'points', headerTooltip: 'Punkty' },
]; ];
public data = []; public data = [];

2
FrontEnd/src/app/groups/tests-in-group-results/tests-in-group-results.component.html
View File

@ -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> <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 style="clear: both;"></div>
</div> </div>
<h1>{{group?.name}}</h1> <h1>Wyniki za testy w grupie: {{group?.name}}</h1>
<br /> <br />
<div> <div>
<h2>Wybierz test aby zobaczyć wyniki:</h2> <h2>Wybierz test aby zobaczyć wyniki:</h2>