Skip to content
Snippets Groups Projects
Commit 6d89b175 authored by srosse's avatar srosse
Browse files

Merge remote-tracking branch 'origin/OpenOLAT_12.5'

parents b8c40453 7a96e94e
No related branches found
No related tags found
No related merge requests found
...@@ -370,6 +370,9 @@ public class IdentityListCourseNodeController extends FormBasicController ...@@ -370,6 +370,9 @@ public class IdentityListCourseNodeController extends FormBasicController
if(assessableNode.getMaxScoreConfiguration() != null) { if(assessableNode.getMaxScoreConfiguration() != null) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.max, new ScoreCellRenderer())); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.max, new ScoreCellRenderer()));
} }
if(assessableNode.hasPassedConfigured() && assessableNode.getCutValueConfiguration() != null) {
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, IdentityCourseElementCols.cut, new ScoreCellRenderer()));
}
} }
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.score, new ScoreCellRenderer())); columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(IdentityCourseElementCols.score, new ScoreCellRenderer()));
} }
......
...@@ -55,6 +55,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel ...@@ -55,6 +55,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
private Float minScore; private Float minScore;
private Float maxScore; private Float maxScore;
private Float cutValue;
private final AssessableCourseNode courseNode; private final AssessableCourseNode courseNode;
private List<AssessedIdentityElementRow> backups; private List<AssessedIdentityElementRow> backups;
private ConcurrentMap<Long, CertificateLight> certificateMap; private ConcurrentMap<Long, CertificateLight> certificateMap;
...@@ -67,6 +68,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel ...@@ -67,6 +68,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
if(courseNode != null && !(courseNode instanceof STCourseNode) && courseNode.hasScoreConfigured()) { if(courseNode != null && !(courseNode instanceof STCourseNode) && courseNode.hasScoreConfigured()) {
maxScore = courseNode.getMaxScoreConfiguration(); maxScore = courseNode.getMaxScoreConfiguration();
minScore = courseNode.getMinScoreConfiguration(); minScore = courseNode.getMinScoreConfiguration();
cutValue = courseNode.getCutValueConfiguration();
} }
} }
...@@ -139,6 +141,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel ...@@ -139,6 +141,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
case score: return row.getScore(); case score: return row.getScore();
case min: return minScore; case min: return minScore;
case max: return maxScore; case max: return maxScore;
case cut: return cutValue;
case status: return ""; case status: return "";
case passed: return row.getPassed(); case passed: return row.getPassed();
case numOfAssessmentDocs: { case numOfAssessmentDocs: {
...@@ -190,7 +193,8 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel ...@@ -190,7 +193,8 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
numOfAssessmentDocs("table.header.num.assessmentDocs"), numOfAssessmentDocs("table.header.num.assessmentDocs"),
currentCompletion("table.header.completion"), currentCompletion("table.header.completion"),
tools("table.header.tools"), tools("table.header.tools"),
details("table.header.details"); details("table.header.details"),
cut("table.header.cut");
private final String i18nKey; private final String i18nKey;
......
...@@ -51,6 +51,7 @@ sub.details=Details ...@@ -51,6 +51,7 @@ sub.details=Details
table.entries=Eintr\u00E4ge table.entries=Eintr\u00E4ge
table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus
table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion
table.header.cut=Punktschwelle
table.header.description=Beschreibung table.header.description=Beschreibung
table.header.elements.toReview=Baustein table.header.elements.toReview=Baustein
table.header.group.name=Namen table.header.group.name=Namen
......
...@@ -51,6 +51,7 @@ sub.details=Details ...@@ -51,6 +51,7 @@ sub.details=Details
table.entries=Entries table.entries=Entries
table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus
table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion
table.header.cut=Cut
table.header.description=Description table.header.description=Description
table.header.elements.toReview=Elements table.header.elements.toReview=Elements
table.header.group.name=Name table.header.group.name=Name
......
...@@ -51,6 +51,7 @@ sub.details=D\u00E9tails ...@@ -51,6 +51,7 @@ sub.details=D\u00E9tails
table.entries=Entr\u00E9es table.entries=Entr\u00E9es
table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus
table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion
Points \u00E0 obtenir
table.header.description=Description table.header.description=Description
table.header.elements.toReview=El\u00E9ment table.header.elements.toReview=El\u00E9ment
table.header.group.name=Noms table.header.group.name=Noms
......
...@@ -442,6 +442,7 @@ public class AssessmentTestComposerController extends MainLayoutBasicController ...@@ -442,6 +442,7 @@ public class AssessmentTestComposerController extends MainLayoutBasicController
if(ate == AssessmentTestEvent.ASSESSMENT_TEST_CHANGED_EVENT) { if(ate == AssessmentTestEvent.ASSESSMENT_TEST_CHANGED_EVENT) {
AssessmentTest ast = assessmentTestBuilder.getAssessmentTest(); AssessmentTest ast = assessmentTestBuilder.getAssessmentTest();
assessmentChanged(ureq); assessmentChanged(ureq);
doSaveAssessmentTest(ureq, null);
doUpdate(ast.getIdentifier(), ast.getTitle()); doUpdate(ast.getIdentifier(), ast.getTitle());
} }
} else if(event instanceof AssessmentTestPartEvent) { } else if(event instanceof AssessmentTestPartEvent) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment