diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java index 6ef05a2..c71ae8d 100644 --- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java +++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java @@ -33,7 +33,6 @@ public class Gruppen2Controller { private final GroupService groupService; private final UserService userService; private final ControllerService controllerService; - private List groups = new ArrayList<>(); public Gruppen2Controller(KeyCloakService keyCloakService, EventService eventService, GroupService groupService, UserService userService, ControllerService controllerService) { this.keyCloakService = keyCloakService; @@ -58,6 +57,7 @@ public class Gruppen2Controller { model.addAttribute("account", keyCloakService.createAccountFromPrincipal(token)); model.addAttribute("gruppen", userService.getUserGroups(user.getUser_id())); + model.addAttribute("user",user); return "index"; } @@ -83,10 +83,16 @@ public class Gruppen2Controller { @PostMapping("/createGroup") public String pCreateGroup(KeycloakAuthenticationToken token, @RequestParam(value = "title") String title, - @RequestParam(value = "beschreibung") String beschreibung) { + @RequestParam(value = "beschreibung") String beschreibung, + @RequestParam(value = "visibility", required = false) Boolean visibility) { Account account = keyCloakService.createAccountFromPrincipal(token); - controllerService.createGroup(account, title, beschreibung); + if (visibility == null) { + visibility = true; + }else{ + visibility = false; + } + controllerService.createGroup(account, title, beschreibung, visibility); return "redirect:/gruppen2/"; } @@ -100,7 +106,7 @@ public class Gruppen2Controller { User user = new User(account.getName(), account.getGivenname(), account.getFamilyname(), account.getEmail()); if(group!= null) { model.addAttribute("group", group); - model.addAttribute("role",group.getRoles().get(user.getUser_id())); + model.addAttribute("role", group.getRoles().get(user.getUser_id())); return "detailsMember"; } throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Group not found"); diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java index 246a101..56173c1 100644 --- a/src/main/java/mops/gruppen2/service/ControllerService.java +++ b/src/main/java/mops/gruppen2/service/ControllerService.java @@ -27,10 +27,15 @@ public class ControllerService { * @param title Gruppentitel * @param description Gruppenbeschreibung */ - public void createGroup(Account account, String title, String description) { - + public void createGroup(Account account, String title, String description, Boolean visibility) { + Visibility visibility1; + if (visibility){ + visibility1 = Visibility.PUBLIC; + }else{ + visibility1 = Visibility.PRIVATE; + } List eventList = new ArrayList<>(); - Collections.addAll(eventList, new CreateGroupEvent(eventService.checkGroup(), account.getName(), null , GroupType.LECTURE, Visibility.PUBLIC), + Collections.addAll(eventList, new CreateGroupEvent(eventService.checkGroup(), account.getName(), null , GroupType.LECTURE, visibility1), new AddUserEvent(eventService.checkGroup(), account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail()), new UpdateRoleEvent(eventService.checkGroup(), account.getName(), Role.ADMIN), new UpdateGroupTitleEvent(eventService.checkGroup(), account.getName(), title), diff --git a/src/main/java/mops/gruppen2/service/GroupService.java b/src/main/java/mops/gruppen2/service/GroupService.java index a1a669c..2faf17e 100644 --- a/src/main/java/mops/gruppen2/service/GroupService.java +++ b/src/main/java/mops/gruppen2/service/GroupService.java @@ -77,7 +77,7 @@ public class GroupService { * @throws EventException */ public List getAllGroupWithVisibilityPublic() throws EventException { - return projectEventList(eventService.translateEventDTOs(eventRepository.findEventDTOByVisibility(Boolean.FALSE))); + return projectEventList(eventService.translateEventDTOs(eventRepository.findEventDTOByVisibility(Boolean.TRUE))); } diff --git a/src/main/resources/templates/create.html b/src/main/resources/templates/create.html index 5b76e37..08c2b7e 100644 --- a/src/main/resources/templates/create.html +++ b/src/main/resources/templates/create.html @@ -29,7 +29,7 @@

Gruppenerstellung

-
+
@@ -38,11 +38,9 @@
-
- - Privat - - Veranstaltung +
+ +
diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html index 14f2522..4781f31 100644 --- a/src/main/resources/templates/detailsMember.html +++ b/src/main/resources/templates/detailsMember.html @@ -31,8 +31,8 @@

- Private Gruppe - Öffentliche Gruppe + Private Gruppe + Öffentliche Gruppe Veranstaltung

@@ -43,6 +43,7 @@
+

Mitglieder

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 02d560d..f41f418 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -25,19 +25,39 @@
-

Meine Gruppen

-
-
-
-

- -

-

-
-
+
+
+

Meine Gruppen

+ +
+
+

+ +

+

+
+
+
+
- +
+
+
+

user_id

+

+ username + usersurname +

+

usermail

+

+ In Gruppen: + +

+
+
+
+