From 40ea4d96ea383ac7b8cb69937aed67e7a8a774e1 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Fri, 23 Aug 2019 12:26:13 +0200
Subject: [PATCH] OO-4186: Usage of course assessment service in task course
element
---
.../java/org/olat/course/nodes/TACourseNode.java | 13 -------------
.../org/olat/course/nodes/ta/TaskController.java | 9 +++++----
2 files changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/TACourseNode.java b/src/main/java/org/olat/course/nodes/TACourseNode.java
index 0eff13d9734..72cf5471648 100644
--- a/src/main/java/org/olat/course/nodes/TACourseNode.java
+++ b/src/main/java/org/olat/course/nodes/TACourseNode.java
@@ -69,7 +69,6 @@ import org.olat.core.util.vfs.VFSManager;
import org.olat.core.util.vfs.filters.VFSSystemItemFilter;
import org.olat.course.ICourse;
import org.olat.course.archiver.ScoreAccountingHelper;
-import org.olat.course.assessment.AssessmentManager;
import org.olat.course.condition.Condition;
import org.olat.course.condition.interpreter.ConditionExpression;
import org.olat.course.condition.interpreter.ConditionInterpreter;
@@ -88,11 +87,9 @@ import org.olat.course.properties.CoursePropertyManager;
import org.olat.course.properties.PersistingCoursePropertyManager;
import org.olat.course.run.environment.CourseEnvironment;
import org.olat.course.run.navigation.NodeRunConstructionResult;
-import org.olat.course.run.scoring.ScoreEvaluation;
import org.olat.course.run.userview.NodeEvaluation;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.modules.ModuleConfiguration;
-import org.olat.modules.assessment.Role;
import org.olat.properties.Property;
import org.olat.repository.RepositoryEntry;
import org.olat.resource.OLATResource;
@@ -441,16 +438,6 @@ public class TACourseNode extends GenericCourseNode implements PersistentAssessa
this.conditionSolution = conditionSolution;
}
- //TODO uh anders als die Default Implemntation notwendig?
- public void updateUserScoreEvaluation(ScoreEvaluation scoreEval, UserCourseEnvironment userCourseEnvironment,
- Identity coachingIdentity, boolean incrementAttempts, Role by) {
- AssessmentManager am = userCourseEnvironment.getCourseEnvironment().getAssessmentManager();
- Identity mySelf = userCourseEnvironment.getIdentityEnvironment().getIdentity();
- ScoreEvaluation newScoreEval = new ScoreEvaluation(scoreEval.getScore(), scoreEval.getPassed(), scoreEval.getAssessmentStatus(), scoreEval.getUserVisible(),
- null, null, null, null);
- am.saveScoreEvaluation(this, coachingIdentity, mySelf, newScoreEval, userCourseEnvironment, incrementAttempts, by);
- }
-
@Override
public void copyConfigurationTo(CourseNode courseNode, ICourse course) {
if(courseNode instanceof GTACourseNode) {
diff --git a/src/main/java/org/olat/course/nodes/ta/TaskController.java b/src/main/java/org/olat/course/nodes/ta/TaskController.java
index b2d1e228c81..7d8c93c1ba5 100644
--- a/src/main/java/org/olat/course/nodes/ta/TaskController.java
+++ b/src/main/java/org/olat/course/nodes/ta/TaskController.java
@@ -66,7 +66,7 @@ import org.olat.course.nodes.CourseNode;
import org.olat.course.nodes.TACourseNode;
import org.olat.course.properties.CoursePropertyManager;
import org.olat.course.run.environment.CourseEnvironment;
-import org.olat.course.run.scoring.AssessmentEvaluation;
+import org.olat.course.run.scoring.ScoreEvaluation;
import org.olat.course.run.userview.UserCourseEnvironment;
import org.olat.modules.ModuleConfiguration;
import org.olat.modules.assessment.Role;
@@ -344,10 +344,11 @@ public class TaskController extends BasicController {
Property p = cpm.createCourseNodePropertyInstance(node, identity, null, PROP_ASSIGNED, null, null, task, null);
cpm.saveProperty(p);
- AssessmentEvaluation eval = courseAssessmentService.getAssessmentEvaluation(node, userCourseEnv);
+ ScoreEvaluation eval = courseAssessmentService.getAssessmentEvaluation(node, userCourseEnv);
if(eval.getAssessmentStatus() == null || eval.getAssessmentStatus() == AssessmentEntryStatus.notStarted) {
- eval = new AssessmentEvaluation(eval, AssessmentEntryStatus.inProgress);
- node.updateUserScoreEvaluation(eval, userCourseEnv, getIdentity(), false, Role.user);
+ eval = new ScoreEvaluation(eval.getScore(), eval.getPassed(), AssessmentEntryStatus.inProgress,
+ eval.getUserVisible(), null, null, null, null);
+ courseAssessmentService.saveScoreEvaluation(node, getIdentity(), eval, userCourseEnv, false, Role.user);
}
}
--
GitLab