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

add more UI improvements and functionality

Browse Source
This commit is contained in:
killerber4t
2020-03-14 02:03:08 +01:00
parent 3849b61614
commit 3d7681fc8f
4 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
View File

@ -54,6 +54,7 @@ public class Gruppen2Controller {
model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
model.addAttribute("gruppen", userService.getUserGroups(user.getUser_id())); model.addAttribute("gruppen", userService.getUserGroups(user.getUser_id()));
model.addAttribute("user",user);
return "index"; return "index";
} }

2
src/main/resources/templates/create.html
View File

@ -29,7 +29,7 @@
<h1>Gruppenerstellung</h1> <h1>Gruppenerstellung</h1>
<div class="container-fluid"> <div class="container-fluid">
<form method="post" action="/gruppen2/createGroup"> <form method="post" action="/gruppen2/createGroup">
<div class="shadow p-2" style="border: 10px solid aliceblue; background: aliceblue"> <div class="shadow p-2" style=" border: 10px solid aliceblue; background: aliceblue">
<div class="form-group"> <div class="form-group">
<label for="titel">Titel</label> <label for="titel">Titel</label>
<input type="text" class="form-control" id="titel" th:name="title" required> <input type="text" class="form-control" id="titel" th:name="title" required>

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

@ -43,15 +43,18 @@
</form> </form>
</div> </div>
<div class="col-3"> <div class="col-3">
<h2 style="display: inline-block">Mitglieder</h2>
<a style="float: right" th:if="${role == role.ADMIN}">
<button class="btn btn-secondary" type="warning" style="background: slategrey; align-self: end" >Mitglieder bearbeiten</button>
</a>
<p></p>
<ul th:each="member : ${group.getMembers()}" class="list-group-flush" style="background: slategrey"> <ul th:each="member : ${group.getMembers()}" class="list-group-flush" style="background: slategrey">
<li class="list-group-item" style="background: aliceblue"> <li class="list-group-item" style="background: aliceblue">
<span th:text="${member.getUser_id()}"></span> <span th:text="${member.getUser_id()}"></span>
<span th:if="${role == role.ADMIN}" class="badge badge-success">admin</span> <span th:if="${role == role.ADMIN}" class="badge badge-success">admin</span>
</li> </li>
</ul> </ul>
<div class="text-right" th:if="${role == role.ADMIN}">
<button class="btn btn-secondary" type="warning" style="background: slategrey" >Gruppenmitglieder bearbeiten</button>
</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -25,8 +25,10 @@
</nav> </nav>
</header> </header>
<main th:fragment="bodycontent"> <main th:fragment="bodycontent">
<h1>Meine Gruppen</h1>
<div class="container-fluid"> <div class="container-fluid">
<div class="row" >
<div class="col-9">
<h1>Meine Gruppen</h1>
<form action="/" method="get"> <form action="/" method="get">
<div th:each="gruppe: ${gruppen}"> <div th:each="gruppe: ${gruppen}">
<div style="border: 10px solid aliceblue; background: aliceblue"> <div style="border: 10px solid aliceblue; background: aliceblue">
@ -39,6 +41,20 @@
</div> </div>
</form> </form>
</div> </div>
<div class="col-3" >
<div class="container-fluid" style="background: aliceblue">
<div>
<h2 th:text="${user.getUser_id()}" style="text-align: center">user_id</h2>
<h3>
<span th:text="${user.getGivenname()}">username</span>
<span th:text="${user.getFamilyname()}">usersurname</span>
</h3>
<small th:text="${user.getEmail()}">usermail</small>
</div>
</div>
</div>
</div>
</div>
</main> </main>
</body> </body>
</html> </html>