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

OO-3544: override score from XML file with the ones from the database if

manual scoring
parent 74399386
No related branches found
No related tags found
No related merge requests found
...@@ -224,10 +224,12 @@ public class AssessmentResultController extends FormBasicController { ...@@ -224,10 +224,12 @@ public class AssessmentResultController extends FormBasicController {
layoutCont.contextPut("testResults", testResults); layoutCont.contextPut("testResults", testResults);
TestResult testResult = assessmentResult.getTestResult(); TestResult testResult = assessmentResult.getTestResult();
if(testResult != null) { if(testResult != null) {
extractOutcomeVariable(testResult.getItemVariables(), testResults);
if(candidateSession.getManualScore() != null) { if(candidateSession.getManualScore() != null) {
testResults.setScore(candidateSession.getScore());
testResults.addScore(candidateSession.getManualScore()); testResults.addScore(candidateSession.getManualScore());
testResults.setManualScore(candidateSession.getManualScore()); testResults.setManualScore(candidateSession.getManualScore());
} else {
extractOutcomeVariable(testResult.getItemVariables(), testResults);
} }
AssessmentTest assessmentTest = resolvedAssessmentTest.getRootNodeLookup().extractIfSuccessful(); AssessmentTest assessmentTest = resolvedAssessmentTest.getRootNodeLookup().extractIfSuccessful();
......
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