From e44adf12c6acc4da03d1262a8e9e3eb5c0fcb560 Mon Sep 17 00:00:00 2001 From: uhensler <urs.hensler@frentix.com> Date: Tue, 20 Aug 2019 07:58:55 +0200 Subject: [PATCH] OO-4186: Consistent method names of the assessment configurations --- .../archiver/ScoreAccountingHelper.java | 36 +++++++++---------- .../course/assessment/AssessmentHelper.java | 28 +++++++-------- .../assessment/handler/AssessmentConfig.java | 18 +++++----- .../handler/ModuleAssessmentConfig.java | 18 +++++----- .../handler/NonAssessmentConfig.java | 18 +++++----- .../manager/BulkAssessmentTask.java | 12 +++---- .../model/BulkAssessmentSettings.java | 12 +++---- ...BusinessGroupCourseNodeListController.java | 4 +-- .../assessment/ui/tool/AssessmentForm.java | 14 ++++---- .../IdentityListCourseNodeController.java | 12 +++---- .../IdentityListCourseNodeTableModel.java | 10 +++--- .../tool/tools/AbstractToolsController.java | 2 +- .../course/nodes/CheckListCourseNode.java | 2 +- .../org/olat/course/nodes/GTACourseNode.java | 2 +- .../olat/course/nodes/IQSURVCourseNode.java | 2 +- .../olat/course/nodes/IQTESTCourseNode.java | 2 +- .../org/olat/course/nodes/MSCourseNode.java | 2 +- .../org/olat/course/nodes/TACourseNode.java | 2 +- .../basiclti/CourseNodeOutcomeMapper.java | 6 ++-- .../nodes/basiclti/LTIAssessmentConfig.java | 24 ++++++------- .../nodes/cl/CheckListAssessmentConfig.java | 6 ++-- .../nodes/cl/ui/CheckListExcelExport.java | 4 +-- .../nodes/cl/ui/CheckListRunController.java | 4 +-- .../course/nodes/gta/GTAAssessmentConfig.java | 18 +++++----- .../nodes/gta/manager/GTANotifications.java | 4 +-- .../ui/GTACoachedGroupGradingController.java | 6 ++-- .../gta/ui/GroupAssessmentController.java | 8 ++--- .../course/nodes/iq/IQPreviewController.java | 2 +- .../olat/course/nodes/iq/IQRunController.java | 2 +- .../nodes/iq/IQTESTAssessmentConfig.java | 18 +++++----- .../iq/QTI21AssessmentRunController.java | 4 +-- .../course/nodes/ms/MSAssessmentConfig.java | 16 ++++----- .../nodes/ms/MSCourseNodeEditController.java | 2 +- .../nodes/ms/MSCourseNodeRunController.java | 18 +++++----- .../portfolio/PortfolioAssessmentConfig.java | 6 ++-- .../PortfolioCourseNodeRunController.java | 16 ++++----- .../ProjectBrokerAssessmentConfig.java | 12 +++---- .../nodes/scorm/ScormAssessmentConfig.java | 18 +++++----- .../nodes/scorm/ScormRunController.java | 2 +- .../course/nodes/st/STAssessmentConfig.java | 18 +++++----- .../nodes/st/STCourseNodeEditController.java | 2 +- .../nodes/st/STCourseNodeRunController.java | 8 ++--- .../ta/DropboxScoringViewController.java | 2 +- .../course/nodes/ta/TAAssessmentConfig.java | 18 +++++----- .../course/reminder/rule/PassedRuleSPI.java | 2 +- .../course/reminder/rule/ScoreRuleSPI.java | 2 +- .../reminder/ui/AttemptsRuleEditor.java | 2 +- .../ui/InitialAttemptsRuleEditor.java | 2 +- .../course/reminder/ui/PassedRuleEditor.java | 2 +- .../course/reminder/ui/ScoreRuleEditor.java | 2 +- .../run/scoring/AssessmentEvaluation.java | 8 ++--- .../course/run/scoring/ScoreAccounting.java | 6 ++-- .../manager/archive/QTI21ArchiveFormat.java | 14 ++++---- ...I21AssessmentTestStatisticsController.java | 4 +-- .../portfolio/BinderConfiguration.java | 8 ++--- .../olat/modules/scorm/ScormAPIMapper.java | 6 ++-- .../manager/ReminderRuleEngineTest.java | 2 +- 57 files changed, 250 insertions(+), 250 deletions(-) diff --git a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java index d06c60b6a82..1a2f4419483 100644 --- a/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java +++ b/src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java @@ -177,10 +177,10 @@ public class ScoreAccountingHelper { header1ColCnt += acNode.getType().equals("ita") ? 1 : 0; AssessmentConfig assessmentConfig = acNode.getAssessmentConfig(); - boolean scoreOk = assessmentConfig.hasScoreConfigured(); - boolean passedOk = assessmentConfig.hasPassedConfigured(); - boolean attemptsOk = assessmentConfig.hasAttemptsConfigured(); - boolean commentOk = assessmentConfig.hasCommentConfigured(); + boolean scoreOk = assessmentConfig.hasScore(); + boolean passedOk = assessmentConfig.hasPassed(); + boolean attemptsOk = assessmentConfig.hasAttempts(); + boolean commentOk = assessmentConfig.hasComment(); if (scoreOk || passedOk || commentOk || attemptsOk) { header1ColCnt += scoreOk ? 1 : 0; header1ColCnt += passedOk ? 1 : 0; @@ -200,10 +200,10 @@ public class ScoreAccountingHelper { } AssessmentConfig assessmentConfig = acNode.getAssessmentConfig(); - boolean scoreOk = assessmentConfig.hasScoreConfigured(); - boolean passedOk = assessmentConfig.hasPassedConfigured(); - boolean attemptsOk = assessmentConfig.hasAttemptsConfigured(); - boolean commentOk = assessmentConfig.hasCommentConfigured(); + boolean scoreOk = assessmentConfig.hasScore(); + boolean passedOk = assessmentConfig.hasPassed(); + boolean attemptsOk = assessmentConfig.hasAttempts(); + boolean commentOk = assessmentConfig.hasComment(); if (scoreOk || passedOk || commentOk || attemptsOk) { if(scoreOk) { headerRow2.addCell(header2ColCnt++, sc); @@ -263,10 +263,10 @@ public class ScoreAccountingHelper { for (AssessableCourseNode acnode:myNodes) { AssessmentConfig assessmentConfig = acnode.getAssessmentConfig(); - boolean scoreOk = assessmentConfig.hasScoreConfigured(); - boolean passedOk = assessmentConfig.hasPassedConfigured(); - boolean attemptsOk = assessmentConfig.hasAttemptsConfigured(); - boolean commentOk = assessmentConfig.hasCommentConfigured(); + boolean scoreOk = assessmentConfig.hasScore(); + boolean passedOk = assessmentConfig.hasPassed(); + boolean attemptsOk = assessmentConfig.hasAttempts(); + boolean commentOk = assessmentConfig.hasComment(); if (acnode.getType().equals("ita")) { String log = acnode.getUserLog(uce); @@ -353,7 +353,7 @@ public class ScoreAccountingHelper { boolean first = true; for (AssessableCourseNode acnode:myNodes) { AssessmentConfig assessmentConfig = acnode.getAssessmentConfig(); - if (!assessmentConfig.hasScoreConfigured()) { + if (!assessmentConfig.hasScore()) { // only show min/max/cut legend when score configured continue; } @@ -369,15 +369,15 @@ public class ScoreAccountingHelper { String minVal; String maxVal; String cutVal; - if(acnode instanceof STCourseNode || !assessmentConfig.hasScoreConfigured()) { + if(acnode instanceof STCourseNode || !assessmentConfig.hasScore()) { minVal = maxVal = cutVal = "-"; } else { - Float minScoreConfig = assessmentConfig.getMinScoreConfiguration(); - Float maxScoreConfig = assessmentConfig.getMaxScoreConfiguration(); + Float minScoreConfig = assessmentConfig.getMinScore(); + Float maxScoreConfig = assessmentConfig.getMaxScore(); minVal = minScoreConfig == null ? "-" : AssessmentHelper.getRoundedScore(minScoreConfig); maxVal = maxScoreConfig == null ? "-" : AssessmentHelper.getRoundedScore(maxScoreConfig); - if (assessmentConfig.hasPassedConfigured()) { - Float cutValueConfig = assessmentConfig.getCutValueConfiguration(); + if (assessmentConfig.hasPassed()) { + Float cutValueConfig = assessmentConfig.getCutValue(); cutVal = cutValueConfig == null ? "-" : AssessmentHelper.getRoundedScore(cutValueConfig); } else { cutVal = "-"; diff --git a/src/main/java/org/olat/course/assessment/AssessmentHelper.java b/src/main/java/org/olat/course/assessment/AssessmentHelper.java index 4757667561f..334ec60fe42 100644 --- a/src/main/java/org/olat/course/assessment/AssessmentHelper.java +++ b/src/main/java/org/olat/course/assessment/AssessmentHelper.java @@ -158,7 +158,7 @@ public class AssessmentHelper { String details = null; if (courseNode != null) { AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if (assessmentConfig.hasAttemptsConfigured()) { + if (assessmentConfig.hasAttempts()) { attempts = courseNode.getUserAttempts(uce); } if (courseNode.hasDetails()) { @@ -225,13 +225,13 @@ public class AssessmentHelper { if (node instanceof STCourseNode) { STCourseNode scn = (STCourseNode) node; AssessmentConfig assessmentConfig = scn.getAssessmentConfig(); - if (assessmentConfig.hasPassedConfigured() || assessmentConfig.hasScoreConfigured()) { + if (assessmentConfig.hasPassed() || assessmentConfig.hasScore()) { return true; } } else if (node instanceof ScormCourseNode) { ScormCourseNode scormn = (ScormCourseNode) node; AssessmentConfig assessmentConfig = scormn.getAssessmentConfig(); - if (assessmentConfig.hasPassedConfigured() || assessmentConfig.hasScoreConfigured()) { + if (assessmentConfig.hasPassed() || assessmentConfig.hasScore()) { return true; } } else if (node instanceof ProjectBrokerCourseNode) { @@ -400,10 +400,10 @@ public class AssessmentHelper { AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); if (assessableCourseNode.hasDetails() - || assessmentConfig.hasAttemptsConfigured() - || assessmentConfig.hasScoreConfigured() - || assessmentConfig.hasPassedConfigured() - || assessmentConfig.hasCommentConfigured()) { + || assessmentConfig.hasAttempts() + || assessmentConfig.hasScore() + || assessmentConfig.hasPassed() + || assessmentConfig.hasComment()) { assessable = true; } @@ -523,7 +523,7 @@ public class AssessmentHelper { } } // attempts - if (assessmentConfig.hasAttemptsConfigured()) { + if (assessmentConfig.hasAttempts()) { hasDisplayableValuesConfigured = true; Integer attemptsValue = scoreEvaluation.getAttempts(); if (attemptsValue != null) { @@ -535,7 +535,7 @@ public class AssessmentHelper { } } // score - if (assessmentConfig.hasScoreConfigured()) { + if (assessmentConfig.hasScore()) { hasDisplayableValuesConfigured = true; Float score = scoreEvaluation.getScore(); if (score != null) { @@ -544,12 +544,12 @@ public class AssessmentHelper { hasDisplayableUserValues = true; } if(!(assessableCourseNode instanceof STCourseNode)) { - assessmentNodeData.setMaxScore(assessableCourseNode.getAssessmentConfig().getMaxScoreConfiguration()); - assessmentNodeData.setMinScore(assessmentConfig.getMinScoreConfiguration()); + assessmentNodeData.setMaxScore(assessableCourseNode.getAssessmentConfig().getMaxScore()); + assessmentNodeData.setMinScore(assessmentConfig.getMinScore()); } } // passed - if (assessmentConfig.hasPassedConfigured()) { + if (assessmentConfig.hasPassed()) { hasDisplayableValuesConfigured = true; Boolean passed = scoreEvaluation.getPassed(); if (passed != null) { @@ -559,7 +559,7 @@ public class AssessmentHelper { } } // selection command available - if (assessmentConfig.isEditableConfigured()) { + if (assessmentConfig.isEditable()) { // Assessable course nodes are selectable assessmentNodeData.setSelectable(true); } else { @@ -568,7 +568,7 @@ public class AssessmentHelper { assessmentNodeData.setSelectable(false); } - if (!hasDisplayableUserValues && assessmentConfig.hasCommentConfigured() && !discardComments) { + if (!hasDisplayableUserValues && assessmentConfig.hasComment() && !discardComments) { // 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; 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 4927de3b0d2..8b8e74bf295 100644 --- a/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java +++ b/src/main/java/org/olat/course/assessment/handler/AssessmentConfig.java @@ -30,24 +30,24 @@ public interface AssessmentConfig { /** * @return True if this course node produces a score variable for the learner */ - public boolean hasScoreConfigured(); + public boolean hasScore(); /** * @return Returns the maximal score that can be achieved on this node. Throws * an OLATRuntimeException if hasScore set to false, maxScore is undefined in this case */ - public Float getMaxScoreConfiguration(); + public Float getMaxScore(); /** * @return Returns the minimal score that can be achieved on this node. Throws * an OLATRuntimeException if hasScore set to false, maxScore is undefined in this case */ - public Float getMinScoreConfiguration(); + public Float getMinScore(); /** * @return True if this course node produces a passed variable for the learner */ - public boolean hasPassedConfigured(); + public boolean hasPassed(); /** * @return Returns the passed cut value or null if no such value is defined. A null @@ -55,7 +55,7 @@ public interface AssessmentConfig { * score or no score at all. Throws an OLATRuntimeException if hasPassed is set to false, * cutValue is undefined in this case */ - public Float getCutValueConfiguration(); + public Float getCutValue(); /** * @return True if this course node can produces a completion variable for the learner @@ -65,12 +65,12 @@ public interface AssessmentConfig { /** * @return True if this course node produces an attempts variable for the learner */ - public boolean hasAttemptsConfigured(); + public boolean hasAttempts(); /** * @return True if this course node produces a comment variable for the learner */ - public boolean hasCommentConfigured(); + public boolean hasComment(); /** * @return True if this course node can hold some documents about the assessment of the learner @@ -80,13 +80,13 @@ public interface AssessmentConfig { /** * @return True if this course node produces an status variable for the learner */ - public boolean hasStatusConfigured(); + public boolean hasStatus(); public boolean isAssessedBusinessGroups(); /** * @return True if score, passed, attempts and comment are editable by the assessment tool */ - public boolean isEditableConfigured(); + public boolean isEditable(); } 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 d09d2402d82..1b4dc39db0b 100644 --- a/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java +++ b/src/main/java/org/olat/course/assessment/handler/ModuleAssessmentConfig.java @@ -38,34 +38,34 @@ public abstract class ModuleAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_SCORE_FIELD); } @Override - public Float getMaxScoreConfiguration() { - if (!hasScoreConfigured()) { + public Float getMaxScore() { + if (!hasScore()) { throw new OLATRuntimeException(ModuleAssessmentConfig.class, "getMaxScore not defined when hasScoreConfigured set to false", null); } return config.getFloatEntry(MSCourseNode.CONFIG_KEY_SCORE_MAX); } @Override - public Float getMinScoreConfiguration() { - if (!hasScoreConfigured()) { + public Float getMinScore() { + if (!hasScore()) { throw new OLATRuntimeException(ModuleAssessmentConfig.class, "getMinScore not defined when hasScore set to false", null); } return config.getFloatEntry(MSCourseNode.CONFIG_KEY_SCORE_MIN); } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_PASSED_FIELD); } @Override - public Float getCutValueConfiguration() { - if (!hasPassedConfigured()) { + public Float getCutValue() { + if (!hasPassed()) { throw new OLATRuntimeException(ModuleAssessmentConfig.class, "getCutValue not defined when hasPassed set to false", null); } return config.getFloatEntry(MSCourseNode.CONFIG_KEY_PASSED_CUT_VALUE); @@ -77,7 +77,7 @@ public abstract class ModuleAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_COMMENT_FIELD); } 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 9af738a0036..1287d049ac1 100644 --- a/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java +++ b/src/main/java/org/olat/course/assessment/handler/NonAssessmentConfig.java @@ -38,27 +38,27 @@ public class NonAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { return false; } @Override - public Float getMaxScoreConfiguration() { + public Float getMaxScore() { return null; } @Override - public Float getMinScoreConfiguration() { + public Float getMinScore() { return null; } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { return false; } @Override - public Float getCutValueConfiguration() { + public Float getCutValue() { return null; } @@ -68,12 +68,12 @@ public class NonAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return false; } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { return false; } @@ -83,12 +83,12 @@ public class NonAssessmentConfig implements AssessmentConfig { } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { return false; } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return false; } 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 bfcac3c03ba..64c29654794 100644 --- a/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java +++ b/src/main/java/org/olat/course/assessment/manager/BulkAssessmentTask.java @@ -313,9 +313,9 @@ public class BulkAssessmentTask implements LongRunnable, TaskAwareRunnable, Sequ final AssessableCourseNode courseNode = getCourseNode(); final AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - final boolean hasUserComment = assessmentConfig.hasCommentConfigured(); - final boolean hasScore = assessmentConfig.hasScoreConfigured(); - final boolean hasPassed = assessmentConfig.hasPassedConfigured(); + final boolean hasUserComment = assessmentConfig.hasComment(); + final boolean hasScore = assessmentConfig.hasScore(); + final boolean hasPassed = assessmentConfig.hasPassed(); final boolean hasReturnFiles = (StringHelper.containsNonWhitespace(datas.getReturnFiles()) && (courseNode instanceof TACourseNode || courseNode instanceof GTACourseNode)); @@ -335,11 +335,11 @@ public class BulkAssessmentTask implements LongRunnable, TaskAwareRunnable, Sequ Float max = null; Float cut = null; if (hasScore) { - min = assessmentConfig.getMinScoreConfiguration(); - max = assessmentConfig.getMaxScoreConfiguration(); + min = assessmentConfig.getMinScore(); + max = assessmentConfig.getMaxScore(); } if (hasPassed) { - cut = assessmentConfig.getCutValueConfiguration(); + cut = assessmentConfig.getCutValue(); } int count = 0; diff --git a/src/main/java/org/olat/course/assessment/model/BulkAssessmentSettings.java b/src/main/java/org/olat/course/assessment/model/BulkAssessmentSettings.java index f5e072d4d7e..8025af1410d 100644 --- a/src/main/java/org/olat/course/assessment/model/BulkAssessmentSettings.java +++ b/src/main/java/org/olat/course/assessment/model/BulkAssessmentSettings.java @@ -49,9 +49,9 @@ public class BulkAssessmentSettings implements Serializable { public BulkAssessmentSettings(AssessableCourseNode courseNode) { AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - hasUserComment = assessmentConfig.hasCommentConfigured(); - hasScore = assessmentConfig.hasScoreConfigured(); - hasPassed = assessmentConfig.hasPassedConfigured(); + hasUserComment = assessmentConfig.hasComment(); + hasScore = assessmentConfig.hasScore(); + hasPassed = assessmentConfig.hasPassed(); ModuleConfiguration config = courseNode.getModuleConfiguration(); if (courseNode instanceof TACourseNode) { @@ -68,13 +68,13 @@ public class BulkAssessmentSettings implements Serializable { } if (hasScore) { - min = assessmentConfig.getMinScoreConfiguration(); - max = assessmentConfig.getMaxScoreConfiguration(); + min = assessmentConfig.getMinScore(); + max = assessmentConfig.getMaxScore(); } else { min = max = null; } if (hasPassed) { - cut = assessmentConfig.getCutValueConfiguration(); + cut = assessmentConfig.getCutValue(); } else { cut = null; } diff --git a/src/main/java/org/olat/course/assessment/ui/tool/AssessedBusinessGroupCourseNodeListController.java b/src/main/java/org/olat/course/assessment/ui/tool/AssessedBusinessGroupCourseNodeListController.java index 860113e43a7..6250c1fa63e 100644 --- a/src/main/java/org/olat/course/assessment/ui/tool/AssessedBusinessGroupCourseNodeListController.java +++ b/src/main/java/org/olat/course/assessment/ui/tool/AssessedBusinessGroupCourseNodeListController.java @@ -119,11 +119,11 @@ public class AssessedBusinessGroupCourseNodeListController extends FormBasicCont if(courseNode instanceof AssessableCourseNode) { AssessableCourseNode aNode = (AssessableCourseNode)courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if(assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasPassed()) { columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ABGCols.countPassed, new ProgressRenderer(false, getTranslator()))); } - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasScore()) { columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ABGCols.averageScore, new ScoreCellRenderer())); } 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 3bd4f0a7eec..9ca662421f9 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 @@ -122,10 +122,10 @@ public class AssessmentForm extends FormBasicController { setTranslator(Util.createPackageTranslator(AssessmentModule.class, getLocale(), getTranslator())); AssessmentConfig assessmentConfig = assessableCourseNode.getAssessmentConfig(); - hasAttempts = assessmentConfig.hasAttemptsConfigured(); - hasScore = assessmentConfig.hasScoreConfigured(); - hasPassed = assessmentConfig.hasPassedConfigured(); - hasComment = assessmentConfig.hasCommentConfigured(); + hasAttempts = assessmentConfig.hasAttempts(); + hasScore = assessmentConfig.hasScore(); + hasPassed = assessmentConfig.hasPassed(); + hasComment = assessmentConfig.hasComment(); hasIndividualAssessmentDocs = assessmentConfig.hasIndividualAsssessmentDocuments(); this.coachCourseEnv = coachCourseEnv; @@ -516,10 +516,10 @@ public class AssessmentForm extends FormBasicController { } if (hasScore) { - min = assessmentConfig.getMinScoreConfiguration(); - max = assessmentConfig.getMaxScoreConfiguration(); + min = assessmentConfig.getMinScore(); + max = assessmentConfig.getMaxScore(); if (hasPassed) { - cut = assessmentConfig.getCutValueConfiguration(); + cut = assessmentConfig.getCutValue(); } String minStr = AssessmentHelper.getRoundedScore(min); 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 5e315f62ab4..4f0f4916f43 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 @@ -357,28 +357,28 @@ public class IdentityListCourseNodeController extends FormBasicController AssessableCourseNode assessableNode = (AssessableCourseNode)courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if(assessmentConfig.hasAttemptsConfigured()) { + if(assessmentConfig.hasAttempts()) { columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.attempts)); } if(!(courseNode instanceof CalculatedAssessableCourseNode)) { columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.userVisibility, new UserVisibilityCellRenderer(getTranslator()))); } - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasScore()) { if(!(assessableNode instanceof STCourseNode)) { - if(assessmentConfig.getMinScoreConfiguration() != null) { + if(assessmentConfig.getMinScore() != null) { columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.min, new ScoreCellRenderer())); } - if(assessmentConfig.getMaxScoreConfiguration() != null) { + if(assessmentConfig.getMaxScore() != null) { columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.max, new ScoreCellRenderer())); } - if(assessmentConfig.hasPassedConfigured() && assessmentConfig.getCutValueConfiguration() != null) { + if(assessmentConfig.hasPassed() && assessmentConfig.getCutValue() != null) { columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, IdentityCourseElementCols.cut, new ScoreCellRenderer())); } } initScoreColumns(columnsModel); } - if(assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasPassed()) { columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.passed, new PassedCellRenderer())); } if(assessmentConfig.hasIndividualAsssessmentDocuments()) { diff --git a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java index b2d06fd8f34..497676ff585 100644 --- a/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java +++ b/src/main/java/org/olat/course/assessment/ui/tool/IdentityListCourseNodeTableModel.java @@ -68,11 +68,11 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel if (courseNode != null) { AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if(!(courseNode instanceof STCourseNode) && assessmentConfig.hasScoreConfigured()) { - maxScore = assessmentConfig.getMaxScoreConfiguration(); - minScore = assessmentConfig.getMinScoreConfiguration(); - if (assessmentConfig.hasPassedConfigured()) { - cutValue = assessmentConfig.getCutValueConfiguration(); + if(!(courseNode instanceof STCourseNode) && assessmentConfig.hasScore()) { + maxScore = assessmentConfig.getMaxScore(); + minScore = assessmentConfig.getMinScore(); + if (assessmentConfig.hasPassed()) { + cutValue = assessmentConfig.getCutValue(); } } } diff --git a/src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java b/src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java index fdcdf5f76a4..1c4805511e1 100644 --- a/src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java +++ b/src/main/java/org/olat/course/assessment/ui/tool/tools/AbstractToolsController.java @@ -152,7 +152,7 @@ public abstract class AbstractToolsController extends BasicController { } protected void initResetAttempts() { - if(courseNode.getAssessmentConfig().hasAttemptsConfigured()) { + if(courseNode.getAssessmentConfig().hasAttempts()) { resetAttemptsButton = addLink("tool.reset.attempts", "reset.attempts", "o_icon o_icon-fw o_icon_reset"); } } diff --git a/src/main/java/org/olat/course/nodes/CheckListCourseNode.java b/src/main/java/org/olat/course/nodes/CheckListCourseNode.java index b6b337f6fa3..df1c9f25dc6 100644 --- a/src/main/java/org/olat/course/nodes/CheckListCourseNode.java +++ b/src/main/java/org/olat/course/nodes/CheckListCourseNode.java @@ -168,7 +168,7 @@ public class CheckListCourseNode extends AbstractAccessableCourseNode implements @Override public AssessmentEvaluation getUserScoreEvaluation(UserCourseEnvironment userCourseEnv) { AssessmentConfig assessmentConfig = getAssessmentConfig(); - if(assessmentConfig.hasPassedConfigured() || assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasPassed() || assessmentConfig.hasScore()) { return getUserScoreEvaluation(getUserAssessmentEntry(userCourseEnv)); } return AssessmentEvaluation.EMPTY_EVAL; diff --git a/src/main/java/org/olat/course/nodes/GTACourseNode.java b/src/main/java/org/olat/course/nodes/GTACourseNode.java index f2d14bdd855..9781ce50d49 100644 --- a/src/main/java/org/olat/course/nodes/GTACourseNode.java +++ b/src/main/java/org/olat/course/nodes/GTACourseNode.java @@ -854,7 +854,7 @@ public class GTACourseNode extends AbstractAccessableCourseNode implements Persi @Override public AssessmentEvaluation getUserScoreEvaluation(UserCourseEnvironment userCourseEnv) { AssessmentConfig assessmentConfig = getAssessmentConfig(); - if(assessmentConfig.hasPassedConfigured() || assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasPassed() || assessmentConfig.hasScore()) { return getUserScoreEvaluation(getUserAssessmentEntry(userCourseEnv)); } return AssessmentEvaluation.EMPTY_EVAL; diff --git a/src/main/java/org/olat/course/nodes/IQSURVCourseNode.java b/src/main/java/org/olat/course/nodes/IQSURVCourseNode.java index 82612535703..f966c981617 100644 --- a/src/main/java/org/olat/course/nodes/IQSURVCourseNode.java +++ b/src/main/java/org/olat/course/nodes/IQSURVCourseNode.java @@ -378,7 +378,7 @@ public class IQSURVCourseNode extends AbstractAccessableCourseNode implements QT } /** - * @see org.olat.course.nodes.AssessableCourseNode#hasAttemptsConfigured() + * @see org.olat.course.nodes.AssessableCourseNode#hasAttempts() */ @Override public boolean hasAttemptsConfigured() { diff --git a/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java b/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java index f2221818a7c..987016e86fe 100644 --- a/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java +++ b/src/main/java/org/olat/course/nodes/IQTESTCourseNode.java @@ -680,7 +680,7 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements Pe @Override public boolean hasAttemptsConfigured() { - return getAssessmentConfig().hasAttemptsConfigured(); + return getAssessmentConfig().hasAttempts(); } } \ No newline at end of file diff --git a/src/main/java/org/olat/course/nodes/MSCourseNode.java b/src/main/java/org/olat/course/nodes/MSCourseNode.java index cbed7d66094..7e40e782be0 100644 --- a/src/main/java/org/olat/course/nodes/MSCourseNode.java +++ b/src/main/java/org/olat/course/nodes/MSCourseNode.java @@ -282,7 +282,7 @@ public class MSCourseNode extends AbstractAccessableCourseNode implements Persis @Override public AssessmentEvaluation getUserScoreEvaluation(UserCourseEnvironment userCourseEnv) { AssessmentConfig assessmentConfig = getAssessmentConfig(); - if(assessmentConfig.hasPassedConfigured() || assessmentConfig.hasScoreConfigured() || assessmentConfig.hasCommentConfigured()) { + if(assessmentConfig.hasPassed() || assessmentConfig.hasScore() || assessmentConfig.hasComment()) { return getUserScoreEvaluation(getUserAssessmentEntry(userCourseEnv)); } return AssessmentEvaluation.EMPTY_EVAL; diff --git a/src/main/java/org/olat/course/nodes/TACourseNode.java b/src/main/java/org/olat/course/nodes/TACourseNode.java index d09a7f42bc0..4a3d8cc1cdf 100644 --- a/src/main/java/org/olat/course/nodes/TACourseNode.java +++ b/src/main/java/org/olat/course/nodes/TACourseNode.java @@ -462,7 +462,7 @@ public class TACourseNode extends GenericCourseNode implements PersistentAssessa @Override public AssessmentEvaluation getUserScoreEvaluation(UserCourseEnvironment userCourseEnv) { AssessmentConfig assessmentConfig = getAssessmentConfig(); - if(assessmentConfig.hasPassedConfigured() || assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasPassed() || assessmentConfig.hasScore()) { return getUserScoreEvaluation(getUserAssessmentEntry(userCourseEnv)); } return AssessmentEvaluation.EMPTY_EVAL; diff --git a/src/main/java/org/olat/course/nodes/basiclti/CourseNodeOutcomeMapper.java b/src/main/java/org/olat/course/nodes/basiclti/CourseNodeOutcomeMapper.java index a9a771ac17e..ec24d34929d 100644 --- a/src/main/java/org/olat/course/nodes/basiclti/CourseNodeOutcomeMapper.java +++ b/src/main/java/org/olat/course/nodes/basiclti/CourseNodeOutcomeMapper.java @@ -160,7 +160,7 @@ public class CourseNodeOutcomeMapper extends OutcomeMapper { } private float getScalingFactor(BasicLTICourseNode ltiNode) { - if(ltiNode.getAssessmentConfig().hasScoreConfigured()) { + if(ltiNode.getAssessmentConfig().hasScore()) { Float scale = ltiNode.getModuleConfiguration().getFloatEntry(BasicLTICourseNode.CONFIG_KEY_SCALEVALUE); if(scale == null) { return 1.0f; @@ -171,8 +171,8 @@ public class CourseNodeOutcomeMapper extends OutcomeMapper { } private Float getCutValue(AssessmentConfig assessmentConfig) { - if(assessmentConfig.hasPassedConfigured()) { - Float cutValue = assessmentConfig.getCutValueConfiguration(); + if(assessmentConfig.hasPassed()) { + Float cutValue = assessmentConfig.getCutValue(); if(cutValue == null) { return null; } 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 4ebcbb8fd08..5dc6c7648bd 100644 --- a/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/basiclti/LTIAssessmentConfig.java @@ -40,13 +40,13 @@ public class LTIAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_SCORE_FIELD); } @Override - public Float getMaxScoreConfiguration() { - if (!hasScoreConfigured()) { + public Float getMaxScore() { + if (!hasScore()) { throw new OLATRuntimeException(LTIAssessmentConfig.class, "getMaxScore not defined when hasScoreConfigured set to false", null); } @@ -58,21 +58,21 @@ public class LTIAssessmentConfig implements AssessmentConfig { } @Override - public Float getMinScoreConfiguration() { - if (!hasScoreConfigured()) { + public Float getMinScore() { + if (!hasScore()) { throw new OLATRuntimeException(LTIAssessmentConfig.class, "getMaxScore not defined when hasScoreConfigured set to false", null); } return 0.0f; } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_PASSED_FIELD); } @Override - public Float getCutValueConfiguration() { - if (!hasPassedConfigured()) { + public Float getCutValue() { + if (!hasPassed()) { throw new OLATRuntimeException(LTIAssessmentConfig.class, "getCutValue not defined when hasPassedConfigured set to false", null); } return config.getFloatEntry(MSCourseNode.CONFIG_KEY_PASSED_CUT_VALUE); @@ -84,13 +84,13 @@ public class LTIAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { // having score defined means the node is assessable return config.getBooleanSafe(MSCourseNode.CONFIG_KEY_HAS_SCORE_FIELD); } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { return false; } @@ -100,7 +100,7 @@ public class LTIAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return false; } @@ -110,7 +110,7 @@ public class LTIAssessmentConfig implements AssessmentConfig { } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { // 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 fb80d84bca5..72b24f5e440 100644 --- a/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/cl/CheckListAssessmentConfig.java @@ -35,17 +35,17 @@ public class CheckListAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return false; } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return false; } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { return true; } diff --git a/src/main/java/org/olat/course/nodes/cl/ui/CheckListExcelExport.java b/src/main/java/org/olat/course/nodes/cl/ui/CheckListExcelExport.java index d31a9db1e74..575eeae45b4 100644 --- a/src/main/java/org/olat/course/nodes/cl/ui/CheckListExcelExport.java +++ b/src/main/java/org/olat/course/nodes/cl/ui/CheckListExcelExport.java @@ -85,8 +85,8 @@ public class CheckListExcelExport { this.courseNode = courseNode; this.course = course; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - this.hasScore = assessmentConfig.hasScoreConfigured(); - this.hasPassed = assessmentConfig.hasPassedConfigured(); + this.hasScore = assessmentConfig.hasScore(); + this.hasPassed = assessmentConfig.hasPassed(); userManager = CoreSpringFactory.getImpl(UserManager.class); checkboxManager = CoreSpringFactory.getImpl(CheckboxManager.class); diff --git a/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java b/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java index b129ee9c7c2..0254fb5a505 100644 --- a/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java +++ b/src/main/java/org/olat/course/nodes/cl/ui/CheckListRunController.java @@ -215,7 +215,7 @@ public class CheckListRunController extends FormBasicController implements Contr layoutCont.contextPut("hasPassedValue", (scoreEval.getPassed() == null ? Boolean.FALSE : Boolean.TRUE)); layoutCont.contextPut("passed", scoreEval.getPassed()); if(resultsVisible) { - if(assessmentConfig.hasCommentConfigured()) { + if(assessmentConfig.hasComment()) { StringBuilder comment = Formatter.stripTabsAndReturns(scoreEval.getComment()); layoutCont.contextPut("comment", StringHelper.xssScan(comment)); layoutCont.contextPut("incomment", isPanelOpen(ureq, "comment", true)); @@ -340,7 +340,7 @@ public class CheckListRunController extends FormBasicController implements Contr exposeUserDataToVC(ureq, flc); AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - return assessmentConfig.hasScoreConfigured() || assessmentConfig.hasPassedConfigured(); + return assessmentConfig.hasScore() || assessmentConfig.hasPassed(); } private void logUpdateCheck(String checkboxId, String boxTitle) { 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 c5ede077e38..c697ba235ca 100644 --- a/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/gta/GTAAssessmentConfig.java @@ -39,29 +39,29 @@ public class GTAAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { if (hasNoGrading) return false; - return super.hasScoreConfigured(); + return super.hasScore(); } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { if (hasNoGrading) return false; - return super.hasPassedConfigured(); + return super.hasPassed(); } @Override - public boolean hasAttemptsConfigured(){ + public boolean hasAttempts(){ return true; } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { if (hasNoGrading) return false; - return super.hasCommentConfigured(); + return super.hasComment(); } @Override @@ -72,7 +72,7 @@ public class GTAAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return true; // Task Course node has always a status-field } @@ -82,7 +82,7 @@ public class GTAAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { return true; } diff --git a/src/main/java/org/olat/course/nodes/gta/manager/GTANotifications.java b/src/main/java/org/olat/course/nodes/gta/manager/GTANotifications.java index 42dabdf0687..f35b650e5cf 100644 --- a/src/main/java/org/olat/course/nodes/gta/manager/GTANotifications.java +++ b/src/main/java/org/olat/course/nodes/gta/manager/GTANotifications.java @@ -591,10 +591,10 @@ class GTANotifications { String score = null; String status = null; AssessmentConfig assessmentConfig = gtaNode.getAssessmentConfig(); - if(assessmentConfig.hasScoreConfigured() && assessment.getScore() != null) { + if(assessmentConfig.hasScore() && assessment.getScore() != null) { score = AssessmentHelper.getRoundedScore(assessment.getScore()); } - if(assessmentConfig.hasPassedConfigured() && assessment.getPassed() != null) { + if(assessmentConfig.hasPassed() && assessment.getPassed() != null) { status = assessment.getPassed().booleanValue() ? translator.translate("notifications.assessment.passed.true") : translator.translate("notifications.assessment.passed.false"); } diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupGradingController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupGradingController.java index 1345526cac7..2c9a42b0727 100644 --- a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupGradingController.java +++ b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachedGroupGradingController.java @@ -135,9 +135,9 @@ public class GTACoachedGroupGradingController extends FormBasicController { assessmentManager = courseEnv.getAssessmentManager(); AssessmentConfig assessmentConfig = gtaNode.getAssessmentConfig(); - withScore = assessmentConfig.hasScoreConfigured(); - withPassed = assessmentConfig.hasPassedConfigured(); - withComment = assessmentConfig.hasCommentConfigured(); + withScore = assessmentConfig.hasScore(); + withPassed = assessmentConfig.hasPassed(); + withComment = assessmentConfig.hasComment(); Roles roles = ureq.getUserSession().getRoles(); isAdministrativeUser = securityModule.isUserAllowedAdminProps(roles); 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 74a37162a4e..0a5dd5c7d5d 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 @@ -124,12 +124,12 @@ public class GroupAssessmentController extends FormBasicController { this.assessedGroup = assessedGroup; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - withScore = assessmentConfig.hasScoreConfigured(); - withPassed = assessmentConfig.hasPassedConfigured(); + withScore = assessmentConfig.hasScore(); + withPassed = assessmentConfig.hasPassed(); if(withPassed) { - cutValue = assessmentConfig.getCutValueConfiguration(); + cutValue = assessmentConfig.getCutValue(); } - withComment = assessmentConfig.hasCommentConfigured(); + withComment = assessmentConfig.hasComment(); Roles roles = ureq.getUserSession().getRoles(); isAdministrativeUser = securityModule.isUserAllowedAdminProps(roles); diff --git a/src/main/java/org/olat/course/nodes/iq/IQPreviewController.java b/src/main/java/org/olat/course/nodes/iq/IQPreviewController.java index 77ad3dee8cf..86f17196d74 100644 --- a/src/main/java/org/olat/course/nodes/iq/IQPreviewController.java +++ b/src/main/java/org/olat/course/nodes/iq/IQPreviewController.java @@ -76,7 +76,7 @@ public class IQPreviewController extends BasicController { if (source == pf) { if (event == Event.DONE_EVENT) { int score = pf.getPointValue(); - Float cutValue = cn.getAssessmentConfig().getCutValueConfiguration(); + Float cutValue = cn.getAssessmentConfig().getCutValue(); boolean passed = score >= (cutValue == null ? 0 : cutValue.floatValue()); ScoreEvaluation sceval = new ScoreEvaluation(new Float(score), new Boolean(passed)); boolean incrementUserAttempts = true; diff --git a/src/main/java/org/olat/course/nodes/iq/IQRunController.java b/src/main/java/org/olat/course/nodes/iq/IQRunController.java index d01009068f4..9a686c384b2 100644 --- a/src/main/java/org/olat/course/nodes/iq/IQRunController.java +++ b/src/main/java/org/olat/course/nodes/iq/IQRunController.java @@ -664,7 +664,7 @@ public class IQRunController extends BasicController implements GenericEventList myContent.contextPut("passed", assessmentEntry.getPassed()); if(resultsVisible) { AssessmentConfig assessmentConfig = acn.getAssessmentConfig(); - if(assessmentConfig.hasCommentConfigured()) { + if(assessmentConfig.hasComment()) { StringBuilder comment = Formatter.stripTabsAndReturns(assessmentEntry.getComment()); myContent.contextPut("comment", StringHelper.xssScan(comment)); myContent.contextPut("incomment", isPanelOpen(ureq, "comment", true)); 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 89cbd193780..b100a150f59 100644 --- a/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/iq/IQTESTAssessmentConfig.java @@ -42,12 +42,12 @@ public class IQTESTAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { return true; } @Override - public Float getMaxScoreConfiguration() { + public Float getMaxScore() { Float maxScore = null; ModuleConfiguration config = courseNode.getModuleConfiguration(); @@ -75,7 +75,7 @@ public class IQTESTAssessmentConfig implements AssessmentConfig { @Override - public Float getMinScoreConfiguration() { + public Float getMinScore() { Float minScore = null; ModuleConfiguration config = courseNode.getModuleConfiguration(); // for onyx and QTI 1.2 @@ -100,12 +100,12 @@ public class IQTESTAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { return true; } @Override - public Float getCutValueConfiguration() { + public Float getCutValue() { Float cutValue = null; ModuleConfiguration config = courseNode.getModuleConfiguration(); @@ -136,12 +136,12 @@ public class IQTESTAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return true; } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { // coach should be able to add comments here, visible to users return true; } @@ -152,7 +152,7 @@ public class IQTESTAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return false; } @@ -162,7 +162,7 @@ public class IQTESTAssessmentConfig implements AssessmentConfig { } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { // test scoring fields can be edited manually return true; } 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 319846a334f..3a5c016fb35 100644 --- a/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java +++ b/src/main/java/org/olat/course/nodes/iq/QTI21AssessmentRunController.java @@ -243,7 +243,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen if (courseNode instanceof AssessableCourseNode) { AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if (assessmentConfig.hasScoreConfigured() || userCourseEnv.isCoach()){ + if (assessmentConfig.hasScore() || userCourseEnv.isCoach()){ HighScoreRunController highScoreCtr = new HighScoreRunController(ureq, getWindowControl(), userCourseEnv, courseNode); if (highScoreCtr.isViewHighscore()) { Component highScoreComponent = highScoreCtr.getInitialComponent(); @@ -297,7 +297,7 @@ public class QTI21AssessmentRunController extends BasicController implements Gen mainVC.contextPut("passed", passed); if(resultsVisible) { AssessmentConfig assessmentConfig = testCourseNode.getAssessmentConfig(); - if(assessmentConfig.hasCommentConfigured()) { + if(assessmentConfig.hasComment()) { StringBuilder comment = Formatter.stripTabsAndReturns(testCourseNode.getUserComment(userCourseEnv)); if (comment != null && comment.length() > 0) { mainVC.contextPut("comment", StringHelper.xssScan(comment)); 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 ccbad226fdd..2531f1da20f 100644 --- a/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/ms/MSAssessmentConfig.java @@ -37,39 +37,39 @@ public class MSAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { String scoreKey = config.getStringValue(MSCourseNode.CONFIG_KEY_SCORE); return !MSCourseNode.CONFIG_VALUE_SCORE_NONE.equals(scoreKey); } @Override - public Float getMaxScoreConfiguration() { - if (!hasScoreConfigured()) { + public Float getMaxScore() { + if (!hasScore()) { throw new OLATRuntimeException(MSAssessmentConfig.class, "getMaxScore not defined when hasScoreConfigured set to false", null); } return MSCourseNode.getMinMax(config).getMax(); } @Override - public Float getMinScoreConfiguration() { - if (!hasScoreConfigured()) { + public Float getMinScore() { + if (!hasScore()) { throw new OLATRuntimeException(MSAssessmentConfig.class, "getMinScore not defined when hasScoreConfigured set to false", null); } return MSCourseNode.getMinMax(config).getMin(); } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return false; } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return false; } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { // manual scoring fields can be edited manually return true; } diff --git a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeEditController.java b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeEditController.java index e60f0e7bf7b..6cff137847f 100644 --- a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeEditController.java +++ b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeEditController.java @@ -139,7 +139,7 @@ public class MSCourseNodeEditController extends ActivateableTabbableDefaultContr } private void updateHighscoreTab() { - myTabbedPane.setEnabled(4, msNode.getAssessmentConfig().hasScoreConfigured()); + myTabbedPane.setEnabled(4, msNode.getAssessmentConfig().hasScore()); } @Override diff --git a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java index ded647281c1..c578d6ae238 100644 --- a/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java +++ b/src/main/java/org/olat/course/nodes/ms/MSCourseNodeRunController.java @@ -195,16 +195,16 @@ public class MSCourseNodeRunController extends BasicController implements Activa private void exposeConfigToVC(UserRequest ureq) { AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); ModuleConfiguration config = courseNode.getModuleConfiguration(); - myContent.contextPut("hasScoreField", assessmentConfig.hasScoreConfigured()); - if (assessmentConfig.hasScoreConfigured()) { - myContent.contextPut("scoreMin", AssessmentHelper.getRoundedScore(assessmentConfig.getMinScoreConfiguration())); - myContent.contextPut("scoreMax", AssessmentHelper.getRoundedScore(assessmentConfig.getMaxScoreConfiguration())); + myContent.contextPut("hasScoreField", assessmentConfig.hasScore()); + if (assessmentConfig.hasScore()) { + myContent.contextPut("scoreMin", AssessmentHelper.getRoundedScore(assessmentConfig.getMinScore())); + myContent.contextPut("scoreMax", AssessmentHelper.getRoundedScore(assessmentConfig.getMaxScore())); } - myContent.contextPut("hasPassedField", assessmentConfig.hasPassedConfigured()); - if (assessmentConfig.hasPassedConfigured()) { - myContent.contextPut("passedCutValue", AssessmentHelper.getRoundedScore(assessmentConfig.getCutValueConfiguration())); + myContent.contextPut("hasPassedField", assessmentConfig.hasPassed()); + if (assessmentConfig.hasPassed()) { + myContent.contextPut("passedCutValue", AssessmentHelper.getRoundedScore(assessmentConfig.getCutValue())); } - myContent.contextPut("hasCommentField", assessmentConfig.hasCommentConfigured()); + myContent.contextPut("hasCommentField", assessmentConfig.hasComment()); String infoTextUser = (String) config.get(MSCourseNode.CONFIG_KEY_INFOTEXT_USER); if(StringHelper.containsNonWhitespace(infoTextUser)) { myContent.contextPut(MSCourseNode.CONFIG_KEY_INFOTEXT_USER, infoTextUser); @@ -223,7 +223,7 @@ public class MSCourseNodeRunController extends BasicController implements Activa hasPassed = assessmentEntry.getPassed() != null; hasScore = assessmentEntry.getScore() != null; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - hasComment = assessmentConfig.hasCommentConfigured() && StringHelper.containsNonWhitespace(rawComment); + hasComment = assessmentConfig.hasComment() && StringHelper.containsNonWhitespace(rawComment); boolean resultsVisible = overrideUserResultsVisiblity || assessmentEntry.getUserVisibility() == null 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 41cd0311216..009252c1ee5 100644 --- a/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/portfolio/PortfolioAssessmentConfig.java @@ -35,17 +35,17 @@ public class PortfolioAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return true; } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return true; } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { return true; } diff --git a/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeRunController.java b/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeRunController.java index dd557761354..05eb30be348 100644 --- a/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeRunController.java +++ b/src/main/java/org/olat/course/nodes/portfolio/PortfolioCourseNodeRunController.java @@ -315,29 +315,29 @@ public class PortfolioCourseNodeRunController extends FormBasicController { boolean resultsVisible = scoreEval.getUserVisible() == null || scoreEval.getUserVisible().booleanValue(); assessmentInfosContainer.contextPut("resultsVisible", resultsVisible); //score - assessmentInfosContainer.contextPut("hasScoreField", new Boolean(assessmentConfig.hasScoreConfigured())); - if(assessmentConfig.hasScoreConfigured()) { + assessmentInfosContainer.contextPut("hasScoreField", new Boolean(assessmentConfig.hasScore())); + if(assessmentConfig.hasScore()) { Float score = scoreEval.getScore(); - Float minScore = assessmentConfig.getMinScoreConfiguration(); - Float maxScore = assessmentConfig.getMaxScoreConfiguration(); + Float minScore = assessmentConfig.getMinScore(); + Float maxScore = assessmentConfig.getMaxScore(); assessmentInfosContainer.contextPut("scoreMin", AssessmentHelper.getRoundedScore(minScore)); assessmentInfosContainer.contextPut("scoreMax", AssessmentHelper.getRoundedScore(maxScore)); assessmentInfosContainer.contextPut("score", AssessmentHelper.getRoundedScore(score)); } //passed - assessmentInfosContainer.contextPut("hasPassedField", new Boolean(assessmentConfig.hasPassedConfigured())); - if(assessmentConfig.hasPassedConfigured()) { + assessmentInfosContainer.contextPut("hasPassedField", new Boolean(assessmentConfig.hasPassed())); + if(assessmentConfig.hasPassed()) { Boolean passed = scoreEval.getPassed(); assessmentInfosContainer.contextPut("passed", passed); assessmentInfosContainer.contextPut("hasPassedValue", new Boolean(passed != null)); - Float cutValue = assessmentConfig.getCutValueConfiguration(); + Float cutValue = assessmentConfig.getCutValue(); assessmentInfosContainer.contextPut("passedCutValue", AssessmentHelper.getRoundedScore(cutValue)); } // get comment if(resultsVisible) { - if(assessmentConfig.hasCommentConfigured()) { + if(assessmentConfig.hasComment()) { AssessmentManager am = userCourseEnv.getCourseEnvironment().getAssessmentManager(); String comment = am.getNodeComment(courseNode, getIdentity()); assessmentInfosContainer.contextPut("comment", comment); 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 9f24613d095..f2370936fbf 100644 --- a/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/projectbroker/ProjectBrokerAssessmentConfig.java @@ -35,22 +35,22 @@ public class ProjectBrokerAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { return false; } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { return false; } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return false; } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { return false; } @@ -60,12 +60,12 @@ public class ProjectBrokerAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return false; // Project broker Course node has no status-field } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { return false; } 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 5a964de1171..1a621359026 100644 --- a/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/scorm/ScormAssessmentConfig.java @@ -37,7 +37,7 @@ public class ScormAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { boolean assessable = config.getBooleanSafe(ScormEditController.CONFIG_ISASSESSABLE, true); if (assessable) { String type = config.getStringValue(ScormEditController.CONFIG_ASSESSABLE_TYPE, @@ -48,24 +48,24 @@ public class ScormAssessmentConfig implements AssessmentConfig { } @Override - public Float getMaxScoreConfiguration() { + public Float getMaxScore() { // According to SCORM Standard, SCORE is between 0 and 100. return Float.valueOf(100); } @Override - public Float getMinScoreConfiguration() { + public Float getMinScore() { // According to SCORM Standard, SCORE is between 0 and 100. return Float.valueOf(0); } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { return config.getBooleanSafe(ScormEditController.CONFIG_ISASSESSABLE, true); } @Override - public Float getCutValueConfiguration() { + public Float getCutValue() { int cutValue = config.getIntegerSafe(ScormEditController.CONFIG_CUTVALUE, 0); return Float.valueOf(cutValue); } @@ -76,12 +76,12 @@ public class ScormAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return config.getBooleanSafe(ScormEditController.CONFIG_ISASSESSABLE, true); } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { return false; } @@ -91,7 +91,7 @@ public class ScormAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return false; } @@ -101,7 +101,7 @@ public class ScormAssessmentConfig implements AssessmentConfig { } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { return config.getBooleanSafe(ScormEditController.CONFIG_ISASSESSABLE, 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 a5a469e9b58..93307a3c580 100644 --- a/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java +++ b/src/main/java/org/olat/course/nodes/scorm/ScormRunController.java @@ -245,7 +245,7 @@ public class ScormRunController extends BasicController implements ScormAPICallb boolean resultsVisible = scoreEval.getUserVisible() == null || scoreEval.getUserVisible().booleanValue(); startPage.contextPut("resultsVisible", resultsVisible); AssessmentConfig assessmentConfig = scormNode.getAssessmentConfig(); - if(resultsVisible && assessmentConfig.hasCommentConfigured()) { + if(resultsVisible && assessmentConfig.hasComment()) { StringBuilder comment = Formatter.stripTabsAndReturns(scormNode.getUserComment(userCourseEnv)); startPage.contextPut("comment", StringHelper.xssScan(comment)); } 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 ff152cfb796..42366df5fca 100644 --- a/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/st/STAssessmentConfig.java @@ -39,7 +39,7 @@ public class STAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { if (scoreCalculator != null && StringHelper.containsNonWhitespace(scoreCalculator.getScoreExpression())) { return true; } @@ -47,17 +47,17 @@ public class STAssessmentConfig implements AssessmentConfig { } @Override - public Float getMaxScoreConfiguration() { + public Float getMaxScore() { throw new OLATRuntimeException(STAssessmentConfig.class, "Max score never defined for ST nodes", null); } @Override - public Float getMinScoreConfiguration() { + public Float getMinScore() { throw new OLATRuntimeException(STAssessmentConfig.class, "Min score never defined for ST nodes", null); } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { if (scoreCalculator != null && StringHelper.containsNonWhitespace(scoreCalculator.getPassedExpression())) { return true; } @@ -65,7 +65,7 @@ public class STAssessmentConfig implements AssessmentConfig { } @Override - public Float getCutValueConfiguration() { + public Float getCutValue() { throw new OLATRuntimeException(STAssessmentConfig.class, "Cut value never defined for ST nodes", null); } @@ -75,12 +75,12 @@ public class STAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return false; } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { return false; } @@ -90,7 +90,7 @@ public class STAssessmentConfig implements AssessmentConfig { } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return false; } @@ -100,7 +100,7 @@ public class STAssessmentConfig implements AssessmentConfig { } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { // ST nodes never editable, data generated on the fly return false; } diff --git a/src/main/java/org/olat/course/nodes/st/STCourseNodeEditController.java b/src/main/java/org/olat/course/nodes/st/STCourseNodeEditController.java index 5f7964148ed..690d530b5f0 100644 --- a/src/main/java/org/olat/course/nodes/st/STCourseNodeEditController.java +++ b/src/main/java/org/olat/course/nodes/st/STCourseNodeEditController.java @@ -429,7 +429,7 @@ public class STCourseNodeEditController extends ActivateableTabbableDefaultContr } private void updateHighscoreTab() { - Boolean sf = stNode.getAssessmentConfig().hasScoreConfigured(); + Boolean sf = stNode.getAssessmentConfig().hasScore(); myTabbedPane.setEnabled(5, sf); } /** diff --git a/src/main/java/org/olat/course/nodes/st/STCourseNodeRunController.java b/src/main/java/org/olat/course/nodes/st/STCourseNodeRunController.java index 477ab28a228..8d0ec90bd32 100644 --- a/src/main/java/org/olat/course/nodes/st/STCourseNodeRunController.java +++ b/src/main/java/org/olat/course/nodes/st/STCourseNodeRunController.java @@ -99,7 +99,7 @@ public class STCourseNodeRunController extends BasicController { myContent.setDomReplacementWrapperRequired(false); // we provide our own DOM replacement ID AssessmentConfig assessmentConfig = stCourseNode.getAssessmentConfig(); - if (se != null && (assessmentConfig.hasScoreConfigured() || assessmentConfig.hasPassedConfigured())) { + if (se != null && (assessmentConfig.hasScore() || assessmentConfig.hasPassed())) { HighScoreRunController highScoreCtr = new HighScoreRunController(ureq, wControl, userCourseEnv, stCourseNode); if (highScoreCtr.isViewHighscore()) { Component highScoreComponent = highScoreCtr.getInitialComponent(); @@ -174,10 +174,10 @@ public class STCourseNodeRunController extends BasicController { myContent.contextPut("hasScore", Boolean.FALSE); myContent.contextPut("hasPassed", Boolean.FALSE); } else { - myContent.contextPut("hasScore", new Boolean(assessmentConfig.hasScoreConfigured())); - myContent.contextPut("hasPassed", new Boolean(assessmentConfig.hasPassedConfigured())); + myContent.contextPut("hasScore", new Boolean(assessmentConfig.hasScore())); + myContent.contextPut("hasPassed", new Boolean(assessmentConfig.hasPassed())); - if(assessmentConfig.hasScoreConfigured() || assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasScore() || assessmentConfig.hasPassed()) { CourseConfig cc = userCourseEnv.getCourseEnvironment().getCourseConfig(); if((cc.isEfficencyStatementEnabled() || cc.isCertificateEnabled()) && userCourseEnv.hasEfficiencyStatementOrCertificate(false)) { diff --git a/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java b/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java index c71c422eefe..10000ac9bcf 100644 --- a/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java +++ b/src/main/java/org/olat/course/nodes/ta/DropboxScoringViewController.java @@ -211,7 +211,7 @@ public class DropboxScoringViewController extends BasicController { // insert Status Pull-Down Menu depending on user role == author boolean isAuthor = ureq.getUserSession().getRoles().isAuthor(); boolean isTutor = userCourseEnv.isCoach(); - if ( ((AssessableCourseNode)node).getAssessmentConfig().hasStatusConfigured() && (isAuthor || isTutor)) { + if ( ((AssessableCourseNode)node).getAssessmentConfig().hasStatus() && (isAuthor || isTutor)) { myContent.contextPut("hasStatusPullDown", Boolean.TRUE); statusForm = new StatusForm(ureq, getWindowControl(), userCourseEnv.isCourseReadOnly()); listenTo(statusForm); 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 0cdb4a8b87b..ea4da30b840 100644 --- a/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java +++ b/src/main/java/org/olat/course/nodes/ta/TAAssessmentConfig.java @@ -39,29 +39,29 @@ public class TAAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasScoreConfigured() { + public boolean hasScore() { if (hasNoScoring) return false; - return super.hasScoreConfigured(); + return super.hasScore(); } @Override - public boolean hasPassedConfigured() { + public boolean hasPassed() { if (hasNoScoring) return false; - return super.hasPassedConfigured(); + return super.hasPassed(); } @Override - public boolean hasAttemptsConfigured() { + public boolean hasAttempts() { return true; } @Override - public boolean hasCommentConfigured() { + public boolean hasComment() { if (hasNoScoring) return false; - return super.hasCommentConfigured(); + return super.hasComment(); } @Override @@ -70,12 +70,12 @@ public class TAAssessmentConfig extends ModuleAssessmentConfig { } @Override - public boolean hasStatusConfigured() { + public boolean hasStatus() { return true; // Task Course node has always a status-field } @Override - public boolean isEditableConfigured() { + public boolean isEditable() { return true; } diff --git a/src/main/java/org/olat/course/reminder/rule/PassedRuleSPI.java b/src/main/java/org/olat/course/reminder/rule/PassedRuleSPI.java index 0995f85fb20..35e00cc6117 100644 --- a/src/main/java/org/olat/course/reminder/rule/PassedRuleSPI.java +++ b/src/main/java/org/olat/course/reminder/rule/PassedRuleSPI.java @@ -101,7 +101,7 @@ public class PassedRuleSPI implements FilterRuleSPI { STCourseNode structureNode = (STCourseNode)courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if(assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasPassed()) { for(Identity identity:identities) { UserCourseEnvironment uce = AssessmentHelper.createAndInitUserCourseEnvironment(identity, course); ScoreEvaluation scoreEval = structureNode.getUserScoreEvaluation(uce); diff --git a/src/main/java/org/olat/course/reminder/rule/ScoreRuleSPI.java b/src/main/java/org/olat/course/reminder/rule/ScoreRuleSPI.java index a1b499211f0..aaaa676aca9 100644 --- a/src/main/java/org/olat/course/reminder/rule/ScoreRuleSPI.java +++ b/src/main/java/org/olat/course/reminder/rule/ScoreRuleSPI.java @@ -103,7 +103,7 @@ public class ScoreRuleSPI implements FilterRuleSPI { STCourseNode structureNode = (STCourseNode)courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasScore()) { for(Identity identity:identities) { UserCourseEnvironment uce = AssessmentHelper.createAndInitUserCourseEnvironment(identity, course); ScoreEvaluation scoreEval = structureNode.getUserScoreEvaluation(uce); diff --git a/src/main/java/org/olat/course/reminder/ui/AttemptsRuleEditor.java b/src/main/java/org/olat/course/reminder/ui/AttemptsRuleEditor.java index 90518609fe8..603fa5750d6 100644 --- a/src/main/java/org/olat/course/reminder/ui/AttemptsRuleEditor.java +++ b/src/main/java/org/olat/course/reminder/ui/AttemptsRuleEditor.java @@ -147,7 +147,7 @@ public class AttemptsRuleEditor extends RuleEditorFragment { if (courseNode instanceof AssessableCourseNode) { AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if (assessmentConfig.hasAttemptsConfigured()) { + if (assessmentConfig.hasAttempts()) { nodes.add(courseNode); } } else if (courseNode instanceof QTICourseNode) { diff --git a/src/main/java/org/olat/course/reminder/ui/InitialAttemptsRuleEditor.java b/src/main/java/org/olat/course/reminder/ui/InitialAttemptsRuleEditor.java index 1fed9012235..a3543878cef 100644 --- a/src/main/java/org/olat/course/reminder/ui/InitialAttemptsRuleEditor.java +++ b/src/main/java/org/olat/course/reminder/ui/InitialAttemptsRuleEditor.java @@ -156,7 +156,7 @@ public class InitialAttemptsRuleEditor extends RuleEditorFragment { if (courseNode instanceof AssessableCourseNode) { AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if (assessmentConfig.hasAttemptsConfigured()) { + if (assessmentConfig.hasAttempts()) { nodes.add(courseNode); } } diff --git a/src/main/java/org/olat/course/reminder/ui/PassedRuleEditor.java b/src/main/java/org/olat/course/reminder/ui/PassedRuleEditor.java index 76eb61ead55..2f350bae582 100644 --- a/src/main/java/org/olat/course/reminder/ui/PassedRuleEditor.java +++ b/src/main/java/org/olat/course/reminder/ui/PassedRuleEditor.java @@ -142,7 +142,7 @@ public class PassedRuleEditor extends RuleEditorFragment { if (courseNode instanceof AssessableCourseNode) { AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if (assessmentConfig.hasPassedConfigured()) { + if (assessmentConfig.hasPassed()) { nodes.add(courseNode); } } diff --git a/src/main/java/org/olat/course/reminder/ui/ScoreRuleEditor.java b/src/main/java/org/olat/course/reminder/ui/ScoreRuleEditor.java index d8eff9a8271..9f098a195c3 100644 --- a/src/main/java/org/olat/course/reminder/ui/ScoreRuleEditor.java +++ b/src/main/java/org/olat/course/reminder/ui/ScoreRuleEditor.java @@ -143,7 +143,7 @@ public class ScoreRuleEditor extends RuleEditorFragment { private void searchScoreableNodes(CourseNode courseNode, List<CourseNode> nodes) { if (courseNode instanceof AssessableCourseNode) { AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode; - if (assessableCourseNode.getAssessmentConfig().hasScoreConfigured()) { + if (assessableCourseNode.getAssessmentConfig().hasScore()) { nodes.add(courseNode); } } diff --git a/src/main/java/org/olat/course/run/scoring/AssessmentEvaluation.java b/src/main/java/org/olat/course/run/scoring/AssessmentEvaluation.java index 48fd59d44be..a695b86d1f0 100644 --- a/src/main/java/org/olat/course/run/scoring/AssessmentEvaluation.java +++ b/src/main/java/org/olat/course/run/scoring/AssessmentEvaluation.java @@ -126,22 +126,22 @@ public class AssessmentEvaluation extends ScoreEvaluation { AssessmentConfig assessmentConfig = node.getAssessmentConfig(); Integer attempts = null; - if(assessmentConfig.hasAttemptsConfigured()) { + if(assessmentConfig.hasAttempts()) { attempts = entry.getAttempts(); } Float score = null; - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasScore()) { score = entry.getScore() == null ? null : entry.getScore().floatValue(); } Boolean passed = null; - if(assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasPassed()) { passed = entry.getPassed(); } String comment = null; - if(assessmentConfig.hasCommentConfigured()) { + if(assessmentConfig.hasComment()) { comment = entry.getComment(); } diff --git a/src/main/java/org/olat/course/run/scoring/ScoreAccounting.java b/src/main/java/org/olat/course/run/scoring/ScoreAccounting.java index b7019eb00b2..96178ec0697 100644 --- a/src/main/java/org/olat/course/run/scoring/ScoreAccounting.java +++ b/src/main/java/org/olat/course/run/scoring/ScoreAccounting.java @@ -202,7 +202,7 @@ public class ScoreAccounting { private AssessmentEvaluation calculateScoreEvaluation(AssessmentEntry entry, CalculatedAssessableCourseNode cNode) { AssessmentEvaluation se; AssessmentConfig assessmentConfig = cNode.getAssessmentConfig(); - if(assessmentConfig.hasScoreConfigured() || assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasScore() || assessmentConfig.hasPassed()) { ScoreCalculator scoreCalculator = cNode.getScoreCalculator(); String scoreExpressionStr = scoreCalculator.getScoreExpression(); String passedExpressionStr = scoreCalculator.getPassedExpression(); @@ -218,10 +218,10 @@ public class ScoreAccounting { AssessmentEntryStatus assessmentStatus = AssessmentEntryStatus.inProgress; ConditionInterpreter ci = userCourseEnvironment.getConditionInterpreter(); - if (assessmentConfig.hasScoreConfigured() && scoreExpressionStr != null) { + if (assessmentConfig.hasScore() && scoreExpressionStr != null) { score = Float.valueOf(ci.evaluateCalculation(scoreExpressionStr)); } - if (assessmentConfig.hasPassedConfigured() && passedExpressionStr != null) { + if (assessmentConfig.hasPassed() && passedExpressionStr != null) { boolean hasPassed = ci.evaluateCondition(passedExpressionStr); if(hasPassed) { passed = Boolean.TRUE; diff --git a/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java b/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java index 4b539c18efe..794e1a576bd 100644 --- a/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java +++ b/src/main/java/org/olat/ims/qti21/manager/archive/QTI21ArchiveFormat.java @@ -326,11 +326,11 @@ public class QTI21ArchiveFormat { if(courseNode instanceof AssessableCourseNode) { AssessableCourseNode assessableCourseNode = (AssessableCourseNode)courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasScore()) { header1Row.addCell(col++, translator.translate("archive.table.header.node"), headerStyle); } - if(assessmentConfig.hasPassedConfigured()) { - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasPassed()) { + if(assessmentConfig.hasScore()) { col++; } else { header1Row.addCell(col++, translator.translate("archive.table.header.node"), headerStyle); @@ -405,10 +405,10 @@ public class QTI21ArchiveFormat { if(courseNode instanceof AssessableCourseNode) { AssessableCourseNode assessableCourseNode = (AssessableCourseNode)courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasScore()) { header2Row.addCell(col++, translator.translate("archive.table.header.node.points"), headerStyle); } - if(assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasPassed()) { header2Row.addCell(col++, translator.translate("archive.table.header.node.passed"), headerStyle); } } @@ -539,14 +539,14 @@ public class QTI21ArchiveFormat { if(courseNode instanceof AssessableCourseNode) { AssessableCourseNode assessableCourseNode = (AssessableCourseNode)courseNode; AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasScore()) { if(entry.getScore() != null) { dataRow.addCell(col++, entry.getScore(), null); } else { col++; } } - if(assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasPassed()) { if(entry.getPassed() != null) { dataRow.addCell(col++, entry.getPassed().toString(), null); } else { diff --git a/src/main/java/org/olat/ims/qti21/ui/statistics/QTI21AssessmentTestStatisticsController.java b/src/main/java/org/olat/ims/qti21/ui/statistics/QTI21AssessmentTestStatisticsController.java index e0ed96478ec..b2538c4b8c2 100644 --- a/src/main/java/org/olat/ims/qti21/ui/statistics/QTI21AssessmentTestStatisticsController.java +++ b/src/main/java/org/olat/ims/qti21/ui/statistics/QTI21AssessmentTestStatisticsController.java @@ -154,7 +154,7 @@ public class QTI21AssessmentTestStatisticsController extends BasicController imp private Float getMaxScoreSetting(QTICourseNode testNode) { Float maxScoreSetting = null; if(QTIType.qtiworks.equals(type)) { - maxScoreSetting = testNode instanceof IQTESTCourseNode ? ((IQTESTCourseNode)testNode).getAssessmentConfig().getMaxScoreConfiguration() : null; + maxScoreSetting = testNode instanceof IQTESTCourseNode ? ((IQTESTCourseNode)testNode).getAssessmentConfig().getMaxScore() : null; } return maxScoreSetting; } @@ -162,7 +162,7 @@ public class QTI21AssessmentTestStatisticsController extends BasicController imp private Float getCutValueSetting(QTICourseNode testNode) { Float cutValueSetting = null; if(QTIType.qtiworks.equals(type)) { - cutValueSetting = testNode instanceof IQTESTCourseNode ? ((IQTESTCourseNode)testNode).getAssessmentConfig().getCutValueConfiguration() : null; + cutValueSetting = testNode instanceof IQTESTCourseNode ? ((IQTESTCourseNode)testNode).getAssessmentConfig().getCutValue() : null; } return cutValueSetting; } diff --git a/src/main/java/org/olat/modules/portfolio/BinderConfiguration.java b/src/main/java/org/olat/modules/portfolio/BinderConfiguration.java index 20cdcdb728b..b670996bd0f 100644 --- a/src/main/java/org/olat/modules/portfolio/BinderConfiguration.java +++ b/src/main/java/org/olat/modules/portfolio/BinderConfiguration.java @@ -144,12 +144,12 @@ public class BinderConfiguration { CourseNode courseNode = course.getRunStructure().getNode(binder.getSubIdent()); if(courseNode instanceof PortfolioCourseNode) { AssessmentConfig assessmentConfig = courseNode.getAssessmentConfig(); - withScore = assessmentConfig.hasScoreConfigured(); + withScore = assessmentConfig.hasScore(); if(withScore) { - maxScore = assessmentConfig.getMaxScoreConfiguration(); - minScore = assessmentConfig.getMinScoreConfiguration(); + maxScore = assessmentConfig.getMaxScore(); + minScore = assessmentConfig.getMinScore(); } - withPassed = assessmentConfig.hasPassedConfigured(); + withPassed = assessmentConfig.hasPassed(); assessable = withPassed || withScore; } else { withPassed = true; diff --git a/src/main/java/org/olat/modules/scorm/ScormAPIMapper.java b/src/main/java/org/olat/modules/scorm/ScormAPIMapper.java index 0720b705974..0c7d2eba77c 100644 --- a/src/main/java/org/olat/modules/scorm/ScormAPIMapper.java +++ b/src/main/java/org/olat/modules/scorm/ScormAPIMapper.java @@ -115,10 +115,10 @@ public class ScormAPIMapper implements Mapper, ScormAPICallback, Serializable { if(isAssessable) { checkForLms(); AssessmentConfig assessmentConfig = scormNode.getAssessmentConfig(); - if(assessmentConfig.hasScoreConfigured()) { + if(assessmentConfig.hasScore()) { currentScore = scormNode.getUserScoreEvaluation(userCourseEnv).getScore(); } - if(assessmentConfig.hasPassedConfigured()) { + if(assessmentConfig.hasPassed()) { currentPassed = scormNode.getUserScoreEvaluation(userCourseEnv).getPassed(); } } @@ -254,7 +254,7 @@ public class ScormAPIMapper implements Mapper, ScormAPICallback, Serializable { } AssessmentConfig assessmentConfig = scormNode.getAssessmentConfig(); - float cutval = assessmentConfig.getCutValueConfiguration().floatValue(); + float cutval = assessmentConfig.getCutValue().floatValue(); boolean passed = (score >= cutval); // if advanceScore option is set update the score only if it is higher // <OLATEE-27> diff --git a/src/test/java/org/olat/modules/reminder/manager/ReminderRuleEngineTest.java b/src/test/java/org/olat/modules/reminder/manager/ReminderRuleEngineTest.java index b2929d1f810..efb7378c2bf 100644 --- a/src/test/java/org/olat/modules/reminder/manager/ReminderRuleEngineTest.java +++ b/src/test/java/org/olat/modules/reminder/manager/ReminderRuleEngineTest.java @@ -1086,7 +1086,7 @@ public class ReminderRuleEngineTest extends OlatTestCase { } } Assert.assertNotNull(testNode); - Assert.assertTrue(testNode.getAssessmentConfig().hasScoreConfigured()); + Assert.assertTrue(testNode.getAssessmentConfig().hasScore()); IdentityEnvironment ienv = new IdentityEnvironment(); ienv.setIdentity(student); -- GitLab