From 87e1ee4c5c8385f304c60f7a3420c2141b2d1c3f Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 18 Mar 2014 16:12:53 +0100
Subject: [PATCH] OO-1023: don't show the warnings if a survey contains an
essay
---
.../java/org/olat/course/nodes/iq/IQEditController.java | 1 +
.../java/org/olat/ims/qti/editor/EssayItemController.java | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/iq/IQEditController.java b/src/main/java/org/olat/course/nodes/iq/IQEditController.java
index 4ec72db2243..3b1188cb433 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQEditController.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQEditController.java
@@ -636,6 +636,7 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
private void checkEssay(RepositoryEntry re) {
if(OnyxModule.isOnyxTest(re.getOlatResource())) return;
+ if(courseNode instanceof IQSURVCourseNode || courseNode instanceof IQSELFCourseNode) return;
TestFileResource fr = new TestFileResource();
fr.overrideResourceableId(re.getOlatResource().getResourceableId());
diff --git a/src/main/java/org/olat/ims/qti/editor/EssayItemController.java b/src/main/java/org/olat/ims/qti/editor/EssayItemController.java
index a4dd74647f1..34ec7d25896 100644
--- a/src/main/java/org/olat/ims/qti/editor/EssayItemController.java
+++ b/src/main/java/org/olat/ims/qti/editor/EssayItemController.java
@@ -121,13 +121,15 @@ public class EssayItemController extends DefaultController implements Controller
try {
String score = ureq.getParameter("single_score");
float sc = Float.parseFloat(score);
- if(sc <= 0.0001f) {
+ if(sc <= 0.0001f && !qtiPackage.getQTIDocument().isSurvey()) {
getWindowControl().setWarning(trnsltr.translate("editor.info.mc.zero.points"));
}
essayQuestion.setMinValue(0.0f);
essayQuestion.setMaxValue(sc);
} catch(Exception e) {
- getWindowControl().setWarning(trnsltr.translate("editor.info.mc.zero.points"));
+ if(!qtiPackage.getQTIDocument().isSurvey()) {
+ getWindowControl().setWarning(trnsltr.translate("editor.info.mc.zero.points"));
+ }
}
if (restrictedEdit) {
--
GitLab