From a1e976a8057dee62085612d140a90ea2c8238971 Mon Sep 17 00:00:00 2001
From: tomvahl <tom-vahl@hotmail.com>
Date: Thu, 19 Mar 2020 15:30:19 +0100
Subject: [PATCH 1/2] add exception

---
 .../java/mops/gruppen2/domain/event/AddUserEvent.java |  3 ++-
 .../gruppen2/domain/exception/GroupFullException.java | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/mops/gruppen2/domain/exception/GroupFullException.java

diff --git a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
index 02bcb6c..9491355 100644
--- a/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
+++ b/src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
@@ -7,6 +7,7 @@ import mops.gruppen2.domain.Group;
 import mops.gruppen2.domain.Role;
 import mops.gruppen2.domain.User;
 import mops.gruppen2.domain.exception.EventException;
+import mops.gruppen2.domain.exception.GroupFullException;
 import mops.gruppen2.domain.exception.UserAlreadyExistsException;
 
 /**
@@ -37,7 +38,7 @@ public class AddUserEvent extends Event {
         }
         //andere exception
         if (group.getMembers().size() == group.getUserMaximum()){
-            throw new UserAlreadyExistsException(this.getClass().toString());
+            throw new GroupFullException(this.getClass().toString());
         }
 
         group.getMembers().add(user);
diff --git a/src/main/java/mops/gruppen2/domain/exception/GroupFullException.java b/src/main/java/mops/gruppen2/domain/exception/GroupFullException.java
new file mode 100644
index 0000000..1fb1509
--- /dev/null
+++ b/src/main/java/mops/gruppen2/domain/exception/GroupFullException.java
@@ -0,0 +1,11 @@
+package mops.gruppen2.domain.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class GroupFullException extends EventException {
+
+	public GroupFullException(String info) {
+		super(HttpStatus.INTERNAL_SERVER_ERROR, "Der User existiert bereits.", info);
+	}
+}
+

From ca5930971626405dafbfb58a64c1bb16698bdc63 Mon Sep 17 00:00:00 2001
From: kasch309 <fr3sh3rpi55a@gmail.com>
Date: Thu, 19 Mar 2020 15:35:58 +0100
Subject: [PATCH 2/2] add display of actual and maximum users

---
 src/main/resources/templates/detailsMember.html | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index 03436d8..7001e33 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -63,13 +63,18 @@
             <div class="col-3" style="white-space: nowrap">
                 <div style="display: inline-block; margin: 0">
                     <h2>Mitglieder</h2>
+                    <div>
+                        <h4>
+                            <a th:text="${group.getMembers().size()}"></a>
+                            <a>von maximal</a>
+                            <a th:text="${group.getUserMaximum()}"></a>
+                            <a>Benutzern.</a>
+                        </h4>
+                    </div>
                     <div th:if="${group.getRoles().get(user.getId()) == admin}">
                         <form method="get"
                               th:action="@{/gruppen2/details/members/{id}(id=${group.getId()})}">
-                            <button class="btn btn-secondary"
-                                    style="background: slategrey; float: right">
-                                Mitglieder bearbeiten
-                            </button>
+                            <button class="btn btn-secondary" style="background: slategrey; float: left">Mitglieder bearbeiten</button>
                         </form>
                     </div>
                     <br>