From f1560dc8c6cea13966424ad57e74dbfd40546fa5 Mon Sep 17 00:00:00 2001 From: anhefti Date: Thu, 16 Jun 2022 17:03:57 +0200 Subject: [PATCH] SEBSERV-189 --- .../gui/content/action/ActionCategory.java | 7 +++++-- .../gui/content/action/ActionDefinition.java | 2 +- .../gui/content/action/ActionPane.java | 3 +++ .../monitoring/MonitoringRunningExam.java | 17 ----------------- src/main/resources/messages.properties | 3 ++- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java index 451e70b9..6594f68e 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java @@ -31,8 +31,11 @@ public enum ActionCategory { "sebserver.monitoring.exam.connection.notificationlist.actions"), 1), EXAM_MONITORING_2(new LocTextKey( - "sebserver.monitoring.exam.connection.selected.actions"), 2), - EXAM_MONITORING_3(null, 3), + "sebserver.monitoring.exam.connection.actions.group2"), + 2), + EXAM_MONITORING_3(new LocTextKey( + "sebserver.monitoring.exam.connection.actions.group3"), + 3), CLIENT_EVENT_LIST(new LocTextKey("sebserver.monitoring.exam.connection.list.actions"), 1), LOGS_USER_ACTIVITY_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1), LOGS_SEB_CLIENT_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1), diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java index 110bf6fa..586e478c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java @@ -806,7 +806,7 @@ public enum ActionDefinition { new LocTextKey("sebserver.monitoring.exam.connection.action.instruction.quit.all"), ImageIcon.SEND_QUIT, PageStateDefinitionImpl.MONITORING_RUNNING_EXAM, - ActionCategory.FORM), + ActionCategory.EXAM_MONITORING_2), MONITOR_EXAM_LOCK_SELECTED( new LocTextKey("sebserver.monitoring.exam.connection.action.instruction.lock.selected"), ImageIcon.LOCK, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java index de67612f..9f791680 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java @@ -238,6 +238,9 @@ public class ActionPane implements TemplateComposer { CustomVariant.TEXT_H3, category.title); final GridData titleLayout = new GridData(SWT.FILL, SWT.TOP, true, false); + if (" ".equals(this.pageService.getI18nSupport().getText(category.title))) { + titleLayout.heightHint = 6; + } actionsTitle.setLayoutData(titleLayout); } 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 7e5360fa..92a8a26c 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 @@ -506,23 +506,6 @@ public class MonitoringRunningExam implements TemplateComposer { return action; } -// private PageAction lockSEBClients( -// final PageAction action, -// final ClientConnectionTable clientTable, -// final boolean all) { -// -// this.instructionProcessor.propagateSEBLockInstruction( -// clientTable.getExam().getModelId(), -// statesPredicate -> clientTable.getConnectionTokens( -// statesPredicate, -// !all), -// action.pageContext()); -// -// clientTable.removeSelection(); -// clientTable.forceUpdateAll(); -// return action; -// } - private PageAction disableSEBClients( final PageAction action, final ClientConnectionTable clientTable, diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index aab5b066..3ba4dc1d 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -1899,7 +1899,8 @@ sebserver.monitoring.exam.connection.action.proctoring.examroom=Exam Room Procto sebserver.monitoring.exam.connection.action.openTownhall.confirm=You are about to open the town-hall room and force all SEB clients to join the town-hall room.
Are you sure to open the town-hall? sebserver.monitoring.exam.connection.action.closeTownhall.confirm=You are about to close the town-hall room and force all SEB clients to join it's proctoring room.
Are you sure to close the town-hall? sebserver.monitoring.exam.connection.action.singleroom.confirm=You are about to open the single/one to one room for this participant.
Are you sure you want to open the single room? -sebserver.monitoring.exam.connection.selected.actions=  +sebserver.monitoring.exam.connection.actions.group2=  +sebserver.monitoring.exam.connection.actions.group3=  sebserver.monitoring.exam.connection.notificationlist.actions= sebserver.monitoring.exam.connection.action.confirm.notification=Confirm Notification