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

185 Commits

Author SHA1 Message Date
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
[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
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
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
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
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
tomvahl
bd9e1bb28e add Join Group 
Mitgearbeitet hat:
Karla
Andi
 2020-03-17 15:11:40 +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
[Mahgs]
906585ce9a added InviteLinkRepository 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-17 13:42:35 +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
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
[Mahgs]
d0a42c4569 Merge remote-tracking branch 'origin/master' into keycloakRestApi 2020-03-16 16:18:25 +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
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
[Mahgs]
e12f0c1d59 added @Secured and fixed 
Co-authored-by: LukasEttel <lukas.ettie@yahoo.de>
Co-authored-by: AndiBuls <andreas.buls@uni-duesseldorf.de>
 2020-03-16 15:40: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
kasch309
7c3942c10d Merge branch 'master' into details-templates 2020-03-16 14:53:19 +01:00
Christoph
2c3531657d csv proof of concept 2020-03-16 14:09:30 +01:00
Christoph
9f464fe859 init csv support 2020-03-16 13:56:05 +01:00
kasch309
54d5028693 Add template for detailsNoMember.html, that displays the details when you search a page. 
Add connection to the controller
 2020-03-16 13:31:51 +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
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