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

SEBSERV-529 fixed

Browse source
This commit is contained in:
anhefti 2024-03-25 16:26:47 +01:00
parent b463e5be6c
commit 28960ddacc
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/SEBRestrictionServiceImpl.java
View file

@ -148,9 +148,12 @@ public class SEBRestrictionServiceImpl implements SEBRestrictionService {
// special Moodle plugin case for ADDITIONAL_ATTR_ALTERNATIVE_SEB_BEK // special Moodle plugin case for ADDITIONAL_ATTR_ALTERNATIVE_SEB_BEK
this.lmsAPIService.getLmsSetup(exam.lmsSetupId).map(lms -> { this.lmsAPIService.getLmsSetup(exam.lmsSetupId).map(lms -> {
if (lms.lmsType == LmsType.MOODLE_PLUGIN) { if (lms.lmsType == LmsType.MOODLE_PLUGIN) {
additionalAttributes.put( final AdditionalAttributeRecord attr = this.additionalAttributesDAO.getAdditionalAttribute(
MoodleSEBRestriction.ATTR_ALT_BEK, EntityType.EXAM,
exam.getAdditionalAttribute(ADDITIONAL_ATTR_ALTERNATIVE_SEB_BEK)); exam.id,
ADDITIONAL_ATTR_ALTERNATIVE_SEB_BEK)
.getOrThrow();
additionalAttributes.put(MoodleSEBRestriction.ATTR_ALT_BEK, attr.getValue());
} }
return lms; return lms;
}); });

7
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/lms/impl/moodle/plugin/MoodlePluginCourseRestriction.java
View file

@ -137,8 +137,11 @@ public class MoodlePluginCourseRestriction implements SEBRestrictionAPI {
final ArrayList<String> configKeys = new ArrayList<>(sebRestrictionData.configKeys); final ArrayList<String> configKeys = new ArrayList<>(sebRestrictionData.configKeys);
final String quitLink = this.examConfigurationValueService.getQuitLink(exam.id); final String quitLink = this.examConfigurationValueService.getQuitLink(exam.id);
final String quitSecret = this.examConfigurationValueService.getQuitPassword(exam.id); final String quitSecret = this.examConfigurationValueService.getQuitPassword(exam.id);
final String additionalBEK = exam.getAdditionalAttribute( String additionalBEK = sebRestrictionData.additionalProperties.get(SEBRestrictionService.ADDITIONAL_ATTR_ALTERNATIVE_SEB_BEK);
SEBRestrictionService.ADDITIONAL_ATTR_ALTERNATIVE_SEB_BEK); if (additionalBEK == null) {
additionalBEK = exam.getAdditionalAttribute(
SEBRestrictionService.ADDITIONAL_ATTR_ALTERNATIVE_SEB_BEK);
}
if (additionalBEK != null && !beks.contains(additionalBEK)) { if (additionalBEK != null && !beks.contains(additionalBEK)) {
beks.add(additionalBEK); beks.add(additionalBEK);