christoph/lecture-professional-software-development
1
Fork 0
Code Activity
635 Commits 2 Branches 0 Tags
91e745e939aa8503bae9787cd45835d066d81f48
Commit Graph

73 Commits

Author SHA1 Message Date
Lukas Ettel
91e745e939 Merge remote-tracking branch 'origin/master' into refactor-controllerService 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-26 13:57:10 +01:00
Lukas Ettel
8c1eb876c5 Refactor of all createGroups complete 
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-26 13:50:22 +01:00
AndiBuls
a140cd22a0 Merge branch 'master' into refactor-controllerService 
# Conflicts:
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-25 16:45:01 +01:00
[Mahgs]
81b93266e5 fixed checkstyle problems 2020-03-25 16:36:37 +01:00
AndiBuls
95e3c38dd9 refactor createOrga 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
 2020-03-25 16:30:22 +01:00
Talha Caliskan
c00ee2f235 Merge branch 'master' into add-ValidationService 2020-03-25 16:09:20 +01:00
XXNitram
dbfa260c4d Refactor after merge with master 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-25 16:07:31 +01:00
tomvahl
6f9ab00ba1 fix UUID 2020-03-25 15:56:30 +01:00
tomvahl
48b8617cbb Merge branch 'master' into killertester 2020-03-25 15:52:53 +01:00
XXNitram
2c70deeb7b Merge remote-tracking branch 'origin/master' into add-ValidationService 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/WebController.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-25 15:51:10 +01:00
XXNitram
0c43050166 Refactor WebController and ValidationService 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-25 15:43:41 +01:00
AndiBuls
5736de146d refactor createGroup and createOrga 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
                tomvahl <tom-vahl@hotmail.com>
 2020-03-25 15:38:37 +01:00
tomvahl
d703b1f255 refactor Exceptions 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-25 14:47:46 +01:00
tomvahl
be37fcbd50 add Exceptions 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-25 14:40:59 +01:00
tomvahl
ddfd21c6ef add MaxMemberException 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-25 13:44:08 +01:00
Christoph
8eda960e39 remove checkGroup 2020-03-24 16:30:05 +01:00
killerber4t
46aaf3658e refactor createOrga Method in ControllerService 2020-03-24 15:36:52 +01:00
Christoph
5c6d94753b some uuid improvements 2020-03-24 14:37:23 +01:00
Christoph
2f8a044c53 Merge branch 'master' into invite-link-group-id-change 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-24 14:28:30 +01:00
Christoph
c844f5d4fa some uuid improvements 2020-03-24 14:12:32 +01:00
Christoph
d562df8826 temporarily disable tests + rough change from groupid to uuid + remove invitelink old system 2020-03-23 16:17:17 +01:00
tomvahl
62efdb784d Merge pull request #120 from hhu-propra2/fix-add-csv 
Fix add csv
 2020-03-23 15:38:35 +01:00
tomvahl
7bae5e1184 add change_maximum size 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-23 14:57:33 +01:00
Lukas Ettel
676245d44d Merge remote-tracking branch 'origin/master' into fixSomeErrors 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
 2020-03-23 13:05:32 +01:00
killerber4t
069885a771 add adjusting UserMax 2020-03-20 16:38:39 +01:00
Lukas Ettel
cb9750efc6 fixed double csv import 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
 2020-03-20 14:49:03 +01:00
tomvahl
73f6798c2c if group empty gets delete 
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
 2020-03-20 14:00:41 +01:00
XXNitram
820782c2ce Add feature to link a group to a lecture 2020-03-20 02:36:51 +01:00
XXNitram
b24f6d273f Fix merge with master 2020-03-19 17:24:10 +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
dc11536db3 Merge Erstellen and Veranstaltung into a single site 
add two Erstellen sites, one for orga and one for student

Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: kasch309 <kasch309@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-19 16:50:52 +01:00
AndiBuls
fd4c4ba0f1 Merge pull request #107 from hhu-propra2/entadminisierung 
Entadminisierung
 2020-03-19 16:45:26 +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
cf46a549dc admin change when leaving group 
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:10:35 +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
4b5cdee975 fix createVeranstaltung 2020-03-19 15:40:00 +01:00
tomvahl
a2ae464bf0 add UserMaximum function 2020-03-19 14:28:15 +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
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
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
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
XXNitram
40d1c898e8 Refactor ControllerService 2020-03-18 18:02:11 +01:00
XXNitram
4b6e8eae39 Merge remote-tracking branch 'origin/master' into import-csv-in-overview 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
#	src/main/resources/templates/editMembers.html
 2020-03-18 17:36:06 +01:00
killerber4t
d2c1de7c9f fix for merge 2020-03-18 17:01:33 +01:00
Talha Caliskan
b3107c98f1 Merge branch 'master' into edit-User 2020-03-18 16:43:33 +01:00
XXNitram
4450a091de Add addUsersFromCsv in editMembers Overview 
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
 2020-03-18 16:42:06 +01:00
killerber4t
4b88742776 add deleteUser button and reconfigure the according method 2020-03-18 16:36:54 +01:00