christoph/lecture-professional-software-development
1
Fork 0
Code Activity
493 Commits 2 Branches 0 Tags
6506ce7bbe35f7b76b7edf8c4d37fb78c2ab35e0
Commit Graph

96 Commits

Author SHA1 Message Date
tomvahl
ef946c9f82 automatic group size for ogra 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 15:57:16 +01:00
tomvahl
71ea7eec40 add DeleteGoup function 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 13:45:40 +01:00
XXNitram
ef044cbdf7 Merge remote-tracking branch 'origin/master' into csv-error-handling 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/User.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/resources/templates/createStudent.html
 2020-03-19 17:01:32 +01:00
XXNitram
cd1d7183e7 Add exceptions for csv errors 2020-03-19 16:51:40 +01:00
AndiBuls
fd4c4ba0f1 Merge pull request #107 from hhu-propra2/entadminisierung 
Entadminisierung
 2020-03-19 16:45:26 +01:00
XXNitram
59487fc4c7 Fix User class so that csv works 2020-03-19 16:44:08 +01:00
Lukas Ettel
5917d9b0fc fixed exeptionname 
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-19 16:42:27 +01:00
Lukas Ettel
a96981515f Merge remote-tracking branch 'origin/master' into entadminisierung 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/User.java
#	src/main/resources/templates/editMembers.html
 2020-03-19 16:14:57 +01:00
Lukas Ettel
06b308167d abfangen von wenn letzter admin nicht mehr 
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-19 16:00:09 +01:00
killerber4t
d2b5b44a0d Merge remote-tracking branch 'origin/master' into max_userNumber 
# Conflicts:
#	src/main/resources/templates/editMembers.html
 2020-03-19 15:55:59 +01:00
tomvahl
a1e976a805 add exception 2020-03-19 15:30:19 +01:00
killerber4t
1a5dc2571a add userMaximum 
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
 2020-03-19 15:25:05 +01:00
tomvahl
abae802e0c add exception 2020-03-19 15:11:20 +01:00
Lukas Ettel
68ec062fdb crated an exeption 2020-03-19 14:39:54 +01:00
tomvahl
a2ae464bf0 add UserMaximum function 2020-03-19 14:28:15 +01:00
killerber4t
22bfcf3a05 fix-search after leaving group 2020-03-19 14:14:54 +01:00
Christoph
2192751a01 fix rename errors 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-19 00:20:14 +01:00
Christoph
fdd9d44aac fix merge errors 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-19 00:00:33 +01:00
Christoph
1c5139da8c Merge refactor into error-handling + fix merge errors 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 23:45:07 +01:00
Christoph
849c94481c Merge branch 'refactoring' into error-handling 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserAlreadyExistsException.java
#	src/main/java/mops/gruppen2/domain/Exceptions/UserNotFoundException.java
#	src/main/java/mops/gruppen2/domain/Group.java
#	src/main/java/mops/gruppen2/domain/event/AddUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/CreateGroupEvent.java
#	src/main/java/mops/gruppen2/domain/event/DeleteUserEvent.java
#	src/main/java/mops/gruppen2/domain/event/Event.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupDescriptionEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateGroupTitleEvent.java
#	src/main/java/mops/gruppen2/domain/event/UpdateRoleEvent.java
#	src/main/java/mops/gruppen2/domain/exception/EventException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupIdMismatchException.java
#	src/main/java/mops/gruppen2/domain/exception/GroupNotFoundException.java
#	src/main/java/mops/gruppen2/domain/exception/NoValueException.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
#	src/main/java/mops/gruppen2/service/UserService.java
#	src/main/resources/templates/errorRenameLater.html
 2020-03-18 23:40:39 +01:00
Christoph
e9bab1bf3f Intellij Code Cleaunp 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 23:25:54 +01:00
Christoph
a05ffe9e4c Fix Checkstyle Errors :( 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 23:17:57 +01:00
Christoph
79de4a8540 renaming 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 21:40:36 +01:00
Christoph
e4d8fb05cb removed unneccessary fields, decreased field visibility 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 21:32:05 +01:00
Christoph
2ba913f2c8 Formatting 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 20:18:03 +01:00
Christoph
b1460abe48 Exception rework: clearer message + origin 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 18:49:40 +01:00
Christoph
df7803f83d add error handling (frontend) + exception changes 
Co-authored-by: Christoph <tobi@urpost.de>
Co-authored-by: Mahgs <maxoerter@gmx.de>
 2020-03-18 16:27:24 +01:00
XXNitram
f292700c78 Merge remote-tracking branch 'origin/master' into feature-orga-csv 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-18 14:27:54 +01:00
[Mahgs]
722cd80831 Merge remote-tracking branch 'origin/master' into group-invite-links 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/repository/EventRepository.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/java/mops/gruppen2/service/GroupService.java
 2020-03-18 13:18:34 +01:00
XXNitram
4b1627a993 Merge remote-tracking branch 'origin/csv-import' into feature-orga-csv 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/APIController.java
#	src/main/resources/templates/create.html
 2020-03-18 03:23:22 +01:00
Christoph
6e067d1b47 Fix InviteLink DB Schema + Implement Frontend InviteLink Handling 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 16:16:58 +01:00
Lukas Ettel
49c38b583c Quick fix on master 2020-03-17 16:13:29 +01:00
Talha Caliskan
90a07e7b2a Merge pull request #90 from hhu-propra2/eventExeptionHandling 
Implementation of old EventExeptions
 2020-03-17 16:06:54 +01:00
Lukas Ettel
991bcf2aaa Implementation of old EventExeptions 2020-03-17 15:57:26 +01:00
killerber4t
61e007e4d8 add leaving group 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-17 14:36:55 +01:00
Christoph
e045dc54ee Add InviteLinkDTO + add dto folder 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 13:33:02 +01:00
Lukas Ettel
ca469d83af even further stuff 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
 2020-03-16 17:01:44 +01:00
killerber4t
6991a18405 fix UpdateRoleEvent and DeleteUserEvent 
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
 2020-03-16 16:50:32 +01:00
Lukas Ettel
abd99f6a5e further refactor of eventhandling 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
 2020-03-16 16:33:26 +01:00
killerber4t
ee6d2cca9f Merge branch 'change-to-polymorphie' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into change-to-polymorphie 2020-03-16 15:53:34 +01:00
killerber4t
4f6ec4ed96 Merge branch 'change-to-polymorphie' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into change-to-polymorphie 2020-03-16 15:53:03 +01:00
tomvahl
266c1d6da9 Merge remote-tracking branch 'origin/change-to-polymorphie' into change-to-polymorphie 2020-03-16 15:48:16 +01:00
killerber4t
8d0b81b65f delete applyEvent-Methods from Group 2020-03-16 15:47:07 +01:00
killerber4t
315d1d6011 change AddUserEvent and DeleteUserEvent 2020-03-16 15:46:23 +01:00
tomvahl
06fa9f5284 change UpdateRoleEvent 2020-03-16 15:45:26 +01:00
XXNitram
801ef1998c Change UpdateGroupTitleEvent and UpdateGroupDescriptionEvent 2020-03-16 15:44:31 +01:00
killerber4t
22eede051b change CreateGroupEvent 
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
 2020-03-16 15:36:28 +01:00
Christoph
2c3531657d csv proof of concept 2020-03-16 14:09:30 +01:00
Mahgs
db11bdb8a9 Merge remote-tracking branch 'origin/master' into EventServiceTests 
# Conflicts:
#	src/test/java/mops/gruppen2/service/EventServiceTest.java
 2020-03-16 13:14:10 +01:00
Talha Caliskan
434a69f93d Merge branch 'master' into change_DTO 2020-03-14 09:28:39 +01:00