christoph/lecture-professional-software-development
1
Fork 0
Code Activity

add badges in group lists

Browse Source 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
This commit is contained in:
Christoph
2020-03-25 15:46:58 +01:00
parent dd7404553c
commit ed4a9b5728
4 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/mops/gruppen2/service/GroupService.java
View File

@ -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<Group> 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<Group> groups) {
groups.sort(new Comparator<Group>() {
@Override
public int compare(Group g1, Group g2) {
if (g1.getType() == GroupType.LECTURE) {
return -1;
}
if (g2.getType() == GroupType.LECTURE) {
return 0;
}
return 1;
}
});
}
}