From 9701b6c941a782c8cd6f9a79dc9080fe0ce2aa6b Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 15 Jan 2020 08:41:39 +0100
Subject: [PATCH] OO-4464: revert logic to detect score per variant in FIB
---
.../model/xml/interactions/FIBAssessmentItemBuilder.java | 2 +-
.../org/olat/modules/qpool/ui/QuestionListController.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/ims/qti21/model/xml/interactions/FIBAssessmentItemBuilder.java b/src/main/java/org/olat/ims/qti21/model/xml/interactions/FIBAssessmentItemBuilder.java
index cdc43c53a7e..03bf16bdd19 100644
--- a/src/main/java/org/olat/ims/qti21/model/xml/interactions/FIBAssessmentItemBuilder.java
+++ b/src/main/java/org/olat/ims/qti21/model/xml/interactions/FIBAssessmentItemBuilder.java
@@ -508,7 +508,7 @@ public class FIBAssessmentItemBuilder extends AssessmentItemBuilder {
if(textEntry.getAlternatives() != null && !textEntry.getAlternatives().isEmpty()) {
for(TextEntryAlternative alternative:textEntry.getAlternatives()) {
double altScore = alternative.getScore();
- if(altScore >= 0.0d && score != null && score.doubleValue() == altScore) {
+ if(altScore >= 0.0d && score != null && score.doubleValue() != altScore) {
return true;
}
}
diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
index bc9840006d9..813f607bac5 100644
--- a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java
@@ -799,13 +799,13 @@ public class QuestionListController extends AbstractItemListController implement
}
private void doOpenImport(UserRequest ureq) {
- String title = translate("import");
+ removeAsListenerAndDispose(calloutCtrl);
removeAsListenerAndDispose(importSourcesCtrl);
+
importSourcesCtrl = new ImportSourcesController(ureq, getWindowControl());
listenTo(importSourcesCtrl);
- removeAsListenerAndDispose(calloutCtrl);
- calloutCtrl = new CloseableCalloutWindowController(ureq, getWindowControl(), importSourcesCtrl.getInitialComponent(), importItem, title, true, null);
+ calloutCtrl = new CloseableCalloutWindowController(ureq, getWindowControl(), importSourcesCtrl.getInitialComponent(), importItem, null, true, null);
listenTo(calloutCtrl);
calloutCtrl.activate();
}
--
GitLab