From 7a96e94ebc4ca6a3611ba626b6cc8a2201e5a6c3 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 28 Feb 2019 13:44:25 +0100
Subject: [PATCH] OO-3916: show the cut value in the assessment tool in tables
---
.../ui/tool/IdentityListCourseNodeController.java | 3 +++
.../ui/tool/IdentityListCourseNodeTableModel.java | 6 +++++-
.../assessment/ui/tool/_i18n/LocalStrings_de.properties | 1 +
.../assessment/ui/tool/_i18n/LocalStrings_en.properties | 1 +
.../assessment/ui/tool/_i18n/LocalStrings_fr.properties | 1 +
5 files changed, 11 insertions(+), 1 deletion(-)
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 12665c810f2..f637b236f56 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
@@ -341,6 +341,9 @@ public class IdentityListCourseNodeController extends FormBasicController
if(assessableNode.getMaxScoreConfiguration() != null) {
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()));
}
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 edc97354321..2d8b477fbfa 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
@@ -55,6 +55,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
private Float minScore;
private Float maxScore;
+ private Float cutValue;
private final AssessableCourseNode courseNode;
private List<AssessedIdentityElementRow> backups;
private ConcurrentMap<Long, CertificateLight> certificateMap;
@@ -67,6 +68,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
if(courseNode != null && !(courseNode instanceof STCourseNode) && courseNode.hasScoreConfigured()) {
maxScore = courseNode.getMaxScoreConfiguration();
minScore = courseNode.getMinScoreConfiguration();
+ cutValue = courseNode.getCutValueConfiguration();
}
}
@@ -139,6 +141,7 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
case score: return row.getScore();
case min: return minScore;
case max: return maxScore;
+ case cut: return cutValue;
case status: return "";
case passed: return row.getPassed();
case numOfAssessmentDocs: {
@@ -190,7 +193,8 @@ public class IdentityListCourseNodeTableModel extends DefaultFlexiTableDataModel
numOfAssessmentDocs("table.header.num.assessmentDocs"),
currentCompletion("table.header.completion"),
tools("table.header.tools"),
- details("table.header.details");
+ details("table.header.details"),
+ cut("table.header.cut");
private final String i18nKey;
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties
index 73c6bae4600..b9346248762 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties
@@ -51,6 +51,7 @@ sub.details=Details
table.entries=Eintr\u00E4ge
table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus
table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion
+table.header.cut=Punktschwelle
table.header.description=Beschreibung
table.header.elements.toReview=Baustein
table.header.group.name=Namen
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_en.properties
index d2c8d40e835..dce2e9bc988 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_en.properties
@@ -51,6 +51,7 @@ sub.details=Details
table.entries=Entries
table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus
table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion
+table.header.cut=Cut
table.header.description=Description
table.header.elements.toReview=Elements
table.header.group.name=Name
diff --git a/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties
index 3af226a6afb..2325427fd39 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_fr.properties
@@ -51,6 +51,7 @@ sub.details=D\u00E9tails
table.entries=Entr\u00E9es
table.header.assessmentStatus=$org.olat.modules.assessment.ui\:table.header.assessmentStatus
table.header.completion=$org.olat.modules.assessment.ui\:table.header.completion
+Points \u00E0 obtenir
table.header.description=Description
table.header.elements.toReview=El\u00E9ment
table.header.group.name=Noms
--
GitLab