diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/rules/ProctoringViewRules.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/rules/ProctoringViewRules.java index 75e2411a..4031f26c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/rules/ProctoringViewRules.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/examconfig/impl/rules/ProctoringViewRules.java @@ -26,6 +26,7 @@ public class ProctoringViewRules implements ValueChangeRule { public static final String KEY_ENABLE_AI = "proctoringAIEnable"; public static final String KEY_ENABLE_JITSI = "jitsiMeetEnable"; + public static final String JITSI_GROUP_AUDIO_VIDEO = "jitsiMeetReceiveAudio"; public static final String JITSI_GROUP_FEATURES = "jitsiMeetFeatureFlagChat"; public static final String JITSI_GROUP_CONTROLS = "jitsiMeetAudioMuted"; @@ -45,9 +46,11 @@ public class ProctoringViewRules implements ValueChangeRule { if (KEY_ENABLE_JITSI.equals(attribute.name)) { if (BooleanUtils.toBoolean(value.value)) { + context.enableGroup(JITSI_GROUP_AUDIO_VIDEO); context.enableGroup(JITSI_GROUP_FEATURES); context.enableGroup(JITSI_GROUP_CONTROLS); } else { + context.disableGroup(JITSI_GROUP_AUDIO_VIDEO); context.disableGroup(JITSI_GROUP_FEATURES); context.disableGroup(JITSI_GROUP_CONTROLS); } diff --git a/src/main/resources/config/sql/base/V5_3__update_proctoring_attributes_v1_1.sql b/src/main/resources/config/sql/base/V5_3__update_proctoring_attributes_v1_1.sql new file mode 100644 index 00000000..dfa4f505 --- /dev/null +++ b/src/main/resources/config/sql/base/V5_3__update_proctoring_attributes_v1_1.sql @@ -0,0 +1,21 @@ +UPDATE orientation SET y_position='7' WHERE config_attribute_id='1103'; +UPDATE orientation SET y_position='8' WHERE config_attribute_id='1106'; +UPDATE orientation SET y_position='9' WHERE config_attribute_id='1108'; +UPDATE orientation SET y_position='10' WHERE config_attribute_id='1104'; +UPDATE orientation SET y_position='11' WHERE config_attribute_id='1105'; + +UPDATE orientation SET y_position='13' WHERE config_attribute_id='1100'; +UPDATE orientation SET y_position='14' WHERE config_attribute_id='1116'; +UPDATE orientation SET y_position='15' WHERE config_attribute_id='1101'; + +UPDATE orientation SET group_id='jitsi_audio_video', x_position='6' WHERE config_attribute_id='1130'; +UPDATE orientation SET group_id='jitsi_audio_video', x_position='6' WHERE config_attribute_id='1131'; +UPDATE orientation SET group_id='jitsi_audio_video', x_position='6' WHERE config_attribute_id='1132'; +UPDATE orientation SET group_id='jitsi_audio_video', x_position='6' WHERE config_attribute_id='1133'; + +UPDATE orientation SET y_position='2' WHERE config_attribute_id='1120'; +UPDATE orientation SET y_position='3' WHERE config_attribute_id='1122'; +UPDATE orientation SET y_position='4' WHERE config_attribute_id='1123'; +UPDATE orientation SET y_position='6' WHERE config_attribute_id='1125'; +UPDATE orientation SET y_position='7' WHERE config_attribute_id='1124'; +UPDATE orientation SET y_position='8' WHERE config_attribute_id='1121'; \ No newline at end of file diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 79ace93b..8e3dd0cf 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -1283,6 +1283,8 @@ sebserver.examconfig.props.label.enableF10=Enable F10 sebserver.examconfig.props.label.enableF11=Enable F11 sebserver.examconfig.props.label.enableF12=Enable F12 +sebserver.examconfig.props.group.jitsi_audio_video=Jitsi Meet Audio Video Settings +sebserver.examconfig.props.group.jitsi_audio_video.tooltip= sebserver.examconfig.props.group.jitsi_features=Jitsi Meet Features sebserver.examconfig.props.group.jitsi_features.tooltip= sebserver.examconfig.props.group.jitsi_controls=Jitsi Meet User Controls