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

951 commits

Author SHA1 Message Date
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
07bc906cfc wording: chanced Client Configuration to Connection Configuration 2021-01-13 13:53:21 +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
d23357248e removed standard file log appender 2021-01-06 17:15:32 +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
anhefti
a5e65a2ff2 fixed exams for exam list must be up to date (evict cache) 2020-11-24 15:01:26 +01:00
anhefti
d3a372cfac SEBSERV-136 SEBSERV-147 implementation and integration tests 2020-11-24 13:48:29 +01:00
anhefti
696a85a1fe fixed some issues with proctoring rooms and error handling 2020-11-18 16:05:52 +01:00
anhefti
3b1641994a Merge remote-tracking branch 'origin/patch-1.0.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/MonitoringRunningExam.java
 2020-11-17 17:29:06 +01:00
anhefti
797ebdd200 changed internal method name 2020-11-17 17:05:25 +01:00
anhefti
1d7bd02382 fixed concurrent user login within ServerPushService 2020-11-17 17:04:01 +01:00
anhefti
61cd109ff2 Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-11-17 12:36:59 +01:00
anhefti
1b9b201da9 minor message fix 2020-11-17 12:29:56 +01:00
anhefti
ff6e38d97f
SEBSERV-146 fixed 2020-11-17 12:28:21 +01:00
anhefti
10ef9792bc
fixed proctoring 2020-11-17 12:23:39 +01:00
anhefti
e3a331196c
fixed caching issue with client connections 2020-11-17 09:13:22 +01:00
anhefti
84d32393fb
test new codecov 2020-11-16 17:48:18 +01:00
anhefti
222edfade4
Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-11-12 17:01:20 +01:00
anhefti
e0ba0a9277
fix login error 2020-11-12 17:00:32 +01:00
anhefti
51311f4972
update migration 2020-11-12 15:15:21 +01:00
anhefti
6b1d5f9179
error handling on proc update 2020-11-12 14:27:59 +01:00
anhefti
230b6edc9f fixed logout error 2020-11-12 14:05:59 +01:00
anhefti
bee3f7a059
Merge remote-tracking branch 'origin/patch-1.0.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/service/page/PageService.java
	src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java
 2020-11-12 14:01:06 +01:00
anhefti
baee52a69a
fixed logout error bug 2020-11-12 13:52:26 +01:00
anhefti
53bb378d0b
SEBSERV-139 refactoring of townhall and instruction service 2020-11-12 13:28:03 +01:00
anhefti
8e04e43bfa
SEBSERV-139 refactoring and implementation of town hall 2020-11-10 15:35:47 +01:00
anhefti
489845e35b
fixed external port property 2020-10-29 18:54:22 +01:00
anhefti
c8d2052329
fixed gui service external address default settings 2020-10-29 18:09:00 +01:00
anhefti
6ea548548f
disable Remote Proctoring URL check on Port 5000 2020-10-29 17:18:41 +01:00
anhefti
8a0fdc72a1
Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-10-28 17:10:15 +01:00
anhefti
af8cca8ab2
fixed client config selection only for cc of institution of exam 2020-10-28 17:09:17 +01:00
anhefti
057275ba49
SEBSERV-139 added collecting all room feature 2020-10-28 15:20:58 +01:00
anhefti
6e3549dbb7
Merge remote-tracking branch 'origin/patch-1.0.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/ExamForm.java
 2020-10-27 13:41:18 +01:00
anhefti
6c8aa7b12c
fixed client config export to configure a client with password 
added possibility to export client config on exam side with including
examId in the config
 2020-10-27 13:13:43 +01:00
anhefti
eeca8bb88a fix broken build 2020-10-26 14:59:51 +01:00
anhefti
b3f83877f2 starting collect all room impl 2020-10-26 14:54:54 +01:00
anhefti
f7d80ed4da
fixed some bugs from findBugs 2020-10-26 10:42:05 +01:00
anhefti
bfdfcb389f
update db model for testing new eclipse setup 2020-10-26 10:00:11 +01:00
anhefti
556ad80c8e SEBSERV-136 prepare DB model and indicators for new features 2020-10-22 17:00:27 +02:00
anhefti
44452640fd Merge remote-tracking branch 'origin/patch-1.0.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
 2020-10-21 14:19:47 +02:00
anhefti
14334f0d7e fixed start time filter for exams. Running exams are always shown 2020-10-21 14:17:34 +02:00
anhefti
286ba29e02 fixed Moodle quiz recovery 2020-10-21 14:00:05 +02:00
anhefti
a17da0923b added logging for Moodle quiz recovering 2020-10-21 12:40:21 +02:00
anhefti
d69d7b7c64 Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-10-21 12:30:26 +02:00
anhefti
03937afc62 fixed Date {0} title on audit log popup 2020-10-21 12:29:09 +02:00
anhefti
24131ddfac Added Moodle quiz recovery and delete additional attributes for exam 2020-10-21 12:20:39 +02:00
anhefti
a222590cad fixed moodle quiz API again with using course_module with id now for URL 2020-10-20 11:29:36 +02:00
anhefti
55cfc07a9d fixed proctor room action update 2020-10-20 10:20:37 +02:00
anhefti
5b9b336886 fixed proctoring room issues 2020-10-19 13:42:53 +02:00
anhefti
daebd9b5f7 added more actions and connection list to proctor rooms 2020-10-15 16:24:53 +02:00
anhefti
1d7d15c02c new remote proctoring implementation 2020-10-14 16:41:47 +02:00
anhefti
e4a0f30adf finished first impl of new proctoring strategy (collecting rooms) 2020-10-08 14:48:25 +02:00
anhefti
f0351fe558 Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-10-07 15:17:43 +02:00
anhefti
3b77f95849 fixed connection table update on status filter change 2020-10-07 15:09:06 +02:00
anhefti
62f2437dad proctoring collecting rooms first implementation 2020-10-07 15:07:08 +02:00
anhefti
f7643f94ea Merge remote-tracking branch 'origin/patch-1.0.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/RAPConfiguration.java
 2020-10-06 11:52:25 +02:00
anhefti
606de67aa2 added static property support to GUI and fix setting gui endpoint 2020-10-06 11:50:06 +02:00
anhefti
e9393068df remote proctoring 2020-10-06 11:30:37 +02:00
anhefti
3fd064055a Merge remote-tracking branch 'origin/patch-1.0.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/dao/impl/ExamDAOImpl.java
	src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ClientEventController.java
	fixes in Moodle LMS binding
 2020-10-06 09:08:04 +02:00
anhefti
2a5a243759 fixed running exam cache 2020-10-05 16:53:59 +02:00
anhefti
fb11423cce Exam shall be shown even if quiz data cannot be get from LMS 2020-10-05 16:39:33 +02:00
anhefti
87be4f4696 Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-10-05 15:41:07 +02:00
anhefti
fcef3c08df added get Exam GrandEntity to DAO and use it in Controller 2020-10-05 15:36:34 +02:00
anhefti
99bc028208 try proctoring popup with RAP Browser tool and new RAPServlet mapping 2020-10-05 15:20:14 +02:00
anhefti
0e806b99bb extended DB Model for proctoring 2020-10-01 08:27:18 +02:00
anhefti
193c9e5a6a added some exam config attribute to GUI 2020-09-30 14:22:02 +02:00
anhefti
22ab37ba73 Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-09-30 12:47:57 +02:00
anhefti
73a27cb003 fixed duplicate key for exam config attributes 2020-09-30 12:45:16 +02:00
anhefti
dfd4f67f0a Merge remote-tracking branch 'origin/patch-1.0.2' into development 2020-09-30 11:04:21 +02:00
anhefti
dfda89a45a fixed form validation error and added new config attributes (migration) 2020-09-30 11:02:47 +02:00
anhefti
1da749a473 fixed moodle and proctoring 2020-09-29 17:48:50 +02:00
anhefti
257b400e1a fixed sebserver.gui.http.external.port 2020-09-19 09:54:40 +02:00
anhefti
e8315e4da0 code cleanup 2020-08-27 14:51:22 +02:00
anhefti
e0fd028ebf Merge branch 'patch-1.0.2' into development 2020-08-27 14:48:52 +02:00
anhefti
5cfbf09d30 more resilience while query courses form several LMS. Make process 
parallel and set circuit breaker to 10 seconds (request timeout is on 20
seconds)
 2020-08-27 14:48:10 +02:00
