Author: michiel
Date: 2010-05-07 17:23:25 +0200 (Fri, 07 May 2010)
New Revision: 42110
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
Log:
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
2010-05-07 13:26:30 UTC (rev 42109)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/matrix.div.coach.jspx
2010-05-07 15:23:25 UTC (rev 42110)
@@ -63,12 +63,7 @@
</c:if>
</mm:relation>
- <!-- now let the user _edit_ (if first 'open' lesson)
- this relation, or only _see_ (if 'closed' lesson).
- That is, inidcate how much trouble the problem is now causing.
- -->
-
<mm:listrelationscontainer type="problems" role="posrel">
<mm:addnode element="problems" number="${problem}" />
@@ -92,24 +87,23 @@
<mm:import externid="subsub" />
- <mm:relatednodes max="1" path="problemtypes,tests" element="tests">
+ <mm:relatednodes max="1" path="problemtypes,tests" element="tests">
<mm:node id="test" />
</mm:relatednodes>
+
<mm:present referid="test">
- <di:copybook student="${student_nr}">
- <mm:node>
- <mm:list path="madetests,tests" constraints="tests.number =
${test}" fields="madetests.number">
- <mm:field name="madetests.number"
id="madeTest" write="false"/>
- </mm:list>
- </mm:node>
+ <di:copybook student="${student_id}">
+ <mm:relatednodescontainer path="madetests,tests" element="madetests"
id="q">
+ <mm:constraint field="tests.number" value="${test}" />
+ <mm:sortorder field="number" direction="down" />
+ <mm:relatednodes max="1">
+ <mm:node id="madeTest" />
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
</di:copybook>
-
-
- <mm:link referids="test,_n...@problem,student_id,sub?">
+ <mm:link
referids="test,_n...@problem,student_id,sub?,madet...@madetestno">
<mm:param name="subsub">stage2-evaluate-coach</mm:param>
- <mm:param name="testNo">${test}</mm:param>
- <mm:param name="madetestNo">${madeTest}</mm:param>
<td colspan="${fn:length(learnBlock) - blockCount}"
class="learnblockItems" align="right">
<a href="${_}">bekijk uitwerking</a>
</td>
Modified:
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
===================================================================
---
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
2010-05-07 13:26:30 UTC (rev 42109)
+++
didactor/trunk/components/assessment/src/main/webapp/assessment/stage2-evaluate-coach.jspx
2010-05-07 15:23:25 UTC (rev 42110)
@@ -21,7 +21,9 @@
</mm:link>
<h3><mm:node number="${student_id}"><mm:field id="studentname"
name="firstname"/></mm:node></h3>
+
<mm:node referid="problem">
+ <h4><mm:field name="name" /></h4>
<p>
<mm:link page="/homework/" referids="sub">
<mm:param name="sub">assessment_coach</mm:param>
@@ -39,7 +41,7 @@
<div id="contentFrame" style="clear: both;">
<mm:include page="/education/tests/viewanswers.jsp"
- referids="t...@learnobject,student...@userno" />
+ referids="t...@learnobject,t...@testno,student...@userno" />
</div>
<!-- This is not a form, so it does not need commit
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
