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

530 commits

Author SHA1 Message Date
anhefti
938dafc0dd SEBSERV-133 impl LMS Setup and Institution 2022-05-03 17:28:08 +02:00
anhefti
e5ca068ccb minor fixes in error handling and running exam update 2022-05-03 08:57:45 +02:00
anhefti
6396afa53b SEBSERV-160 fixed "In Use" for selection 2022-05-02 13:35:35 +02:00
anhefti
d2ea6eb316 Merge remote-tracking branch 'origin/dev-1.3' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/mockup/MockupLmsAPITemplate.java
 2022-04-27 13:47:47 +02:00
anhefti
bc1026a6b7 SEBSERV-299 fixed for null end-time and added Mockup test quiz11 2022-04-27 11:40:54 +02:00
anhefti
911332e30f SEBSERV-233 implementation 2022-04-27 10:53:58 +02:00
anhefti
191f8432de SEBSERV-287 back-end implementation 2022-04-13 14:21:27 +02:00
anhefti
3d94637300 Merge branch 'dev-1.3' into development 
Conflicts:
	src/test/java/ch/ethz/seb/sebserver/webservice/integration/api/admin/UserAPITest.java
 2022-04-13 11:05:22 +02:00
anhefti
9956f1a122 SEBSERV-296 fixed 2022-04-12 17:01:42 +02:00
anhefti
55baa2d518 SEBSERV-160 implemented reset from template 2022-04-12 15:05:46 +02:00
anhefti
9d29a48151 SEBSERV-160 implemented state change batch action 2022-04-07 16:52:22 +02:00
anhefti
16582d0ce8 Merge remote-tracking branch 'origin/dev-1.3' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/InternalClientConnectionDataFactory.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/AbstractClientIndicator.java
 2022-03-30 15:20:16 +02:00
anhefti
d86b8a186b Finished exam test 2022-03-29 15:26:31 +02:00
anhefti
a2269c0a7e fix jenkins build 2022-03-24 19:58:23 +01:00
anhefti
a196e74f61 fixing jenkins tests 2022-03-24 19:04:44 +01:00
anhefti
a378941458 jenkins? 2022-03-24 18:09:23 +01:00
anhefti
ee93014478 fix push 2022-03-24 17:35:39 +01:00
anhefti
50f94e8581 fix use-case tests 2022-03-24 17:28:19 +01:00
anhefti
091f7408a7 SEBSERV-158 preparation 2022-03-21 13:54:48 +01:00
anhefti
eb08df6c00 SEBSERV-158 preparation - refactoring of LmsAPITemplate 2022-03-21 13:37:33 +01:00
anhefti
6f320a489d integration tests 2022-03-10 16:04:41 +01:00
anhefti
4758b8c6c6 more integration tests 2022-03-09 10:49:45 +01:00
anhefti
bc69495a17 more tests 2022-03-08 15:39:22 +01:00
anhefti
fd64554395 more tests 2022-03-08 11:20:16 +01:00
anhefti
ef02fe2846 more Unit tests 2022-03-07 16:07:16 +01:00
anhefti
6146f2e4ce more tests 2022-03-07 08:46:27 +01:00
anhefti
8632e594bd more integration tests 2022-03-03 10:33:24 +01:00
anhefti
e4cf8e149c more integration tests 2022-03-02 17:21:06 +01:00
anhefti
c21f0ef463 # WARNING: head commit changed in the meantime 
Merge remote-tracking branch 'origin/master' into dev-1.3
plus more unit tests
plus CircuitBreaker fix
 2022-03-02 17:09:37 +01:00
