From 05ca01c0fd002e4fe2fed6a0c2762a420f29128d Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 30 Sep 2016 17:39:34 +0200
Subject: [PATCH] OO-2234: count itself
---
.../org/olat/course/assessment/AssessmentHelper.java | 4 ++--
.../course/assessment/model/AssessmentNodeData.java | 12 ++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/olat/course/assessment/AssessmentHelper.java b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
index 4209e3b4e2b..df3e268e3e2 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentHelper.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
@@ -478,7 +478,7 @@ public class AssessmentHelper {
if(courseNode instanceof ProjectBrokerCourseNode) {
//ProjectBroker : no assessment-tool in V1.0 , remove project broker completely form assessment-tool gui
assessmentNodeData.setSelectable(false);
- } else if (courseNode instanceof AssessableCourseNode) {
+ } else if (courseNode instanceof AssessableCourseNode) {
AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode;
AssessmentEvaluation scoreEvaluation = scoreAccounting.evalCourseNode(assessableCourseNode);
if(scoreEvaluation != null) {
@@ -569,7 +569,7 @@ public class AssessmentHelper {
data.remove(assessmentNodeData);
return 0;
}
- return numOfChildren;
+ return numOfChildren + 1;//add itself
}
/**
diff --git a/src/main/java/org/olat/course/assessment/model/AssessmentNodeData.java b/src/main/java/org/olat/course/assessment/model/AssessmentNodeData.java
index e8d761f541b..f8ec4750602 100644
--- a/src/main/java/org/olat/course/assessment/model/AssessmentNodeData.java
+++ b/src/main/java/org/olat/course/assessment/model/AssessmentNodeData.java
@@ -36,6 +36,8 @@ import static org.olat.course.assessment.AssessmentHelper.KEY_TYPE;
import java.util.HashMap;
import java.util.Map;
+import org.olat.core.util.StringHelper;
+import org.olat.course.assessment.AssessmentHelper;
import org.olat.course.nodes.CourseNode;
import org.olat.modules.assessment.model.AssessmentEntryStatus;
@@ -259,4 +261,14 @@ public class AssessmentNodeData {
selectable = ((Boolean)nodeData.get(KEY_SELECTABLE)).booleanValue();
}
}
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder(64);
+ sb.append("data[title=").append(StringHelper.containsNonWhitespace(longTitle) ? longTitle : (shortTitle == null ? "" : shortTitle))
+ .append(":score=").append(score == null ? "" : AssessmentHelper.getRoundedScore(score))
+ .append(":passed=").append(passed == null ? "" : passed.toString())
+ .append("]");
+ return sb.toString();
+ }
}
--
GitLab