diff --git a/src/main/java/org/olat/course/assessment/AssessmentHelper.java b/src/main/java/org/olat/course/assessment/AssessmentHelper.java index acb6afdf71bf39cb591f21125e8d0a7a11695760..52d186107732359c6190fc55dd62bd447a135155 100644 --- a/src/main/java/org/olat/course/assessment/AssessmentHelper.java +++ b/src/main/java/org/olat/course/assessment/AssessmentHelper.java @@ -163,7 +163,7 @@ public class AssessmentHelper { if (assessmentConfig.hasAttempts()) { attempts = courseAssessmentService.getUserAttempts(courseNode, uce); } - if (assessmentConfig.hasDetails()) { + if (assessmentConfig.hasEditableDetails()) { details = courseNode.getDetailsListView(uce); if (details == null) { details = DETAILS_NA_VALUE; @@ -402,7 +402,7 @@ public class AssessmentHelper { if (courseNode instanceof AssessableCourseNode && !(courseNode instanceof ProjectBrokerCourseNode)) { CourseAssessmentService courseAssessmentService = CoreSpringFactory.getImpl(CourseAssessmentService.class); AssessmentConfig assessmentConfig = courseAssessmentService.getAssessmentConfig(courseNode); - if (assessmentConfig.hasDetails() + if (assessmentConfig.hasEditableDetails() || assessmentConfig.hasAttempts() || assessmentConfig.hasScore() || assessmentConfig.hasPassed() @@ -515,7 +515,7 @@ public class AssessmentHelper { if(!followUserVisibility || scoreEvaluation.getUserVisible() == null || scoreEvaluation.getUserVisible().booleanValue()) { // details - if (assessmentConfig.hasDetails()) { + if (assessmentConfig.hasEditableDetails()) { hasDisplayableValuesConfigured = true; String detailValue = assessableCourseNode.getDetailsListView(userCourseEnv); if (detailValue == null) { 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 dc8f03064db3bf787401229858ea97dbe2a1a29b..894df8be1fecee230275dfa8f6e3b96c5e15aa9c 100644 --- a/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java +++ b/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java @@ -90,8 +90,8 @@ public interface AssessmentConfig { public boolean isEditable(); /** - * @return True if this course node has additional details to be edited / viewed + * @return True if this course node has additional details to be edited. */ - public boolean hasDetails(); + public boolean hasEditableDetails(); } diff --git a/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java b/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java index 7154e2112e42b261139d98b2299e0333d9253fc9..4ec832952526aabcf38a9e7632d64eb54fbef561 100644 --- a/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java +++ b/src/main/java/org/olat/course/assessment/handler/AssessmentHandler.java @@ -40,7 +40,7 @@ public interface AssessmentHandler { /** * Returns a controller to edit the node specific details. Check - * AssessmentConfig.hasDeatils() before invoking this method. + * AssessmentConfig.hasEditableDetails() before invoking this method. * * @param ureq * @param wControl 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 e1053abdaee34c13875511e17782d24455ccbaef..ad107fb937f5f7beb92dc9e67c5ec15617c8455c 100644 --- a/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java +++ b/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java @@ -98,7 +98,7 @@ public class NonAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return false; } diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java index 544a548febe8b798bd60b3aeb866b9545b88c51a..09335e2c7224cfbd2fd4395fe6211664f4332525 100644 --- a/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java +++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessmentIdentityCourseNodeController.java @@ -127,7 +127,7 @@ public class AssessmentIdentityCourseNodeController extends BasicController impl // Add the users details controller AssessmentConfig assessmentConfig = courseAssessmentService.getAssessmentConfig(courseNode); - if (assessmentConfig.hasDetails() && courseNodeDetails) { + if (assessmentConfig.hasEditableDetails() && courseNodeDetails) { detailsEditController = courseAssessmentService.getAssessmentHandler(aCourseNode) .getDetailsEditController(ureq, wControl, stackPanel, courseNode, coachCourseEnv, assessedUserCourseEnvironment); 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 99a54cd54fc2a2f4156f604066c9569b8c026efb..36c64178514cb9dc7c17b60b1c1c6cf281fc2108 100644 --- a/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java @@ -116,7 +116,7 @@ public class LTIAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { // having score defined means the node is assessable return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_SCORE_FIELD); } diff --git a/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java b/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java index 8adfaa4f57138f73e598f0a489d083c0283c2d85..608d16a013358cfef1ebc6329797f56f4d470d99 100644 --- a/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java @@ -50,7 +50,7 @@ public class CheckListAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return true; } diff --git a/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java b/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java index 54cc5a2d5505f5d2cd94d8812e6ec1e48f58cdb9..832ed0070a64c8665e2f52c40d80e97731dd6b42 100644 --- a/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java @@ -87,7 +87,7 @@ public class GTAAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return config.getBooleanSafe(GTACourseNode.GTASK_ASSIGNMENT) || config.getBooleanSafe(GTACourseNode.GTASK_SUBMIT) || config.getBooleanSafe(GTACourseNode.GTASK_REVIEW_AND_CORRECTION) 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 257c4c5cb3da524f4ea296a0a5841a3c9ca40468..519d94d903f678afe7a18496ab2c120bf8c16c2e 100644 --- a/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java @@ -168,7 +168,7 @@ public class IQTESTAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return true; } diff --git a/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java b/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java index ec7691ec6032670a854a61ffcc88d26d80f29e01..dc1f4675ba8a3e15ab2001a0a6e925c433a3f0dc 100644 --- a/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java @@ -75,7 +75,7 @@ public class MSAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_EVAL_FORM_ENABLED); } diff --git a/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java b/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java index 3f770147f9ee844d8c9ace5cd87f681e47a722ad..38d3660583ac0d4396f52d3b4d42b6d962051d48 100644 --- a/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java @@ -50,7 +50,7 @@ public class PortfolioAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return true; } diff --git a/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java b/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java index 8b209c69709067662e0d1550dec6441eac6056bc..e6a80de70eec00d940f54f68eccf4ea108c27463 100644 --- a/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java @@ -71,7 +71,7 @@ public class ProjectBrokerAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return config.getBooleanSafe(ProjectBrokerCourseNode.CONF_DROPBOX_ENABLED); } 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 cf5d3631a8a45edf8d4a301f66cf05d43f12fe3a..2b175e998d5a3244cafbadaf77f8fea162ea2cc3 100644 --- a/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java @@ -106,7 +106,7 @@ public class ScormAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return config.getBooleanSafe(ScormEditController.CONFIG_ISASSESSABLE, true); } diff --git a/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java b/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java index 9613b82a2f7ebd992890fa1ed7499dcf0d13f709..7bc980423e1bda647b37e2ac5ae2cee74b4d3d61 100644 --- a/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java @@ -106,7 +106,7 @@ public class STAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return false; } } diff --git a/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java b/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java index bc732f74a056c4ed6fdb20b4ea2dc28e6a9ecd11..ef6fd9676892e9545117a8d0ba8b5880a1e903b5 100644 --- a/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java @@ -80,7 +80,7 @@ public class TAAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasDetails() { + public boolean hasEditableDetails() { return config.getBooleanSafe(TACourseNode.CONF_TASK_ENABLED) || config.getBooleanSafe(TACourseNode.CONF_DROPBOX_ENABLED) || config.getBooleanSafe(TACourseNode.CONF_RETURNBOX_ENABLED);