Commit graph

802 commits

Author SHA1 Message Date
anhefti
84035da42f Merge remote-tracking branch 'origin/dev-1.1.0' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AsyncBatchEventSaveStrategy.java
2021-03-04 15:23:27 +01:00
anhefti
b4edfb4ab9 code cleanup 2021-03-04 14:50:53 +01:00
anhefti
8a3b84461c Improved list navigation 2021-03-04 14:13:18 +01:00
anhefti
caf35ad657 Fixed event log table separation 2021-03-04 13:54:18 +01:00
anhefti
d4c79e06d8 code cleanup 2021-03-04 13:50:40 +01:00
anhefti
53a9710ec8 Improved event log batch processing 2021-03-04 13:48:16 +01:00
anhefti
3f5ce27f19 better dispose 2021-03-04 08:22:43 +01:00
anhefti
254255b3ac Merge remote-tracking branch 'origin/dev-1.1.0' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/api/APIMessage.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/SEBClientConnectionServiceImpl.java
2021-03-03 13:51:53 +01:00
anhefti
2f8913f129 improved LMS fail handling on exams
1. if LMS is not available the exams gets a state override and is not
running
2. if LMS lms is available but the course id is invalid, the exams gets
a state override and is not running
2021-03-03 13:28:33 +01:00
anhefti
527c005702 fixed update id 2021-03-01 20:21:12 +01:00
anhefti
0383aebcbf fix: take also finished exams into running check 2021-03-01 20:07:00 +01:00
anhefti
b0dd0e1afc Zoom integration 2021-03-01 19:06:38 +01:00
anhefti
3dddaf9051 SEBSERV-148 refactoring and backend 2021-02-24 16:38:30 +01:00
anhefti
290ca046c3 allow updating client connection in active state 2021-02-22 13:05:59 +01:00
anhefti
fa327e4e29 fixed view of foreign SEB Settings 2021-02-22 13:05:08 +01:00
anhefti
8e0dd36a41 invest 2021-02-18 13:33:31 +01:00
anhefti
653b5a4c75 inspection 2021-02-18 13:31:23 +01:00
anhefti
26a26c7989 investigate TableConverter error 2021-02-18 13:20:52 +01:00
anhefti
96313e41a7 minor fixes 2021-02-18 12:41:04 +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
5cb771c2c2 SEBSERV-170 fixed update page after import 2021-02-16 12:36:56 +01:00
anhefti
89ebf4da4b proctoring refactoring 2021-02-16 11:50:30 +01:00
anhefti
a6a9988cbe SEBSERV-139 added moderator flag to the jitsi meet room token 2021-02-15 16:29:22 +01:00
anhefti
b6e9e55106 SEBWIN-464 added missing attributes and created migration task 2021-02-15 15:34:01 +01:00
anhefti
256b59e566 SEBSERV-168 fixed. Missed to apply the filter after refactoring 2021-02-15 10:03:20 +01:00
anhefti
f6757ec587 VDI API 2021-02-15 09:09:18 +01:00
anhefti
fd7699b68f SEBSERV-145 SEB handshake implementation plus Unit Tests 2021-02-04 17:19:42 +01:00
anhefti
5440f4bdcd Merge branch 'development' into development_VDI 2021-02-03 11:16:27 +01:00
anhefti
7e40cec488 fixed description from LMS and missing ping error indication 2021-02-03 11:12:41 +01:00
anhefti
65e63c8446 docu 2021-02-03 10:04:18 +01:00
anhefti
3c46251a9d update Spring Boot version to 2.3.0.RELEASE 2021-02-02 17:58:40 +01:00
anhefti
18f3764422 Merge branch 'development' into development_VDI
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gbl/api/EntityType.java
	src/main/java/ch/ethz/seb/sebserver/gbl/model/Domain.java
	src/main/java/ch/ethz/seb/sebserver/gbl/model/session/ClientConnection.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientConfigForm.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/AdditionalAttributeRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientConnectionRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientEventRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ClientInstructionRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationAttributeRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationNodeRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ConfigurationValueRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamConfigurationMapRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ExamRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/IndicatorRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/InstitutionRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/LmsSetupRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/OrientationRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RemoteProctoringRoomRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/RoleRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/SebClientConfigRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ThresholdRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserActivityLogRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/UserRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/ViewRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordDynamicSqlSupport.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/mapper/WebserviceServerInfoRecordMapper.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/AdditionalAttributeRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientConnectionRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientEventRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ClientInstructionRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationAttributeRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationNodeRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ConfigurationValueRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamConfigurationMapRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ExamRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/IndicatorRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/InstitutionRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/LmsSetupRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/OrientationRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RemoteProctoringRoomRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/RoleRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/SebClientConfigRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ThresholdRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserActivityLogRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/UserRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/ViewRecord.java
	src/main/java/ch/ethz/seb/sebserver/webservice/datalayer/batis/model/WebserviceServerInfoRecord.java
