[MMBASE CVS] contributions/didactor2/src/assessment/templates/assessment coach.jspx matrix.div.jspx student.jspx

[Michiel Meeuwissen]

Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv20478/templates/assessment

Modified Files:
        coach.jspx matrix.div.jspx student.jspx 
Log Message:
added a features 'relate_component' to indicate which learnblocks must be 
presented in the assessment overviews


See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment


Index: coach.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/coach.jspx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- coach.jspx  4 Sep 2008 13:24:21 -0000       1.8
+++ coach.jspx  9 Oct 2008 16:07:24 -0000       1.9
@@ -15,7 +15,12 @@
         <tr>
           <th class="listHeader">&amp;nbsp;</th>
           <mm:node number="$education">
-            <mm:relatednodes type="learnblocks" path="posrel,learnblocks" 
id="learnblocks" orderby="posrel.pos">
+            <mm:relatednodescontainer element="learnblocks"  
path="posrel,learnblocks${di:setting('assessment', 'relate_learnblocks') ? 
',components' : ''}">
+              <mm:sortorder field="posrel.pos" />
+              <c:if test="${di:setting('assessment', 'relate_learnblocks')}">
+                <mm:addnode element="components" number="component.assessment" 
/>
+              </c:if>
+              <mm:relatednodes id="learnblocks">
               <th class="listHeader">
                 <mm:field name="name" />
                 <!--
@@ -24,6 +29,7 @@
                 -->
               </th>
             </mm:relatednodes>
+            </mm:relatednodescontainer>
           </mm:node>
         </tr>
         <mm:relatednodes type="classes" path="classrel,classes" id="class">
@@ -55,8 +61,7 @@
                 <td class="listItem">
                   <di:person />
                 </td>
-                <mm:node number="$education" notfound="skip">
-                  <mm:relatednodes id="learnblock" type="learnblocks" 
path="posrel,learnblocks" orderby="posrel.pos" >
+                <mm:relatednodes referid="learnblocks" id="learnblock">
                     <td class="listItem">
                       <mm:relation role="classrel" to="${student}">
                         <mm:relatednodes type="popfeedback">
@@ -128,7 +133,6 @@
                       </mm:link>
                     </mm:node>
                   </td>
-                </mm:node>
               </tr>
             </mm:relatednodes>
           </mm:relatednodescontainer>


Index: matrix.div.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/matrix.div.jspx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- matrix.div.jspx     15 Aug 2008 12:26:18 -0000      1.9
+++ matrix.div.jspx     9 Oct 2008 16:07:24 -0000       1.10
@@ -36,11 +36,16 @@
 
   <!-- And, per lesson, how much trouble it gave -->
   <mm:node number="${education}">
-    <mm:relatednodes
-        id="learnBlock"
-        element="learnblocks" path="posrel,learnblocks" orderby="posrel.pos">
+    <mm:relatednodescontainer
+        element="learnblocks"
+        path="posrel,learnblocks${di:setting('assessment', 
'relate_learnblocks') ? ',components' : ''}">
+      <mm:sortorder field="posrel.pos" />
+      <c:if test="${di:setting('assessment', 'relate_learnblocks')}">
+        <mm:addnode element="components" number="component.assessment" />
+      </c:if>
 
       <mm:size id="size" write="false" />
+      <mm:relatednodes id="learnBlock">
       <span class="col" style="width: ${60 / size}%">
 
         <!--
@@ -113,6 +118,7 @@
 
 
     </mm:relatednodes>
+    </mm:relatednodescontainer>
   </mm:node>
 
   <span class="col">


Index: student.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- student.jspx        4 Sep 2008 12:49:59 -0000       1.17
+++ student.jspx        9 Oct 2008 16:07:24 -0000       1.18
@@ -36,11 +36,15 @@
     -->
     <mm:node number="${education}">
       <span class="head problem">&amp;nbsp;</span>
-      <mm:relatednodescontainer path="posrel,learnblocks">
+      <mm:relatednodescontainer 
path="posrel,learnblocks${di:setting('assessment', 'relate_learnblocks') ? 
',components' : ''}">
         <mm:sortorder field="posrel.pos" />
+        <c:if test="${di:setting('assessment', 'relate_learnblocks')}">
+          <mm:addnode element="components" number="component.assessment" />
+        </c:if>
+
         <mm:relatednodes id="learnBlock"  varStatus="status">
           <!--
-               If a relation learnBlock -classrel->user exists, then that 
means that this lesson is marekd 'closed' (by this module)
+               If a relation learnBlock -classrel->user exists, then that 
means that this lesson is marked 'closed' (by this module)
           -->
           <mm:relation to="${user}" role="classrel" notfound="null">
             <c:if test="${empty _node and empty firstopenlesson}">
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs