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

SEBSERV-204 removed "Audio Broadcast" button from Zoom Proc Window

Browse source
This commit is contained in:
anhefti 2021-07-12 11:35:41 +02:00
parent fe45a0357c
commit c043f0460e
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/AbstractProctoringView.java
View file

@ -93,12 +93,16 @@ public abstract class AbstractProctoringView implements RemoteProctoringView {
final BroadcastActionState state = final BroadcastActionState state =
(BroadcastActionState) videoAction.getData(BroadcastActionState.KEY_NAME); (BroadcastActionState) videoAction.getData(BroadcastActionState.KEY_NAME);
if (audioAction != null) {
this.pageService.getPolyglotPageService().injectI18n( this.pageService.getPolyglotPageService().injectI18n(
audioAction, audioAction,
state.video ? BROADCAST_AUDIO_ON_TEXT_KEY : BROADCAST_AUDIO_OFF_TEXT_KEY); state.video ? BROADCAST_AUDIO_ON_TEXT_KEY : BROADCAST_AUDIO_OFF_TEXT_KEY);
}
if (videoAction != null) {
this.pageService.getPolyglotPageService().injectI18n( this.pageService.getPolyglotPageService().injectI18n(
videoAction, videoAction,
state.video ? BROADCAST_VIDEO_ON_TEXT_KEY : BROADCAST_VIDEO_OFF_TEXT_KEY); state.video ? BROADCAST_VIDEO_ON_TEXT_KEY : BROADCAST_VIDEO_OFF_TEXT_KEY);
}
state.video = !state.video; state.video = !state.video;
state.audio = state.video; state.audio = state.video;

16
src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/ZoomProctoringView.java
View file

@ -117,13 +117,13 @@ public class ZoomProctoringView extends AbstractProctoringView {
final BroadcastActionState broadcastActionState = new BroadcastActionState(); final BroadcastActionState broadcastActionState = new BroadcastActionState();
if (proctoringSettings.enabledFeatures.contains(ProctoringFeature.BROADCAST)) { if (proctoringSettings.enabledFeatures.contains(ProctoringFeature.BROADCAST)) {
final Button broadcastAudioAction = widgetFactory.buttonLocalized(footer, BROADCAST_AUDIO_ON_TEXT_KEY); // final Button broadcastAudioAction = widgetFactory.buttonLocalized(footer, BROADCAST_AUDIO_ON_TEXT_KEY);
broadcastAudioAction.setLayoutData(new RowData()); // broadcastAudioAction.setLayoutData(new RowData());
broadcastAudioAction.addListener(SWT.Selection, event -> toggleBroadcastAudio( // broadcastAudioAction.addListener(SWT.Selection, event -> toggleBroadcastAudio(
proctoringWindowData.examId, // proctoringWindowData.examId,
proctoringWindowData.connectionData.roomName, // proctoringWindowData.connectionData.roomName,
broadcastAudioAction)); // broadcastAudioAction));
broadcastAudioAction.setData(BroadcastActionState.KEY_NAME, broadcastActionState); // broadcastAudioAction.setData(BroadcastActionState.KEY_NAME, broadcastActionState);
final Button broadcastVideoAction = widgetFactory.buttonLocalized(footer, BROADCAST_VIDEO_ON_TEXT_KEY); final Button broadcastVideoAction = widgetFactory.buttonLocalized(footer, BROADCAST_VIDEO_ON_TEXT_KEY);
broadcastVideoAction.setLayoutData(new RowData()); broadcastVideoAction.setLayoutData(new RowData());
@ -131,7 +131,7 @@ public class ZoomProctoringView extends AbstractProctoringView {
proctoringWindowData.examId, proctoringWindowData.examId,
proctoringWindowData.connectionData.roomName, proctoringWindowData.connectionData.roomName,
broadcastVideoAction, broadcastVideoAction,
broadcastAudioAction)); null));
broadcastVideoAction.setData(BroadcastActionState.KEY_NAME, broadcastActionState); broadcastVideoAction.setData(BroadcastActionState.KEY_NAME, broadcastActionState);
} }
if (proctoringSettings.enabledFeatures.contains(ProctoringFeature.ENABLE_CHAT)) { if (proctoringSettings.enabledFeatures.contains(ProctoringFeature.ENABLE_CHAT)) {