Leaderboard fix
This commit is contained in:
parent
8c3590c3c0
commit
4a304a42f8
@ -121,37 +121,32 @@ public class MainController {
|
||||
// TODO FIX LEADERBOARD AND SORTING
|
||||
|
||||
//Hämta alla skolor och lagra dom i en ArrayList
|
||||
Iterable<School> iterable = schoolRepository.findAll();
|
||||
Iterable<School> schools = schoolRepository.findAll();
|
||||
|
||||
//Räkna för varje skola antal aktiviteter registrerade och räkna ut poäng
|
||||
HashMap <String, Integer> points = new HashMap <String, Integer>();
|
||||
for (School school : iterable) {
|
||||
Iterable<Activity> ite = activityRepository.findBySchoolCode(school.getCode());
|
||||
|
||||
for (School school : schools) {
|
||||
ArrayList<Activity> activities = new ArrayList();
|
||||
ite.forEach(activities::add);
|
||||
Iterable<Activity> ite = activityRepository.findAll();
|
||||
|
||||
points.put(school.getCode(),5 * activities.size());
|
||||
for (Activity activity : ite) {
|
||||
if ((activity.getSchoolCode()).equals(school.getCode())) {
|
||||
activities.add(activity);
|
||||
}
|
||||
}
|
||||
|
||||
//TODO COUNT POINTS FOR USER PARTICIPATION
|
||||
|
||||
int userPoints = 0;
|
||||
|
||||
for (Activity activity : activities) {
|
||||
|
||||
userPoints += (1 * activity.getAmountRegistered());
|
||||
|
||||
}
|
||||
points.put(school.getCode(), (5 * (activities.size())));
|
||||
int userPoints = 0;
|
||||
|
||||
for (Activity activity : activities) {
|
||||
userPoints += (activity.getAmountRegistered());
|
||||
}
|
||||
|
||||
points.put(school.getCode(),points.get(school.getCode()) + userPoints);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
//TODO skicka top 4 skolor med högst poäng
|
||||
|
||||
return points;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user