diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java index 48716126..a9b34818 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java @@ -473,7 +473,7 @@ public class MonitoringRunningExam implements TemplateComposer { final ActionDefinition hideActionDef) { final int numOfConnections = filter.getNumOfConnections(status); - PageAction action; + final PageAction action; if (filter.isStatusHidden(status)) { action = actionBuilder.newAction(showActionDef) .withExec(showStateViewAction(filter, clientTable, status)) @@ -514,7 +514,7 @@ public class MonitoringRunningExam implements TemplateComposer { final ActionDefinition hideActionDef) { final int numOfConnections = filter.getNumOfConnections(clientGroup.id); - PageAction action; + final PageAction action; if (filter.isClientGroupHidden(clientGroup.id)) { action = actionBuilder.newAction(showActionDef) .withExec(showClientGroupAction(filter, clientTable, clientGroup.id)) diff --git a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java index 1da8efd9..51c7ce58 100644 --- a/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java +++ b/src/main/java/ch/ethz/seb/sebserver/webservice/weblayer/api/ExamMonitoringController.java @@ -320,7 +320,8 @@ public class ExamMonitoringController { required = false) final String hiddenClientGroups) { // TODO respond this within another Thread-pool (Executor) - // TODO try to cache some monitoring data throughout multiple requests (for about 2 sec.) + // TODO try to cache some MonitoringSEBConnectionData throughout multiple requests (for about 2 sec.) + // problem: different filter settings, maybe cache unfiltered data and then just filter cached data per request final Exam runningExam = checkPrivileges(institutionId, examId); diff --git a/src/main/resources/config/initialPermittedProcesses.xml b/src/main/resources/config/initialPermittedProcesses.xml index d5273951..94c5d298 100644 --- a/src/main/resources/config/initialPermittedProcesses.xml +++ b/src/main/resources/config/initialPermittedProcesses.xml @@ -4,36 +4,6 @@ permittedProcesses - - active - - allowUserToChooseApp - - arguments - - autostart - - description - - executable - firefox.exe - iconInTaskbar - - identifier - Firefox - os - 1 - path - ../xulrunner/ - runInBackground - - strongKill - - title - SEB - originalName - firefox.exe - \ No newline at end of file diff --git a/src/main/resources/config/sql/base/V27__exam_config_gui_additions_v1_6.sql b/src/main/resources/config/sql/base/V27__exam_config_gui_additions_v1_6.sql index 2ec272b1..b6f3d955 100644 --- a/src/main/resources/config/sql/base/V27__exam_config_gui_additions_v1_6.sql +++ b/src/main/resources/config/sql/base/V27__exam_config_gui_additions_v1_6.sql @@ -53,4 +53,11 @@ INSERT IGNORE INTO configuration_attribute VALUES (1583, 'systemAlwaysOn', 'CHECKBOX', null, null, null, null, 'true'), (1584, 'displayAlwaysOn', 'CHECKBOX', null, null, null, null, 'true'), (1585, 'disableSessionChangeLockScreen', 'CHECKBOX', null, null, null, null, 'false') -; \ No newline at end of file +; + +-- ---------------------------------------------------------------- +-- Add new SEB Settings GUI (SEBSERV-405) +-- ---------------------------------------------------------------- + +INSERT IGNORE INTO orientation (config_attribute_id, template_id, view_id, group_id, x_position, y_position, width, height, title) VALUES + (1200, 0, 6, null, 0, 6, 1, 1, 'LEFT'); \ No newline at end of file diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index e84caa8b..0db5b37b 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -1454,6 +1454,7 @@ sebserver.examconfig.props.label.permittedProcesses.description.tooltip=Optional sebserver.examconfig.props.label.permittedProcesses.executable=Executable sebserver.examconfig.props.label.permittedProcesses.executable.tooltip=File name of the executable, which should not contain any parts of a file system path,
only the filename of the exe file (like calc.exe). sebserver.examconfig.props.label.permittedProcesses.originalName=Original Name +sebserver.examconfig.props.label.permittedProcesses.signature=Signature sebserver.examconfig.props.label.permittedProcesses.allowedExecutables=Window handling process sebserver.examconfig.props.label.permittedProcesses.path=Path sebserver.examconfig.props.label.permittedProcesses.arguments=Arguments