From 5b5d92e694db65b1f7ccd01216c173543b2519ef Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 23 Nov 2018 09:16:05 +0100
Subject: [PATCH] OO-3751: respect the default value for "Show results after
test"
---
.../nodes/iq/QTI21AssessmentRunController.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
index cbf91dab3bf..2f4244e681f 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
@@ -699,14 +699,18 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
finalOptions.setDigitalSignatureMail(config.getBooleanSafe(IQEditController.CONFIG_DIGITAL_SIGNATURE_SEND_MAIL, testOptions.isDigitalSignatureMail()));
}
- Boolean assessmentResultOnFinish = config.getBooleanEntry(IQEditController.CONFIG_KEY_RESULT_ON_FINISH);
- if(assessmentResultOnFinish != null) {
- finalOptions.setShowAssessmentResultsOnFinish(assessmentResultOnFinish.booleanValue());
- }
+
if(!AssessmentInstance.QMD_ENTRY_SUMMARY_COMPACT.equals(config.getStringValue(IQEditController.CONFIG_KEY_SUMMARY))) {
//if this setting is set, override the summary
finalOptions.setAssessmentResultsOptions(QTI21AssessmentResultsOptions.parseString(config.getStringValue(IQEditController.CONFIG_KEY_SUMMARY, AssessmentInstance.QMD_ENTRY_SUMMARY_COMPACT)));
}
+ Boolean assessmentResultOnFinish = config.getBooleanEntry(IQEditController.CONFIG_KEY_RESULT_ON_FINISH);
+ if(assessmentResultOnFinish != null) {
+ finalOptions.setShowAssessmentResultsOnFinish(assessmentResultOnFinish.booleanValue());
+ } else if(finalOptions.getAssessmentResultsOptions() != null
+ && !finalOptions.getAssessmentResultsOptions().none()) {
+ finalOptions.setShowAssessmentResultsOnFinish(true);
+ }
return finalOptions;
}
--
GitLab