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 c1caa426..0414c4f8 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 @@ -47,7 +47,7 @@ public enum ActionCategory { VARIA(new LocTextKey("sebserver.overall.action.category.varia"), 0), STATE_FILTER(new LocTextKey("sebserver.exam.monitoring.action.category.statefilter"), 40), GROUP_FILTER(new LocTextKey("sebserver.exam.monitoring.action.category.groupfilter"), 50), - ISSUE_FILTER(new LocTextKey("sebserver.exam.monitoring.action.category.issuefilter"), 60), + ISSUE_FILTER(new LocTextKey("sebserver.exam.monitoring.action.category.issuefilter"), 45), PROCTORING(new LocTextKey("sebserver.exam.overall.action.category.proctoring"), 70), SCREEN_PROCTORING(new LocTextKey("sebserver.exam.overall.action.category.screenproctoring"), 75), 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 e6f35958..04bc7585 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 @@ -187,4 +187,10 @@ INSERT IGNORE INTO orientation (config_attribute_id, template_id, view_id, group (1595, 0, 2, null, 7, 8, 5, 1, 'TOP') ; -UPDATE orientation SET height=1 WHERE config_attribute_id=8 AND template_id=0; \ No newline at end of file +UPDATE orientation SET height=1 WHERE config_attribute_id=8 AND template_id=0; + +-- ---------------------------------------------------------------- +-- Correct Quantisation Screen Proctoring (SEBSERV-504) +-- ---------------------------------------------------------------- + +UPDATE configuration_attribute SET resources='0,1,2,3,4,5,6,7,8' WHERE id=1305; \ No newline at end of file diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 63ddb1e9..75abeb4f 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -1950,12 +1950,15 @@ sebserver.examconfig.props.label.screenProctoringImageFormat=Image Format sebserver.examconfig.props.label.screenProctoringImageFormat.0=PNG sebserver.examconfig.props.label.screenProctoringImageQuantization=Image Color Quantization sebserver.examconfig.props.label.screenProctoringImageQuantization.tooltip=Indicating to use black/white, grayscale or color quantization. -sebserver.examconfig.props.label.screenProctoringImageQuantization.0=Black and White -sebserver.examconfig.props.label.screenProctoringImageQuantization.1=Grayscale 2 Bpp -sebserver.examconfig.props.label.screenProctoringImageQuantization.2=Grayscale 4 Bpp -sebserver.examconfig.props.label.screenProctoringImageQuantization.3=Grayscale 8 Bpp -sebserver.examconfig.props.label.screenProctoringImageQuantization.4=Color 16 Bpp -sebserver.examconfig.props.label.screenProctoringImageQuantization.5=Color 24 Bpp +sebserver.examconfig.props.label.screenProctoringImageQuantization.0=Black-White +sebserver.examconfig.props.label.screenProctoringImageQuantization.1=Grayscale 2Bpp +sebserver.examconfig.props.label.screenProctoringImageQuantization.2=Grayscale 4Bpp +sebserver.examconfig.props.label.screenProctoringImageQuantization.3=Grayscale 8Bpp +sebserver.examconfig.props.label.screenProctoringImageQuantization.4=Grayscale 16 Bpp +sebserver.examconfig.props.label.screenProctoringImageQuantization.5=Grayscale 24 Bpp +sebserver.examconfig.props.label.screenProctoringImageQuantization.6=Color 8Bpp +sebserver.examconfig.props.label.screenProctoringImageQuantization.7=Color16 Bpp +sebserver.examconfig.props.label.screenProctoringImageQuantization.8=Color 24 Bpp sebserver.examconfig.props.label.screenProctoringImageDownscale=Image Downscale sebserver.examconfig.props.label.screenProctoringImageDownscale.tooltip=Image downscale factor from 1 to 2 sebserver.examconfig.props.label.screenProctoringImageDownscale.0=1.0 @@ -2302,8 +2305,8 @@ sebserver.monitoring.exam.connection.action.hide.undefined=Hide Undefined ( {0} sebserver.monitoring.exam.connection.action.show.undefined=Show Undefined ( {0} ) sebserver.monitoring.exam.connection.action.hide.clientgroup=Hide {0} ( {1} ) sebserver.monitoring.exam.connection.action.show.clientgroup=Show {0} ( {1} ) -sebserver.monitoring.exam.connection.action.hide.askgranted=Hide Ask Granted ( {0} ) -sebserver.monitoring.exam.connection.action.show.askgranted=Show Ask Granted ( {0} ) +sebserver.monitoring.exam.connection.action.hide.askgranted=Hide ASK Granted ( {0} ) +sebserver.monitoring.exam.connection.action.show.askgranted=Show ASK Granted ( {0} ) sebserver.monitoring.exam.connection.action.hide.sebversiongranted=Hide SEB Version Granted ( {0} ) sebserver.monitoring.exam.connection.action.show.sebversiongranted=Show SEB Version Granted ( {0} ) sebserver.monitoring.exam.connection.action.proctoring=Single Room Proctoring