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

79 Commits

Author SHA1 Message Date
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
[Mahgs]
b236e3bb9d changed checkGroup Method to a Query 2020-03-18 14:09:30 +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
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
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
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
killerber4t
c052ec6ae6 refactor code 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-17 14:58:02 +01:00
killerber4t
61e007e4d8 add leaving group 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-17 14:36:55 +01:00
Lukas Ettel
0467d3c6a6 removed outdated test 
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
Co-Authored-By: Talha Caliskan <killerber4t@users.noreply.github.com>
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
 2020-03-17 13:46:19 +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
325c5d84f9 Merge branch 'master' into change-to-polymorphie 2020-03-17 13:05:20 +01:00
tomvahl
cbf69e387b fix search funktion 2020-03-17 12:35:06 +01:00
tomvahl
8387b58e35 change createGroup Methode in ControllerService 2020-03-17 11:09:27 +01:00
tomvahl
1b8fa04826 change createGroup Methode in ControllerService 2020-03-17 10:45:03 +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
[Mahgs]
7e2c1dec81 tested APIController 
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-16 16:16:46 +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
AndiBuls
3f144d14e4 update KeyCloakConfig like in the KeycloakDemo 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-16 15:16:43 +01:00
Christoph
9f464fe859 init csv support 2020-03-16 13:56:05 +01:00
killerber4t
e2978e10d0 fix visibility in controller 2020-03-16 12:37:45 +01:00
killerber4t
1ad3ad8bab Merge remote-tracking branch 'origin/UI-Improvements' 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/resources/templates/detailsMember.html
 2020-03-14 23:47:41 +01:00
killerber4t
d3c5ded6d0 added functionality to choose wether group is private or open 2020-03-14 11:50:52 +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
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
kasch309
eeded221b4 Add method to find group by id 
Add method to connect details.html to the controller
 2020-03-13 14:28:16 +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
LukasEttel
d1f296129d Impletended SwaggerApi with all provisionally funktiontionallitys 2020-03-13 13:50:49 +01:00
XXNitram
26f26a1c1a Add JavaDoc comments to SerializationService 2020-03-13 13:47:05 +01:00
XXNitram
6b788beb4b Refactor ControllerService and add an UpdateRoleEvent to createGroup 2020-03-13 13:46:34 +01:00
killerber4t
430b52b417 add new Controller to redirect 2020-03-12 16:48:08 +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
XXNitram
6f213af10e Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user 2020-03-12 16:18:25 +01:00
XXNitram
80a9566d6f Add ControllerService and refactor Gruppen2Controller 2020-03-12 16:18:15 +01:00
LukasEttel
9795c10c14 Impletended the updategroup(status) method in the API 2020-03-12 16:11:32 +01:00
tomvahl
77b6ba247d add comments 2020-03-12 15:13:56 +01:00
killerber4t
a688235100 fix queries and user_id type 2020-03-12 14:59:34 +01:00
killerber4t
528ca1a2c0 refactor projecteventlist 2020-03-12 14:46:41 +01:00
LukasEttel
3fcf8105f7 Merge remote-tracking branch 'origin/performance-tests' into updateGroupsAPI 2020-03-12 14:41:39 +01:00
LukasEttel
a30d458219 Created first Api implementation 2020-03-12 14:40:07 +01:00
killerber4t
13e1cf0e36 Merge remote-tracking branch 'origin/performance-tests' into groups-for-user 
# Conflicts:
#	src/main/java/mops/gruppen2/service/GroupService.java
 2020-03-12 14:39:08 +01:00
Christoph
f64bb0f578 refactor projection method 2020-03-12 14:37:32 +01:00
killerber4t
7b5f70745c fix Methods 2020-03-12 14:03:48 +01:00
killerber4t
8ddf9f2d64 Merge branch 'groups-for-user' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into groups-for-user 2020-03-12 13:56:06 +01:00
killerber4t
a775040abe add 2 new Queries and 2 Methods for UserService 2020-03-12 13:55:10 +01:00