diff --git a/olat3/webapp/WEB-INF/src/de/bps/course/assessment/AssessmentMainController.java b/olat3/webapp/WEB-INF/src/de/bps/course/assessment/AssessmentMainController.java
index c5be53856117b56975987ae64d7b21c0fb15b484..c75aec78bd109b7ae66e89b4f02da1bb9a3032a4 100644
--- a/olat3/webapp/WEB-INF/src/de/bps/course/assessment/AssessmentMainController.java
+++ b/olat3/webapp/WEB-INF/src/de/bps/course/assessment/AssessmentMainController.java
@@ -1086,7 +1086,7 @@ AssessmentMainController(UserRequest ureq, WindowControl wControl, OLATResourcea
} else {
wrapper.contextPut("courseNode", this.currentCourseNode);
// push node css class
- wrapper.contextPut("courseNodeCss", CourseNodeFactory.getInstance().getCourseNodeConfiguration(currentCourseNode.getType()).getIconCSSClass());
+ wrapper.contextPut("courseNodeCss", CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(currentCourseNode.getType()).getIconCSSClass());
}
wrapper.put("content", content);
diff --git a/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentEditController.java b/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentEditController.java
index a82202cf961129a7b152e12d102e8712cb2c1038..b864ae0c388d9eb14513ba758bf09d37484f76f0 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentEditController.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentEditController.java
@@ -143,7 +143,7 @@ public class AssessmentEditController extends BasicController {
// push node for page header
detailView.contextPut("courseNode", courseNode);
// push node css class
- detailView.contextPut("courseNodeCss", CourseNodeFactory.getInstance().getCourseNodeConfiguration(courseNode.getType()).getIconCSSClass());
+ detailView.contextPut("courseNodeCss", CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(courseNode.getType()).getIconCSSClass());
// push infos about users groups
List<BusinessGroup> participantGroups = course.getCourseEnvironment().getCourseGroupManager().getParticipatingLearningGroupsFromAllContexts(
diff --git a/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentMainController.java b/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentMainController.java
index 819fb37445a2282e9ba52a33517647118b6bbfb9..4446a860ee3195c444ec555b78a3e59f290d8279 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentMainController.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentMainController.java
@@ -923,7 +923,7 @@ AssessmentMainController(UserRequest ureq, WindowControl wControl, OLATResourcea
} else {
wrapper.contextPut("courseNode", this.currentCourseNode);
// push node css class
- wrapper.contextPut("courseNodeCss", CourseNodeFactory.getInstance().getCourseNodeConfiguration(currentCourseNode.getType()).getIconCSSClass());
+ wrapper.contextPut("courseNodeCss", CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(currentCourseNode.getType()).getIconCSSClass());
}
wrapper.put("content", content);
diff --git a/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentNotificationsHandler.java b/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentNotificationsHandler.java
index 298fd716db87181880c9e7b80287e2dfaf08e549..ba00855e4e6e49904649d1611caefa10c420b196 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentNotificationsHandler.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/course/assessment/AssessmentNotificationsHandler.java
@@ -373,7 +373,7 @@ public class AssessmentNotificationsHandler implements NotificationsHandler {
SubscriptionListItem subListItem = new SubscriptionListItem(desc, urlToSend, modDate, CSS_CLASS_USER_ICON);
if(si == null) {
String title = translator.translate("notifications.header", new String[]{course.getCourseTitle()});
- String css = CourseNodeFactory.getInstance().getCourseNodeConfiguration(test.getType()).getIconCSSClass();
+ String css = CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(test.getType()).getIconCSSClass();
si = new SubscriptionInfo(new TitleItem(title, css), null);
}
si.addSubscriptionListItem(subListItem);
diff --git a/olat3/webapp/WEB-INF/src/org/olat/course/assessment/IndentedNodeRenderer.java b/olat3/webapp/WEB-INF/src/org/olat/course/assessment/IndentedNodeRenderer.java
index 8219b230e5dedcf063b0ce33670681330869efba..e6517b52a11b31320a8ed2dc6474fc816b71527b 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/course/assessment/IndentedNodeRenderer.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/course/assessment/IndentedNodeRenderer.java
@@ -59,7 +59,7 @@ public class IndentedNodeRenderer implements CustomCellRenderer {
Integer indent = (Integer) nodeData.get(AssessmentHelper.KEY_INDENT);
String type = (String) nodeData.get(AssessmentHelper.KEY_TYPE);
- String cssClass = CourseNodeFactory.getInstance().getCourseNodeConfiguration(type).getIconCSSClass();
+ String cssClass = CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(type).getIconCSSClass();
String title = (String) nodeData.get(AssessmentHelper.KEY_TITLE_SHORT);
String altText = (String) nodeData.get(AssessmentHelper.KEY_TITLE_LONG);
diff --git a/olat3/webapp/WEB-INF/src/org/olat/course/nodes/st/PeekViewWrapperController.java b/olat3/webapp/WEB-INF/src/org/olat/course/nodes/st/PeekViewWrapperController.java
index 2cbb79349bac2181fada844c7b1af862f2c06fee..8be1a1a433606a896911996c1870f609e9d87cca 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/course/nodes/st/PeekViewWrapperController.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/course/nodes/st/PeekViewWrapperController.java
@@ -72,7 +72,7 @@ public class PeekViewWrapperController extends BasicController {
nodeLink = LinkFactory.createLink("nodeLink", peekViewWrapperVC, this);
nodeLink.setCustomDisplayText(courseNode.getShortTitle());
// Add css class for course node type
- String iconCSSClass = CourseNodeFactory.getInstance().getCourseNodeConfiguration(courseNode.getType()).getIconCSSClass();
+ String iconCSSClass = CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(courseNode.getType()).getIconCSSClass();
nodeLink.setCustomEnabledLinkCSS("b_with_small_icon_left o_gotoNode " + iconCSSClass);
nodeLink.setUserObject(courseNode.getIdent());
// Add optional peekViewController
diff --git a/olat3/webapp/WEB-INF/src/org/olat/course/statistic/IndentedStatisticNodeRenderer.java b/olat3/webapp/WEB-INF/src/org/olat/course/statistic/IndentedStatisticNodeRenderer.java
index ae01a2d801aa1529f482aae164e6bf95c24ed918..a012eb7396628dbfeadd9b77c879bca47b6d2a29 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/course/statistic/IndentedStatisticNodeRenderer.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/course/statistic/IndentedStatisticNodeRenderer.java
@@ -104,7 +104,7 @@ public class IndentedStatisticNodeRenderer implements CustomCellRenderer {
return;
}
- String cssClass = CourseNodeFactory.getInstance().getCourseNodeConfiguration(type).getIconCSSClass();
+ String cssClass = CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(type).getIconCSSClass();
appendIndent(sb,indent);
diff --git a/olat3/webapp/WEB-INF/src/org/olat/course/tree/CourseInternalLinkTreeModel.java b/olat3/webapp/WEB-INF/src/org/olat/course/tree/CourseInternalLinkTreeModel.java
index 4fd014c4cd30040f7d534c9028f93fb696e5d8cf..6cae6a8c93601df4a7c59b73a76a8df2c88ee26b 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/course/tree/CourseInternalLinkTreeModel.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/course/tree/CourseInternalLinkTreeModel.java
@@ -77,7 +77,7 @@ public class CourseInternalLinkTreeModel extends CustomLinkTreeModel {
GenericTreeNode treeNode = new GenericTreeNode();
treeNode.setIdent(courseNode.getIdent());
treeNode.setTitle(courseNode.getShortTitle());
- treeNode.setIconCssClass(CourseNodeFactory.getInstance().getCourseNodeConfiguration(courseNode.getType()).getIconCSSClass());
+ treeNode.setIconCssClass(CourseNodeFactory.getInstance().getCourseNodeConfigurationEvenForDisabledBB(courseNode.getType()).getIconCSSClass());
// go through all children and add them as converted tree nodes
for (int i = 0; i < courseNode.getChildCount(); i++) {
CourseNode child = (CourseNode) courseNode.getChildAt(i);
diff --git a/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/EPMultipleMapController.java b/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/EPMultipleMapController.java
index 430fce6d4f7e153fdb400385db5dc3e9e75a3950..1b1ae98824c9fd7622cba94c6bad3bd7d7584476 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/EPMultipleMapController.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/EPMultipleMapController.java
@@ -152,7 +152,7 @@ public class EPMultipleMapController extends BasicController implements Activate
List<Integer> childAmount = new ArrayList<Integer>(userMaps.size());
List<String> mapStyles = new ArrayList<String>(userMaps.size());
List<Date> deadLines = new ArrayList<Date>(userMaps.size());
- List<String[]> restriStats = new ArrayList<String[]>(userMaps.size());
+ List<String> restriStats = new ArrayList<String>(userMaps.size());
List<String> owners = new ArrayList<String>(userMaps.size());
List<String> amounts = new ArrayList<String>(userMaps.size());
@@ -226,8 +226,21 @@ public class EPMultipleMapController extends BasicController implements Activate
logDebug(" in loop : looked up course at : ", String.valueOf(System.currentTimeMillis()));
}
// get some stats about the restrictions if available
- String[] stats = ePFMgr.getRestrictionStatisticsOfMap(structMap);
- restriStats.add(stats);
+ String[] stats = ePFMgr.getRestrictionStatisticsOfMap(structMap);
+ int toCollect = 0;
+ if (stats != null){
+ try {
+ toCollect = Integer.parseInt(stats[1]) - Integer.parseInt(stats[0]);
+ } catch (Exception e) {
+ // do nothing
+ toCollect = 0;
+ }
+ }
+ if (toCollect != 0) {
+ restriStats.add(String.valueOf(toCollect));
+ } else {
+ restriStats.add(null);
+ }
if (isLogDebugEnabled()) {
logDebug(" in loop : calculated restriction statistics at : ", String.valueOf(System.currentTimeMillis()));
}
diff --git a/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_content/multiMaps.html b/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_content/multiMaps.html
index 01fd2a40b6dae965a93528325cb15cd960cb4c31..a904a341ae0bfb6a3e42d6327e973a9005251b84 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_content/multiMaps.html
+++ b/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_content/multiMaps.html
@@ -17,7 +17,7 @@
#if ($owners.get($index)) <p>$r.translate("map.owners", $owners.get($index)) </p> #end
<p>$amounts.get($index)
#if ($deadLines.get($index)) <br/> $r.translate("map.deadline", "$r.formatDate($deadLines.get($index))") #end
- #if ($restriStats.get($index)) <br/> $r.translate("map.restriction.stats", $restriStats.get($index)) #end
+ #if ($restriStats.get($index)) <br/> $r.translate("map.restriction.overview", $restriStats.get($index)) #end
</p>
#if($r.available($viewLink)) $r.render($viewLink) </br>#end
#if($r.get($courseLink))
diff --git a/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_i18n/LocalStrings_de.properties b/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_i18n/LocalStrings_de.properties
index 90288637b5d213a89460fe4a6323092eee469c58..7264efbbd69de65010c7c6dc1203e3b6f6f2cf00 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_i18n/LocalStrings_de.properties
+++ b/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/_i18n/LocalStrings_de.properties
@@ -117,4 +117,7 @@ chelp.share.date1=Von / Bis
chelp.editor.hoover=Hilfe zum Editieren von Sammelmappen
chelp.editorwithrestrictions.hoover=Hilfe zum Editieren von Portfoliovorlagen
map.cannot.submit.nomore.coursenode=Der Kursknoten dieser Portfolioaufgabe wurde gelöscht. Diese Sammelmappe kann daher nicht abgegeben werden und bleibt zur Bearbeitung geöffnet.
-map.restriction.stats={0}/{1} Restriktionen erfüllt
+map.restriction.stats={0} von {1} zu sammelnden Artefakten verlinkt.
+map.restriction.overview=Noch {0} Artefakte zu sammeln
+
+