diff --git a/src/main/java/org/olat/course/assessment/AssessmentHelper.java b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
index 54397d5d00aa88d7e157ff603e653c8b449ea78b..d26630daf0faf9dcf9dbd2ce09cc8b66a99cb043 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentHelper.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
@@ -567,7 +567,7 @@ public class AssessmentHelper {
// comments are invisible in the table but if configured the node must be in the list
// for the efficiency statement this can be ignored, this is the case when discardComments is true
hasDisplayableValuesConfigured = true;
- if (assessableCourseNode.getUserUserComment(userCourseEnv) != null) {
+ if (assessableCourseNode.getUserComment(userCourseEnv) != null) {
hasDisplayableUserValues = true;
}
}
diff --git a/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java b/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java
index f9260849dcf2d3d23503228011f0b46469d7255a..42d23a33a2c2ddbb12987c12c10ebba6d19324d1 100644
--- a/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java
+++ b/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java
@@ -357,7 +357,7 @@ public class BulkAssessmentTask implements LongRunnable, TaskAwareRunnable, Sequ
String userComment = row.getComment();
if(hasUserComment && userComment != null){
// Update userComment in db
- courseNode.updateUserUserComment(userComment, uce, coachIdentity);
+ courseNode.updatedUserComment(userComment, uce, coachIdentity);
//LD: why do we have to update the efficiency statement?
//EfficiencyStatementManager esm = EfficiencyStatementManager.getInstance();
//esm.updateUserEfficiencyStatement(uce);
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
index a8320498d23d6ad5454595bb590742df6f215105..4e6e686eb85738b1d024a83291276e338c8f4b74 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
+++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentForm.java
@@ -385,13 +385,13 @@ public class AssessmentForm extends FormBasicController {
if (isHasComment() && isUserCommentDirty()) {
String newComment = getUserComment().getValue();
// Update properties in db
- assessableCourseNode.updateUserUserComment(newComment, assessedUserCourseEnv, getIdentity());
+ assessableCourseNode.updatedUserComment(newComment, assessedUserCourseEnv, getIdentity());
}
if (isCoachCommentDirty()) {
String newCoachComment = getCoachComment().getValue();
// Update properties in db
- assessableCourseNode.updateUserCoachComment(newCoachComment, assessedUserCourseEnv);
+ assessableCourseNode.updateCoachComment(newCoachComment, assessedUserCourseEnv);
}
}
@@ -425,7 +425,7 @@ public class AssessmentForm extends FormBasicController {
}
if(hasComment) {
- userCommentValue = assessableCourseNode.getUserUserComment(assessedUserCourseEnv);
+ userCommentValue = assessableCourseNode.getUserComment(assessedUserCourseEnv);
userComment.setValue(userCommentValue);
}
@@ -565,7 +565,7 @@ public class AssessmentForm extends FormBasicController {
if (hasComment) {
// Use init variables from db, not available from wrapper
- userCommentValue = assessableCourseNode.getUserUserComment(assessedUserCourseEnv);
+ userCommentValue = assessableCourseNode.getUserComment(assessedUserCourseEnv);
userComment = uifactory.addTextAreaElement("usercomment", "form.usercomment", 2500, 5, 40, true, false, userCommentValue, formLayout);
userComment.setNotLongerThanCheck(2500, "input.toolong");
}
@@ -582,7 +582,7 @@ public class AssessmentForm extends FormBasicController {
uploadDocsEl.addActionListener(FormEvent.ONCHANGE);
}
- coachCommentValue = assessableCourseNode.getUserCoachComment(assessedUserCourseEnv);
+ coachCommentValue = assessableCourseNode.getCoachComment(assessedUserCourseEnv);
coachComment = uifactory.addTextAreaElement("coachcomment", "form.coachcomment", 2500, 5, 40, true, false, coachCommentValue, formLayout);
coachComment.setNotLongerThanCheck(2500, "input.toolong");
diff --git a/src/main/java/org/olat/course/nodes/CourseNode.java b/src/main/java/org/olat/course/nodes/CourseNode.java
index fed67971cf2fed4b5bb7f5fbdb35dce3034a9b9c..fe3c547b5cebb8d9ff5b86ef0e42a1a4c37a2a0d 100644
--- a/src/main/java/org/olat/course/nodes/CourseNode.java
+++ b/src/main/java/org/olat/course/nodes/CourseNode.java
@@ -490,7 +490,7 @@ public interface CourseNode extends INode, ShortName {
* @param userCourseEnvironment
* @return the user comment for this user for this node, given by coach
*/
- public String getUserUserComment(UserCourseEnvironment userCourseEnvironment);
+ public String getUserComment(UserCourseEnvironment userCourseEnvironment);
/**
* Updates the user comment for this node and this user. This comment is visible to the user.
@@ -499,15 +499,14 @@ public interface CourseNode extends INode, ShortName {
* @param userCourseEnvironment
* @param coachingIdentity
*/
- public void updateUserUserComment(String userComment, UserCourseEnvironment userCourseEnvironment,
+ public void updatedUserComment(String userComment, UserCourseEnvironment userCourseEnvironment,
Identity coachingIdentity);
/**
* @param userCourseEnvironment
* @return The coach comment for this user for this node (not visible to user)
*/
- //TODO uh rename getCoachComment (auch update und bei useruser)
- public String getUserCoachComment(UserCourseEnvironment userCourseEnvironment);
+ public String getCoachComment(UserCourseEnvironment userCourseEnvironment);
/**
* Updates the coach comment for this node and this user. This comment is not visible to the user.
@@ -515,7 +514,7 @@ public interface CourseNode extends INode, ShortName {
* @param coachComment
* @param userCourseEnvironment
*/
- public void updateUserCoachComment(String coachComment, UserCourseEnvironment userCourseEnvironment);
+ public void updateCoachComment(String coachComment, UserCourseEnvironment userCourseEnvironment);
/**
diff --git a/src/main/java/org/olat/course/nodes/GenericCourseNode.java b/src/main/java/org/olat/course/nodes/GenericCourseNode.java
index 974fbb6027cce0202ddad629a2ce32db9d44d059..bd9f673b26c87076dea9db477fd04616c6653f5d 100644
--- a/src/main/java/org/olat/course/nodes/GenericCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/GenericCourseNode.java
@@ -726,14 +726,14 @@ public abstract class GenericCourseNode extends GenericNode implements CourseNod
}
@Override
- public String getUserUserComment(UserCourseEnvironment userCourseEnvironment) {
+ public String getUserComment(UserCourseEnvironment userCourseEnvironment) {
AssessmentManager am = userCourseEnvironment.getCourseEnvironment().getAssessmentManager();
Identity assessedIdentity = userCourseEnvironment.getIdentityEnvironment().getIdentity();
return am.getNodeComment(this, assessedIdentity);
}
@Override
- public void updateUserUserComment(String userComment, UserCourseEnvironment userCourseEnvironment,
+ public void updatedUserComment(String userComment, UserCourseEnvironment userCourseEnvironment,
Identity coachingIdentity) {
if (userComment != null) {
AssessmentManager am = userCourseEnvironment.getCourseEnvironment().getAssessmentManager();
@@ -743,14 +743,14 @@ public abstract class GenericCourseNode extends GenericNode implements CourseNod
}
@Override
- public String getUserCoachComment(UserCourseEnvironment userCourseEnvironment) {
+ public String getCoachComment(UserCourseEnvironment userCourseEnvironment) {
AssessmentManager am = userCourseEnvironment.getCourseEnvironment().getAssessmentManager();
Identity assessedIdentity = userCourseEnvironment.getIdentityEnvironment().getIdentity();
return am.getNodeCoachComment(this, assessedIdentity);
}
@Override
- public void updateUserCoachComment(String coachComment, UserCourseEnvironment userCourseEnvironment) {
+ public void updateCoachComment(String coachComment, UserCourseEnvironment userCourseEnvironment) {
if (coachComment != null) {
AssessmentManager am = userCourseEnvironment.getCourseEnvironment().getAssessmentManager();
Identity assessedIdentity = userCourseEnvironment.getIdentityEnvironment().getIdentity();
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/EditCommentController.java b/src/main/java/org/olat/course/nodes/gta/ui/EditCommentController.java
index ae94762b6e9e5413caac26d802473c28f6cd1d33..eee49431382d28602b5253a5f113859bb0607dc6 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/EditCommentController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/EditCommentController.java
@@ -76,7 +76,7 @@ public class EditCommentController extends FormBasicController {
ICourse course = CourseFactory.loadCourse(courseOres);
UserCourseEnvironment userCourseEnv = row.getUserCourseEnvironment(course);
- gtaNode.updateUserUserComment(comment, userCourseEnv, getIdentity());
+ gtaNode.updatedUserComment(comment, userCourseEnv, getIdentity());
if(StringHelper.containsNonWhitespace(comment)) {
row.getCommentEditLink().setIconLeftCSS("o_icon o_icon_comments");
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java b/src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java
index 2f46d0611d6fefd54a3a4550bae44f0b51cadd4a..138b5778fa363bea334758db435658db85ceeff7 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GroupAssessmentController.java
@@ -558,7 +558,7 @@ public class GroupAssessmentController extends FormBasicController {
if(withComment) {
String comment = row.getComment();
if(StringHelper.containsNonWhitespace(comment)) {
- gtaNode.updateUserUserComment(comment, userCourseEnv, getIdentity());
+ gtaNode.updatedUserComment(comment, userCourseEnv, getIdentity());
}
}
}
@@ -600,7 +600,7 @@ public class GroupAssessmentController extends FormBasicController {
if(StringHelper.containsNonWhitespace(comment)) {
for(AssessmentRow row:rows) {
UserCourseEnvironment userCourseEnv = row.getUserCourseEnvironment(course);
- gtaNode.updateUserUserComment(comment, userCourseEnv, getIdentity());
+ gtaNode.updatedUserComment(comment, userCourseEnv, getIdentity());
}
}
}
diff --git a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
index 898c1763f9da179f820b897c174fdb8616192e0a..7de22e0bec5e4afe43a0568aa180f32efe81d2ef 100644
--- a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
+++ b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java
@@ -295,7 +295,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
mainVC.contextPut("passed", passed);
if(resultsVisible) {
if(testCourseNode.hasCommentConfigured()) {
- StringBuilder comment = Formatter.stripTabsAndReturns(testCourseNode.getUserUserComment(userCourseEnv));
+ StringBuilder comment = Formatter.stripTabsAndReturns(testCourseNode.getUserComment(userCourseEnv));
if (comment != null && comment.length() > 0) {
mainVC.contextPut("comment", StringHelper.xssScan(comment));
mainVC.contextPut("incomment", isPanelOpen(ureq, "comment", true));
diff --git a/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java b/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
index 86d90fd801fdc07320583e93da799771627f2c1b..774754cdea0e3766ae464cf4fa4f0347dffe59e5 100644
--- a/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
+++ b/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java
@@ -244,7 +244,7 @@ public class ScormRunController extends BasicController implements ScormAPICallb
boolean resultsVisible = scoreEval.getUserVisible() == null || scoreEval.getUserVisible().booleanValue();
startPage.contextPut("resultsVisible", resultsVisible);
if(resultsVisible && scormNode.hasCommentConfigured()) {
- StringBuilder comment = Formatter.stripTabsAndReturns(scormNode.getUserUserComment(userCourseEnv));
+ StringBuilder comment = Formatter.stripTabsAndReturns(scormNode.getUserComment(userCourseEnv));
startPage.contextPut("comment", StringHelper.xssScan(comment));
}
startPage.contextPut("attempts", scormNode.getUserAttempts(userCourseEnv));