zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1700 commits 10 branches 96 tags 34 MiB
Commit graph

1138 commits

Author SHA1 Message Date
anhefti
9896258afc Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/ProctorRoomConnectionsPopup.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientEvents.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientEventController.java
 2021-11-10 13:25:26 +01:00
anhefti
a881de1c9b Merge remote-tracking branch 'origin/dev-1.2-ethz' into dev-1.2 2021-11-10 10:22:19 +01:00
anhefti
49dfa9e3a0 Merge remote-tracking branch 'origin/dev-1.2-ethz' into dev-1.2 2021-11-10 10:14:53 +01:00
anhefti
52b96647c1 fine tune for distributed setup 2021-11-10 10:00:50 +01:00
anhefti
70c4fe1571 added test id attributes 2021-11-09 16:47:39 +01:00
anhefti
814fa84730 Merge remote-tracking branch 'origin/dev-1.2-ethz' into dev-1.2 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/DistributedPingCache.java
 2021-11-09 09:47:37 +01:00
anhefti
780a17834c more fixes to prevent DB deadlocks 2021-11-09 09:39:11 +01:00
anhefti
2447009f99 fixed potential DB deadlock cause 2021-11-09 09:02:01 +01:00
anhefti
4a3d5ed54d fixed potential DB deadlock cause 2021-11-09 08:53:45 +01:00
anhefti
f1dc16b5ef Merge remote-tracking branch 'origin/SEBSERV-191' into dev-1.2 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
 2021-11-08 13:13:10 +01:00
anhefti
9ebd7827ac SEBSERV-238 improved proctoring room assignments for connecting clients 
(re)mark a client connection for update if the join instruction was not
be able to send to the SEB client. In this case this shall be tried
again until it works.
 2021-11-08 12:56:05 +01:00
anhefti
c89a609615 SEBSERV-238 use max exp time for Zoom SDK Token generation 
(no exam end-time involvement to check if this was the error)
 2021-11-08 12:54:25 +01:00
anhefti
3aa46b3241 better logging for Zoom Proctoring 2021-11-04 17:36:25 +01:00
anhefti
06ce72a76f SEBSERV-191 gui implementation and download streaming 2021-11-04 16:52:48 +01:00
anhefti
32d8c8a978 Merge remote-tracking branch 'origin/dev-1.2' into SEBSERV-191 2021-11-03 13:22:04 +01:00
anhefti
c414586fec SEBSERV-191 finished back-end implementation 2021-11-03 13:18:40 +01:00
anhefti
40ab3861db better logging 2021-11-03 11:29:05 +01:00
anhefti
2f2a3670b7 SEBSERV-191 backend implementation 2021-11-03 10:31:15 +01:00
anhefti
458cc9486e SEBSERV-238 2021-11-02 13:55:21 +01:00
anhefti
daeb118210 SEBSERV-239 2021-11-02 10:04:57 +01:00
anhefti
81d871b521 Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	pom.xml
	src/main/java/ch/ethz/seb/sebserver/gbl/util/Utils.java
 2021-11-01 09:49:35 +01:00
anhefti
7a05820274 SEBSERV-236 fixed 2021-10-28 14:33:51 +02:00
anhefti
299769bcb6 Merge branch 'rel-1.2.2-exam-update-fix' into dev-1.2 2021-10-28 13:48:29 +02:00
anhefti
9ce538484b fixed single moodle course bug 2021-10-28 13:45:34 +02:00
anhefti
d763da6a79 fixed exam update task for finished exams 
finished exams where opened-up and immediately closed agian and again
on every task run.
 2021-10-27 12:45:51 +02:00