2021-02-02 10:45:25 +01:00
anhefti
1f9ed3c4f0 DB schema version 1.2.0 2021-02-02 10:31:13 +01:00
anhefti
977ada8947 SEBSERV-145 new attributes in Connection Configuration gui and back-end 2021-02-01 14:13:44 +01:00
anhefti
87951bdaaa fixed sort in User Activity Logs for User column 2021-02-01 09:20:32 +01:00
anhefti
8bf00bf413 fixed some GUI issues 2021-01-27 17:24:30 +01:00
anhefti
199ba53688 SEBSERV-145 additional attributes in connection config 2021-01-27 16:57:10 +01:00
anhefti
4734b1a3b3 fixed GUI issues 2021-01-27 10:02:08 +01:00
anhefti
ff31692160 db schema update for distributed setup and a lot performance
improvements done with caching as well as with the monitoring table
This should now also work for distributed setups but is not fully tested
yet
2021-01-27 09:17:45 +01:00
anhefti
d4668eeeee privileges 2021-01-21 15:21:46 +01:00
anhefti
c74cd42645 fixed export settings available also in readonly 2021-01-21 15:20:36 +01:00
anhefti
004c54a173 SEBSERV-142 fixes 2021-01-21 15:04:31 +01:00
anhefti
c3b767b7a0 updated wording as discussed 2021-01-20 17:48:01 +01:00
anhefti
c9eda69065 added update_time to client_connection table
this is used to track changes on client connections within distributed
setups. But there are still some todos that has to implement and work
with the update_time to guarantee proper cache sync
2021-01-20 16:07:11 +01:00
anhefti
adce16bc7c fixed some bugs in bulk action and moodle load sync 2021-01-19 14:55:09 +01:00
anhefti
de760b3714 catch Moodle warnings and improved logging 2021-01-18 13:19:10 +01:00
anhefti
7143bd7ed9 fixed logging 2021-01-14 17:39:48 +01:00
anhefti
49d6938e0f fixed null start date in moodle course 2021-01-14 17:32:24 +01:00
anhefti
6de13b3635 more compact actions 2021-01-13 13:53:44 +01:00
anhefti
5f969a22cf SEBSERV-143 and SEBSERV-144 2021-01-13 11:58:30 +01:00
anhefti
a7e0dded7f SEBSERV-142 fixed 2021-01-12 16:04:35 +01:00
anhefti
c5008ad5c2 SEBSERV-97 implementation 2021-01-12 15:14:05 +01:00
anhefti
eec4392f78 Added EHcache for caching and improved Moodle asnyc loading 2021-01-12 10:10:30 +01:00
anhefti
5f30aa9c2e fixed bug with ad hoc testing LMS Setup in edit view 2021-01-12 09:55:49 +01:00
anhefti
433aad87df SEBSERV-147: finished todos 2021-01-06 15:55:11 +01:00
anhefti
69f8d6cd4a handle another error caused by invalid LMS Setup access 2020-12-17 19:34:48 +01:00
anhefti
7ad3dc77b5 fixed error for getting exams on invalid LMS Setup 2020-12-17 19:25:39 +01:00
anhefti
9941d57d44 SEBSERV-150 fixed filtering 2020-12-17 18:04:28 +01:00
anhefti
7fcfcf1445 Filter fromDate in Moodle lookup 2020-12-17 18:03:56 +01:00
anhefti
3cefcbe3f3 better Moodle course access (background fetch and caching) 2020-12-17 13:20:08 +01:00
anhefti
5aca3bc5b5 test with two pages a 1000 courses 2020-12-15 21:45:35 +01:00
anhefti
5f39d02b07 get page of 1000 2020-12-15 21:34:10 +01:00
anhefti
7eeb133a74 added course filter again 2020-12-15 21:27:11 +01:00
anhefti
868420108d filter quizzes now 2020-12-15 21:15:18 +01:00
anhefti
2b5047343c moodle filtering 2020-12-15 20:28:22 +01:00
anhefti
85a784b3c0 moodle course filtering logs 2020-12-15 19:55:44 +01:00
anhefti
bd6cf929be removed export exam config from exam view 2020-12-15 19:40:24 +01:00
anhefti
1c28aad328 adapt Moodle course filtering again 2020-12-15 19:38:32 +01:00
anhefti
d3a794c5b1 fixed some tests and filtering 2020-12-15 17:53:21 +01:00
anhefti
0790b5827f download name client config over exam 2020-12-14 17:20:37 +01:00
anhefti
c72bf2cf9c fixed some minor bugs for Moodle integration 2020-12-14 17:01:33 +01:00
anhefti
39a90d201b fixed moodle course filter 2020-12-14 12:40:13 +01:00
anhefti
34c8e2e33c fixed tests 2020-12-10 21:01:30 +01:00
anhefti
4c002b4ac2 fixed various issues 2020-12-10 20:27:43 +01:00
anhefti
873391394a fixed static tagging 2020-12-10 17:07:12 +01:00
anhefti
49b2ffe338 LMS Template API 2020-12-09 16:56:05 +01:00
anhefti
29248898ff fix nullpointer 2020-12-09 10:02:05 +01:00
anhefti
24c32a38fa Moodle API 2020-12-09 09:52:49 +01:00
anhefti
74dd42759d moodle API 2020-12-09 09:05:28 +01:00
anhefti
8da7954256 Moodle performance 2020-12-09 08:48:31 +01:00
anhefti
03563a50ed logging 2020-12-09 08:23:27 +01:00
anhefti
bbf241b08e more resilient implementation of Moodle course API access 2020-12-09 08:07:08 +01:00
anhefti
b74778a67d experimental trim Moodle courses to 100 if there are more 2020-12-07 18:12:34 +01:00
anhefti
a502699774 Merge remote-tracking branch 'origin/master' into development
Conflicts:
	pom.xml
