From 0bcc50d76c240f94dbef4035a3dc2af1a2206a19 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Wed, 18 Mar 2020 15:37:29 +0100
Subject: [PATCH] OO-4582: Remove obsolete method
---
.../org/olat/course/archiver/ScoreAccountingHelper.java | 2 +-
.../java/org/olat/course/assessment/AssessmentHelper.java | 2 +-
.../olat/course/assessment/handler/AssessmentConfig.java | 6 ------
.../course/assessment/handler/ModuleAssessmentConfig.java | 5 -----
.../olat/course/assessment/handler/NonAssessmentConfig.java | 5 -----
.../assessment/manager/AssessmentNotificationsHandler.java | 3 ++-
.../ui/tool/IdentityListCourseNodeController.java | 6 +++---
.../learningpath/LearningPathOnlyAssessmentConfig.java | 5 -----
.../org/olat/course/nodes/basiclti/LTIAssessmentConfig.java | 5 -----
.../org/olat/course/nodes/iq/IQTESTAssessmentConfig.java | 5 -----
.../org/olat/course/nodes/scorm/ScormAssessmentConfig.java | 5 -----
.../olat/course/nodes/st/assessment/STAssessmentConfig.java | 5 -----
12 files changed, 7 insertions(+), 47 deletions(-)
diff --git a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java
index 8b7c26978ed..0e4e5980098 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 b98d7ad25bf..34f8e89fb46 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 b6c5a09bd18..aef5e35b0a0 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 c1d141951f3..2a7070812d5 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 f1fb7d10daf..56d2e7869f8 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 a35efd703cd..37fe6ce7bf7 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 107d266ea49..b45d988eb9d 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 b076a4c5d72..a387653f1cd 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 34b8c0e4ce4..93d5ce05425 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 4b830278e95..5c6ef3c8397 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 a5e8a1bac59..53a1477d361 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 6171ed449f0..ba8f9a99a1b 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())) {
--
GitLab