anhefti
ea65d1e81c code analysis 2021-10-27 09:11:00 +02:00
anhefti
b06e6d5424 Fixed Zoom SDK JWT-Token generation 2021-10-25 13:31:05 +02:00
anhefti
5cf2547b86 Merge branch 'dev-lms-open-olat' into dev-1.2 2021-10-25 10:43:21 +02:00
Carol Alexandru
1449de217c don't construct json manually 2021-10-13 12:01:12 +02:00
Carol Alexandru
519ad5a9f8 authenticate with OLAT using POST instead of GET 2021-10-13 11:29:02 +02:00
anhefti
5b8d920a4f SEBSERV-160 more back-end implementation 2021-10-11 17:12:14 +02:00
anhefti
fa5aa6353c SEBSERV-160 new db schema and back-end implementation 2021-10-11 09:22:23 +02:00
anhefti
b1181bb97a Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/ExamAdminService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/impl/ExamAdminServiceImpl.java
 2021-10-07 10:50:59 +02:00
anhefti
020a885c1b fix: Zoom meetings created by ad-hoc users-accounts are now lizensed 
fix: Cleanup zoom rooms, meetings and ad-hoc users-accounts on exam
deletion and prevent SQL foreign constraint error on deletion process
when there are still living Zoom rooms for the exam.
 2021-10-07 09:30:00 +02:00
anhefti
67bd9bf647 SEBSERV-160 new db schema 2021-10-06 17:47:34 +02:00
anhefti
1a592ac606 SEBSERV-201 finished up 2021-09-30 15:45:57 +02:00
anhefti
f7a8fb4a33 SEBSERV-160 2021-09-30 14:59:20 +02:00
anhefti
d0407645d8 SEBSERV-175 implemented 2021-09-30 11:27:53 +02:00
anhefti
177d448e08 SEBSERV-160 2021-09-30 11:00:57 +02:00
anhefti
69c9de6d64 SEBSERV-155 implementation 2021-09-29 16:06:35 +02:00
anhefti
7d7f458d82 SEBSERV-201 added migrations 2021-09-28 17:14:08 +02:00
anhefti
92207cf2c3 fixed tests 2021-09-27 10:48:58 +02:00
anhefti
33c915bd92 SEBSERV-230 removed attributes from GUI 2021-09-27 10:35:21 +02:00
anhefti
2fd3850186 Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	.github/workflows/buildReporting.yml
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
 2021-09-23 11:05:10 +02:00
anhefti
42993e3c97 fixed SEB session integrity check (allow multiple establish requests 
from same SEB client. This is usful when the SEB sends the userSessionId
multiple times)
 2021-09-23 09:30:40 +02:00
anhefti
6fc54e5310 Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamDeletePopup.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/EntityController.java
 2021-09-22 17:07:24 +02:00
anhefti
70358d0128 fixed session id, exam delete, ane better logs 2021-09-22 16:55:28 +02:00
anhefti
349303c168 fixed monitoring with no indicators 2021-09-21 14:43:41 +02:00
anhefti
fa0715b673 SEBSERV-162 fixes and better error handling 2021-09-21 14:38:45 +02:00
anhefti
9a00e9c1ab Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java
 2021-09-20 16:20:54 +02:00
anhefti
7d647cc9c2 fixed notification changes in GUI 2021-09-20 15:46:20 +02:00
anhefti
e3ac612fb3 Merge remote-tracking branch 'origin/dev-1.2' into development 2021-09-16 12:58:49 +02:00
anhefti
dffb0e61f8 fixed notification confirm for SEB also for delete 2021-09-16 11:55:36 +02:00
anhefti
0546b97b0a fixed notification confirm from SEB client 2021-09-16 11:33:25 +02:00
anhefti
c126056959 fixed notification confirmation form SEB side 2021-09-16 10:57:04 +02:00
anhefti
b0ad786c45 tests for instructions 2021-09-16 09:50:44 +02:00
anhefti
fe7f2bbaba Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/resources/messages.properties
 2021-09-16 08:44:05 +02:00
anhefti
c9ce66d89c code cleanup 2021-09-16 08:38:59 +02:00
anhefti
54a0f05a39 Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringClientConnection.java
 2021-09-16 08:37:34 +02:00