anhefti
a9acb1b915 More Unit Tests and better logging 2022-02-21 13:50:13 +01:00
anhefti
11f879ba2c Unit Tests, automated test keys... 2022-02-03 15:27:42 +01:00
anhefti
8985843c66 new migration task to set client_connection info fields to 255 chars 2022-01-31 12:40:59 +01:00
anhefti
45322deea0 Merge branch 'SEBSERV-262' into development 2022-01-27 11:42:50 +01:00
anhefti
0ab61c876d SEBSERV-262 2022-01-27 11:39:57 +01:00
anhefti
2f8f8296d7 refactored downloads 2022-01-20 14:41:12 +01:00
anhefti
95c3f31cb9 - SEBSERV-250 fixed exam and access token cache 
- SEBSERV-188 implemented
- SEBSERV-165 code cleanup un monitoring
 2022-01-19 09:46:11 +01:00
anhefti
b1b582028f SEBSERV-188 implementation 2022-01-18 13:33:23 +01:00
anhefti
50aef06db0 SEBSERV-250,SEBSERV-188 
- implemented overall generic incident marker for client connection
handler and removed specific missingPing incident.
- adapted missing ping handling to new overall generic incident marker
 2022-01-13 13:07:02 +01:00
anhefti
bad7510a63 SEBSERV-232 db extension and implementation 2022-01-12 16:35:11 +01:00
anhefti
48f23ea7e4 SEBSERV-200 fixed wrong JWT token generation with moderator flag 2022-01-11 16:37:04 +01:00
anhefti
863511dbc7 fixed time zone for CSV Export 2022-01-06 16:23:17 +01:00
anhefti
f0afa473fd fixed date formatting with CSV Export 2022-01-06 16:11:59 +01:00
Damian Büchel
40ac8780f3 SEBSERV-165: Implemented unit tests for client event CSV exporter and changed implementation to use separator constant. 2022-01-06 09:29:15 +01:00
anhefti
d422d2091e fixed test for jenkins 2022-01-05 10:44:22 +01:00
anhefti
1692a54588 try fix integration test for Java 8 2022-01-05 10:02:10 +01:00
anhefti
dfdd16a728 SEBSERV-255 separated client notifications from ordinary client event 
table. New table client_notification
 2022-01-05 08:30:08 +01:00
anhefti
9fbc5bdbc1 SEBSERV-250 service for all indicators with separated table and update 2021-12-15 16:16:17 +01:00
anhefti
b99502dd41 SEBSERV-250 detach client event post processing (update and 
notifications)
 2021-12-08 10:33:21 +01:00
anhefti
dfb8afb740 SEBSERV-250 improved webservice init 2021-12-07 10:41:54 +01:00
anhefti
bab4b95609 SEBSERV-250 new table client_indicator for indicator values of running 
exams.
 2021-12-06 16:08:24 +01:00
anhefti
c9a1c3a019 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/MonitoringRunningExam.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/test/resources/application-test.properties
 2021-11-24 13:34:14 +01:00
anhefti
46786af1d6 Merge remote-tracking branch 'origin/dev-1.2-pingCache' into dev-1.2 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/ClientHttpRequestFactoryService.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/ExamSessionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/indicator/DistributedPingCache.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamAPI_V1_Controller.java
	src/main/resources/config/application-dev-ws.properties
 2021-11-24 10:45:39 +01:00
