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

Merge remote-tracking branch 'origin/dev-1.6' into development

Browse source
This commit is contained in:
anhefti 2024-03-20 11:31:30 +01:00
commit 67b223ad02
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamIndicatorsList.java
View file

@ -57,6 +57,8 @@ public class ExamIndicatorsList implements TemplateComposer {
new LocTextKey("sebserver.exam.indicator.list.pleaseSelect");
private static final LocTextKey INDICATOR_EMPTY_LIST_MESSAGE =
new LocTextKey("sebserver.exam.indicator.list.empty");
private static final LocTextKey CONFIRM_MESSAGE_REMOVE_INDICATOR =
new LocTextKey("sebserver.exam.indicator.list.delete.confirm");
private final PageService pageService;
private final ResourceService resourceService;
@ -144,6 +146,7 @@ public class ExamIndicatorsList implements TemplateComposer {
indicatorTable::getMultiSelection,
this::deleteSelectedIndicator,
INDICATOR_EMPTY_SELECTION_TEXT_KEY)
.withConfirm(() -> CONFIRM_MESSAGE_REMOVE_INDICATOR)
.publishIf(() -> indicatorEnabled && !isLight && editable && indicatorTable.hasAnyContent(), false)
.newAction(ActionDefinition.EXAM_INDICATOR_NEW)

11
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/sebconfig/impl/converter/RealNumberConverter.java
View file

@ -32,11 +32,12 @@ import ch.ethz.seb.sebserver.webservice.servicelayer.sebconfig.AttributeValueCon
@WebServiceProfile
public class RealNumberConverter implements AttributeValueConverter {
private static final Logger log = LoggerFactory.getLogger(IntegerConverter.class);
private static final Logger log = LoggerFactory.getLogger(RealNumberConverter.class);
public static final Set<String> SUPPORTED_ATTR_NAMES = Utils.immutableSetOf(
"defaultPageZoomLevel",
"defaultTextZoomLevel");
"defaultTextZoomLevel",
"screenProctoringImageDownscale");
private static final String XML_TEMPLATE = "<key>%s</key><real>%s</real>";
private static final String JSON_TEMPLATE = "\"%s\":%s";
@ -89,6 +90,12 @@ public class RealNumberConverter implements AttributeValueConverter {
realVal = 0;
}
// NOTE: this is a special case for screenProctoringImageDownscale selector to get the selected real value
// from the selection-index instead using the index. See SEBSERV-527
if ("screenProctoringImageDownscale".equals(attribute.name)) {
realVal = realVal / 10.0 + 1.0;
}
out.write(Utils.toByteArray(String.format(
template,
AttributeValueConverter.extractName(attribute),

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

@ -709,6 +709,7 @@ sebserver.exam.indicator.list.column.thresholds=Thresholds
sebserver.exam.indicator.list.column.thresholds.tooltip=The thresholds of the indicator
sebserver.exam.indicator.list.empty=There is currently no indicator defined for this exam. Please create a new one
sebserver.exam.indicator.list.pleaseSelect=At first please select an indicator from the list
sebserver.exam.indicator.list.delete.confirm=Are you sure to delete the selected Indicator from the Exam?
sebserver.exam.clientgroup.list.actions=&nbsp;
sebserver.exam.clientgroup.list.title=Client Groups