Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv27281
Modified Files:
closelesson.link.jspx problem.item.jspx stage3-problems.jspx
student.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
Index: closelesson.link.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/closelesson.link.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- closelesson.link.jspx 8 Jan 2009 10:32:53 -0000 1.3
+++ closelesson.link.jspx 8 Jan 2009 10:51:53 -0000 1.4
@@ -8,16 +8,17 @@
class="closelesson">
<jsp:output omit-xml-declaration="true" />
+ <mm:import id="firstopenlesson" from="session"
externid="firstopenlesson_${user}_${education}" />
- <c:if test="${! empty lastlesson}">
+ <c:if test="${! empty firstopenlesson}">
<mm:node number="$user">
- <mm:node referid="lastlesson">
+ <mm:node referid="firstopenlesson">
<mm:nodeinfo type="gui" />
</mm:node>
<mm:function name="canCloseLesson"
- referids="lastles...@lesson">
+ referids="firstopenles...@lesson">
<c:choose>
<c:when test="${_}">
@@ -28,8 +29,8 @@
<form name="closelessonform" action="${_}" method="post">
<input type="hidden" name="coachmode" value="false" />
- <input type="hidden" name="lesson" value="${lastlesson}" />
- <di:translate key="assessment.close_and_send_to_coach"
arg0="${lastlesson.name}">
+ <input type="hidden" name="lesson" value="${firstopenlesson}"
/>
+ <di:translate key="assessment.close_and_send_to_coach"
arg0="${firstopenlesson.name}">
<input type="submit" class="formbutton" value="${_}" />
</di:translate>
</form>
Index: problem.item.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/problem.item.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- problem.item.jspx 8 Jan 2009 10:32:53 -0000 1.3
+++ problem.item.jspx 8 Jan 2009 10:51:53 -0000 1.4
@@ -18,6 +18,8 @@
<mm:fieldinfo type="errors" />
</mm:fieldlist>
+ <mm:import id="lastlesson" from="session"
externid="lastlesson_${user}_${education}" />
+
<mm:present referid="lastlesson">
<mm:relation to="${lastlesson}" role="posrel" notfound="null">
@@ -34,7 +36,7 @@
</mm:relation>
<mm:listrelationscontainer type="learnobjects" role="posrel">
- <mm:addnode element="learnobjects" number="${sessionScope.lastlesson}"
/>
+ <mm:addnode element="learnobjects" number="${lastlesson}" />
<mm:listrelations id="relation">
<mm:field name="pos" id="pos${relation}">
<mm:fieldinfo field="pos${_node}"
datatype="didactor_assessment_troubles" type="input" />
Index: stage3-problems.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/stage3-problems.jspx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- stage3-problems.jspx 8 Jan 2009 10:32:53 -0000 1.3
+++ stage3-problems.jspx 8 Jan 2009 10:51:53 -0000 1.4
@@ -9,6 +9,9 @@
<h2><di:translate key="assessment.problems" /></h2>
+ <mm:import id="lastlesson" from="session"
externid="lastlesson_${user}_${education}" />
+
+
<div>
<mm:node referid="lastlesson">
Hoeveel last in <mm:nodeinfo type="gui" />
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- student.jspx 8 Jan 2009 10:32:53 -0000 1.29
+++ student.jspx 8 Jan 2009 10:51:53 -0000 1.30
@@ -49,15 +49,26 @@
<mm:listrelationscontainer type="learnblocks" role="posrel">
<mm:listrelations>
<mm:relation from="${learnBlock}" to="${user}" role="classrel">
- <mm:remove referid="lastlesson" />
- <mm:node node="learnBlock" id="lastlesson" />
+ <mm:remove referid="lastclosedlesson" />
+ <mm:node node="learnBlock" id="lastclosedlesson" />
</mm:relation>
</mm:listrelations>
</mm:listrelationscontainer>
+ <mm:relation to="${user}" notfound="null">
+ <c:if test="${! empty _node or empty firstopenlesson}">
+ <c:if test="${empty _node}">
+ <mm:node node="learnBlock" id="firstopenlesson" />
+ </c:if>
+ </c:if>
+ </mm:relation>
</mm:relatednodes>
</mm:relatednodescontainer>
+
</mm:node>
- <mm:write session="lastlesson" referid="lastlesson" />
+
+ <mm:write session="lastlesson_${user}_${education}"
value="${lastclosedlesson}" />
+ <mm:write session="firstopenlesson_${user}_${education}"
referid="firstopenlesson" />
+
<di:include page="/assessment/${stage}.jspx" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
