diff --git a/src/main/java/org/olat/course/nodes/MSCourseNode.java b/src/main/java/org/olat/course/nodes/MSCourseNode.java index cd3fae93ef596d3857d633d27913d926f5acdc2e..d19a01b1102b47eb289a54325681d3fb38a55b24 100644 --- a/src/main/java/org/olat/course/nodes/MSCourseNode.java +++ b/src/main/java/org/olat/course/nodes/MSCourseNode.java @@ -380,7 +380,7 @@ public class MSCourseNode extends AbstractAccessableCourseNode implements Persis private MinMax getMinMax() { ModuleConfiguration config = getModuleConfiguration(); String scoreConfig = config.getStringValue(CONFIG_KEY_SCORE); - String scaleConfig = config.getStringValue(CONFIG_KEY_EVAL_FORM_SCALE); + String scaleConfig = config.getStringValue(CONFIG_KEY_EVAL_FORM_SCALE, CONFIG_DEFAULT_EVAL_FORM_SCALE); if (CONFIG_VALUE_SCORE_MANUAL.equals(scoreConfig)) { Float min = (Float) config.get(CONFIG_KEY_SCORE_MIN); @@ -633,7 +633,7 @@ public class MSCourseNode extends AbstractAccessableCourseNode implements Persis Float score = null; ModuleConfiguration config = getModuleConfiguration(); String scoreConfig = config.getStringValue(CONFIG_KEY_SCORE); - String scaleConfig = config.getStringValue(CONFIG_KEY_EVAL_FORM_SCALE); + String scaleConfig = config.getStringValue(CONFIG_KEY_EVAL_FORM_SCALE, CONFIG_DEFAULT_EVAL_FORM_SCALE); float scale = Float.parseFloat(scaleConfig); if (CONFIG_VALUE_SCORE_EVAL_FORM_AVG.equals(scoreConfig)) { score = msService.calculateScoreByAvg(session); diff --git a/src/main/java/org/olat/course/nodes/ms/MSResultDetailsController.java b/src/main/java/org/olat/course/nodes/ms/MSResultDetailsController.java index 871d4ead9c043fccc56d3b4806a189b7e407765e..ecd43bb2f524d3fc2dc3c9dec36fed6077e32378 100644 --- a/src/main/java/org/olat/course/nodes/ms/MSResultDetailsController.java +++ b/src/main/java/org/olat/course/nodes/ms/MSResultDetailsController.java @@ -81,7 +81,8 @@ public class MSResultDetailsController extends BasicController { boolean pointsFromEvaluationForm = MSCourseNode.CONFIG_VALUE_SCORE_EVAL_FORM_SUM.equals(scoreConfig) || MSCourseNode.CONFIG_VALUE_SCORE_EVAL_FORM_AVG.equals(scoreConfig); if (pointsFromEvaluationForm) { - String scaleConfig = config.getStringValue(MSCourseNode.CONFIG_KEY_EVAL_FORM_SCALE); + String scaleConfig = config.getStringValue(MSCourseNode.CONFIG_KEY_EVAL_FORM_SCALE, + MSCourseNode.CONFIG_DEFAULT_EVAL_FORM_SCALE); float scale = Float.parseFloat(scaleConfig); List<RubricStatistic> statistics = msService.getRubricStatistics(session); diff --git a/src/main/java/org/olat/course/nodes/ms/MSStatisticController.java b/src/main/java/org/olat/course/nodes/ms/MSStatisticController.java index b36c40e51d8fb732900de46e6b29cde39ac32ac0..1e01c8f9fba14a33b4d7dd21f1476e4211ad4624 100644 --- a/src/main/java/org/olat/course/nodes/ms/MSStatisticController.java +++ b/src/main/java/org/olat/course/nodes/ms/MSStatisticController.java @@ -116,7 +116,8 @@ public class MSStatisticController extends FormBasicController { ModuleConfiguration config = courseNode.getModuleConfiguration(); String scoreConfig = config.getStringValue(MSCourseNode.CONFIG_KEY_SCORE); this.sum = MSCourseNode.CONFIG_VALUE_SCORE_EVAL_FORM_SUM.equals(scoreConfig); - String scaleConfig = config.getStringValue(MSCourseNode.CONFIG_KEY_EVAL_FORM_SCALE); + String scaleConfig = config.getStringValue(MSCourseNode.CONFIG_KEY_EVAL_FORM_SCALE, + MSCourseNode.CONFIG_DEFAULT_EVAL_FORM_SCALE); this.scale = Float.parseFloat(scaleConfig); isAdministrativeUser = securityModule.isUserAllowedAdminProps(ureq.getUserSession().getRoles());