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

renaming + better use of wrappers

Browse Source
This commit is contained in:
Christoph
2020-04-13 01:06:59 +02:00
parent 85455fac17
commit f5d668fba2
38 changed files with 206 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/resources/templates/fragments/groups.html
View File

@ -15,9 +15,9 @@
th:if='${group.getType() == lecture}'>Veranstaltung</span>
<span class="badge badge-pill parent"
th:unless="${parent == null || parent?.getTitle()?.getGroupTitle() == null|| parent?.getTitle()?.getGroupTitle() == ''}"
th:title="${'Die Gruppe gehört zur Veranstaltung ' + parent.getTitle().getGroupTitle() + '.'}"
th:text="${parent.getTitle().getGroupTitle()}">Parent</span>
th:unless="${parent == null || parent?.getTitle() == null|| parent?.getTitle() == ''}"
th:title="${'Die Gruppe gehört zur Veranstaltung ' + parent.getTitle() + '.'}"
th:text="${parent.getTitle()}">Parent</span>
<!--Needs completly projected (cached) groups-->
<!--<span class="badge badge-success float-right"
@ -28,7 +28,7 @@
<!--User Badges-->
<th:block th:fragment="userbadges">
<span class="badge badge-success align-self-start ml-2"
th:if="${group.getRoles().get(member.getId()) == admin}">Admin</span>
th:if="${group.getRoles().get(member.getUserid()) == admin}">Admin</span>
</th:block>
<th:block th:fragment="groupcontent">
@ -48,21 +48,21 @@
<!--Buttonbar zum Gruppe beitreten-->
<th:block th:fragment="joingroup">
<div class="content-heading">
<span th:if="${group.getMembers().size() < group.getUserLimit().getUserLimit()}">
<span th:if="${group.getMembers().size() < group.getLimit().getUserLimit()}">
Möchtest du dieser Gruppe beitreten?
</span>
<span th:unless="${group.getMembers().size() < group.getUserLimit().getUserLimit()}">
<span th:unless="${group.getMembers().size() < group.getLimit().getUserLimit()}">
Diese Gruppe hat ihre maximale Teilnehmeranzahl erreicht.
</span>
</div>
<div class="row">
<form method="post" th:action="@{/gruppen2/details/{id}/join(id = ${group.getId()})}"
th:if="${group.getMembers().size() < group.getUserLimit().getUserLimit()}">
<form method="post" th:action="@{/gruppen2/details/{id}/join(id = ${group.getGroupId()})}"
th:if="${group.getMembers().size() < group.getLimit().getUserLimit()}">
<button class="btn btn-success" type="submit">Gruppe beitreten.</button>
</form>
<div class="col" th:if="${group.getMembers().size() < group.getUserLimit().getUserLimit()}"></div>
<div class="col" th:if="${group.getMembers().size() < group.getLimit().getUserLimit()}"></div>
<a class="btn btn-primary" href="/gruppen2"
type="submit">Startseite.</a>