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 org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -84,6 +85,8 @@ public class GroupService {
List<Group> visibleGroups = projectEventList(groupEvents); List<Group> visibleGroups = projectEventList(groupEvents);
sortByGroupType(visibleGroups);
return visibleGroups.parallelStream() return visibleGroups.parallelStream()
.filter(group -> group.getType() != null) .filter(group -> group.getType() != null)
.filter(group -> !eventService.userInGroup(group.getId(), userId)) .filter(group -> !eventService.userInGroup(group.getId(), userId))
@ -132,4 +135,20 @@ public class GroupService {
group.getDescription().toLowerCase().contains(search.toLowerCase())) group.getDescription().toLowerCase().contains(search.toLowerCase()))
.collect(Collectors.toList()); .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;
}
});
}
} }

3
src/main/java/mops/gruppen2/service/UserService.java
View File

@ -35,6 +35,9 @@ public class UserService {
newGroups.add(group); newGroups.add(group);
} }
} }
groupService.sortByGroupType(newGroups);
return newGroups; return newGroups;
} }

9
src/main/resources/templates/index.html
View File

@ -10,7 +10,8 @@
</head> </head>
<body> <body>
<header> <header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation" th:switch="${account.getRoles().contains('orga')}"> <nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation"
th:switch="${account.getRoles().contains('orga')}">
<ul> <ul>
<li class="active"> <li class="active">
<a href="/" th:href="@{/gruppen2}">Gruppen</a> <a href="/" th:href="@{/gruppen2}">Gruppen</a>
@ -44,8 +45,12 @@
</h3> </h3>
<br> <br>
<div th:each="gruppe: ${gruppen}"> <div th:each="gruppe: ${gruppen}">
<div class="shadow-sm p-4" style="border: none; border-radius: 5px; background: aliceblue"> <div class="shadow-sm p-4"
style="border: none; border-radius: 5px; background: aliceblue">
<h3 style="color: dodgerblue; font-weight: bold; font-optical-sizing: auto; overflow-wrap: break-word"> <h3 style="color: dodgerblue; font-weight: bold; font-optical-sizing: auto; overflow-wrap: break-word">
<span class="badge badge-pill badge-success"
style="background: lightseagreen; margin-right: 25px;"
th:if='${gruppe.getType() == gruppe.getType().LECTURE}'>Veranstaltung</span>
<a th:href="@{/gruppen2/details/{id}(id=${gruppe.getId()})}" <a th:href="@{/gruppen2/details/{id}(id=${gruppe.getId()})}"
th:text="${gruppe.getTitle()}"></a> th:text="${gruppe.getTitle()}"></a>
</h3> </h3>

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

@ -59,8 +59,11 @@
<tbody> <tbody>
<tr th:each="gruppe : ${gruppen}" th:switch="${gruppe.getUserMaximum() != 100000}"> <tr th:each="gruppe : ${gruppen}" th:switch="${gruppe.getUserMaximum() != 100000}">
<th scope="row"> <th scope="row">
<span class="badge badge-pill badge-success"
style="background: lightseagreen; margin-right: 25px;"
th:if='${gruppe.getType() == gruppe.getType().LECTURE}'>Veranstaltung</span>
<a th:href="@{/gruppen2/detailsSearch(id=${gruppe.getId()})}" <a th:href="@{/gruppen2/detailsSearch(id=${gruppe.getId()})}"
th:text="${gruppe.getTitle()}">Gruppenname</a> th:text="${#strings.abbreviate(gruppe.getTitle(), 50)}">Gruppenname</a>
</th> </th>
<td style="" th:text="${#strings.abbreviate(gruppe.getDescription(), 50)}"> <td style="" th:text="${#strings.abbreviate(gruppe.getDescription(), 50)}">
Beschreibung Beschreibung