anhefti
cea62d5fa4 fixed instructions creation with attributes 2021-09-15 16:53:42 +02:00
anhefti
25265fdb2b SEBSERV-162 create exam from template and tests 2021-09-15 15:51:02 +02:00
anhefti
a589fd8ad4 SEBSERV-162 audit logs and deletion 2021-09-14 11:52:56 +02:00
anhefti
f794ab5e7d SEBSERV-162 implementations and test 2021-09-09 17:16:56 +02:00
anhefti
f54b769388 better logging 2021-09-09 11:34:59 +02:00
anhefti
ef3a633ce1 SEBSERV-162 added institutional default flag 2021-09-09 10:21:36 +02:00
anhefti
36f546960b Merge remote-tracking branch 'origin/dev-1.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamProctoringSettings.java
 2021-09-08 16:10:36 +02:00
anhefti
c3eda2b81d Fixed Exam update task to not brake on single exam update error 2021-09-08 16:02:58 +02:00
anhefti
291a0e3532 code cleanup 2021-09-07 15:38:50 +02:00
anhefti
87e12a998e Correct some minor exam supporter rights 2021-09-07 13:27:07 +02:00
anhefti
0f7ef455e8 Added Zoom Client App integration for collecting rooms 2021-09-07 11:35:20 +02:00
anhefti
152955f712 SEBSERV-153 IndicatorTemplate implementation 2021-09-06 15:58:30 +02:00
anhefti
446bb15a9c added join URL for Zoom collecting rooms 2021-09-06 11:21:32 +02:00
anhefti
a081a38f84 SEBSERV-162 fixed db schema 2021-09-06 09:17:13 +02:00
anhefti
d469b30951 SEBSERV-162, SEBSERV-153 implementation 2021-09-02 17:12:19 +02:00
anhefti
c412fc3d97 Merge remote-tracking branch 'origin/dev-1.2' into development 2021-09-01 11:04:01 +02:00
anhefti
0061b27e75 update zoom web SDK to version 1.9.8, make version configurable 
removed unused libs for zoom web SDK (jQuery)
 2021-08-31 17:02:30 +02:00