anhefti
a88e308ba9 SEBSERV-194 better distributed ping handling (dedicated ThreadPool) 2021-11-24 09:59:43 +01:00
anhefti
3e35a7745b fixes and fine-tuning for distributed setup 2021-11-18 08:21:03 +01:00
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
a747c48458 fixed tests 2021-11-09 09:07:26 +01:00
anhefti
10d16d8af8 fixed tests 2021-11-03 12:01:50 +01:00
anhefti
fa5aa6353c SEBSERV-160 new db schema and back-end implementation 2021-10-11 09:22:23 +02:00
anhefti
67bd9bf647 SEBSERV-160 new db schema 2021-10-06 17:47:34 +02:00
anhefti
4b79662246 fixed integration tests 2021-09-21 16:19:48 +02:00
anhefti
4e3b397b28 fixed integration tests 2021-09-21 16:14:48 +02:00
anhefti
0bd6664255 fix integration tests 2021-09-21 16:03:47 +02:00
anhefti
ebdd938123 more unit and integration tests 2021-09-21 15:57:58 +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
d897b91be9 integration tests for instruction service 2021-09-16 15:27:13 +02:00
anhefti
b0ad786c45 tests for instructions 2021-09-16 09:50:44 +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
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
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
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
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
8d4272d2a0 changed Zoom API from 1.9.0 to 1.9.1 2021-08-26 20:30:56 +02:00
anhefti
81d6d132d6 remove Zoom join hook test 2021-08-26 16:27:38 +02:00
anhefti
aeb614082c Merge branch 'proctoring_sdkkey' into dev-1.2 2021-08-12 13:34:52 +02:00
anhefti
52013752ea fixed tests code cleanup 2021-08-10 09:50: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
643c565b73 fixed time current millis 2021-08-03 18:26:19 +02:00
anhefti
448a77cc90 Merge remote-tracking branch 'origin/rel-1.2.0' into dev-1.2 2021-07-29 11:13:00 +02:00
anhefti
dcb4eba7bf fixed tests 2021-07-29 10:50:05 +02:00
anhefti
64536fd909 distributed ping cache 2021-07-22 13:27:44 +02:00
anhefti
3296b7c004 SEBSERV-195 improved ping indicator for distributed setups 2021-07-15 14:50:06 +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
c7952b32bc SEBSERV-182 2021-07-07 13:24:38 +02:00
anhefti
5724a750b7 Zoom improvements and accessibility additions 2021-07-07 08:29:27 +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
0638bcafd6 SEBSERV-204 fixed 2021-06-30 13:18:34 +02:00
anhefti
2ae1b928f9 fixed tests 2021-06-29 15:15:48 +02:00
anhefti
d76f1f5ca9 SEBSERV-135 improved identity handling and error messages 2021-06-28 17:33:24 +02:00
anhefti
efa27fb7b6 adapted Zoom Window 2021-06-24 16:34:06 +02:00
anhefti
e49d8291d8 SEBSERV-202 implemented 2021-06-24 15:51:54 +02:00
anhefti
d2036a8598 disallow proctoring service change if there are existing proctoring 
rooms
 2021-06-22 14:26:08 +02:00
anhefti
4ec882f039 fixed tests 2021-06-17 14:36:42 +02:00
anhefti
e88d2d9edd Jitsi integration: new access token creation for JaaS integration 2021-06-17 14:07:17 +02:00
anhefti
812386c4c5 fixed tests 2021-06-16 14:35:15 +02:00
anhefti
0328a3b939 fixed tests 2021-06-16 14:29:51 +02:00
anhefti
0d9930ff8c fixed tests 2021-05-20 13:19:51 +02:00
anhefti
d203530757 fixed tests 2021-05-20 13:19:07 +02:00
anhefti
dd765e66bf integration preparation 2021-05-20 13:14:53 +02:00
anhefti
89c306e35a added OlatLmsAPITemplate skeleton ready to be implemented 2021-05-17 22:43:42 +02:00
anhefti
d4aa25a736 added update_time for lms-setup table and check cache for distributed 
setup
 2021-05-17 14:28:39 +02:00
