christoph/lecture-professional-software-development
1
Fork 0
Code Activity
446 Commits 2 Branches 0 Tags
22bfcf3a0544a13ace88ef83b69afdd5db5378c3
Commit Graph

224 Commits

Author SHA1 Message Date
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
08717611d5 Rename SerializationService to JsonService 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 21:46:14 +01:00
Christoph
e1a630ae1a adapt tests 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 21:45:33 +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
XXNitram
a1ee6a18cd Refactor Gruppen2Controller and change redirect in addUsersFromCsv method 2020-03-18 18:03:02 +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
Christoph
2d8472bd4a Merge remote-tracking branch 'origin/master' into error-handling 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/resources/templates/errorRenameLater.html
 2020-03-18 17:20:31 +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
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
killerber4t
dac0b28efb fix path redirecting 2020-03-18 16:16:27 +01:00
tomvahl
62397a24ef update search 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
 2020-03-18 16:03:34 +01:00
AndiBuls
22172b5406 cleanup of the search function 2020-03-18 15:25:37 +01:00
tomvahl
2b1d6507e6 fix-search 
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
 2020-03-18 15:17:48 +01:00
XXNitram
6f664326c3 Merge remote-tracking branch 'origin/edit-User' into import-csv-in-overview 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/java/mops/gruppen2/service/ControllerService.java
 2020-03-18 15:15:06 +01:00
tomvahl
522d1369ec fix search 
remove your Group from search

Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
 2020-03-18 15:09:14 +01:00
XXNitram
7e52935b77 Add check for empty csv file 
and set required parameter to false

Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-18 15:05:09 +01:00
XXNitram
6929b1ead4 Add Service Annotation 2020-03-18 14:43:26 +01:00
XXNitram
f408391f4c Refactor Gruppen2Controller 2020-03-18 14:40:39 +01:00
XXNitram
ba4a531337 Merge remote-tracking branch 'origin/master' into feature-orga-csv 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
 2020-03-18 14:38:50 +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
XXNitram
838bff1d9f Update GroupType in createGroup 
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-18 14:19:00 +01:00
XXNitram
0db03f2ab5 Add createLecture feature 
also add private checkbox again and delete the uploadCsv methods in APIController

Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-18 14:13:58 +01:00
killerber4t
56f82203cd fix entering group youre already part of 2020-03-18 14:11:52 +01:00
[Mahgs]
b236e3bb9d changed checkGroup Method to a Query 2020-03-18 14:09:30 +01:00
[Mahgs]
523d7d2ad9 added a default route 2020-03-18 13:52:48 +01:00
[Mahgs]
e2326d5f23 added a default route 2020-03-18 13:46:51 +01:00
killerber4t
19e8ef9c07 remove unnecessary line 2020-03-18 13:43:12 +01:00
killerber4t
5703ad4678 fix random error 2020-03-18 13:40:07 +01:00
XXNitram
051196f766 Add CSV methods and createLecture.html 
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: Lukas Ettel <lukasettel@users.noreply.github.com>
 2020-03-18 13:36:57 +01:00
[Mahgs]
b431361eec merged with master 2020-03-18 13:19:19 +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
killerber4t
b8936052cb fix role recognition in detailsMember.html 2020-03-18 12:43:49 +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
XXNitram
179062eed9 Add createLecture for orga only 
Co-Authored-By: andibuls <andibuls@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-17 17:07:30 +01:00
killerber4t
9491f83cca fix roles on detailsMember.html 2020-03-17 16:57:13 +01:00
Christoph
aa67bd2e88 Add missing service 
Co-authored-by: [Mahgs] <maxoerter@gmx.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 16:55:32 +01:00
killerber4t
47ee171070 fix roles on detailsMember.html 2020-03-17 16:42:31 +01:00