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

Modified Files:
        stage2-problems.jspx student.jspx 
Added Files:
        problem.item.jspx 
Log Message:
details


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


problem.item.jspx is new



Index: stage2-problems.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage2-problems.jspx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- stage2-problems.jspx        7 Jan 2009 17:05:48 -0000       1.1
+++ stage2-problems.jspx        7 Jan 2009 18:03:54 -0000       1.2
@@ -15,8 +15,8 @@
         page="/mmbase/style/images/" objectlist="${includePath}" 
absolute="context">
       <mm-sr:relatednodes
           icondir="${_}"
+          item="/assessment/problem.item.jspx"
           path="posrel,problems"
-          fields="name,type"
           orderby="posrel.pos" type="problems">
       </mm-sr:relatednodes>
     </mm:treefile>


Index: student.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- student.jspx        7 Jan 2009 17:05:48 -0000       1.25
+++ student.jspx        7 Jan 2009 18:03:54 -0000       1.26
@@ -9,10 +9,6 @@
 
   <mm:import externid="stage">stage1-goals</mm:import>
 
-  <mm:node number="$education">
-    <mm:function name="tree" />
-  </mm:node>
-
 
   <mm:node number="${education}">
     <mm:relatednodescontainer 
path="posrel,learnblocks${di:setting('assessment', 'relate_learnblocks') ? 
',related,components' : ''}" searchdirs="destination">
@@ -34,16 +30,19 @@
     </mm:relatednodescontainer>
   </mm:node>
 
-  FO: ${firstopenlesson}
-
   <ul class="tabs">
+    <mm:import from="cookie" 
externid="didactor_${education}_${user}_maxsequence" id="reached">0</mm:import>
+
     <c:forEach items="stage1-goals,stage2-problems,stage3-problems" var="s">
+      <mm:context>
       <c:set var="settingname" value="opens_${s}" />
 
       <c:if test="${! empty di:setting('assessment', settingname)}">
-
+          <mm:node number="${di:setting('assessment', settingname)}">
+            <mm:function id="stage_required" name="sequence" write="false" />
+          </mm:node>
       </c:if>
-      <c:if test="${empty di:setting('assessment', settingname)}">
+        <c:if test="${empty di:setting('assessment', settingname) or reached 
ge stage_required}">
         <li class="${stage eq s ? 'current' : ''}">
           <mm:link referids="s...@stage">
             <mm:param name="sub">assessment</mm:param>
@@ -51,6 +50,7 @@
           </mm:link>
         </li>
       </c:if>
+      </mm:context>
     </c:forEach>
   </ul>
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to