Update of
/var/cvs/contributions/didactor2/src/assessment/java/nl/didactor/component/assessment/education_menu/utils
In directory james.mmbase.org:/tmp/cvs-serv30231
Modified Files:
LessonChecker.java
Log Message:
be inactive if component not linked to education
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/java/nl/didactor/component/assessment/education_menu/utils
Index: LessonChecker.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/java/nl/didactor/component/assessment/education_menu/utils/LessonChecker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- LessonChecker.java 26 Jul 2007 09:09:36 -0000 1.2
+++ LessonChecker.java 5 Sep 2008 09:59:15 -0000 1.3
@@ -8,7 +8,7 @@
/**
* @javadoc
- * @version $Id: LessonChecker.java,v 1.2 2007/07/26 09:09:36 michiel Exp $
+ * @version $Id: LessonChecker.java,v 1.3 2008/09/05 09:59:15 michiel Exp $
*/
public class LessonChecker {
@@ -21,16 +21,23 @@
* It is advised to call this method only once during the education menu
building
* The goal is performance improving.
*
- * @param nodeEducation Node
- * @param nodeUser Node
+ * @param education Node
+ * @param user Node
* @return Set
*/
- public static Set<Node> getBlockedLearnblocksForThisUser(Node
nodeEducation, Node nodeUser) {
+ public static Set<Node> getBlockedLearnblocksForThisUser(Node education,
Node user) {
Set<Node> resultSet = new HashSet<Node>();
- Cloud cloud = nodeEducation.getCloud();
+ Cloud cloud = education.getCloud();
- NodeList relatedLearnBlocks = cloud.getList("" +
nodeEducation.getNumber(),
+ // Check whether this education indeeds needs 'assessment'.
+
+ Node assessment =
cloud.getNode(nl.didactor.component.Component.getComponent("assessment").getNumber());
+ if (! education.getRelatedNodes("components", "settingrel",
"destination").contains(assessment)) {
+ return resultSet;
+ }
+
+ NodeList relatedLearnBlocks = cloud.getList("" + education.getNumber(),
"educations,posrel,learnblocks",
"learnblocks.number",
null,
@@ -54,7 +61,7 @@
NodeList classRels = cloud.getList("" + learnBlock.getNumber(),
"learnblocks,classrel,people",
"classrel.number",
- "people.number='" +
nodeUser.getNumber() + "'",
+ "people.number='" +
user.getNumber() + "'",
null,
null, null, true);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