anhefti
ec6bfaa9b9 code cleanup fixed tests 2021-05-17 12:19:50 +02:00
anhefti
73a94fcc7c fix tests 2021-05-17 11:54:17 +02:00
anhefti
d1c6d8d7be test build 2021-05-17 11:25:45 +02:00
anhefti
c73fd355a4 test build 2021-05-17 11:14:42 +02:00
anhefti
0b120a0b58 tests 2021-05-17 10:23:50 +02:00
anhefti
d182d7da87 fixed tests 2021-05-17 10:04:44 +02:00
anhefti
957f49b324 tests 2021-05-17 09:29:14 +02:00
anhefti
363d3e3522 remote tests seems not to work 2021-05-17 09:12:28 +02:00
anhefti
dd6150ec2a refactoring and improvement of LMS binding API 2021-05-14 17:08:29 +02:00
anhefti
a853c02947 SEBSERV-135 finished implementation 2021-05-12 09:50:58 +02:00
anhefti
6bf1551028 certs impl 2021-05-04 21:59:04 +02:00
anhefti
89bb29ed4f SEBSERV-135 gui implementation and fixes 2021-04-28 17:12:17 +02:00
anhefti
ab8ac01e05 SEBSERV-135 backend implementation 2021-04-21 14:16:44 +02:00
anhefti
7836b180db Merge remote-tracking branch 'origin/master' into development 
Conflicts:
	.github/workflows/buildReporting_Java11.yml
 2021-04-12 17:58:25 +02:00
anhefti
0603f0b2dd fixed test for new CI 2021-04-12 16:42:22 +02:00
anhefti
7d412c18cb test git actions 2021-04-12 15:26:34 +02:00
anhefti
3a4810e54f fix stests 2021-04-12 14:23:37 +02:00
anhefti
5bfc635785 more tests 2021-04-12 10:34:45 +02:00
anhefti
449f7d5824 SEBSERV-148 test and fixes 2021-04-08 15:44:05 +02:00
anhefti
7fae3f4baf SEBSERV-148 testing fixing 2021-04-08 10:36:32 +02:00
anhefti
2bead4a52a SEBSERV-148 GUI Exam Config impl 2021-04-06 18:44:36 +02:00
anhefti
29bda22a40 SEBSERV-148 implementation und fixes 2021-03-31 08:21:03 +02:00
anhefti
ffe4b6301a SEBSERV-148 GUI impl 2021-03-25 16:56:39 +01:00
anhefti
43383bcebb zoom integration 2021-03-16 17:34:23 +01:00
anhefti
d88924873c SEBSERV-148 strategy with creating users per room - initial commit 2021-03-11 15:15:59 +01:00
anhefti
fa3c5f1135 SEBSERV-148 refactoring and Zoom implementation 2021-03-11 11:08:12 +01:00
anhefti
53f3cc625e SEBSERV-148 finished refactoring separate features and hook into 
underling proctoring service for room creation and closing
 2021-03-09 13:15:22 +01:00
anhefti
3dddaf9051 SEBSERV-148 refactoring and backend 2021-02-24 16:38:30 +01:00
anhefti
2f2a318f9d proctoring refactoring and tests 2021-02-17 16:52:28 +01:00
anhefti
1796ff4a7a Merge remote-tracking branch 'origin/dev-1.1.0' into development 2021-02-17 11:49:26 +01:00
anhefti
8c29d7e8f2 fixed import settings and tests 2021-02-17 11:34:56 +01:00
anhefti
273d9fd923 Fixed master and created tests 2021-02-17 10:21:19 +01:00
anhefti
39f4c85d22 refactor proctoring 2021-02-17 08:43:27 +01:00
anhefti
ad7f06e521 Merge remote-tracking branch 'origin/dev-1.1.0' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamProctoringController.java
 2021-02-16 12:55:11 +01:00
anhefti
89ebf4da4b proctoring refactoring 2021-02-16 11:50:30 +01:00
anhefti
3f2923da8f fixed tests 2021-02-15 16:37:20 +01:00
anhefti
a6a9988cbe SEBSERV-139 added moderator flag to the jitsi meet room token 2021-02-15 16:29:22 +01:00
anhefti
77e8a7c68a fix build 2021-02-04 17:26:57 +01:00
anhefti
fd7699b68f SEBSERV-145 SEB handshake implementation plus Unit Tests 2021-02-04 17:19:42 +01:00
anhefti
3c46251a9d update Spring Boot version to 2.3.0.RELEASE 2021-02-02 17:58:40 +01:00