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

Merge remote-tracking branch 'origin/UI-Improvements'

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/resources/templates/detailsMember.html
This commit is contained in:
killerber4t
2020-03-14 23:47:41 +01:00
parent 916a386179 d3c5ded6d0
commit 1ad3ad8bab
5 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/mops/gruppen2/service/ControllerService.java
View File

@ -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<Event> 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),