From 066d425d3571dbd1cdddba69b626331e5832571d Mon Sep 17 00:00:00 2001
From: XXNitram <matti.55@hotmail.de>
Date: Fri, 20 Mar 2020 02:38:24 +0100
Subject: [PATCH] Add badge that displays parent group in detail site

---
 .../gruppen2/controller/Gruppen2Controller.java    | 14 ++++++++++++++
 src/main/resources/templates/detailsMember.html    |  4 +++-
 src/main/resources/templates/detailsNoMember.html  |  2 ++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 031d3fd..bea3010 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -172,7 +172,14 @@ public class Gruppen2Controller {
         Group group = userService.getGroupById(groupId);
         Account account = keyCloakService.createAccountFromPrincipal(token);
         User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail());
+        Long parentId = group.getParent();
+        Group parent = new Group();
+        if (parentId != null) {
+            parent = userService.getGroupById(parentId);
+        }
         if (group != null) {
+            model.addAttribute("parentId", parentId);
+            model.addAttribute("parent", parent);
             model.addAttribute("group", group);
             model.addAttribute("roles", group.getRoles());
             model.addAttribute("user", user);
@@ -204,8 +211,15 @@ public class Gruppen2Controller {
     public String showGroupDetailsNoMember(KeycloakAuthenticationToken token, Model model, @RequestParam("id") Long groupId) throws EventException {
         model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token));
         Group group = userService.getGroupById(groupId);
+        Long parentId = group.getParent();
+        Group parent = new Group();
+        if (parentId != null) {
+            parent = userService.getGroupById(parentId);
+        }
         if (group != null && group.getUserMaximum() > group.getMembers().size()) {
             model.addAttribute("group", group);
+            model.addAttribute("parentId", parentId);
+            model.addAttribute("parent", parent);
             return "detailsNoMember";
         }
         throw new GroupNotFoundException(this.getClass().toString());
diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index 5d833de..0c44135 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -39,7 +39,9 @@
                     <span class="badge badge-pill badge-primary"
                           th:if="${group.getVisibility() == group.getVisibility().PUBLIC}">Öffentliche Gruppe</span>
                     <span class="badge badge-pill badge-success" style="background: lightseagreen"
-                          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: lightseagreen"
+                          th:text="${parent.getTitle()}">Parent</span>
                 </h3>
                 <br>
                 <div class="shadow-sm p-4" style="background: white">
diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html
index ece315e..64571cc 100644
--- a/src/main/resources/templates/detailsNoMember.html
+++ b/src/main/resources/templates/detailsNoMember.html
@@ -41,6 +41,8 @@
                         <span class="badge badge-pill badge-success"
                               style="background: lightseagreen"
                               th:if='${group.getType() == group.getType().LECTURE}'> Veranstaltung</span>
+                        <span class="badge badge-pill badge-info" style="background: lightseagreen"
+                              th:text="${parent.getTitle()}">Parent</span>
                     </h3>
                     <div class="shadow-sm p-4" style="background: white">
                         <p style="overflow-wrap: break-word"