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

OO-2537: check evaluation (implement evaluation in project broker for the status)

parent 80ab39f3
No related branches found
No related tags found
No related merge requests found
...@@ -469,12 +469,12 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Persis ...@@ -469,12 +469,12 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Persis
@Override @Override
public AssessmentEvaluation getUserScoreEvaluation(UserCourseEnvironment userCourseEnv) { public AssessmentEvaluation getUserScoreEvaluation(UserCourseEnvironment userCourseEnv) {
return null; return getUserScoreEvaluation(getUserAssessmentEntry(userCourseEnv));
} }
@Override @Override
public AssessmentEvaluation getUserScoreEvaluation(AssessmentEntry entry) { public AssessmentEvaluation getUserScoreEvaluation(AssessmentEntry entry) {
return null; return AssessmentEvaluation.toAssessmentEvalutation(entry, this);
} }
@Override @Override
......
...@@ -334,6 +334,9 @@ public class DropboxScoringViewController extends BasicController { ...@@ -334,6 +334,9 @@ public class DropboxScoringViewController extends BasicController {
if(node instanceof AssessableCourseNode) { if(node instanceof AssessableCourseNode) {
AssessableCourseNode acn = (AssessableCourseNode)node; AssessableCourseNode acn = (AssessableCourseNode)node;
AssessmentEvaluation eval = acn.getUserScoreEvaluation(userCourseEnv); AssessmentEvaluation eval = acn.getUserScoreEvaluation(userCourseEnv);
if (eval == null) {
eval = AssessmentEvaluation.EMPTY_EVAL;
}
if(eval.getAssessmentStatus() == null || eval.getAssessmentStatus() == AssessmentEntryStatus.notStarted) { if(eval.getAssessmentStatus() == null || eval.getAssessmentStatus() == AssessmentEntryStatus.notStarted) {
eval = new AssessmentEvaluation(eval, AssessmentEntryStatus.inProgress); eval = new AssessmentEvaluation(eval, AssessmentEntryStatus.inProgress);
acn.updateUserScoreEvaluation(eval, userCourseEnv, getIdentity(), false); acn.updateUserScoreEvaluation(eval, userCourseEnv, getIdentity(), false);
......
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