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

link displayed in UI

Browse Source 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: kasch309 <fr3sh3rpi55a@gmail.com>
This commit is contained in:
[Mahgs]
2020-03-23 15:08:39 +01:00
parent 892c734265
commit a03d3f5b69
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,8 @@ public class Gruppen2Controller {
private final InviteLinkRepositoryService inviteLinkRepositoryService; private final InviteLinkRepositoryService inviteLinkRepositoryService;
private final Gruppen2Config gruppen2Config; private final Gruppen2Config gruppen2Config;
private final String serverURL = "localhost:8080";
public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService, Gruppen2Config gruppen2Config) { public Gruppen2Controller(KeyCloakService keyCloakService, GroupService groupService, UserService userService, ControllerService controllerService, InviteLinkRepositoryService inviteLinkRepositoryService, Gruppen2Config gruppen2Config) {
this.keyCloakService = keyCloakService; this.keyCloakService = keyCloakService;
this.groupService = groupService; this.groupService = groupService;
@ -192,7 +194,7 @@ public class Gruppen2Controller {
model.addAttribute("user", user); model.addAttribute("user", user);
model.addAttribute("admin", Role.ADMIN); model.addAttribute("admin", Role.ADMIN);
String link = inviteLinkRepositoryService.findlinkByGroupId(group.getId()); String link = serverURL + "/gruppen2/acceptinvite/" + inviteLinkRepositoryService.findlinkByGroupId(group.getId());
model.addAttribute("link", link); model.addAttribute("link", link);
return "detailsMember"; return "detailsMember";

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

@ -11,7 +11,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>
@ -31,7 +32,8 @@
<main th:fragment="bodycontent"> <main th:fragment="bodycontent">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class="col-9 shadow-sm p-4" style="border: 10px solid aliceblue; border-radius: 5px; background: aliceblue"> <div class="col-9 shadow-sm p-4"
style="border: 10px solid aliceblue; border-radius: 5px; background: aliceblue">
<h1 style="color: black; font-weight: bold" th:text="${group.getTitle()}"></h1> <h1 style="color: black; font-weight: bold" th:text="${group.getTitle()}"></h1>
<h3> <h3>
<span class="badge badge-pill badge-dark" style="background: darkslategray" <span class="badge badge-pill badge-dark" style="background: darkslategray"
@ -42,14 +44,21 @@
th:if='${group.getType() == group.getType().LECTURE}'>Veranstaltung</span> th:if='${group.getType() == group.getType().LECTURE}'>Veranstaltung</span>
<span class="badge badge-pill badge-info" style="background: mediumorchid" <span class="badge badge-pill badge-info" style="background: mediumorchid"
th:text="${parent.getTitle()}">Parent</span> th:text="${parent.getTitle()}">Parent</span>
<div class="input-group mb-3" style="margin-top: 10px" th:if="${group.getVisibility() == group.getVisibility().PRIVATE}"> <div class="input-group mb-3" style="margin-top: 10px"
th:if="${group.getVisibility() == group.getVisibility().PRIVATE}">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-default" style="background: #52a1eb">Einladungslink:</span> <span class="input-group-text" id="inputGroup-sizing-default">Einladungslink:</span>
</div> </div>
<input type="text" class="form-control" th:value="${link}" <input type="text" class="form-control" th:value="${link}"
aria-label="Recipient's username" aria-describedby="basic-addon2" id="groupLink" style="background: white" readonly> aria-label="Recipient's username" aria-describedby="basic-addon2" id="groupLink"
style="background: white" readonly>
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-outline-secondary" type="button" onclick="copyLink()">Link kopieren</button> <button class="btn btn-outline-secondary" type="button" onclick="copyLink()"
style="background: #52a1eb; border: none">
<a style="color: white">
Link kopieren
</a>
</button>
</div> </div>
</div> </div>
</h3> </h3>
@ -71,7 +80,8 @@
</form> </form>
<form action="/gruppen2/deleteGroup" method="post"> <form action="/gruppen2/deleteGroup" method="post">
<button class="btn btn-danger" style="border-style: none; margin: 5px" <button class="btn btn-danger" style="border-style: none; margin: 5px"
th:name="group_id" th:value="${group.getId()}" th:if="${group.getRoles().get(user.getId()) == admin}" th:name="group_id" th:value="${group.getId()}"
th:if="${group.getRoles().get(user.getId()) == admin}"
type="submit">Gruppe löschen type="submit">Gruppe löschen
</button> </button>
</form> </form>
@ -91,7 +101,9 @@
<div th:if="${group.getRoles().get(user.getId()) == admin}"> <div th:if="${group.getRoles().get(user.getId()) == admin}">
<form method="get" <form method="get"
th:action="@{/gruppen2/details/members/{id}(id=${group.getId()})}"> th:action="@{/gruppen2/details/members/{id}(id=${group.getId()})}">
<button class="btn btn-secondary" style="background: slategrey; float: left">Mitglieder bearbeiten</button> <button class="btn btn-secondary" style="background: slategrey; float: left">Mitglieder
bearbeiten
</button>
</form> </form>
</div> </div>
<br> <br>