anhefti
3143d9ed16 SEBSERV-162, SEBSERV-153 implementation break again... 2021-08-31 15:38:20 +02:00
anhefti
e49a713f72 Merge remote-tracking branch 'origin/dev-1.2' into development 2021-08-31 11:17:30 +02:00
anhefti
5c12b86b55 fixed unique name message 2021-08-31 11:16:28 +02:00
anhefti
6fdd4b11fe SEBSERV-162 implementation 2021-08-31 11:02:19 +02:00
anhefti
c7973d56ce SEBSERV-162, SEBSERV-153 extend db-model for features 2021-08-30 16:24:48 +02:00
anhefti
03300923c0 Merge remote-tracking branch 'origin/dev-1.2' into development 2021-08-30 13:14:16 +02:00
anhefti
ea9de0e60d set default LMSSetup type to "Testing" 2021-08-30 11:25:10 +02:00
anhefti
ac214401e1 Merge remote-tracking branch 'origin/dev-lms-ans' into dev-1.2 2021-08-30 11:12:44 +02:00
anhefti
6122331d6d fixed for Java 8 (replaced Map.of --> new HashMap<>()) 2021-08-30 11:03:27 +02:00
anhefti
8a72cf1fcd code review and cleanup (eclipse code formatting) 2021-08-30 10:55:59 +02:00
Carol Alexandru
6e31ad5e0e Retrieve start_url from Ans Assignment 2021-08-30 03:54:31 +02:00
anhefti
40102be281 catch errors on SEB Settings value init for every single value 2021-08-26 14:54:51 +02:00
anhefti
2a5054906a Merge remote-tracking branch 'origin/dev-1.2' into development 2021-08-25 17:10:17 +02:00
anhefti
88b2311e08 SEBSERV-227 fixed sdkKey override 2021-08-25 15:44:55 +02:00
Carol Alexandru
b767178d75 Implement AnsLms integration 2021-08-17 06:06:58 +02:00
anhefti
6dacca72c3 Merge branch 'dev-1.2' into development 2021-08-12 16:49:11 +02:00
anhefti
aeb614082c Merge branch 'proctoring_sdkkey' into dev-1.2 2021-08-12 13:34:52 +02:00
anhefti
ebf0fab2f0 added OLAT LMS for selection 2021-08-12 13:29:53 +02:00
anhefti
c743947912 Merge remote-tracking branch 'origin/dev-lms-open-olat' into dev-1.2 2021-08-12 11:13:37 +02:00
anhefti
dea65b70d2 more code cleaup 2021-08-12 11:10:58 +02:00
anhefti
1df182fae6 Merge remote-tracking branch 'origin/dev-lms-open-olat' into dev-1.2 2021-08-12 11:09:13 +02:00
anhefti
d1685f4675 some code cleanup 2021-08-12 10:55:28 +02:00
anhefti
ff7cc5b020 fixed nullpointer 2021-08-12 10:30:37 +02:00
anhefti
107b3beb35 fix build 2021-08-11 16:01:58 +02:00
anhefti
2dea3e2285 SEBSERV-138 fixed navigation and filter. Added more input field types 2021-08-11 15:58:48 +02:00
anhefti
c3b999fc4c Merge remote-tracking branch 'origin/dev-1.2' into development 2021-08-11 08:15:34 +02:00
anhefti
52013752ea fixed tests code cleanup 2021-08-10 09:50:28 +02:00
anhefti
a6daba57a8 Merge branch 'dev-1.2' into development 2021-08-10 09:42:25 +02:00
anhefti
43ca2f6ba9 SEBSERV-219 2021-08-10 09:38:16 +02:00
anhefti
eb45dcf0f3 added missing @Transactional to prevent committing without 
needs-confirmation attribute
 2021-08-09 11:11:49 +02:00
anhefti
76a1676b69 added update task to release aged exam record locks 2021-08-05 10:54:28 +02:00
anhefti
9d27dbfbcf Implement SDKToken for Zoom proctoring with SEB client for iOS and MacOS 2021-08-05 09:37:14 +02:00
anhefti
b0fecc2d7d SEBSERV-138 more ARIA improvements 2021-08-04 12:48:35 +02:00
anhefti
9a9ad6e840 code cleanup 2021-08-04 10:08:28 +02:00
anhefti
643c565b73 fixed time current millis 2021-08-03 18:26:19 +02:00
anhefti
9be252f333 added some tabindex fix scripts 2021-08-03 17:57:03 +02:00
Carol Alexandru
d627bb7edb fix silly beginner mistake 2021-08-03 09:52:02 +02:00
Carol Alexandru
8376a1c3fd minor cleanups 2021-08-03 07:27:57 +02:00
Carol Alexandru
0029cd4ec3 get OLAT token lazily when first needed, not upon instantiation 2021-07-30 14:19:53 +02:00
Carol Alexandru
59da4bcf4e minor improvements, re-use OlatLmsRestTemplate with existing token 2021-07-30 13:23:25 +02:00
Carol Alexandru
ae5149226a generate proper exam url using updated OLAT api 2021-07-28 22:47:49 +02:00
Carol Alexandru
cdd393aecd Implement OlatLms integration 2021-07-28 15:21:22 +02:00
anhefti
a9810e3864 Merge remote-tracking branch 'origin/distributed-ping-cache' into 
dev-1.2

Conflicts:
	pom.xml
 2021-07-28 14:33:00 +02:00
