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

161 Commits

Author SHA1 Message Date
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
kasch309
2eb9acea51 fix table and buttons 2020-03-19 16:53:09 +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
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
killerber4t
c343b5adbe fix button to leave editmembers 
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
 2020-03-19 15:49:53 +01:00
kasch309
ca59309716 add display of actual and maximum users 2020-03-19 15:35:58 +01:00
kasch309
087e0f7a13 Merge branch 'master' into ui 2020-03-19 14:32:01 +01:00
tomvahl
a2ae464bf0 add UserMaximum function 2020-03-19 14:28:15 +01:00
kasch309
b6c5fcda65 fix styling, rename error page 2020-03-19 14:22:39 +01:00
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
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
2ba913f2c8 Formatting 
Co-authored-by: Christoph <tobi@urpost.de>
 2020-03-18 20:18:03 +01:00
XXNitram
c631f243a1 Refactor indentation in html files 2020-03-18 18:00:47 +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
Lukas Ettel
1fbfd49781 show file thats choosen to load up 
Co-Authored-By: xxnitram <xxnitram@users.noreply.github.com>
Co-Authored-By: andibuls <andibuls@users.noreply.github.com>
Co-Authored-By: tomvahl <tomvahl@users.noreply.github.com>
 2020-03-18 16:55:07 +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
XXNitram
90124a7c15 Fix file input alignment 2020-03-18 16:40:40 +01:00
killerber4t
4b88742776 add deleteUser button and reconfigure the according method 2020-03-18 16:36:54 +01:00
kasch309
42721e06fc Improve styling on several templates 2020-03-18 16:32:27 +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
kasch309
dad86bb4b2 Merge remote-tracking branch 'origin/edit-User' into edit-User 
# Conflicts:
#	src/main/resources/templates/index.html
 2020-03-18 16:18:14 +01:00
killerber4t
dac0b28efb fix path redirecting 2020-03-18 16:16:27 +01:00
kasch309
e0db7584ac Improve styling on several templates 2020-03-18 16:00:11 +01:00
kasch309
9aa7122779 Improve styling on several templates 2020-03-18 15:23:26 +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
kasch309
b89b47ec81 set redirection to index instead of previous page 2020-03-18 14:21:39 +01:00
kasch309
75a4701bd0 fix table and functionality 2020-03-18 14:21:05 +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
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
XXNitram
af573f2353 Add list entry in 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:22 +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
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
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
kasch309
06eb174c42 add table column 2020-03-17 16:56:38 +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
kasch309
e9199857b7 change table class 2020-03-17 16:35:00 +01:00
kasch309
b0186eee66 fix edit members button (add margin) 2020-03-17 16:32:04 +01:00