Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv15696/assessment
Modified Files:
student.jspx student_overview.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment
Index: student.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- student.jspx 16 Jan 2009 16:25:17 -0000 1.44
+++ student.jspx 19 Jan 2009 14:29:17 -0000 1.45
@@ -9,41 +9,7 @@
<mm:import externid="stage">stage1-goals_problems</mm:import>
-
- <mm:node number="${education}">
- <mm:nodelistfunction id="learnBlock" name="lessons">
- <mm:listrelationscontainer type="learnblocks" role="posrel">
- <mm:listrelations>
- <mm:relation from="${learnBlock}" to="${user}" role="classrel">
- <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 currentlesson}">
- <c:if test="${empty _node}">
- <mm:node node="learnBlock" id="currentlesson">
- <mm:function id="reached" name="sequence" write="false" />
- </mm:node>
- </c:if>
- </c:if>
- </mm:relation>
-
- <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>
-
- <mm:write session="lastlesson_${user}_${education}"
value="${lastclosedlesson}" />
- <mm:write session="currentlesson_${user}_${education}"
value="${currentlesson}" />
-
+ <di:include page="/homework/currentlesson.jspx" />
<di:include page="/assessment/${stage}.jspx" />
Index: student_overview.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student_overview.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- student_overview.jspx 15 Jan 2009 12:47:03 -0000 1.2
+++ student_overview.jspx 19 Jan 2009 14:29:17 -0000 1.3
@@ -10,42 +10,7 @@
<mm:import externid="stage">stage2-overview</mm:import>
-
- <mm:node number="${education}">
- <mm:nodelistfunction id="learnBlock" name="lessons">
- <mm:listrelationscontainer type="learnblocks" role="posrel">
- <mm:listrelations>
- <mm:relation from="${learnBlock}" to="${user}" role="classrel">
- <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 currentlesson}">
- <c:if test="${empty _node}">
- <mm:node node="learnBlock" id="currentlesson">
- <mm:function id="reached" name="sequence" write="false" />
- </mm:node>
- </c:if>
- </c:if>
- </mm:relation>
-
- <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>
-
- <mm:write session="lastlesson_${user}_${education}"
value="${lastclosedlesson}" />
- <mm:write session="currentlesson_${user}_${education}"
value="${currentlesson}" />
-
-
+ <di:include page="/homework/currentlesson.jspx" />
<di:include page="/assessment/${stage}.jspx" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
