diff --git a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
index 8b7c26978ed63954e9c54b30c04894513d573b64..0e4e59800985fa5b930b6556df8509c8f04a41ef 100644
--- a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
+++ b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
@@ -370,7 +370,7 @@ public class ScoreAccountingHelper {
String minVal;
String maxVal;
String cutVal;
- if(assessmentConfig.isEvaluationCalculated() || Mode.none == assessmentConfig.getScoreMode()) {
+ if(Mode.setByNode != assessmentConfig.getScoreMode()) {
minVal = maxVal = cutVal = "-";
} else {
Float minScoreConfig = assessmentConfig.getMinScore();
diff --git a/src/main/java/org/olat/course/assessment/AssessmentHelper.java b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
index b98d7ad25bf24d4f5ee5f72cec03098c347f8e44..34f8e89fb46de0ac3eca835b8aa8f49ddbe63dcf 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentHelper.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
@@ -451,7 +451,7 @@ public class AssessmentHelper {
assessmentNodeData.setScore(score);
hasDisplayableUserValues = true;
}
- if(!assessmentConfig.isEvaluationCalculated()) {
+ if(Mode.setByNode == assessmentConfig.getScoreMode() || Mode.setByNode == assessmentConfig.getPassedMode()) {
assessmentNodeData.setMaxScore(assessmentConfig.getMaxScore());
assessmentNodeData.setMinScore(assessmentConfig.getMinScore());
}
diff --git a/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java b/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java
index b6c5a09bd18516ed6e5beb655ec35f0fcaf33e6b..aef5e35b0a0645e333a17578eed86008d534d8dc 100644
--- a/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java
+++ b/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java
@@ -48,12 +48,6 @@ public interface AssessmentConfig {
public void setIgnoreInCourseAssessment(boolean ignoreInCourseAssessment);
- /**
- * @return true if the score evaluation is calculated e.g as sum of other assessments.
- */
- //TODO uh delete after implementiation of passedMode
- public boolean isEvaluationCalculated();
-
/**
* @return if this course node produces a score variable for the learner
*/
diff --git a/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java b/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java
index c1d141951f31a3bf788161e08ab663afc52ffc6b..2a7070812d5f8c0147b80a045a7245cc1bf5412e 100644
--- a/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java
+++ b/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java
@@ -52,11 +52,6 @@ public abstract class ModuleAssessmentConfig implements AssessmentConfig {
config.setBooleanEntry(MSCourseNode.CONFIG_KEY_IGNORE_IN_COURSE_ASSESSMENT, ignoreInCourseAssessment);
}
- @Override
- public boolean isEvaluationCalculated() {
- return false;
- }
-
@Override
public Mode getScoreMode() {
return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_SCORE_FIELD)? Mode.setByNode: Mode.none;
diff --git a/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java b/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java
index f1fb7d10daf3980fb3e2cf7f4a5d7af84ae3280d..56d2e7869f8d0defee98fcfbf53958a1fc86250a 100644
--- a/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java
+++ b/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java
@@ -48,11 +48,6 @@ public class NonAssessmentConfig implements AssessmentConfig {
//
}
- @Override
- public boolean isEvaluationCalculated() {
- return false;
- }
-
private NonAssessmentConfig() {
//
}
diff --git a/src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java b/src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java
index a35efd703cd923531c2acfce3507d0925c26e807..37fe6ce7bf7a203a2d7ee6ebce8024fd44a90132 100644
--- a/src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java
+++ b/src/main/java/org/olat/course/assessment/manager/AssessmentNotificationsHandler.java
@@ -65,6 +65,7 @@ import org.olat.course.assessment.AssessmentHelper;
import org.olat.course.assessment.AssessmentManager;
import org.olat.course.assessment.CourseAssessmentService;
import org.olat.course.assessment.handler.AssessmentConfig;
+import org.olat.course.assessment.handler.AssessmentConfig.Mode;
import org.olat.course.groupsandrights.CourseGroupManager;
import org.olat.course.groupsandrights.CourseRights;
import org.olat.course.nodes.CourseNode;
@@ -284,7 +285,7 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
CourseNode courseNode = (CourseNode)node;
CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class);
AssessmentConfig assessmentConfig = courseAssessmentService.getAssessmentConfig(courseNode);
- if (assessmentConfig.isAssessable() && !assessmentConfig.isEvaluationCalculated()) {
+ if (assessmentConfig.isAssessable() && (Mode.setByNode == assessmentConfig.getScoreMode() || Mode.setByNode == assessmentConfig.getPassedMode())) {
result.add(courseNode);
}
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
index 107d266ea49aa60b5702ad4bfb50c65a19db09f2..b45d988eb9d83c152d7def42b9962ab53ae2fd9b 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeController.java
@@ -372,19 +372,19 @@ public class IdentityListCourseNodeController extends FormBasicController
if(assessmentConfig.hasAttempts()) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.attempts));
}
- if(!assessmentConfig.isEvaluationCalculated()) {
+ if(Mode.setByNode == assessmentConfig.getScoreMode() || Mode.setByNode == assessmentConfig.getPassedMode()) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.userVisibility,
new UserVisibilityCellRenderer(getTranslator())));
}
if(Mode.none != assessmentConfig.getScoreMode()) {
- if(!assessmentConfig.isEvaluationCalculated()) {
+ if(Mode.setByNode == assessmentConfig.getScoreMode()) {
if(assessmentConfig.getMinScore() != null) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.min, new ScoreCellRenderer()));
}
if(assessmentConfig.getMaxScore() != null) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.max, new ScoreCellRenderer()));
}
- if(Mode.none != assessmentConfig.getPassedMode() && assessmentConfig.getCutValue() != null) {
+ if(assessmentConfig.getCutValue() != null) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, IdentityCourseElementCols.cut, new ScoreCellRenderer()));
}
}
diff --git a/src/main/java/org/olat/course/learningpath/LearningPathOnlyAssessmentConfig.java b/src/main/java/org/olat/course/learningpath/LearningPathOnlyAssessmentConfig.java
index b076a4c5d72929296fa64cce6c548f1e60fc0598..a387653f1cd909c7e3cf09cfaff1aaaecd768b19 100644
--- a/src/main/java/org/olat/course/learningpath/LearningPathOnlyAssessmentConfig.java
+++ b/src/main/java/org/olat/course/learningpath/LearningPathOnlyAssessmentConfig.java
@@ -39,11 +39,6 @@ public class LearningPathOnlyAssessmentConfig implements AssessmentConfig {
return true;
}
- @Override
- public boolean isEvaluationCalculated() {
- return false;
- }
-
@Override
public void setIgnoreInCourseAssessment(boolean ignoreInCourseAssessment) {
//
diff --git a/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java b/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java
index 34b8c0e4ce4b75c38cd2de308c106c6e22b39638..93d5ce05425f6a8892ad9920c0d35e9791b8bd90 100644
--- a/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java
@@ -54,11 +54,6 @@ public class LTIAssessmentConfig implements AssessmentConfig {
config.setBooleanEntry(BasicLTICourseNode.CONFIG_KEY_IGNORE_IN_COURSE_ASSESSMENT, ignoreInCourseAssessment);
}
- @Override
- public boolean isEvaluationCalculated() {
- return false;
- }
-
@Override
public Mode getScoreMode() {
return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_SCORE_FIELD)? Mode.setByNode: Mode.none;
diff --git a/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java b/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java
index 4b830278e95c3a06377a0b3f99c0a59674d233ef..5c6ef3c839768f52db018a964b54ed1942cc81ba 100644
--- a/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java
@@ -59,11 +59,6 @@ public class IQTESTAssessmentConfig implements AssessmentConfig {
config.setBooleanEntry(IQEditController.CONFIG_KEY_IGNORE_IN_COURSE_ASSESSMENT, ignoreInCourseAssessment);
}
- @Override
- public boolean isEvaluationCalculated() {
- return false;
- }
-
@Override
public Mode getScoreMode() {
return Mode.setByNode;
diff --git a/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java b/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java
index a5e8a1bac5958b4bbad13a1a29ce2293bb6da676..53a1477d361093d9c3b10d707db02dbe1c4c293c 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java
@@ -51,11 +51,6 @@ public class ScormAssessmentConfig implements AssessmentConfig {
config.setBooleanEntry(ScormEditController.CONFIG_KEY_IGNORE_IN_COURSE_ASSESSMENT, ignoreInCourseAssessment);
}
- @Override
- public boolean isEvaluationCalculated() {
- return false;
- }
-
@Override
public Mode getScoreMode() {
boolean assessable = config.getBooleanSafe(ScormEditController.CONFIG_ISASSESSABLE, true);
diff --git a/src/main/java/org/olat/course/nodes/st/assessment/STAssessmentConfig.java b/src/main/java/org/olat/course/nodes/st/assessment/STAssessmentConfig.java
index 6171ed449f04a1aa20411a3052d4a7c6e626ad0c..ba8f9a99a1b2a37f3e6caed384ef8aff9aa66237 100644
--- a/src/main/java/org/olat/course/nodes/st/assessment/STAssessmentConfig.java
+++ b/src/main/java/org/olat/course/nodes/st/assessment/STAssessmentConfig.java
@@ -58,11 +58,6 @@ public class STAssessmentConfig implements AssessmentConfig {
//
}
- @Override
- public boolean isEvaluationCalculated() {
- return true;
- }
-
@Override
public Mode getScoreMode() {
if (scoreCalculator != null && StringHelper.containsNonWhitespace(scoreCalculator.getScoreExpression())) {