From aa843f1d8e42824c135869a9520133b14ec347e0 Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Tue, 17 Mar 2020 14:46:20 +0100
Subject: [PATCH 1/2] fix html

---
 .../resources/templates/detailsMember.html    | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index aa0d7f6..6086619 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -27,23 +27,25 @@
 <main th:fragment="bodycontent">
     <div class="container-fluid">
         <div class="row">
-            <div class="shadow-sm p-4" style="border: 10px solid aliceblue; background: aliceblue">
-                <h1 style="color: dodgerblue; font-weight: bold" th:text="${group.getTitle()}"></h1>
-                <p style="font-weight: bold">
-                    <span class="badge badge-pill badge-dark" style="background: darkslategray" th:if="${group.getVisibility() == group.getVisibility().PRIVATE }">Private Gruppe</span>
-                    <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>
-                </p>
-                <p th:text="${group.getDescription()}"></p>
-                <div class="form-group">
-                    <div class="text-right">
-                        <form method="post" action="/gruppen2/leaveGroup">
-                            <button th:value="${group.getId()}" th:name="group_id" class="btn btn-danger" type="submit" style="border-style: none;">Gruppe verlassen</button>
-                        </form>
-                    </div>
+
+            <div class="col-9">
+                <div class="shadow-sm p-4" style="border: 10px solid aliceblue; background: aliceblue">
+                        <h1 style="color: dodgerblue; font-weight: bold" th:text="${group.getTitle()}"></h1>
+                        <p style="font-weight: bold">
+                            <span class="badge badge-pill badge-dark" style="background: darkslategray" th:if="${group.getVisibility() == group.getVisibility().PRIVATE }">Private Gruppe</span>
+                            <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>
+                        </p>
+                        <p th:text="${group.getDescription()}"></p>
+                        <div class="form-group">
+                            <div class="text-right">
+                                <form method="post" action="/gruppen2/leaveGroup">
+                                    <button th:value="${group.getId()}" th:name="group_id" class="btn btn-danger" type="submit" style="border-style: none;">Gruppe verlassen</button>
+                                </form>
+                            </div>
+                        </div>
                 </div>
             </div>
-
             <div class="col-3" style="white-space: nowrap">
                 <div>
                     <h2 style="display: inline-block; margin: 0">Mitglieder</h2>

From c052ec6ae6ec9cbd88a79b1217730efe6bf9b179 Mon Sep 17 00:00:00 2001
From: killerber4t <t.caliskan@live.de>
Date: Tue, 17 Mar 2020 14:58:02 +0100
Subject: [PATCH 2/2] refactor code

Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
---
 src/main/java/mops/gruppen2/controller/Gruppen2Controller.java | 1 -
 src/main/java/mops/gruppen2/service/ControllerService.java     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 59ee52b..ddc90f8 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -133,7 +133,6 @@ public class Gruppen2Controller {
     public String pLeaveGroup(KeycloakAuthenticationToken token, @RequestParam (value="group_id") Long id) {
         Account account = keyCloakService.createAccountFromPrincipal(token);
         controllerService.deleteUser(account, id);
-        System.out.println(id);
         return "redirect:/gruppen2/";
     }
 }
diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java
index f0ee54d..126d519 100644
--- a/src/main/java/mops/gruppen2/service/ControllerService.java
+++ b/src/main/java/mops/gruppen2/service/ControllerService.java
@@ -68,7 +68,6 @@ public class ControllerService {
 
     public void deleteUser(Account account, Long group_id){
         DeleteUserEvent deleteUserEvent = new DeleteUserEvent(group_id,account.getName());
-        System.out.println(deleteUserEvent.getGroup_id() + " " + deleteUserEvent.getUser_id());
         eventService.saveEvent(deleteUserEvent);
     }
 }