Skip to content
Snippets Groups Projects
Commit 9701b6c9 authored by srosse's avatar srosse
Browse files

OO-4464: revert logic to detect score per variant in FIB

parent 30a1ae54
No related branches found
No related tags found
No related merge requests found
...@@ -508,7 +508,7 @@ public class FIBAssessmentItemBuilder extends AssessmentItemBuilder { ...@@ -508,7 +508,7 @@ public class FIBAssessmentItemBuilder extends AssessmentItemBuilder {
if(textEntry.getAlternatives() != null && !textEntry.getAlternatives().isEmpty()) { if(textEntry.getAlternatives() != null && !textEntry.getAlternatives().isEmpty()) {
for(TextEntryAlternative alternative:textEntry.getAlternatives()) { for(TextEntryAlternative alternative:textEntry.getAlternatives()) {
double altScore = alternative.getScore(); double altScore = alternative.getScore();
if(altScore >= 0.0d && score != null && score.doubleValue() == altScore) { if(altScore >= 0.0d && score != null && score.doubleValue() != altScore) {
return true; return true;
} }
} }
......
...@@ -799,13 +799,13 @@ public class QuestionListController extends AbstractItemListController implement ...@@ -799,13 +799,13 @@ public class QuestionListController extends AbstractItemListController implement
} }
private void doOpenImport(UserRequest ureq) { private void doOpenImport(UserRequest ureq) {
String title = translate("import"); removeAsListenerAndDispose(calloutCtrl);
removeAsListenerAndDispose(importSourcesCtrl); removeAsListenerAndDispose(importSourcesCtrl);
importSourcesCtrl = new ImportSourcesController(ureq, getWindowControl()); importSourcesCtrl = new ImportSourcesController(ureq, getWindowControl());
listenTo(importSourcesCtrl); listenTo(importSourcesCtrl);
removeAsListenerAndDispose(calloutCtrl); calloutCtrl = new CloseableCalloutWindowController(ureq, getWindowControl(), importSourcesCtrl.getInitialComponent(), importItem, null, true, null);
calloutCtrl = new CloseableCalloutWindowController(ureq, getWindowControl(), importSourcesCtrl.getInitialComponent(), importItem, title, true, null);
listenTo(calloutCtrl); listenTo(calloutCtrl);
calloutCtrl.activate(); calloutCtrl.activate();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment