 killerber4t
|
57df0263d4
|
refactor ValidationService
|
2020-03-25 16:52:43 +01:00 |
|
|
killerber4tandxxnitram
|
1dd3f9b6fe
|
create ValidationService
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-25 14:08:00 +01:00 |
|
|
killerber4t
|
f0a1a9c7bb
|
refactor Controller
|
2020-03-24 16:16:18 +01:00 |
|
|
killerber4t
|
d957326491
|
refactor Controller
|
2020-03-24 16:02:16 +01:00 |
|
|
killerber4t
|
f907c617a8
|
refactor WebController
|
2020-03-24 15:57:31 +01:00 |
|
|
killerber4t
|
80ab65febb
|
update UserService
|
2020-03-24 15:38:06 +01:00 |
|
|
killerber4t
|
46aaf3658e
|
refactor createOrga Method in ControllerService
|
2020-03-24 15:36:52 +01:00 |
|
|
killerber4t
|
1146308752
|
rename file
|
2020-03-24 15:21:55 +01:00 |
|
|
killerber4tandtomvahl
|
fe12831dab
|
refactor Tests and delete unnecessary Test
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-24 14:22:19 +01:00 |
|
|
killerber4t
|
a307476b07
|
fix JsonService implementation
|
2020-03-24 13:43:36 +01:00 |
|
|
killerber4t
|
c7445d8dee
|
fix 1 Test
|
2020-03-23 16:24:31 +01:00 |
|
|
killerber4t
|
f60214eb64
|
fix Test-setUp
|
2020-03-23 16:12:56 +01:00 |
|
|
killerber4t
|
22e9379b37
|
add EventServiceTest tests
|
2020-03-23 16:08:21 +01:00 |
|
|
killerber4t
|
4d77e2905f
|
fix UserMax when added through orga
|
2020-03-23 13:01:19 +01:00 |
|
|
killerber4t
|
069885a771
|
add adjusting UserMax
|
2020-03-20 16:38:39 +01:00 |
|
|
killerber4tandtomvahl
|
10f7f8f1fc
|
fix-search
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-20 14:18:13 +01:00 |
|
|
killerber4t
|
7358d80528
|
add data.sql to create groups
|
2020-03-19 16:18:46 +01:00 |
|
|
killerber4t
|
d2b5b44a0d
|
Merge remote-tracking branch 'origin/master' into max_userNumber
# Conflicts:
# src/main/resources/templates/editMembers.html
|
2020-03-19 15:55:59 +01:00 |
|
|
killerber4tandtomvahl
|
c343b5adbe
|
fix button to leave editmembers
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-19 15:49:53 +01:00 |
|
|
killerber4t
|
46203e43f8
|
Merge branch 'max_userNumber' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into max_userNumber
|
2020-03-19 15:40:16 +01:00 |
|
|
killerber4t
|
4b5cdee975
|
fix createVeranstaltung
|
2020-03-19 15:40:00 +01:00 |
|
|
killerber4tandtomvahl
|
1a5dc2571a
|
add userMaximum
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-19 15:25:05 +01:00 |
|
|
killerber4t
|
22bfcf3a05
|
fix-search after leaving group
|
2020-03-19 14:14:54 +01:00 |
|
|
killerber4t
|
d2c1de7c9f
|
fix for merge
|
2020-03-18 17:01:33 +01:00 |
|
|
killerber4t
|
4b88742776
|
add deleteUser button and reconfigure the according method
|
2020-03-18 16:36:54 +01:00 |
|
|
killerber4t
|
dac0b28efb
|
fix path redirecting
|
2020-03-18 16:16:27 +01:00 |
|
|
killerber4t
|
45679c7d2a
|
Update .gitignore
|
2020-03-18 14:20:32 +01:00 |
|
|
killerber4t
|
56f82203cd
|
fix entering group youre already part of
|
2020-03-18 14:11:52 +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 |
|
|
killerber4t
|
5f1cdca4ee
|
fix text overflow in groupdescription
|
2020-03-18 13:21:44 +01:00 |
|
|
killerber4t
|
a6667e4091
|
fix text overflow in groupdescription
|
2020-03-18 13:08:35 +01:00 |
|
|
killerber4t
|
0828c278dc
|
fix visibility recognition in detailsMember.html
|
2020-03-18 12:47:03 +01:00 |
|
|
killerber4t
|
b8936052cb
|
fix role recognition in detailsMember.html
|
2020-03-18 12:43:49 +01:00 |
|
|
killerber4t
|
61dc1eb928
|
Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User
|
2020-03-17 16:57:25 +01:00 |
|
|
killerber4t
|
9491f83cca
|
fix roles on detailsMember.html
|
2020-03-17 16:57:13 +01:00 |
|
|
killerber4t
|
a67d8fa993
|
Merge branch 'edit-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into edit-User
|
2020-03-17 16:44:09 +01:00 |
|
|
killerber4t
|
47ee171070
|
fix roles on detailsMember.html
|
2020-03-17 16:42:31 +01:00 |
|
|
killerber4t
|
3036f76b37
|
Merge remote-tracking branch 'origin/master' into edit-User
|
2020-03-17 16:16:44 +01:00 |
|
|
killerber4t
|
72ae173307
|
Merge remote-tracking branch 'origin/ui-edit-user' into edit-User
|
2020-03-17 16:02:26 +01:00 |
|
|
|
ca80b7ca2b
|
add changeRole and refactor Event-Methods in ControllerService
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
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-17 16:00:04 +01:00 |
|
|
killerber4tandxxnitram
|
a868ea86b4
|
add edit-members to controller
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 15:31:53 +01:00 |
|
|
killerber4tandxxnitram
|
c052ec6ae6
|
refactor code
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 14:58:02 +01:00 |
|
|
killerber4t
|
2738b6a35f
|
Merge branch 'delete-User' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into delete-User
|
2020-03-17 14:47:02 +01:00 |
|
|
killerber4t
|
aa843f1d8e
|
fix html
|
2020-03-17 14:46:20 +01:00 |
|
|
killerber4tandxxnitram
|
61e007e4d8
|
add leaving group
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
|
2020-03-17 14:36:55 +01:00 |
|
|
|
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 |
|
|
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 |
|
|
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 |
|
|
|
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 |
|
|
killerber4t
|
e2978e10d0
|
fix visibility in controller
|
2020-03-16 12:37:45 +01:00 |
|
|
killerber4t
|
051b3c3724
|
Merge branch 'UI-Improvements'
|
2020-03-14 23:49:30 +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
|
264d4ad052
|
fix problem where search was keeping same search throughout session and some UI changes
|
2020-03-14 23:29:49 +01:00 |
|
|
killerber4t
|
43a3282b67
|
added functionality to choose wether group is private or open
|
2020-03-14 22:54:40 +01:00 |
|
|
killerber4t
|
d3c5ded6d0
|
added functionality to choose wether group is private or open
|
2020-03-14 11:50:52 +01:00 |
|
|
killerber4t
|
3d7681fc8f
|
add more UI improvements and functionality
|
2020-03-14 02:03:08 +01:00 |
|
|
killerber4t
|
3849b61614
|
add some UI-improvements and functionality
|
2020-03-14 01:11:56 +01:00 |
|
|
killerber4t
|
46985ccca7
|
add button elements depending on various factors
|
2020-03-13 16:27:34 +01:00 |
|
|
killerber4t
|
e870733b37
|
Merge remote-tracking branch 'origin/group-details' into group-details
|
2020-03-13 16:09:25 +01:00 |
|
|
killerber4t
|
a1cc13eb00
|
change create
|
2020-03-13 16:08:47 +01:00 |
|
|
killerber4t
|
68fcc06a17
|
add details page
|
2020-03-13 15:11:23 +01:00 |
|
|
killerber4t
|
8f0b939037
|
Merge branch 'controller-fix' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into controller-fix
|
2020-03-12 16:55:21 +01:00 |
|
|
killerber4t
|
d3ba609e6a
|
fix ControllerTest
|
2020-03-12 16:54:42 +01:00 |
|
|
killerber4t
|
430b52b417
|
add new Controller to redirect
|
2020-03-12 16:48:08 +01:00 |
|
|
killerber4t
|
7ce0cd92af
|
Merge remote-tracking branch 'origin/groups-for-user' into groups-for-user
|
2020-03-12 15:51:13 +01:00 |
|
|
killerber4t
|
d5b1ac2429
|
slight change to controller redirect
|
2020-03-12 15:31:59 +01:00 |
|
|
killerber4t
|
9f40df9d59
|
add Usergroups to controller
|
2020-03-12 15:14:46 +01:00 |
|
|
killerber4t
|
a688235100
|
fix queries and user_id type
|
2020-03-12 14:59:34 +01:00 |
|
|
killerber4t
|
8c0975def3
|
fix queries
|
2020-03-12 14:55:32 +01:00 |
|
|
killerber4t
|
528ca1a2c0
|
refactor projecteventlist
|
2020-03-12 14:46:41 +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 |
|
|
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 |
|
|
killerber4t
|
f43be951a6
|
change failing Tests
|
2020-03-12 13:11:40 +01:00 |
|
|
killerber4t
|
05da814f4e
|
change createSingleGroup test
|
2020-03-11 16:34:28 +01:00 |
|
|
killerber4t
|
846eee9606
|
refactor tests for new events
|
2020-03-11 16:10:58 +01:00 |
|
|
killerber4tandtomvahl
|
68789099be
|
add functionality for group_ids to User class
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
|
2020-03-10 16:54:48 +01:00 |
|
|
killerber4t
|
c553bdd9cc
|
refactored a few Methods in EventService
|
2020-03-10 16:17:31 +01:00 |
|
|
killerber4t
|
d2381071f8
|
add Test for checkGroup Method
|
2020-03-10 14:29:04 +01:00 |
|
|
killerber4t
|
87c345ed54
|
fix JSON Subtypes in Event
|
2020-03-09 23:26:21 +01:00 |
|
|
killerber4t
|
7e1242d0a0
|
Merge branch 'html-gruppe' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into html-gruppe
|
2020-03-09 23:22:14 +01:00 |
|
|
killerber4t
|
61e2d0edba
|
added Creating Groups to frontend and saving them in Database. Also prepared some Methods for Snapshot db
|
2020-03-09 23:21:29 +01:00 |
|
|
killerber4t
|
006822b57d
|
Merge remote-tracking branch 'origin/event-db' into html-gruppe
|
2020-03-09 16:04:19 +01:00 |
|
|
killerber4t
|
a1ec6b28d4
|
Merge branch 'event-db' into html-gruppe
# Conflicts:
# src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
# src/main/java/mops/gruppen2/entities/Teilnehmer.java
|
2020-03-09 14:34:02 +01:00 |
|
|
killerber4t
|
2d8d91c206
|
disable test method
|
2020-03-09 14:26:06 +01:00 |
|
|
killerber4t
|
aa80a3b5df
|
add Saving Events in DB
|
2020-03-09 14:25:00 +01:00 |
|
|
killerber4t
|
e905aa37aa
|
fix DeleteUserEvent
|
2020-03-06 16:11:41 +01:00 |
|
|
killerber4t
|
207fd6742e
|
update Test for addUser
|
2020-03-06 16:07:52 +01:00 |
|
|
killerber4t
|
991287527e
|
add test to addUser-Event
|
2020-03-06 15:58:12 +01:00 |
|
|
killerber4t
|
32bdbeec51
|
add Event Adduser
|
2020-03-06 15:25:42 +01:00 |
|
|
killerber4t
|
166e3bb5fb
|
Merge branch 'Services' of https://github.com/hhu-propra2/abschlussprojekt-it-bois into Services
|
2020-03-06 14:21:35 +01:00 |
|
|
killerber4t
|
75143b33c0
|
add Event related stuff and Group example
|
2020-03-06 14:20:04 +01:00 |
|
|
killerber4t
|
2ba8176500
|
add GruppenService and EventRepository and Event object
|
2020-03-06 13:28:09 +01:00 |
|
|
killerber4t
|
db3713f955
|
update styleguide
|
2020-03-06 13:19:03 +01:00 |
|
|
killerber4t
|
c2b31dd255
|
fix styleguide
|
2020-03-05 13:49:44 +01:00 |
|
|
killerber4t
|
9c49cdec5e
|
add keycloak to app.-prop
|
2020-03-05 13:43:22 +01:00 |
|