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

OO-5258: compare the data from assessment entry without default value

parent a3c47bd3
No related branches found
No related tags found
No related merge requests found
......@@ -457,7 +457,7 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode {
}
}
ScoreEvaluation sceval = new ScoreEvaluation(score, new Boolean(passed));
ScoreEvaluation sceval = new ScoreEvaluation(score, Boolean.valueOf(passed));
CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
courseAssessmentService.saveScoreEvaluation(this, identity, sceval, assessedUserCourseEnv, false, by);
......@@ -475,7 +475,7 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode {
CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
ScoreEvaluation currentEval = courseAssessmentService.getAssessmentEvaluation(this, assessedUserCourseEnv);
ScoreEvaluation sceval = new ScoreEvaluation(new Float(score), currentEval.getPassed());
ScoreEvaluation sceval = new ScoreEvaluation(Float.valueOf(score), currentEval.getPassed());
courseAssessmentService.saveScoreEvaluation(this, identity, sceval, assessedUserCourseEnv, false, by);
}
......@@ -558,10 +558,15 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode {
private void updateScorePassedOnPublish(Identity assessedIdentity, Identity coachIdentity, CheckboxManager checkboxManager, ICourse course) {
AssessmentManager am = course.getCourseEnvironment().getAssessmentManager();
Float currentScore = am.getNodeScore(this, assessedIdentity);
Boolean currentPassed = am.getNodePassed(this, assessedIdentity);
Float currentScore = null;
Boolean currentPassed = null;
AssessmentEntry ae = am.getAssessmentEntry(this, assessedIdentity);
if(ae != null) {
currentScore = ae.getScore() == null ? null : ae.getScore().floatValue();
currentPassed = ae.getPassed();
}
Float updatedScore = null;
Float updatedScore;
Boolean updatedPassed = null;
ModuleConfiguration config = getModuleConfiguration();
......@@ -616,7 +621,7 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode {
|| (currentScore != null && updatedScore == null)
|| (currentScore != null && !currentScore.equals(updatedScore))) {
needUpdate = true;
}
}
if(needUpdate) {
ScoreEvaluation scoreEval = new ScoreEvaluation(updatedScore, updatedPassed);
......
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