anhefti
ed7ae28a0d fixed distributed ping cache 2021-07-28 14:29:21 +02:00
anhefti
cb6a3c5c08 SEBSERV-219 fixed logo 2021-07-26 10:10:26 +02:00
anhefti
64536fd909 distributed ping cache 2021-07-22 13:27:44 +02:00
anhefti
d96816311b SEBSERV-195 fixed ping caching 2021-07-21 11:32:04 +02:00
anhefti
2e7fb8e8dc fixed SEBSERV-220 and SEBSERV-221 2021-07-20 17:15:57 +02:00
anhefti
06bb48590b test commit 2021-07-20 10:20:05 +02:00
anhefti
a59f5bd375 SEBSERV-212 fixed quizz mapping bug 2021-07-19 12:11:05 +02:00
anhefti
3296b7c004 SEBSERV-195 improved ping indicator for distributed setups 2021-07-15 14:50:06 +02:00
anhefti
494c6a08ec SEBSERV-216 fixed 2021-07-15 13:42:14 +02:00
anhefti
bc1e933087 SEBSERV-209 fixed exam session service for distributed setup 
apply client connection sync check over time-interval (per exam) instead
of for every monitoring request and every client connection. So I
implemented batching for that to avoid heavy db load
 2021-07-15 07:52:06 +02:00
anhefti
885e39d1cc SEBSERV-210 fixed 2021-07-14 17:31:04 +02:00
anhefti
086bc5ef3b SEBSERV-212 prevent double-creation of exam for a quiz on the same 
institution. Do also not forward and load the existing one. This seems
to cause some trouble when be done sometimes.
 2021-07-14 16:33:33 +02:00
anhefti
eb7042acf6 SEBSERV-209 fixed indicators for distributed setup 
also fixed instructions for distributed setup
 2021-07-14 13:21:19 +02:00
anhefti
ef72400656 fixed setup for kuberneetes 2021-07-12 17:00:19 +02:00
anhefti
ce270f3057 SEBSERV-208 fixed migration strategy for prod and distributed setup 2021-07-12 13:40:12 +02:00
anhefti
c043f0460e SEBSERV-204 removed "Audio Broadcast" button from Zoom Proc Window 2021-07-12 11:35:41 +02:00
anhefti
fe45a0357c SEBSERV-137 fixed --> 
"Connection requested" shall be considered as active SEB Client
 2021-07-12 11:27:52 +02:00
anhefti
e42336aa6a logging 2021-07-08 13:50:53 +02:00
anhefti
181fb6d95e SEBSERV-204 added collecting room restrictions (only one open at a time) 2021-07-08 13:08:47 +02:00
anhefti
e88f5146ab SEBSERV-135 fix 2021-07-07 17:36:27 +02:00
anhefti
bcdd8b87bd SEBSERV-202 fix 2021-07-07 17:30:56 +02:00
anhefti
6043d752a6 SEBSERV-204 fixes and improvements 2021-07-07 17:20:51 +02:00
anhefti
c7952b32bc SEBSERV-182 2021-07-07 13:24:38 +02:00
anhefti
c217d4d854 SEBSERV-182 2021-07-07 09:01:22 +02:00
anhefti
03c05c7372 SEBSERV-182 updateErrors 2021-07-07 08:46:41 +02:00
anhefti
5724a750b7 Zoom improvements and accessibility additions 2021-07-07 08:29:27 +02:00
anhefti
c8932e9ce8 removed Open OLAT and Ans again 2021-07-05 09:41:05 +02:00
anhefti
1e8ecd94ec SEBSERV-204 fix join instruction 2021-06-30 16:12:19 +02:00
anhefti
cbbff94a75 Merge remote-tracking branch 'origin/dev-lms-open-olat' into dev-1.2 2021-06-30 14:25:31 +02:00
anhefti
57dc15f64d Merge remote-tracking branch 'origin/dev-lms-ans' into dev-1.2 2021-06-30 14:25:14 +02:00
anhefti
03036ec8ee suppress warnings 2021-06-30 14:22:47 +02:00