From a82902fd972a664d9e90a3c0d41153095945f56e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 15 Feb 2017 08:35:09 +0100
Subject: [PATCH] OO-2537: check evaluation (implement evaluation in project
broker for the status)
---
.../java/org/olat/course/nodes/ProjectBrokerCourseNode.java | 4 ++--
.../olat/course/nodes/ta/DropboxScoringViewController.java | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java b/src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java
index ed32df07513..f60a4b4e4f7 100644
--- a/src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/ProjectBrokerCourseNode.java
@@ -469,12 +469,12 @@ public class ProjectBrokerCourseNode extends GenericCourseNode implements Persis
@Override
public AssessmentEvaluation getUserScoreEvaluation(UserCourseEnvironment userCourseEnv) {
- return null;
+ return getUserScoreEvaluation(getUserAssessmentEntry(userCourseEnv));
}
@Override
public AssessmentEvaluation getUserScoreEvaluation(AssessmentEntry entry) {
- return null;
+ return AssessmentEvaluation.toAssessmentEvalutation(entry, this);
}
@Override
diff --git a/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java b/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java
index 85345c649c5..a23dc5fa6b1 100644
--- a/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java
+++ b/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java
@@ -334,6 +334,9 @@ public class DropboxScoringViewController extends BasicController {
if(node instanceof AssessableCourseNode) {
AssessableCourseNode acn = (AssessableCourseNode)node;
AssessmentEvaluation eval = acn.getUserScoreEvaluation(userCourseEnv);
+ if (eval == null) {
+ eval = AssessmentEvaluation.EMPTY_EVAL;
+ }
if(eval.getAssessmentStatus() == null || eval.getAssessmentStatus() == AssessmentEntryStatus.notStarted) {
eval = new AssessmentEvaluation(eval, AssessmentEntryStatus.inProgress);
acn.updateUserScoreEvaluation(eval, userCourseEnv, getIdentity(), false);
--
GitLab