2020-12-07 16:35:57 +01:00
anhefti
366fc3b89b fixed instruction confirmation blocking bug 2020-12-03 19:17:21 +01:00
anhefti
9b8840c779 added LmsType enabling 2020-12-03 10:38:02 +01:00
anhefti
23be314a44 SEBSERV-136 fixed inverse scaled indicator 2020-12-02 17:00:25 +01:00
anhefti
12fcaa405c Merge remote-tracking branch 'origin/patch-1.0.2' into development
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/service/session/ClientConnectionDetails.java
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/session/impl/AbstractClientIndicator.java
2020-12-02 10:01:03 +01:00
anhefti
9f2cb493e0 added static column proportions for monitoring table 2020-12-02 09:49:52 +01:00
anhefti
5258f2384b SEBSERV-136 fixed bug with two indicator of the same type.
The indicator mapping on GUI side is now done within the id not the type
2020-12-02 09:01:12 +01:00
anhefti
3052ec1f59 SEBSERV-147 GUI implementation 2020-12-01 11:46:41 +01:00
anhefti
a7a4b60917 SEBSERV-147 GUI implementation 2020-11-30 13:01:53 +01:00
anhefti
9267d34d3a notification 2020-11-30 08:49:47 +01:00
anhefti
448c4d26b5 SEBSERV-136 battary and wlan status indicator impl and tests 2020-11-25 11:57:36 +01:00
anhefti
7c5a2da59d Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-11-24 15:02:06 +01:00