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

[Michiel Meeuwissen]

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

Modified Files:
        matrix.div.jspx student.jspx 
Log Message:



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


Index: matrix.div.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/matrix.div.jspx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- matrix.div.jspx     14 Aug 2008 14:07:22 -0000      1.6
+++ matrix.div.jspx     14 Aug 2008 15:10:30 -0000      1.7
@@ -38,7 +38,7 @@
   <mm:node number="${education}">
     <mm:relatednodes
         id="learnBlock"
-        type="learnblocks" path="posrel,learnblocks" orderby="posrel.pos">
+        element="learnblocks" path="posrel,learnblocks,components" 
orderby="posrel.pos">
 
       <mm:size id="size" write="false" />
       <span class="col" style="width: ${60 / size}%">


Index: student.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- student.jspx        14 Aug 2008 14:07:22 -0000      1.9
+++ student.jspx        14 Aug 2008 15:10:30 -0000      1.10
@@ -34,7 +34,10 @@
     <!-- show the learnblocks -->
     <mm:node number="${education}">
       <span class="head problem">&amp;nbsp;</span>
-      <mm:relatednodes id="learnBlock"  type="learnblocks" 
path="posrel,learnblocks" orderby="posrel.pos" varStatus="status">
+      <mm:relatednodescontainer path="posrel,learnblocks,components">
+        <mm:addnode element="components" number="component.assessment" />
+        <mm:sortorder field="posrel.pos" />
+        <mm:relatednodes id="learnBlock"  varStatus="status">
         <mm:relation to="${user}" role="classrel" notfound="null">
           <c:if test="${empty _node and empty firstopenlesson}">
             <mm:node node="learnBlock" id="firstopenlesson" />
@@ -44,6 +47,7 @@
           </span>
         </mm:relation>
       </mm:relatednodes>
+      </mm:relatednodescontainer>
       <span class="head delete">&amp;nbsp;</span>
     </mm:node>
 
@@ -77,6 +81,7 @@
       </span>
       <mm:node number="${education}">
         <mm:relatednodes type="learnblocks" path="posrel,learnblocks" 
orderby="posrel.pos" varStatus="status">
+          <mm:relation to="component.assessment">
           <span class="col" style="width: ${60 / (status.count + 1)}%"> <!-- 
the +1 helps IE, but is logically not necessary -->
 
             <mm:relation role="classrel" to="${user}">
@@ -101,6 +106,7 @@
               </mm:treefile>
             </mm:present>
           </span>
+          </mm:relation>
         </mm:relatednodes>
       </mm:node>
     </div>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs