christoph/lecture-professional-software-development
1
Fork 0
Code Activity
443 Commits 2 Branches 0 Tags
fdd9d44aace782d971795750e0d2bff515b87748
Commit Graph

79 Commits

Author SHA1 Message Date
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
tomvahl
fa79b3f136 change EventDTO, add AddUserEventController, add the search function in UI and backend 2020-03-14 09:17:32 +01:00
kasch309
a34c119113 Update UpdateRoleEvent.java 2020-03-13 16:41:27 +01:00
kasch309
e5b69c0cc0 Merge branch 'master' into group-details 2020-03-13 16:36:13 +01:00
killerber4t
46985ccca7 add button elements depending on various factors 2020-03-13 16:27:34 +01:00
Mahgs
0071fce075 added Tests for checkGroup() and getMaxID() 2020-03-13 16:16:51 +01:00
killerber4t
68fcc06a17 add details page 2020-03-13 15:11:23 +01:00
LukasEttel
8ce3fc39b1 quick refactor 2020-03-13 14:42:17 +01:00
LukasEttel
b8fe1bf29a Merge remote-tracking branch 'origin/master' into updateGroupsAPI 
# Conflicts:
#	src/main/java/mops/gruppen2/service/EventService.java
 2020-03-13 13:52:53 +01:00
XXNitram
6b788beb4b Refactor ControllerService and add an UpdateRoleEvent to createGroup 2020-03-13 13:46:34 +01:00
LukasEttel
1754486625 Merge remote-tracking branch 'origin/master' into updateGroupsAPI 
# Conflicts:
#	src/main/java/mops/gruppen2/repository/EventRepository.java
 2020-03-12 16:31:23 +01:00
LukasEttel
9795c10c14 Impletended the updategroup(status) method in the API 2020-03-12 16:11:32 +01:00
tomvahl
e31c9cf522 Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 15:46:14 +01:00
XXNitram
70d911c576 Add UpdateGroupTitleEvent and UpdateGroupDescriptionEvent to Gruppen2Controller 2020-03-12 15:22:10 +01:00
tomvahl
77b6ba247d add comments 2020-03-12 15:13:56 +01:00
killerber4t
846eee9606 refactor tests for new events 2020-03-11 16:10:58 +01:00
Christoph
b7b4485d03 add missing enums 2020-03-11 15:34:52 +01:00
Christoph
e8770066f8 change create group event + new group fields 2020-03-11 15:27:56 +01:00