Skip to content
Snippets Groups Projects
Commit 39ec01ce authored by srosse's avatar srosse
Browse files

OO-1593: score can always be null

parent 0c3f657b
No related branches found
No related tags found
No related merge requests found
...@@ -200,7 +200,11 @@ public class ScoreAccounting { ...@@ -200,7 +200,11 @@ public class ScoreAccounting {
.createAssessmentEntry(cNode, assessedIdentity, se); .createAssessmentEntry(cNode, assessedIdentity, se);
changes = true; changes = true;
} else if(!same(se, entry)) { } else if(!same(se, entry)) {
entry.setScore(new BigDecimal(score)); if(score != null) {
entry.setScore(new BigDecimal(score));
} else {
entry.setScore(null);
}
entry.setPassed(passed); entry.setPassed(passed);
entry = userCourseEnvironment.getCourseEnvironment().getAssessmentManager().updateAssessmentEntry(entry); entry = userCourseEnvironment.getCourseEnvironment().getAssessmentManager().updateAssessmentEntry(entry);
identToEntries.put(cNode.getIdent(), entry); identToEntries.put(cNode.getIdent(), entry);
......
...@@ -256,7 +256,7 @@ public class OLATUpgrade_11_0_0 extends OLATUpgrade { ...@@ -256,7 +256,7 @@ public class OLATUpgrade_11_0_0 extends OLATUpgrade {
if(!identityKeys.contains(identity.getKey())) { if(!identityKeys.contains(identity.getKey())) {
AssessmentEntry entry = createAssessmentEntry(identity, null, course, courseEntry, rootNode.getIdent()); AssessmentEntry entry = createAssessmentEntry(identity, null, course, courseEntry, rootNode.getIdent());
if(statement.getScore() != null) { if(statement.getScore() != null) {
entry.setScore(new BigDecimal(statement.getScore().floatValue())); entry.setScore(new BigDecimal(statement.getScore()));
} }
if(statement.getPassed() != null) { if(statement.getPassed() != null) {
entry.setPassed(statement.getPassed()); entry.setPassed(statement.getPassed());
......
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