anhefti
3c0c8a4c41 SEBSERV-139 implementing join-in room in overall monitoring view 2020-08-27 10:37:56 +02:00
anhefti
a91192ecbb SEBSERV-139 fixed quiz import bug 2020-08-26 10:01:09 +02:00
anhefti
444d2334b4 SEBSERV-139 adapt to new API with shortname and idnumber 2020-08-26 09:05:14 +02:00
anhefti
3ea936cf81 SEBSERV-139 Proctoring room join and leave API 2020-08-25 16:47:30 +02:00
anhefti
9923e06029 SEBSERV-139 added GUI in Exam-Config 2020-08-24 12:52:45 +02:00
anhefti
2bea1f25c6 added GuiServiceInfo 2020-08-20 19:30:39 +02:00
anhefti
343643b331 added external server name for GUI component 2020-08-20 18:00:10 +02:00
anhefti
feb3836b12 add proctoring attributes 2020-08-20 16:44:40 +02:00
anhefti
0e293c7602 SEBSERV-139 Jitsi Javascript API integration 2020-08-20 08:28:31 +02:00
anhefti
59e3d29e3d Merge branch 'patch-1.0.2' into development 2020-08-12 16:45:43 +02:00
anhefti
cdf3b6d452 fixed deletion of empty table rows on status change 2020-08-12 16:44:43 +02:00
anhefti
9364977d4a fixed no quiz data for exam 2020-08-11 17:01:29 +02:00
anhefti
6980715e2f SEBSERV-139 TestBot integration and testing and fixes 2020-08-11 16:01:47 +02:00
anhefti
65cdb1dc52 SEBSERV-139 SEB instruction for proctoring support 2020-08-11 14:23:24 +02:00
anhefti
7335547341 SEBSERV-139 integration of token generation 2020-08-10 11:42:58 +02:00
anhefti
548d4d132f SEBSERV-139 implementing GUI 2020-08-06 17:01:38 +02:00
anhefti
6eedcbb4a0 Merge branch 'patch-1.0.2' into development 2020-08-05 16:59:12 +02:00
anhefti
f324424b3e fixed some prefix for tooltip 2020-08-05 16:58:16 +02:00
anhefti
ec1630fa2f SEBSERV-139 gui implementations 2020-08-05 16:55:19 +02:00
anhefti
6f9daddf53 SEBSERV-75 error handling for SEB Restriction 2020-08-05 11:14:39 +02:00
anhefti
017d191e31 more tests 2020-08-04 15:24:54 +02:00
anhefti
bb2c585eb6 more integration tests 2020-08-04 13:54:33 +02:00
anhefti
dbaffff5c3 SEBSERV-75 allow moodle courses and quizzes to be used as exams 2020-08-04 11:40:21 +02:00
anhefti
640211649c fixed java 8 compile 2020-07-30 16:59:11 +02:00
anhefti
c7728d2fb3 SEBSERV-139 proctoring back-end implementation 2020-07-30 16:53:55 +02:00
anhefti
04e9b06e27 fixed deletion action activation 2020-07-29 14:42:43 +02:00
anhefti
376c3dd8c8 Merge branch 'patch-1.0.2' into development 
Conflicts:
	src/main/java/ch/ethz/seb/sebserver/gui/content/SEBClientLogs.java
	src/main/java/ch/ethz/seb/sebserver/gui/content/UserActivityLogs.java
 2020-07-29 12:10:06 +02:00
anhefti
63949a9416 fixed action disappearing on empty list 2020-07-29 12:07:26 +02:00
anhefti
a2d2ca6751 SEBSERV-133 added deletion for user activity logs for SEB server admins 2020-07-29 11:40:12 +02:00
anhefti
9438206c9d SEBSERV-133 added deletion to SEB client events 2020-07-28 15:34:54 +02:00
anhefti
532ca816bc SEBSERV-75 added Moodle course restriction on SEB Server side 2020-07-23 16:11:40 +02:00
anhefti
cfaaf964fe added full name resolving also for Open edX 2020-07-23 11:47:06 +02:00
anhefti
d85fd1b1d7 SEBSERV-133 simplify exam delete 2020-07-22 16:12:18 +02:00
anhefti
6255a6bf38 SEBSERV-133 deletion of exams 2020-07-22 16:04:42 +02:00
anhefti
cc0f15ab62 SEBSERV-10 GUI implementation 2020-07-21 16:27:08 +02:00
anhefti
265624ec4c Merge branch 'patch-1.0.2' into development 2020-07-16 16:17:30 +02:00
anhefti
066df95d0c fixed testing on LMS Setup and display messages HTML formatting 2020-07-16 16:16:30 +02:00
anhefti
7bbe6386a3 SEBSERV-75 fixed Moodle request API with form URL encoded array values 2020-07-16 10:50:47 +02:00
anhefti
99f34176f2 SEBSERV-75 implemented user account display name resolving 2020-07-15 12:32:26 +02:00
anhefti
7f6c3b46d6 added 1.1.0-SNAPSHOT version and proctoring data 2020-07-15 09:29:31 +02:00
anhefti
2e18ce3382 code cleanup 2020-07-15 09:15:07 +02:00
anhefti
e5879f7809 Merge branch 'patch-1.0.2' into development 2020-07-15 08:57:38 +02:00
anhefti
1d80926f51 fixed Moodle quiz URL for Exam 2020-07-15 08:48:48 +02:00
anhefti
eba81f5715 fix: cut too long event messages to max 512 and tests 2020-07-15 08:44:04 +02:00
anhefti
66699d92d9 add comment for Java 8 fix 2020-07-14 17:06:26 +02:00
anhefti
abbf2093e5 fix for Java 8 2020-07-14 16:58:20 +02:00
anhefti
9e1e979855 fix Java 8 compilation!!! 2020-07-14 16:41:20 +02:00
anhefti
33952a1795 fix compile Java 8 2020-07-14 16:34:54 +02:00
anhefti
f61b142cc7 SEBSERV-10 GUI implementation 2020-07-14 15:25:42 +02:00
anhefti
896db25eca SEBSERV-10 more integration tests and fixes 2020-07-09 15:32:13 +02:00
anhefti
beac468b70 fixed tests 2020-07-08 14:51:13 +02:00
anhefti
35385dcd7b SEBSERV-10 added tests and fixes 2020-07-08 14:36:15 +02:00
anhefti
2a0afe902a SEBSERV-10 back-end implementation 2020-07-08 12:43:38 +02:00
anhefti
d7f79fb3cc Merge branch 'patch-1.0.2' into development 2020-07-06 16:30:26 +02:00
anhefti
36364ed607 added login and logout activity logs 2020-07-06 16:29:31 +02:00
anhefti
b62fb9fd58 batis code generation with now schema (1.1.0) 2020-07-06 10:47:51 +02:00
anhefti
61a232630b added config attribute (primitive) type check on import 2020-07-06 09:41:00 +02:00
anhefti
cc543f79da Streamlined use of org.apache.commons.io.IOUtils 2020-07-01 14:07:34 +02:00
anhefti
fe716296ae API documentation 2020-06-30 16:55:22 +02:00
anhefti
13ad8387ef fixed dev profile 2020-06-23 13:33:55 +02:00
anhefti
f689eb8ecb more tests 2020-06-22 16:27:22 +02:00
anhefti
7e73f08bea API documentation 2020-06-18 08:42:20 +02:00
anhefti
9d353296f3 prepare for patch version 1.0.1 2020-06-16 14:25:46 +02:00
anhefti
e394cb5863 more integration tests 2020-06-16 14:14:18 +02:00
anhefti
54c248980b mor integration tests 2020-06-15 12:43:31 +02:00
anhefti
42a5c7cf3b more integration tests 2020-06-11 12:29:54 +02:00
anhefti
cc22c94793 improved GUI startup info 2020-06-10 10:13:43 +02:00
anhefti
b63a8e39b3 better error handling 2020-06-10 09:43:39 +02:00
anhefti
9ddca15c1e fixed properties 2020-06-10 09:39:15 +02:00
anhefti
e194c97b66 added missing properties for standalone gui service 2020-06-10 08:46:01 +02:00
anhefti
bb5f0c0198 splitted application.properties to ws and gui profiles 2020-06-09 17:34:25 +02:00