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

Merge pull request #122 from hhu-propra2/fix-lecture-parent-list

Browse Source 
Fix lecture parent list
This commit is contained in:
AndiBuls
2020-03-23 16:26:04 +01:00
committed by GitHub
parent 430336ae9c c37535ea05
commit 8f50442c7b
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,8 @@
package mops.gruppen2.service; package mops.gruppen2.service;
import mops.gruppen2.domain.Group; import mops.gruppen2.domain.Group;
import mops.gruppen2.domain.GroupType;
import mops.gruppen2.domain.Visibility;
import mops.gruppen2.domain.dto.EventDTO; import mops.gruppen2.domain.dto.EventDTO;
import mops.gruppen2.domain.event.Event; import mops.gruppen2.domain.event.Event;
import mops.gruppen2.domain.exception.EventException; import mops.gruppen2.domain.exception.EventException;
@ -84,6 +86,7 @@ public class GroupService {
return visibleGroups.parallelStream() return visibleGroups.parallelStream()
.filter(group -> group.getType() != null) .filter(group -> group.getType() != null)
.filter(group -> !userGroupIds.contains(group.getId())) .filter(group -> !userGroupIds.contains(group.getId()))
.filter(group -> group.getVisibility() == Visibility.PUBLIC)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -95,7 +98,8 @@ public class GroupService {
List<Group> visibleGroups = projectEventList(createEvents); List<Group> visibleGroups = projectEventList(createEvents);
return visibleGroups.parallelStream() return visibleGroups.parallelStream()
.filter(group -> group.getType() != null) .filter(group -> group.getType() == GroupType.LECTURE)
.filter(group -> group.getVisibility() == Visibility.PUBLIC)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }

5
src/main/resources/templates/detailsNoMember.html
View File

@ -65,13 +65,14 @@
<div class="col-3" style="white-space: nowrap"> <div class="col-3" style="white-space: nowrap">
<div style="display: inline-block; margin: 0"> <div style="display: inline-block; margin: 0">
<h2>Mitglieder</h2> <h2>Mitglieder</h2>
<div> <div th:switch="${group.getUserMaximum() != 100000}">
<h4> <h4 th:case="${true}">
<a th:text="${group.getMembers().size()}"></a> <a th:text="${group.getMembers().size()}"></a>
<a>von maximal</a> <a>von maximal</a>
<a th:text="${group.getUserMaximum()}"></a> <a th:text="${group.getUserMaximum()}"></a>
<a>Benutzern.</a> <a>Benutzern.</a>
</h4> </h4>
<h4 th:case="false">unbegrenzte Teilnehmeranzahl</h4>
</div> </div>
</div> </div>
</div> </div>