Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv29961
Modified Files:
stage1-goals.jspx stage4-problems.jspx stage5-evaluate.jspx
student.jspx
Log Message:
exceptions if you happend to have closed every lesson
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
Index: stage1-goals.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage1-goals.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- stage1-goals.jspx 8 Jan 2009 17:44:37 -0000 1.2
+++ stage1-goals.jspx 9 Jan 2009 10:40:01 -0000 1.3
@@ -13,9 +13,7 @@
<h2><di:translate key="assessment.goals" /></h2>
<div>
-
<p>Som de dingen op die echt belangrijk zijn in jouw leven.</p>
-
</div>
<mm:node number="$user">
Index: stage4-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage4-problems.jspx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- stage4-problems.jspx 9 Jan 2009 10:24:14 -0000 1.8
+++ stage4-problems.jspx 9 Jan 2009 10:40:01 -0000 1.9
@@ -62,7 +62,6 @@
<tr class="problemItem"><td colspan="7">--</td></tr>
</c:if>
<mm:relatednodes>
-
<mm:include page="/assessment/matrix.div.jspx"
referids="sub?,stage?,_n...@source" />
<tr><td colspan="7"><jsp:text> </jsp:text></td></tr>
</mm:relatednodes>
Index: stage5-evaluate.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage5-evaluate.jspx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- stage5-evaluate.jspx 8 Jan 2009 15:35:29 -0000 1.8
+++ stage5-evaluate.jspx 9 Jan 2009 10:40:01 -0000 1.9
@@ -34,12 +34,11 @@
<h4 class="mm_dt_didactor_assessment_troubles"><mm:nodeinfo
type="gui" /></h4>
</mm:nodelistfunction>
</mm:node>
- <mm:include page="/assessment/stage5-editdifficulties.jspx" />
+
<mm:link page="/assessment/stage5.js.jsp">
<script type="text/javascript" src="${_}" />
</mm:link>
-
</div>
@@ -47,7 +46,6 @@
<mm:include page="/education/tests/buildtest.jsp"
referids="t...@learnobject" />
</div>
- <p>&nbsp;</p><p></p>
<mm:link page="/assessment/stage5.js.jsp">
<script type="text/javascript" src="${_}" />
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- student.jspx 8 Jan 2009 15:10:46 -0000 1.32
+++ student.jspx 9 Jan 2009 10:40:01 -0000 1.33
@@ -11,15 +11,8 @@
<mm:node number="${education}">
- <mm:relatednodescontainer
- element="learnblocks"
- searchdirs="destination"
- path="posrel,learnblocks${di:setting('assessment',
'relate_learnblocks') ? ',related,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">
+
+ <mm:nodelistfunction id="learnBlock" name="lessons">
<mm:listrelationscontainer type="learnblocks" role="posrel">
<mm:listrelations>
<mm:relation from="${learnBlock}" to="${user}" role="classrel">
@@ -29,7 +22,7 @@
</mm:listrelations>
</mm:listrelationscontainer>
<mm:relation to="${user}" notfound="null">
- <c:if test="${! empty _node or empty currentlesson}">
+ <c:if test="${empty currentlesson}">
<c:if test="${empty _node}">
<mm:node node="learnBlock" id="currentlesson">
<mm:function id="reached" name="sequence" write="false" />
@@ -37,9 +30,19 @@
</c:if>
</c:if>
</mm:relation>
- </mm:relatednodes>
- </mm:relatednodescontainer>
+
+ <mm:last>
+ <c:if test="${empty currentlesson}">
+ <mm:node node="learnBlock">
+ <mm:function id="reached" name="sequence" write="false" />
</mm:node>
+ </c:if>
+ </mm:last>
+
+ </mm:nodelistfunction>
+ </mm:node>
+
+
<ul class="tabs">
<c:forEach
items="stage1-goals,stage2-problems,stage3-problems,stage4-problems" var="s">
@@ -66,7 +69,7 @@
<mm:write session="lastlesson_${user}_${education}"
value="${lastclosedlesson}" />
- <mm:write session="currentlesson_${user}_${education}"
referid="currentlesson" />
+ <mm:write session="currentlesson_${user}_${education}"
value="${currentlesson}" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
