From 749d80fc0e7244cef39bc6e1ba2210b344bfb3db Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 2 Feb 2016 12:36:53 +0100
Subject: [PATCH] OO-1876: don't break the recursion for the project broker
course element, don't take it as assessable, but takes its children elements
---
.../org/olat/course/assessment/AssessmentHelper.java | 8 +++++---
.../course/assessment/AssessmentMainController.java | 10 +++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/course/assessment/AssessmentHelper.java b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
index 14aff5c5d15..13efac1c7a9 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentHelper.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentHelper.java
@@ -319,8 +319,7 @@ public class AssessmentHelper {
// - it is of an assessable course node type
boolean hasDisplayableValuesConfigured = false;
boolean hasDisplayableUserValues = false;
- if ( (childrenData.size() > 0 || courseNode instanceof AssessableCourseNode) && !(courseNode instanceof ProjectBrokerCourseNode) ) {
- // TODO:cg 04.11.2010 ProjectBroker : no assessment-tool in V1.0 , remove projectbroker completely form assessment-tool gui
+ if (childrenData.size() > 0 || courseNode instanceof AssessableCourseNode) {
// Store node and user data in object array. This object array serves as data model for
// the user assessment overview table
Map<String,Object> nodeData = new HashMap<String, Object>();
@@ -332,7 +331,10 @@ public class AssessmentHelper {
nodeData.put(KEY_TITLE_LONG, courseNode.getLongTitle());
nodeData.put(KEY_IDENTIFYER, courseNode.getIdent());
- if (courseNode instanceof AssessableCourseNode) {
+ if(courseNode instanceof ProjectBrokerCourseNode) {
+ //ProjectBroker : no assessment-tool in V1.0 , remove project broker completely form assessment-tool gui
+ nodeData.put(KEY_SELECTABLE, Boolean.FALSE);
+ } else if (courseNode instanceof AssessableCourseNode) {
AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode;
ScoreEvaluation scoreEvaluation = userCourseEnv.getScoreAccounting().getScoreEvaluation(courseNode);
// details
diff --git a/src/main/java/org/olat/course/assessment/AssessmentMainController.java b/src/main/java/org/olat/course/assessment/AssessmentMainController.java
index ee961a001da..f85956c50ae 100644
--- a/src/main/java/org/olat/course/assessment/AssessmentMainController.java
+++ b/src/main/java/org/olat/course/assessment/AssessmentMainController.java
@@ -404,7 +404,6 @@ public class AssessmentMainController extends MainLayoutBasicController implemen
} else if (cmd.equals(CMD_USERFOCUS)) {
mode = MODE_USERFOCUS;
identitiesList = getAllAssessableIdentities();
- //fxdiff FXOLAT-108: improve results table of tests
doUserChooseWithData(ureq, identitiesList, null, null);
} else if (cmd.equals(CMD_GROUPFOCUS)) {
mode = MODE_GROUPFOCUS;
@@ -1106,8 +1105,7 @@ public class AssessmentMainController extends MainLayoutBasicController implemen
}
boolean hasDisplayableValuesConfigured = false;
- if ( (childrenData.size() > 0 || courseNode instanceof AssessableCourseNode) && !(courseNode instanceof ProjectBrokerCourseNode) ) {
- // TODO:cg 04.11.2010 ProjectBroker : no assessment-tool in V1.0 , remove projectbroker completely form assessment-tool gui // Store node data in hash map. This hash map serves as data model for
+ if (childrenData.size() > 0 || courseNode instanceof AssessableCourseNode) {
// the user assessment overview table. Leave user data empty since not used in
// this table. (use only node data)
NodeTableRow nodeData = new NodeTableRow(recursionLevel, courseNode);
@@ -1121,9 +1119,11 @@ public class AssessmentMainController extends MainLayoutBasicController implemen
nodeData.setOnyx(false);
}
}
-
- if (courseNode instanceof AssessableCourseNode) {
+ if(courseNode instanceof ProjectBrokerCourseNode) {
+ //ProjectBroker : no assessment-tool in V1.0 , remove project broker completely form assessment-tool gui
+ nodeData.setSelectable(false);
+ } else if (courseNode instanceof AssessableCourseNode) {
AssessableCourseNode assessableCourseNode = (AssessableCourseNode) courseNode;
if ( assessableCourseNode.hasDetails()
|| assessableCourseNode.hasAttemptsConfigured()
--
GitLab