diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index aa22132..ce1c867 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -11,6 +11,7 @@ import mops.gruppen2.security.Account; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -84,6 +85,8 @@ public class GroupService { List visibleGroups = projectEventList(groupEvents); + sortByGroupType(visibleGroups); + return visibleGroups.parallelStream() .filter(group -> group.getType() != null) .filter(group -> !eventService.userInGroup(group.getId(), userId)) @@ -132,4 +135,20 @@ public class GroupService { group.getDescription().toLowerCase().contains(search.toLowerCase())) .collect(Collectors.toList()); } + + public void sortByGroupType(List groups) { + groups.sort(new Comparator() { + @Override + public int compare(Group g1, Group g2) { + if (g1.getType() == GroupType.LECTURE) { + return -1; + } + if (g2.getType() == GroupType.LECTURE) { + return 0; + } + + return 1; + } + }); + } } diff --git a/src/main/java/mops/gruppen2/service/UserService.java b/src/main/java/mops/gruppen2/service/UserService.java index d4db839..39fecff 100644 --- a/src/main/java/mops/gruppen2/service/UserService.java +++ b/src/main/java/mops/gruppen2/service/UserService.java @@ -35,6 +35,9 @@ public class UserService { newGroups.add(group); } } + + groupService.sortByGroupType(newGroups); + return newGroups; } diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index a464f26..06bd43b 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -10,7 +10,8 @@
-