zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SEBSERV-189

Browse source
This commit is contained in:
anhefti 2022-06-16 17:03:57 +02:00
parent 48cd54ae70
commit f1560dc8c6
5 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionCategory.java
View file

@ -31,8 +31,11 @@ public enum ActionCategory {
"sebserver.monitoring.exam.connection.notificationlist.actions"), "sebserver.monitoring.exam.connection.notificationlist.actions"),
1), 1),
EXAM_MONITORING_2(new LocTextKey( EXAM_MONITORING_2(new LocTextKey(
"sebserver.monitoring.exam.connection.selected.actions"), 2), "sebserver.monitoring.exam.connection.actions.group2"),
EXAM_MONITORING_3(null, 3), 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), CLIENT_EVENT_LIST(new LocTextKey("sebserver.monitoring.exam.connection.list.actions"), 1),
LOGS_USER_ACTIVITY_LIST(new LocTextKey("sebserver.userlogs.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), LOGS_SEB_CLIENT_LIST(new LocTextKey("sebserver.userlogs.list.actions"), 1),

2
src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionDefinition.java
View file

@ -806,7 +806,7 @@ public enum ActionDefinition {
new LocTextKey("sebserver.monitoring.exam.connection.action.instruction.quit.all"), new LocTextKey("sebserver.monitoring.exam.connection.action.instruction.quit.all"),
ImageIcon.SEND_QUIT, ImageIcon.SEND_QUIT,
PageStateDefinitionImpl.MONITORING_RUNNING_EXAM, PageStateDefinitionImpl.MONITORING_RUNNING_EXAM,
ActionCategory.FORM), ActionCategory.EXAM_MONITORING_2),
MONITOR_EXAM_LOCK_SELECTED( MONITOR_EXAM_LOCK_SELECTED(
new LocTextKey("sebserver.monitoring.exam.connection.action.instruction.lock.selected"), new LocTextKey("sebserver.monitoring.exam.connection.action.instruction.lock.selected"),
ImageIcon.LOCK, ImageIcon.LOCK,

3
src/main/java/ch/ethz/seb/sebserver/gui/content/action/ActionPane.java
View file

@ -238,6 +238,9 @@ public class ActionPane implements TemplateComposer {
CustomVariant.TEXT_H3, CustomVariant.TEXT_H3,
category.title); category.title);
final GridData titleLayout = new GridData(SWT.FILL, SWT.TOP, true, false); 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); actionsTitle.setLayoutData(titleLayout);
} }

17
src/main/java/ch/ethz/seb/sebserver/gui/content/monitoring/MonitoringRunningExam.java
View file

@ -506,23 +506,6 @@ public class MonitoringRunningExam implements TemplateComposer {
return action; 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( private PageAction disableSEBClients(
final PageAction action, final PageAction action,
final ClientConnectionTable clientTable, final ClientConnectionTable clientTable,

3
src/main/resources/messages.properties
View file

@ -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.<br/>Are you sure to open the town-hall? 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.<br/>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.<br/>Are you sure to close 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.<br/>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.<br/>Are you sure you want to open the single room? sebserver.monitoring.exam.connection.action.singleroom.confirm=You are about to open the single/one to one room for this participant.<br/>Are you sure you want to open the single room?
sebserver.monitoring.exam.connection.selected.actions=&nbsp; sebserver.monitoring.exam.connection.actions.group2=&nbsp;
sebserver.monitoring.exam.connection.actions.group3=&nbsp;
sebserver.monitoring.exam.connection.notificationlist.actions= sebserver.monitoring.exam.connection.notificationlist.actions=
sebserver.monitoring.exam.connection.action.confirm.notification=Confirm Notification sebserver.monitoring.exam.connection.action.confirm.notification=Confirm Notification